diff options
| -rw-r--r-- | kernels/linux-libre-audit/99-linux.hook | 11 | ||||
| -rw-r--r-- | kernels/linux-libre-audit/PKGBUILD | 27 | ||||
| -rw-r--r-- | kernels/linux-libre-audit/linux.install | 20 | ||||
| -rw-r--r-- | kernels/linux-libre-audit/linux.preset | 8 |
4 files changed, 32 insertions, 34 deletions
diff --git a/kernels/linux-libre-audit/99-linux.hook b/kernels/linux-libre-audit/99-linux.hook new file mode 100644 index 000000000..985115199 --- /dev/null +++ b/kernels/linux-libre-audit/99-linux.hook @@ -0,0 +1,11 @@ +[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/kernels/linux-libre-audit/PKGBUILD b/kernels/linux-libre-audit/PKGBUILD index 1161af697..d95700bff 100644 --- a/kernels/linux-libre-audit/PKGBUILD +++ b/kernels/linux-libre-audit/PKGBUILD @@ -19,7 +19,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1 +pkgrel=2 rcnrel=armv7-x4 arch=('i686' 'x86_64' 'armv7h') url="http://linux-libre.fsfla.org/" @@ -39,6 +39,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm.sig" # the main kernel config files 'config.i686' 'config.x86_64' 'config.armv7h' + # pacman hook for initramfs regeneration + '99-linux.hook' # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' @@ -73,7 +75,8 @@ sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a' '07ecf86f1d782efa0429f7b9bb7a67dfc6d90f6a7331d87a3e6e234130ea1437' '4fedae1ca003fb3935509f579f1ad986a2ad2c167bcd3ac5798774a8a51102d5' '98d7fceffa29e173a44a54df591dddaac10f0c9352f1cb3618385d6a819fef0c' - 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' + '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' + 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25' @@ -224,22 +227,18 @@ _package() { fi # set correct depmod command for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \ + "${startdir}/${install}" > "${startdir}/${install}.pkg" true && install=${install}.pkg - sed \ - -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ - -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${install}" if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then # install mkinitcpio preset file for kernel - install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - sed \ - -e "1s|'linux.*'|'${pkgbase}'|" \ - -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ - -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \ - -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ - -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" | + install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + + # install pacman hook for initramfs regeneration + sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" | + install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook" fi # remove build and source links diff --git a/kernels/linux-libre-audit/linux.install b/kernels/linux-libre-audit/linux.install index 378733c98..97a2a8133 100644 --- a/kernels/linux-libre-audit/linux.install +++ b/kernels/linux-libre-audit/linux.install @@ -1,33 +1,21 @@ -# arg 1: the new package version -# arg 2: the old package version - -KERNEL_NAME= -KERNEL_VERSION= - post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} + depmod %KERNVER% if [ "$(uname -m)" = "armv7l" ]; then echo ">>> WARNING: Using this kernel requires an updated U-Boot!" - elif [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} fi } post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} + depmod %KERNVER% if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then 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 - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} - if [ $(vercmp $2 3.13) -lt 0 ]; then echo ">>> WARNING: AT keyboard support is no longer built into the kernel." echo ">>> In order to use your keyboard during early init, you MUST" @@ -39,7 +27,7 @@ post_upgrade() { if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" = "i686" ]; then post_remove() { # also remove the compat symlinks - rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img - rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img + rm -f boot/initramfs-%PKGBASE%.img + rm -f boot/initramfs-%PKGBASE%-fallback.img } fi diff --git a/kernels/linux-libre-audit/linux.preset b/kernels/linux-libre-audit/linux.preset index b06292d10..66709a8c1 100644 --- a/kernels/linux-libre-audit/linux.preset +++ b/kernels/linux-libre-audit/linux.preset @@ -1,14 +1,14 @@ -# mkinitcpio preset file for the 'linux' package +# mkinitcpio preset file for the '%PKGBASE%' package ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux" +ALL_kver="/boot/vmlinuz-%PKGBASE%" PRESETS=('default' 'fallback') #default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" +default_image="/boot/initramfs-%PKGBASE%.img" #default_options="" #fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-linux-fallback.img" +fallback_image="/boot/initramfs-%PKGBASE%-fallback.img" fallback_options="-S autodetect" |