[arch-commits] Commit in mkinitcpio/repos/testing-any (5 files)
Dave Reisner
dreisner at archlinux.org
Fri Oct 6 19:30:21 UTC 2017
Date: Friday, October 6, 2017 @ 19:30:20
Author: dreisner
Revision: 307064
archrelease: copy trunk to testing-any
Added:
mkinitcpio/repos/testing-any/0001-Restore-addition-of-modules-from-config-file.patch
(from rev 307063, mkinitcpio/trunk/0001-Restore-addition-of-modules-from-config-file.patch)
mkinitcpio/repos/testing-any/PKGBUILD
(from rev 307063, mkinitcpio/trunk/PKGBUILD)
mkinitcpio/repos/testing-any/mkinitcpio.install
(from rev 307063, mkinitcpio/trunk/mkinitcpio.install)
Deleted:
mkinitcpio/repos/testing-any/PKGBUILD
mkinitcpio/repos/testing-any/mkinitcpio.install
---------------------------------------------------------+
0001-Restore-addition-of-modules-from-config-file.patch | 39 +++++++
PKGBUILD | 74 +++++++-------
mkinitcpio.install | 30 ++---
3 files changed, 95 insertions(+), 48 deletions(-)
Copied: mkinitcpio/repos/testing-any/0001-Restore-addition-of-modules-from-config-file.patch (from rev 307063, mkinitcpio/trunk/0001-Restore-addition-of-modules-from-config-file.patch)
===================================================================
--- 0001-Restore-addition-of-modules-from-config-file.patch (rev 0)
+++ 0001-Restore-addition-of-modules-from-config-file.patch 2017-10-06 19:30:20 UTC (rev 307064)
@@ -0,0 +1,39 @@
+From 5bba09cb1c661627fde76b977cfe9f937b1264a3 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at 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 at 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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-10-06 19:29:31 UTC (rev 307063)
+++ PKGBUILD 2017-10-06 19:30:20 UTC (rev 307064)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=mkinitcpio
-pkgver=24
-pkgrel=1
-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' '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')
-backup=('etc/mkinitcpio.conf')
-source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-install=mkinitcpio.install
-sha256sums=('ec0ecbc518c14ecacf5a8ece2f068fe86fcaf3aed09ee6b82737e773e5d7d02b'
- 'SKIP')
-validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner
- '86CFFCA918CF3AF47147588051E8B148A9999C34') # Evangelos Foutras
-
-check() {
- make -C "$pkgname-$pkgver" check
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-}
Copied: mkinitcpio/repos/testing-any/PKGBUILD (from rev 307063, mkinitcpio/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-10-06 19:30:20 UTC (rev 307064)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=mkinitcpio
+pkgver=24
+pkgrel=2
+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' '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')
+backup=('etc/mkinitcpio.conf')
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+ 0001-Restore-addition-of-modules-from-config-file.patch)
+install=mkinitcpio.install
+sha256sums=('ec0ecbc518c14ecacf5a8ece2f068fe86fcaf3aed09ee6b82737e773e5d7d02b'
+ 'SKIP'
+ 'd4cbbf7b05f5dcaf23139469376ff6c29e948ce77a8c51ad4867413b4bddc4db')
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner
+ '86CFFCA918CF3AF47147588051E8B148A9999C34') # Evangelos Foutras
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-Restore-addition-of-modules-from-config-file.patch
+}
+
+check() {
+ make -C "$pkgname-$pkgver" check
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
Deleted: mkinitcpio.install
===================================================================
--- mkinitcpio.install 2017-10-06 19:29:31 UTC (rev 307063)
+++ mkinitcpio.install 2017-10-06 19:30:20 UTC (rev 307064)
@@ -1,15 +0,0 @@
-#!/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
-}
Copied: mkinitcpio/repos/testing-any/mkinitcpio.install (from rev 307063, mkinitcpio/trunk/mkinitcpio.install)
===================================================================
--- mkinitcpio.install (rev 0)
+++ mkinitcpio.install 2017-10-06 19:30:20 UTC (rev 307064)
@@ -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
+}
More information about the arch-commits
mailing list