[arch-commits] Commit in mkinitcpio/repos (4 files)

Dave Reisner dreisner at archlinux.org
Sat Jan 21 00:32:03 UTC 2012


    Date: Friday, January 20, 2012 @ 19:32:02
  Author: dreisner
Revision: 147036

db-move: moved mkinitcpio from [testing] to [core] (any)

Added:
  mkinitcpio/repos/core-any/PKGBUILD
    (from rev 147033, mkinitcpio/repos/testing-any/PKGBUILD)
Deleted:
  mkinitcpio/repos/core-any/0001-init_functions-redirect-poll_device-output-to-stderr.patch
  mkinitcpio/repos/core-any/PKGBUILD
  mkinitcpio/repos/testing-any/

-----------------------------------------------------------------+
 0001-init_functions-redirect-poll_device-output-to-stderr.patch |   28 ----
 PKGBUILD                                                        |   70 ++++------
 2 files changed, 30 insertions(+), 68 deletions(-)

Deleted: core-any/0001-init_functions-redirect-poll_device-output-to-stderr.patch
===================================================================
--- core-any/0001-init_functions-redirect-poll_device-output-to-stderr.patch	2012-01-21 00:32:01 UTC (rev 147035)
+++ core-any/0001-init_functions-redirect-poll_device-output-to-stderr.patch	2012-01-21 00:32:02 UTC (rev 147036)
@@ -1,28 +0,0 @@
-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
-

Deleted: core-any/PKGBUILD
===================================================================
--- core-any/PKGBUILD	2012-01-21 00:32:01 UTC (rev 147035)
+++ core-any/PKGBUILD	2012-01-21 00:32:02 UTC (rev 147036)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=mkinitcpio
-pkgver=0.8.0
-pkgrel=3
-pkgdesc="Modular initramfs image creation utility"
-arch=('any')
-url="http://www.archlinux.org/"
-license=('GPL')
-depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils'
-         'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=174-1' 'file' 'gzip')
-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')
-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"
-        '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
-
-  mkdir "$pkgdir/sbin"
-  ln -s /usr/bin/mkinitcpio "$pkgdir/sbin/mkinitcpio"
-}

Copied: mkinitcpio/repos/core-any/PKGBUILD (from rev 147033, mkinitcpio/repos/testing-any/PKGBUILD)
===================================================================
--- core-any/PKGBUILD	                        (rev 0)
+++ core-any/PKGBUILD	2012-01-21 00:32:02 UTC (rev 147036)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=mkinitcpio
+pkgver=0.8.2
+pkgrel=1
+pkgdesc="Modular initramfs image creation utility"
+arch=('any')
+url="http://www.archlinux.org/"
+license=('GPL')
+depends=('mkinitcpio-busybox>=1.16.1-2' 'kmod>=3' 'util-linux>=2.20.1-2' 'libarchive' 'coreutils'
+         'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=177-1' 'file' 'gzip')
+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")
+md5sums=('2e0ac0c657ca7a78aa0583b3368c0e44')
+sha256sums=('9a951f9e2a158b65840f476c1b9e1e45c7b06383a90f182f76eab64bd3a398cb')
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+  # compat symlink
+  install -dm755 "$pkgdir/sbin"
+  ln -s /usr/bin/mkinitcpio "$pkgdir/sbin/mkinitcpio"
+}
+




More information about the arch-commits mailing list