From 80afcea1922fdc70fb3485872823f76ae70671e3 Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Wed, 22 Jan 2020 01:12:45 +0100 Subject: [PATCH] 5.4.13-3 (clr 5.4.13-895) wireguard-20200121 --- .SRCINFO | 8 ++++---- PKGBUILD | 60 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b40aaf1..b9b6f46 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-clear pkgdesc = Clear Linux pkgver = 5.4.13 - pkgrel = 2 + pkgrel = 3 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 license = GPL2 @@ -15,8 +15,8 @@ pkgbase = linux-clear source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.sign source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.4.13.xz - source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.4.12-893 - source = https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-0.0.20200105.tar.xz + source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.4.13-895 + source = https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-0.0.20200121.tar.xz source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz source = pci-enable-overrides-for-missing-acs-capabilities.patch source = futex-wait-multiple-5.2.1.patch::https://aur.archlinux.org/cgit/aur.git/plain/futex-wait-multiple-5.2.1.patch?h=linux-fsync @@ -27,7 +27,7 @@ pkgbase = linux-clear sha256sums = SKIP sha256sums = 40f429d1a47db11033179f4ac3306d72c72556a6727ead7a29dc0f4412a697d1 sha256sums = SKIP - sha256sums = 9f12f68e96f6865325995c38213e09b05751cd1ef03e0bbc9f1bdc3e5680b337 + sha256sums = 7726c2994d11913c4543fd3dc83636f7ce573ca689b15e11b83e980acc04422b sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5 sha256sums = 4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0 sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942 diff --git a/PKGBUILD b/PKGBUILD index 6267e86..26aa03b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -68,17 +68,17 @@ _use_current= _major=5.4 _minor=13 _srcname=linux-${_major} -_clr=${_major}.12-893 +_clr=${_major}.13-895 pkgbase=linux-clear pkgver=${_major}.${_minor} -pkgrel=2 +pkgrel=3 pkgdesc='Clear Linux' arch=('x86_64') url="https://github.com/clearlinux-pkgs/linux" license=('GPL2') makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'xmlto') options=('!strip') -_wrg_snap='0.0.20200105' +_wrg_snap='0.0.20200121' _gcc_more_v='20190822' source=( "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz" @@ -100,24 +100,24 @@ prepare() { cd ${_srcname} ### Add upstream patches - msg2 "Add upstream patches" + echo "Add upstream patches" patch -Np1 -i ../patch-${pkgver} ### Setting version - msg2 "Setting version..." + echo "Setting version..." scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname ### Add Clearlinux patches for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec |\ - grep -Ev '^Patch0123|^Patch0130|^Patch1001|^Patch005' | sed -n 's/.*: //p'); do - msg2 "Applying patch ${i}..." + grep -Ev '^Patch0123|^Patch0130|^Patch1001' | sed -n 's/.*: //p'); do + echo "Applying patch ${i}..." patch -Np1 -i "$srcdir/clearlinux/${i}" done ### Link the WireGuard source directory into the kernel tree - msg2 "Adding the WireGuard source directory..." + echo "Adding the WireGuard source directory..." "${srcdir}/wireguard-linux-compat-${_wrg_snap}/kernel-tree-scripts/jury-rig.sh" ./ local src @@ -125,16 +125,16 @@ prepare() { src="${src%%::*}" src="${src##*/}" [[ $src = *.patch ]] || continue - msg2 "Applying patch $src..." + echo "Applying patch $src..." patch -Np1 < "../$src" done ### Setting config - msg2 "Setting config..." + echo "Setting config..." cp -Tf $srcdir/clearlinux/config ./.config ### Enable extra stuff from arch kernel - msg2 "Enable extra stuff from arch kernel..." + echo "Enable extra stuff from arch kernel..." # General setup scripts/config --enable IKCONFIG \ @@ -180,7 +180,7 @@ prepare() { ### Patch source to unlock additional gcc CPU optimizations # https://github.com/graysky2/kernel_gcc_patch if [ "${_enable_gcc_more_v}" = "y" ]; then - msg2 "Applying enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch ..." + echo "Applying enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch ..." patch -Np1 -i "$srcdir/kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch" fi @@ -193,13 +193,13 @@ prepare() { ### Prepared version make -s kernelrelease > version - msg2 "Prepared %s version %s" "$pkgbase" "$( ./.config else @@ -214,10 +214,10 @@ prepare() { # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then if [ -f $HOME/.config/modprobed.db ]; then - msg2 "Running Steven Rostedt's make localmodconfig now" + echo "Running Steven Rostedt's make localmodconfig now" make LSMOD=$HOME/.config/modprobed.db localmodconfig else - msg2 "No modprobed.db data found" + echo "No modprobed.db data found" exit fi fi @@ -253,7 +253,7 @@ _package() { local kernver="$(