From 635e02124f328366b150e94e4335427189722226 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 5 May 2024 15:45:22 -0400 Subject: [PATCH] mkinitcpio: update to 39, adopt --- srcpkgs/mkinitcpio/patches/eudev.patch | 4 +- srcpkgs/mkinitcpio/patches/gzip-default.patch | 39 ------------------- srcpkgs/mkinitcpio/patches/lvm2.patch | 11 +++--- srcpkgs/mkinitcpio/template | 11 ++++-- 4 files changed, 14 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/mkinitcpio/patches/gzip-default.patch diff --git a/srcpkgs/mkinitcpio/patches/eudev.patch b/srcpkgs/mkinitcpio/patches/eudev.patch index 58d8eb25855..ee38ddc57c6 100644 --- a/srcpkgs/mkinitcpio/patches/eudev.patch +++ b/srcpkgs/mkinitcpio/patches/eudev.patch @@ -32,10 +32,10 @@ #!/usr/bin/ash run_earlyhook() { + local quiet - kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - systemd-tmpfiles --prefix=/dev --create --boot - # assigned by parse_cmdline - # shellcheck disable=SC2154 + quiet="$(getarg quiet)" if [ "${quiet}" = "y" ]; then - /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never >/dev/null 2>&1 + udevd --daemon --resolve-names=never >/dev/null 2>&1 diff --git a/srcpkgs/mkinitcpio/patches/gzip-default.patch b/srcpkgs/mkinitcpio/patches/gzip-default.patch deleted file mode 100644 index 5add14cf05c..00000000000 --- a/srcpkgs/mkinitcpio/patches/gzip-default.patch +++ /dev/null @@ -1,39 +0,0 @@ -Because not all Void kernels may support zstd, change the default initramfs -compression to gzip. - -diff -ur a/man/mkinitcpio.conf.5.adoc b/man/mkinitcpio.conf.5.adoc ---- a/man/mkinitcpio.conf.5.adoc -+++ b/man/mkinitcpio.conf.5.adoc -@@ -55,7 +55,7 @@ - Defines a program to filter the generated image through. The kernel - understands the compression formats yielded by the *zstd*(1), *gzip*(1), - *bzip2*(1), *lz4*(1), *lzop*(1), *lzma*(1), and *xz*(1) compressors. If -- unspecified, this setting defaults to _zstd_ compression. In order to create -+ unspecified, this setting defaults to _gzip_ compression. In order to create - an uncompressed image, define this variable as _cat_. - + - It is not hard to realize that a filter such as a _tac_ or _rev_ will cause -diff -ur a/mkinitcpio b/mkinitcpio ---- a/mkinitcpio -+++ b/mkinitcpio -@@ -998,7 +998,7 @@ - die "Unable to write to '%s'" "$_optgenimg" - fi - -- _optcompress="${_optcompress:-"${COMPRESSION:-zstd}"}" -+ _optcompress="${_optcompress:-"${COMPRESSION:-gzip}"}" - if ! type -P "$_optcompress" >/dev/null; then - warning "Unable to locate compression method: '%s'" "$_optcompress" - _optcompress='cat' -diff -ur a/mkinitcpio.conf b/mkinitcpio.conf ---- a/mkinitcpio.conf -+++ b/mkinitcpio.conf -@@ -55,7 +55,7 @@ - HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck) - - # COMPRESSION --# Use this to compress the initramfs image. By default, zstd compression -+# Use this to compress the initramfs image. By default, gzip compression - # is used. Use 'cat' to create an uncompressed image. - #COMPRESSION="zstd" - #COMPRESSION="gzip" diff --git a/srcpkgs/mkinitcpio/patches/lvm2.patch b/srcpkgs/mkinitcpio/patches/lvm2.patch index b7c74bee034..2471f7d3dc0 100644 --- a/srcpkgs/mkinitcpio/patches/lvm2.patch +++ b/srcpkgs/mkinitcpio/patches/lvm2.patch @@ -17,7 +17,7 @@ Void adds a custom runscript and udev rules to work around missing systemd. # from thin-provisioning-tools add_binary 'pdata_tools' while IFS='' read -r -d '' symlink; do -@@ -31,19 +39,15 @@ +@@ -39,18 +47,14 @@ '11-dm-lvm.rules' \ '13-dm-disk.rules' \ '95-dm-notify.rules' \ @@ -31,13 +31,12 @@ Void adds a custom runscript and udev rules to work around missing systemd. - fi + '/usr/lib/initcpio/udev/11-dm-initramfs.rules' \ + '/usr/lib/initcpio/udev/69-dm-lvm-metad.rules' - + # config file - add_file '/etc/lvm/lvm.conf' - sed -i -e 's/^[[:space:]#]*monitoring = [[:digit:]]\+\s*$/\tmonitoring = 0/' \ - -e '/^$/d' -e '/^[[:space:]]*#/d' "${BUILDROOT}/etc/lvm/lvm.conf" + sed -e 's/^[[:space:]#]*monitoring = [[:digit:]]\+\s*$/\tmonitoring = 0/' \ + -e '/^$/d' -e '/^[[:space:]]*#/d' "/etc/lvm/lvm.conf" | add_file - '/etc/lvm/lvm.conf' 644 + + add_runscript } - + help() { diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template index edb7f7a035a..8242070b99b 100644 --- a/srcpkgs/mkinitcpio/template +++ b/srcpkgs/mkinitcpio/template @@ -1,18 +1,18 @@ # Template file for 'mkinitcpio' pkgname=mkinitcpio -version=38.1 +version=39 revision=1 build_style=gnu-makefile hostmakedepends="asciidoc" depends="busybox-static bsdtar bash zstd" checkdepends="busybox-static bats-assert lz4 xz zstd lzop parallel" short_desc="Next generation of initramfs creation" -maintainer="Andrew J. Hesford " +maintainer="classabbyamp " license="GPL-2.0-only" homepage="https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio" changelog="https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/raw/master/CHANGELOG" -distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=5c63525097a3c17bfb654dacea71ed7681c3102a3684d18c319d06e57007e1cd +distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.xz" +checksum=d91cfe9f04f2fd71839ce2c73ed53083573ab7e80dde9dff52ca9fd68a14d5cd conf_files="/etc/mkinitcpio.conf" alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/mkinitcpio/kernel-hook-postinst @@ -32,6 +32,9 @@ post_install() { rm -r ${DESTDIR}/usr/lib/initcpio/install/systemd rm -r ${DESTDIR}/usr/lib/tmpfiles.d + # Remove patch remnants + rm "${DESTDIR}"/usr/lib/initcpio/{hooks,install}/*.orig + # Remove unneeded pacman hooks rm -rf ${DESTDIR}/usr/share/libalpm