diff --git a/.SRCINFO b/.SRCINFO index 5bc96d2..211afb0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-clear pkgdesc = Clear Linux pkgver = 5.4.3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 license = GPL2 @@ -16,11 +16,12 @@ 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.3.xz - source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.4.2-875 + source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.4.3-877 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 source = Revert-e1000e-5.4.patch + source = Fix-dump_tree-hierarchy-print-always-active.patch::https://lkml.org/lkml/diff/2019/10/6/918/1 validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491 @@ -31,6 +32,7 @@ pkgbase = linux-clear sha256sums = 4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0 sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942 sha256sums = f774eb33e8457d2f64852200654cc8c9e0f7ebe1264771c0b6dbc221ec3b9a3f + sha256sums = 0c1c32cbf75af13baa250b87224564cc60d8480a7e0d9886ae7d664ca725be30 pkgname = linux-clear pkgdesc = The Clear Linux kernel and modules diff --git a/PKGBUILD b/PKGBUILD index 4783d79..82f078a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -61,10 +61,10 @@ _localmodcfg= _major=5.4 _minor=3 _srcname=linux-${_major} -_clr=${_major}.2-875 +_clr=${_major}.3-877 pkgbase=linux-clear pkgver=${_major}.${_minor} -pkgrel=2 +pkgrel=3 pkgdesc='Clear Linux' arch=('x86_64') url="https://github.com/clearlinux-pkgs/linux" @@ -81,6 +81,7 @@ source=( 'pci-enable-overrides-for-missing-acs-capabilities.patch' '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' 'Revert-e1000e-5.4.patch' + 'Fix-dump_tree-hierarchy-print-always-active.patch::https://lkml.org/lkml/diff/2019/10/6/918/1' ) export KBUILD_BUILD_HOST=archlinux @@ -101,7 +102,7 @@ prepare() { echo "${pkgbase#linux}" > localversion.20-pkgname ### Add Clearlinux patches - for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | grep -Ev '^Patch0123|^Patch0130|^Patch0004|^Patch0009|^Patch0015' | sed -n 's/.*: //p'); do + for i in $(grep '^Patch' ${srcdir}/clearlinux/linux.spec | grep -Ev '^Patch0123|^Patch0130' | sed -n 's/.*: //p'); do msg2 "Applying patch ${i}..." patch -Np1 -i "$srcdir/clearlinux/${i}" done @@ -128,8 +129,7 @@ prepare() { --undefine RT_GROUP_SCHED # Power management and ACPI options - scripts/config --enable HIBERNATION \ - --enable ACPI_REV_OVERRIDE_POSSIBLE \ + scripts/config --enable ACPI_REV_OVERRIDE_POSSIBLE \ --enable ACPI_TABLE_UPGRADE # Enable loadable module support @@ -336,7 +336,8 @@ sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491' '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5' '4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0' 'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942' - 'f774eb33e8457d2f64852200654cc8c9e0f7ebe1264771c0b6dbc221ec3b9a3f') + 'f774eb33e8457d2f64852200654cc8c9e0f7ebe1264771c0b6dbc221ec3b9a3f' + '0c1c32cbf75af13baa250b87224564cc60d8480a7e0d9886ae7d664ca725be30') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds