6.2.6-1 (clr 6.2.6-1290) remove extra patches from xanmod repo

This commit is contained in:
Josip Ponjavic 2023-03-14 20:15:05 +01:00
parent 9ed576d4c3
commit 4a02767d7e
2 changed files with 8 additions and 26 deletions

View file

@ -1,6 +1,6 @@
pkgbase = linux-clear pkgbase = linux-clear
pkgdesc = Clear Linux pkgdesc = Clear Linux
pkgver = 6.2.2 pkgver = 6.2.6
pkgrel = 1 pkgrel = 1
url = https://github.com/clearlinux-pkgs/linux url = https://github.com/clearlinux-pkgs/linux
arch = x86_64 arch = x86_64
@ -14,20 +14,16 @@ pkgbase = linux-clear
options = !strip options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.sign source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.sign
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.2.2.xz source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.2.6.xz
source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.2.1-1280 source = linux-clear::git+https://github.com/clearlinux-pkgs/linux.git#tag=6.2.6-1290
source = more-uarches-20230105.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20230105.tar.gz source = more-uarches-20230105.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20230105.tar.gz
source = 0001-pci-Enable-overrides-for-missing-ACS-capabilities-c527f69aa31ddb2cc15b86951bd3c2610df77872.patch::https://raw.githubusercontent.com/xanmod/linux-patches/c527f69aa31ddb2cc15b86951bd3c2610df77872/linux-6.2.y-xanmod/pci_acso/0001-pci-Enable-overrides-for-missing-ACS-capabilities.patch
source = 0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW-c527f69aa31ddb2cc15b86951bd3c2610df77872.patch::https://raw.githubusercontent.com/xanmod/linux-patches/c527f69aa31ddb2cc15b86951bd3c2610df77872/linux-6.2.y-xanmod/userns/0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1 sha256sums = 74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
sha256sums = SKIP sha256sums = SKIP
sha256sums = a1699c7183afcbb2af7c0afb30a2680f867775f934b111a382cbb16760f2f8fa sha256sums = b3276216581b98b777990b3d08aad9568db2665bf55c8d30f46f95643690286c
sha256sums = SKIP sha256sums = SKIP
sha256sums = 802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23 sha256sums = 802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23
sha256sums = f9e2de1f448fcae193c2445658dbbc7b9c18f9d4e2a29a68e3e78fb63238b4b7
sha256sums = 999b1a2548afebcf88aa0e53b1261b36bb1a3b4d6c575048786f07c8266ee37f
pkgname = linux-clear pkgname = linux-clear
pkgdesc = The Clear Linux kernel and modules pkgdesc = The Clear Linux kernel and modules

View file

@ -82,11 +82,10 @@
### IMPORTANT: Do no edit below this line unless you know what you're doing ### IMPORTANT: Do no edit below this line unless you know what you're doing
_major=6.2 _major=6.2
_minor=2 _minor=6
_srcname=linux-${_major} _srcname=linux-${_major}
_clr=${_major}.1-1280 _clr=${_major}.6-1290
_gcc_more_v='20230105' _gcc_more_v='20230105'
_xanmod='c527f69aa31ddb2cc15b86951bd3c2610df77872'
pkgbase=linux-clear pkgbase=linux-clear
pkgver=${_major}.${_minor} pkgver=${_major}.${_minor}
pkgrel=1 pkgrel=1
@ -105,8 +104,6 @@ source=(
"https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz" "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz"
"$pkgbase::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" "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-${_xanmod}.patch::https://raw.githubusercontent.com/xanmod/linux-patches/${_xanmod}/linux-6.2.y-xanmod/pci_acso/0001-pci-Enable-overrides-for-missing-ACS-capabilities.patch"
"0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW-${_xanmod}.patch::https://raw.githubusercontent.com/xanmod/linux-patches/${_xanmod}/linux-6.2.y-xanmod/userns/0001-sysctl-add-sysctl-to-disallow-unprivileged-CLONE_NEW.patch"
) )
if [ -n "$_use_llvm_lto" ]; then if [ -n "$_use_llvm_lto" ]; then
@ -140,15 +137,6 @@ prepare() {
patch -Np1 -i "$srcdir/$pkgbase/${i}" patch -Np1 -i "$srcdir/$pkgbase/${i}"
done done
local src
for src in "${source[@]}"; do
src="${src%%::*}"
src="${src##*/}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
done
### Setting config ### Setting config
echo "Setting config..." echo "Setting config..."
cp -Tf $srcdir/$pkgbase/config ./.config cp -Tf $srcdir/$pkgbase/config ./.config
@ -420,11 +408,9 @@ done
sha256sums=('74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1' sha256sums=('74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1'
'SKIP' 'SKIP'
'a1699c7183afcbb2af7c0afb30a2680f867775f934b111a382cbb16760f2f8fa' 'b3276216581b98b777990b3d08aad9568db2665bf55c8d30f46f95643690286c'
'SKIP' 'SKIP'
'802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23' '802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23')
'f9e2de1f448fcae193c2445658dbbc7b9c18f9d4e2a29a68e3e78fb63238b4b7'
'999b1a2548afebcf88aa0e53b1261b36bb1a3b4d6c575048786f07c8266ee37f')
validpgpkeys=( validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds