diff options
Diffstat (limited to 'nonsystemd')
| -rw-r--r-- | nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch | 39 | ||||
| -rw-r--r-- | nonsystemd/mkinitcpio/PKGBUILD | 27 |
2 files changed, 12 insertions, 54 deletions
diff --git a/nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch b/nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch deleted file mode 100644 index bd2668a36..000000000 --- a/nonsystemd/mkinitcpio/0001-Restore-addition-of-modules-from-config-file.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5bba09cb1c661627fde76b977cfe9f937b1264a3 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Fri, 6 Oct 2017 08:15:43 -0400 -Subject: [mkinitcpio] [PATCH] Restore addition of modules from config file - -Broken by c5ad00c2. - -ref: https://bugs.archlinux.org/task/55870 ---- - functions | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/functions b/functions -index 1486f2f..ba95e80 100644 ---- a/functions -+++ b/functions -@@ -627,9 +627,18 @@ parse_config() { - map add_file "${FILES[@]}" - - tee "$BUILDROOT/buildconfig" < "$1" | { -+ # When MODULES is not an array (but instead implicitly converted at -+ # startup), sourcing the config causes the string value of MODULES -+ # to be assigned as MODULES[0]. Avoid this by explicitly unsetting -+ # MODULES before re-sourcing the config. -+ unset MODULES -+ - . /dev/stdin - -- for mod in "${modules[@]%\?}"; do -+ # arrayize MODULES if necessary. -+ [[ ${MODULES@a} != *a* ]] && read -ra MODULES <<<"${MODULES//-/_}" -+ -+ for mod in "${MODULES[@]%\?}"; do - mod=${mod//-/_} - # only add real modules (2 == builtin) - (( _addedmodules["$mod"] == 1 )) && add+=("$mod") --- -2.14.2 - diff --git a/nonsystemd/mkinitcpio/PKGBUILD b/nonsystemd/mkinitcpio/PKGBUILD index b34d0934d..baa065149 100644 --- a/nonsystemd/mkinitcpio/PKGBUILD +++ b/nonsystemd/mkinitcpio/PKGBUILD @@ -1,18 +1,18 @@ +# Maintainer: David P. <megver83@parabola.nu> # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> # Maintainer (Arch): Thomas Bächler <thomas@archlinux.org> -# Maintainer: David P. <megver83@parabola.nu> pkgname=mkinitcpio -pkgver=24 -pkgrel=2 +pkgver=25 +pkgrel=1 pkgrel+=.nonsystemd1 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' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'eudev') makedepends=('asciidoc') +depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' + 'coreutils' 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'udev') 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' @@ -20,21 +20,18 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') backup=('etc/mkinitcpio.conf') source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} - 'nosystemd.patch' - '0001-Restore-addition-of-modules-from-config-file.patch') + nosystemd.patch) install=mkinitcpio.install -sha256sums=('ec0ecbc518c14ecacf5a8ece2f068fe86fcaf3aed09ee6b82737e773e5d7d02b' +sha256sums=('e14056a9c460d15652e99620bce4308d4dd9309f82c152c4b52287e697fab599' 'SKIP' - 'e561464646274d995a02776d3fee03199e3b3c5bdc80f31fdf53391744bb6b64' - 'd4cbbf7b05f5dcaf23139469376ff6c29e948ce77a8c51ad4867413b4bddc4db') + 'e561464646274d995a02776d3fee03199e3b3c5bdc80f31fdf53391744bb6b64') validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner '86CFFCA918CF3AF47147588051E8B148A9999C34') # Evangelos Foutras -prepare() { - rm -rf ${srcdir}/${pkgname}-${pkgver}/install/sd-* - cd $pkgname-$pkgver - patch -Np1 -i $srcdir/nosystemd.patch - patch -Np1 -i $srcdir/0001-Restore-addition-of-modules-from-config-file.patch +prepare(){ + cd "$pkgname-$pkgver" + rm -rf install/sd-* + patch -Np1 -i $srcdir/nosystemd.patch } check() { |