[arch-commits] Commit in mkinitcpio/repos (5 files)
Dave Reisner
dreisner at archlinux.org
Thu Jun 14 10:05:26 UTC 2012
Date: Thursday, June 14, 2012 @ 06:05:25
Author: dreisner
Revision: 161791
archrelease: copy trunk to testing-any
Added:
mkinitcpio/repos/testing-any/
mkinitcpio/repos/testing-any/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch
(from rev 161790, mkinitcpio/trunk/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch)
mkinitcpio/repos/testing-any/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch
(from rev 161790, mkinitcpio/trunk/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch)
mkinitcpio/repos/testing-any/PKGBUILD
(from rev 161790, mkinitcpio/trunk/PKGBUILD)
mkinitcpio/repos/testing-any/mkinitcpio.install
(from rev 161790, mkinitcpio/trunk/mkinitcpio.install)
-----------------------------------------------------------------+
0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch | 29 +++++++
0002-shutdown-don-t-alert-udev-on-disable-VGs.patch | 28 +++++++
PKGBUILD | 39 ++++++++++
mkinitcpio.install | 8 ++
4 files changed, 104 insertions(+)
Copied: mkinitcpio/repos/testing-any/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch (from rev 161790, mkinitcpio/trunk/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch)
===================================================================
--- testing-any/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch (rev 0)
+++ testing-any/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch 2012-06-14 10:05:25 UTC (rev 161791)
@@ -0,0 +1,29 @@
+From 7cf7ac4eb2c29a2b1aa748dae7658da5fbbc3a18 Mon Sep 17 00:00:00 2001
+From: Brian Parsons <brian at pmex.com>
+Date: Mon, 11 Jun 2012 17:30:10 -0400
+Subject: [PATCH 1/2] Update module filter to be aware of hyphens in the
+ MODULES array
+
+[dave: fix whitespace and re-add needed quoting]
+
+Signed-off-by: Dave Reisner <dreisner at archlinux.org>
+---
+ functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 4a62d8e..e9fb81a 100644
+--- a/functions
++++ b/functions
+@@ -590,7 +590,7 @@ write_image_config() {
+ . "$CONFIG"
+
+ # sanitize of any extra whitespace
+- read -ra modules <<< "$MODULES"
++ read -ra modules <<<"${MODULES//-/_}"
+ for mod in "${modules[@]}"; do
+ in_array "${mod%\?}" "${ADDED_MODULES[@]}" || continue
+ add+=("${mod%\?}")
+--
+1.7.10.4
+
Copied: mkinitcpio/repos/testing-any/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch (from rev 161790, mkinitcpio/trunk/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch)
===================================================================
--- testing-any/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch (rev 0)
+++ testing-any/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch 2012-06-14 10:05:25 UTC (rev 161791)
@@ -0,0 +1,28 @@
+From c257b0d7b4dd1c3f9b63c6a27b68a27bc246acea Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Tue, 12 Jun 2012 19:18:18 -0400
+Subject: [PATCH 2/2] shutdown: don't alert udev on disable VGs
+
+Fixes FS#30271.
+
+Signed-off-by: Dave Reisner <dreisner at archlinux.org>
+---
+ shutdown | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shutdown b/shutdown
+index ce7de23..fd88105 100644
+--- a/shutdown
++++ b/shutdown
+@@ -25,7 +25,7 @@ stop_device() {
+ read devname <"$1/dm/name"
+ lvm lvdisplay -c "/dev/mapper/$devname" | {
+ IFS=: read _ vgname _
+- lvm vgchange -an "$vgname"
++ lvm vgchange --noudevsync -an "$vgname"
+ }
+ ;;
+ raid*)
+--
+1.7.10.4
+
Copied: mkinitcpio/repos/testing-any/PKGBUILD (from rev 161790, mkinitcpio/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD (rev 0)
+++ testing-any/PKGBUILD 2012-06-14 10:05:25 UTC (rev 161791)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=mkinitcpio
+pkgver=0.9.2
+pkgrel=2
+pkgdesc="Modular initramfs image creation utility"
+arch=('any')
+url="http://www.archlinux.org/"
+license=('GPL')
+depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod>=3' 'util-linux>=2.21' 'libarchive' 'coreutils'
+ 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'file' 'gzip' 'systemd-tools')
+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'
+ 'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
+backup=('etc/mkinitcpio.conf')
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
+ 0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch
+ 0002-shutdown-don-t-alert-udev-on-disable-VGs.patch)
+install=mkinitcpio.install
+sha256sums=('1c388ab1df4ecdf6204602c66220a79adc2c564956fdf68deb7dde9bab331c28'
+ '5e5f83a2f9805ce1b09602f31fd4aca93fa7085a40c74bc559cf25c29506b057'
+ 'e32a7955b94e378698268f9cfd07fb0285a4efbdc4b26ea40714e7f1a54705a1')
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch
+ patch -Np1 <"$srcdir"/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch
+
+ make DESTDIR="$pkgdir" install
+
+ # compat symlink
+ install -dm755 "$pkgdir/sbin"
+ ln -s /usr/bin/mkinitcpio "$pkgdir/sbin/mkinitcpio"
+}
+
Copied: mkinitcpio/repos/testing-any/mkinitcpio.install (from rev 161790, mkinitcpio/trunk/mkinitcpio.install)
===================================================================
--- testing-any/mkinitcpio.install (rev 0)
+++ testing-any/mkinitcpio.install 2012-06-14 10:05:25 UTC (rev 161791)
@@ -0,0 +1,8 @@
+#!/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
+}
More information about the arch-commits
mailing list