From ece0a40e739cceee0e8a84a7869c5dc4df89d87d Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Tue, 4 Oct 2022 12:18:01 +0200 Subject: [PATCH] 6.0.0-1 (clr 6.0.0-1194) --- .SRCINFO | 12 +++++------- PKGBUILD | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4ab8938..d3ffa63 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-clear pkgdesc = Clear Linux - pkgver = 5.19.12 + pkgver = 6.0.0 pkgrel = 1 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 @@ -12,18 +12,16 @@ pkgbase = linux-clear makedepends = pahole makedepends = xmlto options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.sign - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.19.12.xz - source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.19.12-1194 + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.sign + source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.0.0-1194 source = more-uarches-20220315.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20220315.tar.gz source = 0001-pci-Enable-overrides-for-missing-ACS-capabilities.patch::https://raw.githubusercontent.com/xanmod/linux-patches/8f964c6180f3fba9eca1c3598c93b2b56f421a9c/linux-5.19.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/8f964c6180f3fba9eca1c3598c93b2b56f421a9c/linux-5.19.y-xanmod/userns/0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 + sha256sums = 5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e sha256sums = SKIP - sha256sums = 1a0cb578fae91e5f25e5c4af0b891b929816cdcee6647f6ffa2d4d9a8ffe4578 sha256sums = SKIP sha256sums = 5a29d172d442a3f31a402d7d306aaa292b0b5ea29139d05080a55e2425f48c5c sha256sums = 0c65735f3e636c45e5baffccd0d9cd519c939d95ec5daf3560a7a1338e1016fb diff --git a/PKGBUILD b/PKGBUILD index 08ef941..6e6318e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -81,10 +81,10 @@ ### IMPORTANT: Do no edit below this line unless you know what you're doing -_major=5.19 -_minor=12 +_major=6.0 +_minor=0 _srcname=linux-${_major} -_clr=${_major}.12-1194 +_clr=${_major}.0-1194 pkgbase=linux-clear pkgver=${_major}.${_minor} pkgrel=1 @@ -99,13 +99,13 @@ fi options=('!strip') _gcc_more_v='20220315' 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" + "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.xz" + "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${_major}.tar.sign" + #"https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz" "$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/8f964c6180f3fba9eca1c3598c93b2b56f421a9c/linux-${_major}.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/8f964c6180f3fba9eca1c3598c93b2b56f421a9c/linux-${_major}.y-xanmod/userns/0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW.patch" + "0001-pci-Enable-overrides-for-missing-ACS-capabilities.patch::https://raw.githubusercontent.com/xanmod/linux-patches/8f964c6180f3fba9eca1c3598c93b2b56f421a9c/linux-5.19.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/8f964c6180f3fba9eca1c3598c93b2b56f421a9c/linux-5.19.y-xanmod/userns/0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW.patch" ) if [ -n "$_use_llvm_lto" ]; then @@ -124,7 +124,7 @@ prepare() { ### Add upstream patches echo "Add upstream patches" - patch -Np1 -i ../patch-${pkgver} + #patch -Np1 -i ../patch-${pkgver} ### Setting version echo "Setting version..." @@ -134,7 +134,7 @@ prepare() { ### Add Clearlinux patches for i in $(grep '^Patch' ${srcdir}/$pkgbase/linux.spec |\ - grep -Ev '^Patch0132|^Patch0201|^Patch0209|^Patch0210|^Patch0216|^Patch0217|^Patch0227|^Patch0228|^Patch0229|^Patch0301|^Patch0304|^Patch0118|^Patch0402|^Patch0113' | sed -n 's/.*: //p'); do + grep -Ev '^Patch0132|^Patch0118|^Patch0402|^Patch0113' | sed -n 's/.*: //p'); do echo "Applying patch ${i}..." patch -Np1 -i "$srcdir/$pkgbase/${i}" done @@ -417,9 +417,9 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8' +sha256sums=('5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e' 'SKIP' - '1a0cb578fae91e5f25e5c4af0b891b929816cdcee6647f6ffa2d4d9a8ffe4578' + #'1a0cb578fae91e5f25e5c4af0b891b929816cdcee6647f6ffa2d4d9a8ffe4578' 'SKIP' '5a29d172d442a3f31a402d7d306aaa292b0b5ea29139d05080a55e2425f48c5c' '0c65735f3e636c45e5baffccd0d9cd519c939d95ec5daf3560a7a1338e1016fb'