5.3.15-2 (clr 5.3.14-874) add futex-wait-multiple patchset

This commit is contained in:
Josip Ponjavic 2019-12-08 13:12:25 +01:00
parent 3d6f579054
commit e8014ad6b7
2 changed files with 16 additions and 13 deletions

View file

@ -1,7 +1,7 @@
pkgbase = linux-clear pkgbase = linux-clear
pkgdesc = Clear Linux pkgdesc = Clear Linux
pkgver = 5.3.15 pkgver = 5.3.15
pkgrel = 1 pkgrel = 2
url = https://github.com/clearlinux-pkgs/linux url = https://github.com/clearlinux-pkgs/linux
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
@ -19,6 +19,7 @@ pkgbase = linux-clear
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.3.14-874 source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.3.14-874
source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
source = add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio source = add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio
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
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 78f3c397513cf4ff0f96aa7d09a921d003e08fa97c09e0bb71d88211b40567b2 sha256sums = 78f3c397513cf4ff0f96aa7d09a921d003e08fa97c09e0bb71d88211b40567b2
@ -27,6 +28,7 @@ pkgbase = linux-clear
sha256sums = SKIP sha256sums = SKIP
sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5 sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5
sha256sums = dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1 sha256sums = dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1
sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942
pkgname = linux-clear pkgname = linux-clear
pkgdesc = The Clear Linux kernel and modules pkgdesc = The Clear Linux kernel and modules

View file

@ -56,10 +56,6 @@ _subarch=31
# More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db
_localmodcfg= _localmodcfg=
# Enable ACS override patch (patch needs to be enabled with kernel command line options)
# https://wiki.archlinux.org/index.php/PCI_passthrough_via_OVMF#Bypassing_the_IOMMU_groups_(ACS_override_patch)
_enable_acs_override="y"
### 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=5.3 _major=5.3
@ -68,7 +64,7 @@ _srcname=linux-${_major}
_clr=${_major}.14-874 _clr=${_major}.14-874
pkgbase=linux-clear pkgbase=linux-clear
pkgver=${_major}.${_minor} pkgver=${_major}.${_minor}
pkgrel=1 pkgrel=2
pkgdesc='Clear Linux' pkgdesc='Clear Linux'
arch=('x86_64') arch=('x86_64')
url="https://github.com/clearlinux-pkgs/linux" url="https://github.com/clearlinux-pkgs/linux"
@ -83,6 +79,7 @@ source=(
"clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}" "clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=${_clr}"
"enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
'add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio' 'add-acs-overrides.patch::https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio'
'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'
) )
export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_HOST=archlinux
@ -108,6 +105,15 @@ prepare() {
patch -Np1 -i "$srcdir/clearlinux/${i}" patch -Np1 -i "$srcdir/clearlinux/${i}"
done done
local src
for src in "${source[@]}"; do
src="${src%%::*}"
src="${src##*/}"
[[ $src = *.patch ]] || continue
msg2 "Applying patch $src..."
patch -Np1 < "../$src"
done
### Setting config ### Setting config
msg2 "Setting config..." msg2 "Setting config..."
cp -Tf $srcdir/clearlinux/config ./.config cp -Tf $srcdir/clearlinux/config ./.config
@ -164,12 +170,6 @@ prepare() {
patch -Np1 -i "$srcdir/kernel_gcc_patch-$_gcc_more_v/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 fi
### Enable ACS override patch
if [ "${_enable_acs_override}" = "y" ]; then
msg2 "Enabling ACS override patch..."
patch -Np1 -i "$srcdir/add-acs-overrides.patch"
fi
### Get kernel version ### Get kernel version
if [ "${_enable_gcc_more_v}" = "y" ] || [ -n "${_subarch}" ]; then if [ "${_enable_gcc_more_v}" = "y" ] || [ -n "${_subarch}" ]; then
yes "$_subarch" | make oldconfig yes "$_subarch" | make oldconfig
@ -333,7 +333,8 @@ sha256sums=('78f3c397513cf4ff0f96aa7d09a921d003e08fa97c09e0bb71d88211b40567b2'
'205c9ec3d4ab126bb0f7c7c7a66f97ea89fdbbfa2145c49490c86709648ff538' '205c9ec3d4ab126bb0f7c7c7a66f97ea89fdbbfa2145c49490c86709648ff538'
'SKIP' 'SKIP'
'8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5' '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
'dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1') 'dbf4ac4b873ce6972e63b78d74ddba18f2701716163bb7f4b4fe5e909346a6e1'
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942')
validpgpkeys=( validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds