[arch-commits] Commit in mkinitcpio/repos (7 files)
Dave Reisner
dreisner at archlinux.org
Wed Aug 1 01:04:59 UTC 2012
Date: Tuesday, July 31, 2012 @ 21:04:59
Author: dreisner
Revision: 164385
db-move: moved mkinitcpio from [testing] to [core] (any)
Added:
mkinitcpio/repos/core-any/PKGBUILD
(from rev 164384, mkinitcpio/repos/testing-any/PKGBUILD)
mkinitcpio/repos/core-any/mkinitcpio.install
(from rev 164384, mkinitcpio/repos/testing-any/mkinitcpio.install)
Deleted:
mkinitcpio/repos/core-any/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch
mkinitcpio/repos/core-any/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch
mkinitcpio/repos/core-any/PKGBUILD
mkinitcpio/repos/core-any/mkinitcpio.install
mkinitcpio/repos/testing-any/
-----------------------------------------------------------------+
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 | 66 ++++------
mkinitcpio.install | 16 +-
4 files changed, 35 insertions(+), 104 deletions(-)
Deleted: core-any/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch
===================================================================
--- core-any/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch 2012-07-31 23:15:30 UTC (rev 164384)
+++ core-any/0001-Update-module-filter-to-be-aware-of-hyphens-in-the-M.patch 2012-08-01 01:04:59 UTC (rev 164385)
@@ -1,29 +0,0 @@
-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
-
Deleted: core-any/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch
===================================================================
--- core-any/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch 2012-07-31 23:15:30 UTC (rev 164384)
+++ core-any/0002-shutdown-don-t-alert-udev-on-disable-VGs.patch 2012-08-01 01:04:59 UTC (rev 164385)
@@ -1,28 +0,0 @@
-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
-
Deleted: core-any/PKGBUILD
===================================================================
--- core-any/PKGBUILD 2012-07-31 23:15:30 UTC (rev 164384)
+++ core-any/PKGBUILD 2012-08-01 01:04:59 UTC (rev 164385)
@@ -1,39 +0,0 @@
-# $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/core-any/PKGBUILD (from rev 164384, mkinitcpio/repos/testing-any/PKGBUILD)
===================================================================
--- core-any/PKGBUILD (rev 0)
+++ core-any/PKGBUILD 2012-08-01 01:04:59 UTC (rev 164385)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=mkinitcpio
+pkgver=0.10
+pkgrel=1
+pkgdesc="Modular initramfs image creation utility"
+arch=('any')
+url="http://www.archlinux.org/"
+license=('GPL')
+depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' '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"{,.sig})
+install=mkinitcpio.install
+sha256sums=('cd3526b135ede8ca60e05222b1e86cdf3a917947d4fd5b6e6a0a34ec408bc494'
+ '21bd8a75203d15706fd66bfc9520ea1eb728736ee8f6c6a595f63f997b2673e3')
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
+
Deleted: core-any/mkinitcpio.install
===================================================================
--- core-any/mkinitcpio.install 2012-07-31 23:15:30 UTC (rev 164384)
+++ core-any/mkinitcpio.install 2012-08-01 01:04:59 UTC (rev 164385)
@@ -1,8 +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
-}
Copied: mkinitcpio/repos/core-any/mkinitcpio.install (from rev 164384, mkinitcpio/repos/testing-any/mkinitcpio.install)
===================================================================
--- core-any/mkinitcpio.install (rev 0)
+++ core-any/mkinitcpio.install 2012-08-01 01:04:59 UTC (rev 164385)
@@ -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