[arch-commits] Commit in mkinitcpio/trunk (2 files)
Dave Reisner
dreisner at archlinux.org
Fri Jan 6 00:36:45 UTC 2012
Date: Thursday, January 5, 2012 @ 19:36:44
Author: dreisner
Revision: 146197
upgpkg: mkinitcpio 0.8.1-1
Dave Reisner (22):
init: remove size limitations from API filesystems
init_functions: rephrase bailout message
mkinitcpio: warn when no modules are added to the image
functions: add verbose output for overwriting files
functions: don't allow add_binary to re-add deps
lsinitcpio: columnize binaries output
mkinitcpio: parse vars from config file last
init_functions: redirect poll_device output to stderr
mkinitcpio: add VERSION stamp to image
lsinitcpio: read VERSION stamp out of image file
functions: don't fail on add_binary adding a non-binary
init: create /run/initramfs as mode 755
lsinitcpio: cleanup binary display
ensure MODULEDIR is declared with a trailing slash
functions: display proper name on file not found
lsinitcpio: remove duplicate in_array function
mkinitcpio: avoid color when stdout isn't a tty
mkinitcpio: remove hardcoded paths
autodetect: check for rootfs module existance
function: suppress errors from modprobe
mkinitcpio: include modules.{builtin,order} for depmod call
shutdown: add new hook
Gerardo Exequiel Pozzi (4):
hooks/net: Refactor and remove sed cmd usage.
hooks/net: Add BOOTIF support
hooks/resume: Remove cut cmd usage
install/base: Add an empty fstab
Tom Gundersen (3):
add_{file,symlink}: overwrite existing file
move all binaries to /usr/bin
busybox: create symlinks manually
Modified:
mkinitcpio/trunk/PKGBUILD
Deleted:
mkinitcpio/trunk/0001-init_functions-redirect-poll_device-output-to-stderr.patch
-----------------------------------------------------------------+
0001-init_functions-redirect-poll_device-output-to-stderr.patch | 28 ----------
PKGBUILD | 26 ++-------
2 files changed, 8 insertions(+), 46 deletions(-)
Deleted: 0001-init_functions-redirect-poll_device-output-to-stderr.patch
===================================================================
--- 0001-init_functions-redirect-poll_device-output-to-stderr.patch 2012-01-05 21:53:59 UTC (rev 146196)
+++ 0001-init_functions-redirect-poll_device-output-to-stderr.patch 2012-01-06 00:36:44 UTC (rev 146197)
@@ -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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-01-05 21:53:59 UTC (rev 146196)
+++ PKGBUILD 2012-01-06 00:36:44 UTC (rev 146197)
@@ -3,13 +3,13 @@
# Maintainer: Thomas Bächler <thomas at archlinux.org>
pkgname=mkinitcpio
-pkgver=0.8.0
-pkgrel=3
+pkgver=0.8.1
+pkgrel=1
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'
+depends=('mkinitcpio-busybox>=1.16.1-2' 'kmod>=3' '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'
@@ -18,23 +18,13 @@
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')
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
+sha256sums=('09b209bb4a759580b33001e5f3aca0228b285f0ffe1ef43192ce98f5ce995350')
-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 -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" install
-
- mkdir "$pkgdir/sbin"
+ # compat symlink
+ install -dm755 "$pkgdir/sbin"
ln -s /usr/bin/mkinitcpio "$pkgdir/sbin/mkinitcpio"
}
More information about the arch-commits
mailing list