From be3c650affdd1bc2c96e71acf48043263f175255 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Wed, 3 Nov 2021 11:13:06 -0400 Subject: [mkinitcpio]: housekeeping --- nonsystemd/mkinitcpio/9000-nonsystemd.patch | 50 +++++++++++++++++++++++++++++ nonsystemd/mkinitcpio/PKGBUILD | 25 +++++++++------ nonsystemd/mkinitcpio/nosystemd.patch | 50 ----------------------------- 3 files changed, 66 insertions(+), 59 deletions(-) create mode 100644 nonsystemd/mkinitcpio/9000-nonsystemd.patch delete mode 100644 nonsystemd/mkinitcpio/nosystemd.patch (limited to 'nonsystemd') diff --git a/nonsystemd/mkinitcpio/9000-nonsystemd.patch b/nonsystemd/mkinitcpio/9000-nonsystemd.patch new file mode 100644 index 000000000..7be07c0fd --- /dev/null +++ b/nonsystemd/mkinitcpio/9000-nonsystemd.patch @@ -0,0 +1,50 @@ + Makefile | 6 +----- + init_functions | 11 ----------- + 2 files changed, 1 insertion(+), 16 deletions(-) + +diff --git a/Makefile b/Makefile +index 9ef0f6a..f6e322e 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,6 @@ DIRS = \ + /usr/share/man/man5 \ + /usr/share/man/man1 \ + /usr/share/mkinitcpio \ +- /usr/lib/systemd/system/shutdown.target.wants \ + /usr/lib/tmpfiles.d \ + /usr/share/libalpm/hooks \ + /usr/share/libalpm/scripts +@@ -57,10 +56,7 @@ install: all + + cp -at $(DESTDIR)/usr/lib/initcpio hooks install + install -m644 -t $(DESTDIR)/usr/share/mkinitcpio mkinitcpio.d/* +- install -m644 systemd/mkinitcpio-generate-shutdown-ramfs.service \ +- $(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service +- ln -s ../mkinitcpio-generate-shutdown-ramfs.service \ +- $(DESTDIR)/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service ++ + install -m644 tmpfiles/mkinitcpio.conf $(DESTDIR)/usr/lib/tmpfiles.d/mkinitcpio.conf + + install -m755 50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install +diff --git a/init_functions b/init_functions +index 8ad10c7..5579a49 100644 +--- a/init_functions ++++ b/init_functions +@@ -298,17 +298,6 @@ fsck_root() { + elif bitfield_has_bit "$fsckret" 128; then + err "fatal error invoking fsck" + fi +- +- # ensure that root is going to be mounted rw. Otherwise, systemd +- # might fsck the device again. Annoy the user so that they fix this. +- if [ "${rwopt:-ro}" != 'rw' ]; then +- echo "********************** WARNING **********************" +- echo "* *" +- echo "* The root device is not configured to be mounted *" +- echo "* read-write! It may be fsck'd again later. *" +- echo "* *" +- echo "*****************************************************" +- fi + fi + } + diff --git a/nonsystemd/mkinitcpio/PKGBUILD b/nonsystemd/mkinitcpio/PKGBUILD index 96b40ce52..d4734c8c3 100644 --- a/nonsystemd/mkinitcpio/PKGBUILD +++ b/nonsystemd/mkinitcpio/PKGBUILD @@ -3,17 +3,23 @@ # Maintainer (Arch): Thomas Bächler # Maintainer: David P. + +# parabola changes and rationale: +# - replace 'systemd' dep with 'udev' + + pkgname=mkinitcpio pkgver=30 pkgrel=1 pkgrel+=.nonsystemd1 pkgdesc="Modular initramfs image creation utility" arch=('any') -url="https://projects.archlinux.org/mkinitcpio.git/" +url='https://github.com/archlinux/mkinitcpio' license=('GPL') makedepends=('asciidoc') depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils' - 'bash' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'zstd' 'udev') + 'bash' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'zstd' 'systemd') +depends=( ${depends[*]/systemd/udev} ) optdepends=('gzip: Use gzip compression for the initramfs image' 'xz: Use lzma or xz compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image' @@ -22,21 +28,22 @@ optdepends=('gzip: Use gzip 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} - nosystemd.patch) +source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +source+=(9000-nonsystemd.patch) install=mkinitcpio.install sha512sums=('ef43a8ddc01697fa43bede4eebad3271bbc89efa57ba7e4e9f321e8174ff2af74d857b308c5c0f37b42a91906c91c1b022f9a651c70d5d3e9dfc8dc441a60ee4' - 'SKIP' - 'f1ad7792b3b42397c2645e834d4b6c6a89122060455954d1ab56a71c673c3b8a8fdbbd6d722d30195211672b9075d09ac07ce6fb5d9723f56ce540709ebe4665') + 'SKIP') +sha512sums+=('f1ad7792b3b42397c2645e834d4b6c6a89122060455954d1ab56a71c673c3b8a8fdbbd6d722d30195211672b9075d09ac07ce6fb5d9723f56ce540709ebe4665') b2sums=('2001f9ac12bfa7369ad32842956cd21b2a786cd28133b6d3256e4aa77210c78ec6cac8a710ff8c2feb5a4797c1a33ce8c8c7dfabd84d7927c08bf8377e330300' - 'SKIP' - '92e1969572e0022bd257f44314045f57db47821d99a40ea1290749967b50ead1cb11adaa9b79f4286fbf20a94173e0ba7f2d4f88208e31d7a03a8de4ea014396') + 'SKIP') +b2sums+=('92e1969572e0022bd257f44314045f57db47821d99a40ea1290749967b50ead1cb11adaa9b79f4286fbf20a94173e0ba7f2d4f88208e31d7a03a8de4ea014396') validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini '86CFFCA918CF3AF47147588051E8B148A9999C34') # Evangelos Foutras prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../nosystemd.patch + + patch -Np1 -i ../9000-nonsystemd.patch } check() { diff --git a/nonsystemd/mkinitcpio/nosystemd.patch b/nonsystemd/mkinitcpio/nosystemd.patch deleted file mode 100644 index 7be07c0fd..000000000 --- a/nonsystemd/mkinitcpio/nosystemd.patch +++ /dev/null @@ -1,50 +0,0 @@ - Makefile | 6 +----- - init_functions | 11 ----------- - 2 files changed, 1 insertion(+), 16 deletions(-) - -diff --git a/Makefile b/Makefile -index 9ef0f6a..f6e322e 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,6 @@ DIRS = \ - /usr/share/man/man5 \ - /usr/share/man/man1 \ - /usr/share/mkinitcpio \ -- /usr/lib/systemd/system/shutdown.target.wants \ - /usr/lib/tmpfiles.d \ - /usr/share/libalpm/hooks \ - /usr/share/libalpm/scripts -@@ -57,10 +56,7 @@ install: all - - cp -at $(DESTDIR)/usr/lib/initcpio hooks install - install -m644 -t $(DESTDIR)/usr/share/mkinitcpio mkinitcpio.d/* -- install -m644 systemd/mkinitcpio-generate-shutdown-ramfs.service \ -- $(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service -- ln -s ../mkinitcpio-generate-shutdown-ramfs.service \ -- $(DESTDIR)/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service -+ - install -m644 tmpfiles/mkinitcpio.conf $(DESTDIR)/usr/lib/tmpfiles.d/mkinitcpio.conf - - install -m755 50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install -diff --git a/init_functions b/init_functions -index 8ad10c7..5579a49 100644 ---- a/init_functions -+++ b/init_functions -@@ -298,17 +298,6 @@ fsck_root() { - elif bitfield_has_bit "$fsckret" 128; then - err "fatal error invoking fsck" - fi -- -- # ensure that root is going to be mounted rw. Otherwise, systemd -- # might fsck the device again. Annoy the user so that they fix this. -- if [ "${rwopt:-ro}" != 'rw' ]; then -- echo "********************** WARNING **********************" -- echo "* *" -- echo "* The root device is not configured to be mounted *" -- echo "* read-write! It may be fsck'd again later. *" -- echo "* *" -- echo "*****************************************************" -- fi - fi - } - -- cgit v1.2.3