[arch-commits] Commit in mkinitcpio/trunk (2 files)

[Dave Reisner]

    Date: Saturday, December 3, 2011 @ 20:20:57
  Author: dreisner
Revision: 144104

upgpkg: mkinitcpio 0.8.0-3

- backport fix for FS#27385

Added:
  mkinitcpio/trunk/0001-init_functions-redirect-poll_device-output-to-stderr.patch
Modified:
  mkinitcpio/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-init_functions-redirect-poll_device-output-to-stderr.patch |   28 ++++++++++
 PKGBUILD                                                        |   16 ++++-
 2 files changed, 40 insertions(+), 4 deletions(-)

Added: 0001-init_functions-redirect-poll_device-output-to-stderr.patch
===================================================================
--- 0001-init_functions-redirect-poll_device-output-to-stderr.patch	                        (rev 0)
+++ 0001-init_functions-redirect-poll_device-output-to-stderr.patch	2011-12-04 01:20:57 UTC (rev 144104)
@@ -0,0 +1,28 @@
+From 7effc762a2de2029ccedb659f25426c80b04cf4d Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Thu, 1 Dec 2011 11:58:40 -0500
+Subject: [PATCH] init_functions: redirect poll_device output to stderr
+
+Fixes FS#27385
+
+Signed-off-by: Dave Reisner <dreisner at archlinux.org>
+---
+ init_functions |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/init_functions b/init_functions
+index 69cd8fb..787b925 100644
+--- a/init_functions
++++ b/init_functions
+@@ -15,7 +15,7 @@ poll_device() {
+     [ -b "$device" ] && return 0
+ 
+     if [ "$udevd_running" -eq 1 ]; then
+-        msg "Waiting $seconds seconds for device $device ..."
++        msg "Waiting $seconds seconds for device $device ..." >&2
+         while [ ! -b "$device" -a "$seconds" -gt 0 ]; do
+             sleep 1
+             seconds=$(( $seconds - 1 ))
+-- 
+1.7.8
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-04 01:16:49 UTC (rev 144103)
+++ PKGBUILD	2011-12-04 01:20:57 UTC (rev 144104)
@@ -4,7 +4,7 @@
 
 pkgname=mkinitcpio
 pkgver=0.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url="http://www.archlinux.org/"
@@ -18,15 +18,23 @@
 replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
           'klibc-module-init-tools' 'klibc-udev')
 backup=(etc/mkinitcpio.conf)
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('097faaf23aaa6d442e7cc6add7238698abfea4185e7d125dcffd74d0ea159246')
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
+        '0001-init_functions-redirect-poll_device-output-to-stderr.patch')
+sha256sums=('097faaf23aaa6d442e7cc6add7238698abfea4185e7d125dcffd74d0ea159246'
+            '00248a66c5a2964e3a5e4e344f5679e5866857aa53b645cc5308ab8af8152e57')
 
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # backport fix for FS#27385
+  patch -Np1 < "$srcdir"/0001-init_functions-redirect-poll_device-output-to-stderr.patch
+}
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
-  # add compat symlink until people stop hardcoding paths !$%(&*!#$
   mkdir "$pkgdir/sbin"
   ln -s /usr/bin/mkinitcpio "$pkgdir/sbin/mkinitcpio"
 }