From 8cb2e4459f3e714a255d65226234751351934736 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Wed, 15 Sep 2010 23:17:06 +0000 Subject: main/mkinitfs: fix for eglibc and dev/null * when building on with eglibc we need to replace libs inside initramfs * seems dev/null is a regular file on .35 kernel with eglibc --- main/mkinitfs/APKBUILD | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'main/mkinitfs/APKBUILD') diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 930ddb7ac5..065cbab969 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,22 +1,26 @@ # Maintainer: Natanael Copa pkgname=mkinitfs pkgver=2.0 -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 + eglibc.patch + fix-dev-null.patch " license="GPL-2" prepare() { cd "$srcdir"/$pkgname-$pkgver - for i in $source; do - case "$i" in - *.patch) patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + # seems dev null is not properly created after switch root + patch -p1 -i "$srcdir"/fix-dev-null.patch || return 1 + # If we are using eglibc we need to include eglibc libs + # instead of uclibc libs. + if [ "$ALPINE_LIBC" = "eglibc" ]; then + patch -p1 -i "$srcdir"/eglibc.patch || return 1 + fi } build() { @@ -28,4 +32,6 @@ package() { cd "$srcdir"/$pkgname-$pkgver make install DESTDIR="$pkgdir" || return 1 } -md5sums="b43a5eae02a1f97362ca66e7b5108593 mkinitfs-2.0.tar.bz2" +md5sums="b43a5eae02a1f97362ca66e7b5108593 mkinitfs-2.0.tar.bz2 +e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch +0f8c809b2f3530519025a52aaccbd296 fix-dev-null.patch" -- cgit v1.2.3