Date: Thursday, July 16, 2020 @ 12:51:11 Author: grazzolini Revision: 391960
archrelease: copy trunk to testing-any Added: mkinitcpio/repos/testing-any/ mkinitcpio/repos/testing-any/0001-mkinitcpio-remove-preset-pacsave.patch (from rev 391959, mkinitcpio/trunk/0001-mkinitcpio-remove-preset-pacsave.patch) mkinitcpio/repos/testing-any/PKGBUILD (from rev 391959, mkinitcpio/trunk/PKGBUILD) mkinitcpio/repos/testing-any/mkinitcpio.install (from rev 391959, mkinitcpio/trunk/mkinitcpio.install) ---------------------------------------------+ 0001-mkinitcpio-remove-preset-pacsave.patch | 59 ++++++++++++++++++++++++++ PKGBUILD | 43 ++++++++++++++++++ mkinitcpio.install | 15 ++++++ 3 files changed, 117 insertions(+) Copied: mkinitcpio/repos/testing-any/0001-mkinitcpio-remove-preset-pacsave.patch (from rev 391959, mkinitcpio/trunk/0001-mkinitcpio-remove-preset-pacsave.patch) =================================================================== --- testing-any/0001-mkinitcpio-remove-preset-pacsave.patch (rev 0) +++ testing-any/0001-mkinitcpio-remove-preset-pacsave.patch 2020-07-16 12:51:11 UTC (rev 391960) @@ -0,0 +1,59 @@ +diff --git a/libalpm/scripts/mkinitcpio-remove b/libalpm/scripts/mkinitcpio-remove +index 86838e4..17b4b31 100644 +--- a/libalpm/scripts/mkinitcpio-remove ++++ b/libalpm/scripts/mkinitcpio-remove +@@ -2,6 +2,20 @@ + + package=0 + ++process_preset() { ++ if [[ -n "${pkgbase}" && -e $preset ]]; then ++ if ! cmp $preset > /dev/null 2>&1 <(sed "s|%PKGBASE%|${pkgbase}|g" /usr/share/mkinitcpio/hook.preset); then ++ if [[ ! -e $preset.pacsave ]]; then ++ # save the preset as pacsave ++ mv $preset $preset.pacsave && return 0 ++ fi ++ else ++ # remove the preset ++ rm $preset && return 0 ++ fi ++ fi ++} ++ + while read -r line; do + if [[ $line != */vmlinuz ]]; then + # triggers when it's a change to usr/lib/initcpio/* +@@ -23,17 +37,25 @@ while read -r line; do + # remove the installed kernel + rm $kernel + fi +- if [[ -e $preset ]]; then +- # remove the preset +- rm $preset ++ ++ process_preset "${pkgbase}" $preset ++ ++ if [[ -e $initramfs ]]; then ++ # remove the main image ++ rm $initramfs + fi +- if [[ -e $initramfs && -e $fallback_initramfs ]]; then +- # remove the images +- rm $initramfs $fallback_initramfs ++ if [[ -e $fallback_initramfs ]]; then ++ # remove the fallback image ++ rm $fallback_initramfs + fi + done + + if (( package )) && compgen -G /etc/mkinitcpio.d/"*.preset" > /dev/null; then +- # remove all presets +- rm /etc/mkinitcpio.d/*.preset ++ shopt -s nullglob ++ for preset in /etc/mkinitcpio.d/*.preset; do ++ pkgbase=${preset##*/} ++ pkgbase=${pkgbase%.preset} ++ process_preset "${pkgbase}" $preset ++ done ++ shopt -u nullglob + fi Copied: mkinitcpio/repos/testing-any/PKGBUILD (from rev 391959, mkinitcpio/trunk/PKGBUILD) =================================================================== --- testing-any/PKGBUILD (rev 0) +++ testing-any/PKGBUILD 2020-07-16 12:51:11 UTC (rev 391960) @@ -0,0 +1,43 @@ +# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgname=mkinitcpio +pkgver=27 +pkgrel=4 +pkgdesc="Modular initramfs image creation utility" +arch=('any') +url="https://projects.archlinux.org/mkinitcpio.git/" +license=('GPL') +depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils' + 'bash' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'systemd') +optdepends=('xz: Use lzma or xz compression for the initramfs image' + 'bzip2: Use bzip2 compression for the initramfs image' + 'lzop: Use lzo compression for the initramfs image' + 'lz4: Use lz4 compression for the initramfs image' + 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') +provides=('initramfs') +backup=('etc/mkinitcpio.conf') +source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + "0001-mkinitcpio-remove-preset-pacsave.patch") +install=mkinitcpio.install +sha256sums=('e6bff1cb78b677538eb9aace900b715fd59de8fc210b74fb9d899dfaa32bc354' + 'SKIP' + '845569fa760f70c868ecb3dc8ae9667287970526dddaf403fdafcb716e8b3d51') +validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner + '86CFFCA918CF3AF47147588051E8B148A9999C34' # Evangelos Foutras + 'ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB') # Giancarlo Razzolini + +prepare() { + cd $pkgname-$pkgver + # Apply 0001-mkinitcpio-remove-preset-pacsave.patch + patch -Np1 < $srcdir/0001-mkinitcpio-remove-preset-pacsave.patch +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install +} Copied: mkinitcpio/repos/testing-any/mkinitcpio.install (from rev 391959, mkinitcpio/trunk/mkinitcpio.install) =================================================================== --- testing-any/mkinitcpio.install (rev 0) +++ testing-any/mkinitcpio.install 2020-07-16 12:51:11 UTC (rev 391960) @@ -0,0 +1,15 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 0.9.0 "$2")" -eq 1 ]; then + printf '==> If your /usr is on a separate partition, you must add the "usr" hook\n' + printf ' to /etc/mkinitcpio.conf and regenerate your images before rebooting\n' + fi + + if [ "$(vercmp 0.12.0 "$2")" -eq 1 ]; then + printf '==> The "block" hook has replaced several hooks:\n' + printf ' fw, sata, pata, scsi, virtio, mmc, usb\n' + printf ' Replace any and all of these in /etc/mkinitcpio.conf with a single\n' + printf ' instance of the "block" hook\n' + fi +}