From 423ea324b414c9e878f467155e4dfb428b14626e Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Sat, 17 Feb 2018 21:51:08 +0100 Subject: [PATCH] pkgupdate: 4.15.4 --- .SRCINFO | 10 +++++----- PKGBUILD | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a40d6b6..43a2526 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-clear - pkgver = 4.15.3 - pkgrel = 3 + pkgver = 4.15.4 + pkgrel = 1 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 license = GPL2 @@ -14,8 +14,8 @@ pkgbase = linux-clear options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.3.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.3.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.4.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.4.sign source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.15.3-529 source = https://downloadmirror.intel.com/27337/eng/microcode-20171117.tgz source = 60-linux.hook @@ -26,7 +26,7 @@ pkgbase = linux-clear validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 sha256sums = SKIP - sha256sums = 6dd42389603bc6c83d2e6db1d736303e41d26cef479cad926b87711f261c9c35 + sha256sums = 5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8 sha256sums = SKIP sha256sums = SKIP sha256sums = 93bd1da9fa58ece0016702e657f708b7e496e56da637a3fe9a6d21f1d6f524dc diff --git a/PKGBUILD b/PKGBUILD index 3775d30..5813054 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,10 +3,10 @@ pkgbase=linux-clear __basekernel=4.15 -_minor=3 +_minor=4 pkgver=${__basekernel}.${_minor} _clearver=${__basekernel}.3-529 -pkgrel=3 +pkgrel=1 arch=('x86_64') url="https://github.com/clearlinux-pkgs/linux" license=('GPL2') @@ -30,7 +30,7 @@ validpgpkeys=( ) sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP' - '6dd42389603bc6c83d2e6db1d736303e41d26cef479cad926b87711f261c9c35' + '5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8' 'SKIP' 'SKIP' '93bd1da9fa58ece0016702e657f708b7e496e56da637a3fe9a6d21f1d6f524dc' @@ -63,8 +63,10 @@ prepare() { sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config fi - # set extraversion to pkgrel - sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + # set extraversion to pkgrel and empty localversion + sed -e "/^EXTRAVERSION =/s/=.*/= -${pkgrel}/" \ + -e "/^EXTRAVERSION =/aLOCALVERSION =" \ + -i Makefile # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh @@ -75,7 +77,7 @@ prepare() { build() { cd linux-${__basekernel} - make ${MAKEFLAGS} LOCALVERSION= bzImage modules + make bzImage modules } _package() { @@ -88,12 +90,12 @@ _package() { cd linux-${__basekernel} # get kernel version - _kernver="$(make LOCALVERSION= kernelrelease)" + _kernver="$(make kernelrelease)" _basekernel=${_kernver%%-*} _basekernel=${_basekernel%.*} mkdir -p "${pkgdir}"/{boot,usr/lib/modules} - make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}/usr" modules_install + make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" # make room for external modules