[arch-commits] Commit in linux/trunk (5 files)
Jan Steffens
heftig at archlinux.org
Wed Oct 9 15:10:41 UTC 2019
Date: Wednesday, October 9, 2019 @ 15:10:40
Author: heftig
Revision: 364259
Revert "5.3.5.arch1-2: Changes for new boot hooks"
Oops, don't use this yet.
Added:
linux/trunk/60-linux.hook
linux/trunk/90-linux.hook
linux/trunk/linux.install
linux/trunk/linux.preset
Modified:
linux/trunk/PKGBUILD
---------------+
60-linux.hook | 12 ++++++++++++
90-linux.hook | 11 +++++++++++
PKGBUILD | 36 +++++++++++++++++++++++++++++++++---
linux.install | 12 ++++++++++++
linux.preset | 14 ++++++++++++++
5 files changed, 82 insertions(+), 3 deletions(-)
Added: 60-linux.hook
===================================================================
--- 60-linux.hook (rev 0)
+++ 60-linux.hook 2019-10-09 15:10:40 UTC (rev 364259)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/modules/%KERNVER%/*
+Target = usr/lib/modules/%EXTRAMODULES%/*
+
+[Action]
+Description = Updating %PKGBASE% module dependencies...
+When = PostTransaction
+Exec = /usr/bin/depmod %KERNVER%
Added: 90-linux.hook
===================================================================
--- 90-linux.hook (rev 0)
+++ 90-linux.hook 2019-10-09 15:10:40 UTC (rev 364259)
@@ -0,0 +1,11 @@
+[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-09 15:08:51 UTC (rev 364258)
+++ PKGBUILD 2019-10-09 15:10:40 UTC (rev 364259)
@@ -6,7 +6,7 @@
#pkgbase=linux-custom # Build kernel with a different name
_srcver=5.3.5-arch1
pkgver=${_srcver//-/.}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url="https://git.archlinux.org/linux.git/log/?h=v$_srcver"
license=(GPL2)
@@ -19,6 +19,9 @@
source=(
"$_srcname::git+https://git.archlinux.org/linux.git?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
@@ -26,7 +29,10 @@
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- '7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423')
+ '7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423'
+ 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
+ 'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
+ 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}
@@ -66,6 +72,8 @@
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
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
@@ -76,6 +84,7 @@
# 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"
@@ -85,7 +94,8 @@
# a place for external modules,
# with version file for building modules and running depmod from hook
- local extradir="$pkgdir/usr/lib/modules/extramodules$_kernelname"
+ local extramodules="extramodules$_kernelname"
+ local extradir="$pkgdir/usr/lib/modules/$extramodules"
install -Dt "$extradir" -m644 ../version
ln -sr "$extradir" "$modulesdir/extramodules"
@@ -92,6 +102,26 @@
# 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
+ s|%EXTRAMODULES%|$extramodules|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"
}
Added: linux.install
===================================================================
--- linux.install (rev 0)
+++ linux.install 2019-10-09 15:10:40 UTC (rev 364259)
@@ -0,0 +1,12 @@
+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:
Added: linux.preset
===================================================================
--- linux.preset (rev 0)
+++ linux.preset 2019-10-09 15:10:40 UTC (rev 364259)
@@ -0,0 +1,14 @@
+# 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"
More information about the arch-commits
mailing list