From a410fd0edcecd02f6c71b345eb8c11fcf09a4561 Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Wed, 13 Oct 2021 13:14:43 +0200 Subject: [PATCH] 5.14.12-1 (clr 5.14.9-1079) --- .SRCINFO | 8 ++++---- PKGBUILD | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a0618da..0fcde3d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-clear pkgdesc = Clear Linux - pkgver = 5.14.11 + pkgver = 5.14.12 pkgrel = 1 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 @@ -14,8 +14,8 @@ pkgbase = linux-clear options = !strip source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.sign - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.14.11.xz - source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.14.9-1079 + source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.14.12.xz + source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.14.9-1079 source = more-uarches-20210914.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20210914.tar.gz source = 0001-pci-Enable-overrides-for-missing-ACS-capabilities.patch::https://raw.githubusercontent.com/xanmod/linux-patches/e2d48df5def86f498766b22e836a9c2f1bcb3809/linux-5.14.y-xanmod/pci_acso/0001-pci-Enable-overrides-for-missing-ACS-capabilities.patch source = 0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW.patch::https://raw.githubusercontent.com/xanmod/linux-patches/e2d48df5def86f498766b22e836a9c2f1bcb3809/linux-5.14.y-xanmod/userns/0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW.patch @@ -23,7 +23,7 @@ pkgbase = linux-clear validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2 sha256sums = SKIP - sha256sums = c073f72d39b2915659c629a8a17c43e59bd77d77564312be99045ab826d7f3d4 + sha256sums = 1553ab8d8e8485716be25c220850496522065b49ac6e4a8d3f9129439c2ed46d sha256sums = SKIP sha256sums = b70720e7537a0b6455edaeb198d52151fb3b3c3a91631b8f43d2e71b694da611 sha256sums = 1c7aee7bccb1d848887b0cef273518badb09021788b148db1c6168d4c761f1fd diff --git a/PKGBUILD b/PKGBUILD index aec0630..a48f1dd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -74,7 +74,7 @@ _use_current= ### IMPORTANT: Do no edit below this line unless you know what you're doing _major=5.14 -_minor=11 +_minor=12 _srcname=linux-${_major} _clr=${_major}.9-1079 pkgbase=linux-clear @@ -91,7 +91,7 @@ source=( "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz" "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.sign" "https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz" - "clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}" + "$pkgbase::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}" "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz" "0001-pci-Enable-overrides-for-missing-ACS-capabilities.patch::https://raw.githubusercontent.com/xanmod/linux-patches/e2d48df5def86f498766b22e836a9c2f1bcb3809/linux-5.14.y-xanmod/pci_acso/0001-pci-Enable-overrides-for-missing-ACS-capabilities.patch" "0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW.patch::https://raw.githubusercontent.com/xanmod/linux-patches/e2d48df5def86f498766b22e836a9c2f1bcb3809/linux-5.14.y-xanmod/userns/0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW.patch" @@ -115,9 +115,9 @@ prepare() { echo "${pkgbase#linux}" > localversion.20-pkgname ### Add Clearlinux patches - for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | sed -n 's/.*: //p'); do + for i in $(grep '^Patch' ${srcdir}/$pkgbase/linux.spec | sed -n 's/.*: //p'); do echo "Applying patch ${i}..." - patch -Np1 -i "$srcdir/clearlinux/${i}" + patch -Np1 -i "$srcdir/$pkgbase/${i}" done local src @@ -131,7 +131,7 @@ prepare() { ### Setting config echo "Setting config..." - cp -Tf $srcdir/clearlinux/config ./.config + cp -Tf $srcdir/$pkgbase/config ./.config ### Enable extra stuff from arch kernel echo "Enable extra stuff from arch kernel..." @@ -181,6 +181,7 @@ prepare() { scripts/config --enable FONT_TER16x32 make olddefconfig + diff -u $srcdir/$pkgbase/config .config || : # https://github.com/graysky2/kernel_compiler_patch # make sure to apply after olddefconfig to allow the next section @@ -353,7 +354,7 @@ done sha256sums=('7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2' 'SKIP' - 'c073f72d39b2915659c629a8a17c43e59bd77d77564312be99045ab826d7f3d4' + '1553ab8d8e8485716be25c220850496522065b49ac6e4a8d3f9129439c2ed46d' 'SKIP' 'b70720e7537a0b6455edaeb198d52151fb3b3c3a91631b8f43d2e71b694da611' '1c7aee7bccb1d848887b0cef273518badb09021788b148db1c6168d4c761f1fd'