Date: Tuesday, October 29, 2019 @ 15:13:00 Author: heftig Revision: 365996
5.3.8.1-1: Changes for new kmod and mkinitcpio hooks Modified: linux-zen/trunk/PKGBUILD Deleted: linux-zen/trunk/60-linux.hook linux-zen/trunk/90-linux.hook linux-zen/trunk/linux.install linux-zen/trunk/linux.preset ---------------+ 60-linux.hook | 11 ----------- 90-linux.hook | 11 ----------- PKGBUILD | 53 ++++++++++------------------------------------------- linux.install | 12 ------------ linux.preset | 14 -------------- 5 files changed, 10 insertions(+), 91 deletions(-) Deleted: 60-linux.hook =================================================================== --- 60-linux.hook 2019-10-29 15:08:13 UTC (rev 365995) +++ 60-linux.hook 2019-10-29 15:13:00 UTC (rev 365996) @@ -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% Deleted: 90-linux.hook =================================================================== --- 90-linux.hook 2019-10-29 15:08:13 UTC (rev 365995) +++ 90-linux.hook 2019-10-29 15:13:00 UTC (rev 365996) @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = usr/lib/modules/%KERNVER%/vmlinuz -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-29 15:08:13 UTC (rev 365995) +++ PKGBUILD 2019-10-29 15:13:00 UTC (rev 365996) @@ -1,18 +1,16 @@ # Maintainer: Jan Alexander Steffens (heftig) <[email protected]> -# Contributor: Tobias Powalowski <[email protected]> -# Contributor: Thomas Baechler <[email protected]> -pkgbase=linux-zen # Build stock -zen kernel -#pkgbase=linux-custom # Build kernel with a different name -_srcver=5.3.7-zen1 -pkgver=${_srcver//-/.} -pkgrel=2 +pkgbase=linux-zen +pkgver=5.3.8.1 +pkgrel=1 +_srcver=${pkgver%.*}-zen${pkgver##*.} +url="https://github.com/zen-kernel/zen-kernel/commits/v$_srcver"; arch=(x86_64) -url="https://github.com/zen-kernel/zen-kernel/commits/v$_srcver"; license=(GPL2) makedepends=( - xmlto kmod inetutils bc libelf git python-sphinx python-sphinx_rtd_theme - graphviz imagemagick + xmlto kmod inetutils bc libelf + python-sphinx python-sphinx_rtd_theme graphviz imagemagick + git ) options=('!strip') _srcname=zen-kernel @@ -19,9 +17,6 @@ source=( "$_srcname::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v$_srcver"; config # the main kernel config file - 60-linux.hook # pacman hook for depmod - 90-linux.hook # pacman hook for initramfs regeneration - linux.preset # standard config files for mkinitcpio ramdisk ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -29,14 +24,8 @@ '8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig) ) sha256sums=('SKIP' - 'bb630d7f69a279bab30b889a4ca5b768020ba3655a6d60dc85ff2f37c9f790d9' - '452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c' - 'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636' - 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') + 'bb630d7f69a279bab30b889a4ca5b768020ba3655a6d60dc85ff2f37c9f790d9') -_kernelname=${pkgbase#linux} -: ${_kernelname:=-ARCH} - export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH:-$(date +%s)}" @@ -47,7 +36,7 @@ msg2 "Setting version..." scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel - echo "$_kernelname" > localversion.20-pkgname + echo "${pkgbase#linux}" > localversion.20-pkgname local src for src in "${source[@]}"; do @@ -76,8 +65,6 @@ 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="$(<version)" @@ -87,7 +74,6 @@ # systemd expects to find the kernel here to allow hibernation # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz" - install -Dm644 "$modulesdir/vmlinuz" "$pkgdir/boot/vmlinuz-$pkgbase" # Used by mkinitcpio to name the kernel echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase" @@ -98,25 +84,6 @@ # remove build and source links rm "$modulesdir"/{source,build} - msg2 "Installing hooks..." - # sed expression for following substitutions - local subst=" - s|%PKGBASE%|$pkgbase|g - s|%KERNVER%|$kernver|g - " - - # hack to allow specifying an initially nonexisting install file - sed "$subst" "$startdir/$install" > "$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" } Deleted: linux.install =================================================================== --- linux.install 2019-10-29 15:08:13 UTC (rev 365995) +++ linux.install 2019-10-29 15:13:00 UTC (rev 365996) @@ -1,12 +0,0 @@ -post_upgrade() { - if findmnt --fstab -uno SOURCE /boot &>/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 -} - -# vim:set ft=sh ts=8 sts=2 sw=2 et: Deleted: linux.preset =================================================================== --- linux.preset 2019-10-29 15:08:13 UTC (rev 365995) +++ linux.preset 2019-10-29 15:13:00 UTC (rev 365996) @@ -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"
