From 6bd03cf784a8e46bef621ac47b48d181a53ddfb3 Mon Sep 17 00:00:00 2001 From: Archlinux-Jerry Build Bot Date: Wed, 2 Oct 2019 16:03:27 +0800 Subject: [PATCH] update linux-phicomm-n1-lts-git: add disable-scm-version.patch --- .../0001-disable-scm-version.patch | 12 ++++++++++++ linux-phicomm-n1-lts-git/PKGBUILD | 7 ++++++- linux-phicomm-n1-lts-git/autobuild.yaml | 4 ---- 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 linux-phicomm-n1-lts-git/0001-disable-scm-version.patch diff --git a/linux-phicomm-n1-lts-git/0001-disable-scm-version.patch b/linux-phicomm-n1-lts-git/0001-disable-scm-version.patch new file mode 100644 index 0000000..866a2a2 --- /dev/null +++ b/linux-phicomm-n1-lts-git/0001-disable-scm-version.patch @@ -0,0 +1,12 @@ +diff --git a/scripts/setlocalversion b/scripts/setlocalversion +index 71f39410691b..f76b0bbc6f5d 100755 +--- a/scripts/setlocalversion ++++ b/scripts/setlocalversion +@@ -31,6 +31,7 @@ fi + + scm_version() + { ++ return + local short + short=false + diff --git a/linux-phicomm-n1-lts-git/PKGBUILD b/linux-phicomm-n1-lts-git/PKGBUILD index 0a95ab0..d8fb896 100644 --- a/linux-phicomm-n1-lts-git/PKGBUILD +++ b/linux-phicomm-n1-lts-git/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-phicomm-n1-lts-git _srcname=Amlogic_s905-kernel _kernelname=${pkgbase#linux} _desc="AArch64 kernel for Phicomm N1" -pkgver=4.19.74.gd63fb2829240 +pkgver=4.19.76.gffc1f4d0798f pkgrel=1 arch=('aarch64') url="https://github.com/isjerryxiao/Amlogic_s905-kernel" @@ -18,10 +18,12 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' ' options=('!strip') source=("git+https://github.com/isjerryxiao/Amlogic_s905-kernel.git#branch=linux-4.19.y" 'config' + '0001-disable-scm-version.patch' 'linux.preset' '99-linux.hook') md5sums=('SKIP' '25a21a791d6dcbd168c9cd41adb1d901' + 'b8a3b7cc32a8786114e29c41636979fc' 'f6ee374f560e1b9df6a7de2399027d1b' 'd1c40c7367a7081f3b4c03264780f9d4') @@ -33,6 +35,9 @@ pkgver() { prepare() { cd "${srcdir}/${_srcname}" + # disable scm version + patch -p1 < "../0001-disable-scm-version.patch" + cat "${srcdir}/config" > ./.config # don't run depmod on 'make install'. We'll do this ourselves in packaging diff --git a/linux-phicomm-n1-lts-git/autobuild.yaml b/linux-phicomm-n1-lts-git/autobuild.yaml index 89dd33a..20c5306 100644 --- a/linux-phicomm-n1-lts-git/autobuild.yaml +++ b/linux-phicomm-n1-lts-git/autobuild.yaml @@ -5,10 +5,6 @@ timeout: priority: -10 extra: - - prebuild: - - mv src/Amlogic_s905-kernel/.git src/Amlogic_s905-kernel/.git-1 - - postbuild: - - mv src/Amlogic_s905-kernel/.git-1 src/Amlogic_s905-kernel/.git - failure: - rm -rf 'src_fail' - mv 'src' 'src_fail'