From 922ba5bf5ae9991ee0aef1bac8be3f40ed36b38c Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 4 Nov 2019 07:58:39 -0800 Subject: Updated to 5.3.8 --- 60-linux.hook | 11 - 90-linux.hook | 11 - PKGBUILD | 112 +- config | 10136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ config.x86_64 | 10180 -------------------------------------------------------- linux.install | 11 - linux.preset | 14 - 7 files changed, 10177 insertions(+), 10298 deletions(-) delete mode 100644 60-linux.hook delete mode 100644 90-linux.hook create mode 100644 config delete mode 100644 config.x86_64 delete mode 100644 linux.install delete mode 100644 linux.preset diff --git a/60-linux.hook b/60-linux.hook deleted file mode 100644 index 584ce35..0000000 --- a/60-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/%KERNVER%/* - -[Action] -Description = Updating %PKGBASE% module dependencies... -When = PostTransaction -Exec = /usr/bin/depmod %KERNVER% diff --git a/90-linux.hook b/90-linux.hook deleted file mode 100644 index be0d886..0000000 --- a/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/vmlinuz-%PKGBASE% -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/PKGBUILD b/PKGBUILD index b8f1ef5..32a1ce9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,6 @@ # Maintainer: jc_gargma # Maintainer (Arch): Jan Alexander Steffens (heftig) -# Maintainer (Arch): Tobias Powalowski # Contributor: Aqua-sama -# Contributor (Arch): Thomas Baechler # # I maintain this because: # Arch version patch script does not apply consistently @@ -19,41 +17,42 @@ pkgbase=linux-ck _supver=5 _majver=3 -_minver=7 +_minver=8 +_gccpatchver='20190822' +_ckpatchversion=ck1 if [ "$_minver" == "0" ]; then pkgver=${_supver}.${_majver} else pkgver=${_supver}.${_majver}.${_minver} fi -_srcname=linux-${pkgver} -_ckpatchversion=ck1 -_ckpatch="patch-${_supver}.${_majver}-${_ckpatchversion}" -_gccpatchver='20190822' -pkgrel=2 +pkgrel=1 url='https://kernel.org' #url='http://ck.kolivas.org/patches/' -arch=('x86_64') -license=('GPL2') +arch=(x86_64) +license=(GPL2) makedepends=( - 'xmlto' 'kmod' 'inetutils' 'bc' 'libelf' - ) -conflicts=('linux-libre') + xmlto kmod inetutils bc libelf +) +conflicts=('linux-libre-ck') options=('!strip') +_srcname=linux-${pkgver} source=( - https://www.kernel.org/pub/linux/kernel/v${_supver}.x/linux-$pkgver.tar.{xz,sign} - 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch - 0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch - linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}.xz::http://ck.kolivas.org/patches/${_supver}.0/${_supver}.${_majver}/${_supver}.${_majver}-${_ckpatchversion}/${_ckpatch}.xz - graysky_bdver2-hotfix.patch - kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz - ath9k-regdom-hack.patch - raid6-default-algo.patch - config.x86_64 # the main kernel config files - 60-linux.hook # pacman hook for depmod - 90-linux.hook # pacman hook for initramfs regeneration - linux.preset # standard config files for mkinitcpio ramdisk - ) -sha256sums=('c6c9714e21531c825c306b107bc6f6c7bfa2d5270a14bad170f8de5a73d34802' + https://www.kernel.org/pub/linux/kernel/v${_supver}.${_majver}.x/${_srcname}.tar.{xz,sign} + 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch + 0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch + linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}.xz::http://ck.kolivas.org/patches/${_supver}.0/${_supver}.${_majver}/${_supver}.${_majver}-${_ckpatchversion}/patch-${_supver}.${_majver}-${_ckpatchversion}.xz + graysky_bdver2-hotfix.patch + kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz + ath9k-regdom-hack.patch + raid6-default-algo.patch + config # the main kernel config file +) +validpgpkeys=( + 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds + '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman +) +# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256sums=('78f3cfc6c20b10ff21c0bb22d7d257cab03781c44d8c5aae289f749f94f76649' 'SKIP' 'e862ecd2cb0b20e1859ec3e47616457a9a3acb111cd5a86094f9ed1dbd7f42ac' '9b92add42581aeb427a0c2cffc584815f0e4223a1a6bc27802ccd77eaf6e4bec' @@ -62,16 +61,8 @@ sha256sums=('c6c9714e21531c825c306b107bc6f6c7bfa2d5270a14bad170f8de5a73d34802' '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5' 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb' - 'c90c450baccd563dc01829f03e71cfc4e1b8fb26a367838f4751a186c70a395f' - '452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c' - '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' - 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') -validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman - ) + '791267b1c137ccb06155537ab529015ba92330614fcf7afeaaaac603f0d23c45') -_kernelname=${pkgbase#linux} #export KBUILD_BUILD_HOST=arc4linux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH:-$(date +%s)}" @@ -82,7 +73,7 @@ prepare() { # add upstream patch # if [ "$_minver" != "0" ]; then # msg2 "Applying upstream patch" -# patch -Np1 < ../patch-${_supver}.${_majver}-${_pkgver} +# patch -Np1 < ../patch-${_supver}.${_majver}-${pkgver} # fi @@ -124,20 +115,20 @@ prepare() { msg2 "Setting version..." scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel - echo "$_kernelname" > localversion.20-pkgname + echo "${pkgbase#linux}" > localversion.20-pkgname msg2 "Setting config..." # we are in src/linux-x.yy.zz, looking for a config next to the pkgbuild - if [ -f ${SRCDEST}/config.ck.previous ]; then - cp ${SRCDEST}/config.ck.previous .config - else - cp ../config.x86_64 .config - fi +# if [ -f ${SRCDEST}/config.ck.previous ]; then +# cp ${SRCDEST}/config.ck.previous .config +# else + cp ../config .config +# fi make olddefconfig - make menuconfig +# make menuconfig # Remove sublevel when no sublevel exists if [ "$_minver" == "0" ]; then @@ -169,49 +160,28 @@ build() { _package() { pkgdesc="The ${pkgbase/linux/Linux} kernel and modules" - depends=(coreutils kmod mkinitcpio) + depends=(coreutils kmod initramfs) optdepends=('crda: to set the correct wireless channels of your country' 'linux-firmware: firmware images needed for some devices') - backup=("etc/mkinitcpio.d/$pkgbase.preset") - install=linux.install cd $_srcname - local kernver="$( "$startdir/$install.pkg" - true && install=$install.pkg - - # fill in mkinitcpio preset and pacman hooks - sed "$subst" ../linux.preset | install -Dm644 /dev/stdin \ - "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset" - sed "$subst" ../60-linux.hook | install -Dm644 /dev/stdin \ - "$pkgdir/usr/share/libalpm/hooks/60-$pkgbase.hook" - sed "$subst" ../90-linux.hook | install -Dm644 /dev/stdin \ - "$pkgdir/usr/share/libalpm/hooks/90-$pkgbase.hook" - msg2 "Fixing permissions..." chmod -Rc u=rwX,go=rX "$pkgdir" } @@ -220,11 +190,11 @@ _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" cd $_srcname - local builddir="$pkgdir/usr/lib/modules/$(/dev/null && ! mountpoint -q /boot; then - echo "WARNING: /boot appears to be a separate partition but is not mounted." - fi - -} - -post_remove() { - rm -f boot/initramfs-%PKGBASE%.img - rm -f boot/initramfs-%PKGBASE%-fallback.img -} diff --git a/linux.preset b/linux.preset deleted file mode 100644 index 66709a8..0000000 --- a/linux.preset +++ /dev/null @@ -1,14 +0,0 @@ -# mkinitcpio preset file for the '%PKGBASE%' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-%PKGBASE%" - -PRESETS=('default' 'fallback') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-%PKGBASE%.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-%PKGBASE%-fallback.img" -fallback_options="-S autodetect" -- cgit v1.2.1