aboutsummaryrefslogtreecommitdiffstats
path: root/main/mkinitfs
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-11-03 13:07:19 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-11-03 13:07:19 +0000
commitb21263b3339301e8cccbef9fba6b7321cf843fab (patch)
tree9c005265ea915d777ceebce0403048e2fc4892b3 /main/mkinitfs
parent965684eda7d18177baea0f967d78a6f59eecdaac (diff)
downloadaports-b21263b3339301e8cccbef9fba6b7321cf843fab.tar.bz2
aports-b21263b3339301e8cccbef9fba6b7321cf843fab.tar.xz
main/mkinitfs: minor fix
Diffstat (limited to 'main/mkinitfs')
-rw-r--r--main/mkinitfs/0001-mkinitfs-fix-for-running-without-b-option.patch34
-rw-r--r--main/mkinitfs/APKBUILD6
2 files changed, 39 insertions, 1 deletions
diff --git a/main/mkinitfs/0001-mkinitfs-fix-for-running-without-b-option.patch b/main/mkinitfs/0001-mkinitfs-fix-for-running-without-b-option.patch
new file mode 100644
index 0000000000..2357d2dda3
--- /dev/null
+++ b/main/mkinitfs/0001-mkinitfs-fix-for-running-without-b-option.patch
@@ -0,0 +1,34 @@
+From 98fb74fadf3dc91a22b6aa11b4351e1a8ea3ef18 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 3 Nov 2010 13:02:12 +0000
+Subject: [PATCH] mkinitfs: fix for running without -b option
+
+---
+ mkinitfs.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mkinitfs.in b/mkinitfs.in
+index 8246d07..67981c4 100755
+--- a/mkinitfs.in
++++ b/mkinitfs.in
+@@ -16,7 +16,7 @@ _cp() {
+ local i
+ if [ -n "$list_sources" ]; then
+ for i in "$@"; do
+- echo "$basedir"/$i
++ echo "$basedir"/"$i"
+ done
+ return
+ fi
+@@ -55,7 +55,7 @@ initfs_base() {
+ done
+ [ -z "$list_sources" ] && mkdir -p $dirs
+
+- cd "$basedir"
++ cd "${basedir:-/}"
+ for file in $(feature_files "$filelists_dir"); do
+ _cp $file
+ done
+--
+1.7.3.2
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 0fe2a753fe..2564722944 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,18 +1,21 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mkinitfs
pkgver=2.1.1
-pkgrel=0
+pkgrel=1
pkgdesc="Tool to generate initramfs images for Alpine"
url=http://git.alpinelinux.org/cgit/mkinitfs
depends="busybox apk-tools>=2.0"
triggers="$pkgname.trigger:/usr/share/kernel/*"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+ 0001-mkinitfs-fix-for-running-without-b-option.patch
eglibc.patch
"
license="GPL-2"
prepare() {
cd "$srcdir"/$pkgname-$pkgver
+ patch -p1 -i "$srcdir"/0001-mkinitfs-fix-for-running-without-b-option.patch || return 1
+
# If we are using eglibc we need to include eglibc libs
# instead of uclibc libs.
if [ "$ALPINE_LIBC" = "eglibc" ]; then
@@ -30,4 +33,5 @@ package() {
make install DESTDIR="$pkgdir" || return 1
}
md5sums="0bb08663748f8fe3578236ad161bf5e6 mkinitfs-2.1.1.tar.bz2
+50fbfe355bc13564299850db1c4c6862 0001-mkinitfs-fix-for-running-without-b-option.patch
e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch"