From 2ff8b254f570cc0e72d67b71b1c7361ed19c0eaa Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 25 Nov 2010 15:36:21 +0000
Subject: main/mkinitfs: support for x86_64 uclibc in initramfs

---
 ...001-inlude-ld64-uClibc-in-initramfs-image.patch | 27 ++++++++++++++++++++++
 main/mkinitfs/APKBUILD                             | 17 ++++++++++----
 2 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 main/mkinitfs/0001-inlude-ld64-uClibc-in-initramfs-image.patch

(limited to 'main/mkinitfs')

diff --git a/main/mkinitfs/0001-inlude-ld64-uClibc-in-initramfs-image.patch b/main/mkinitfs/0001-inlude-ld64-uClibc-in-initramfs-image.patch
new file mode 100644
index 000000000..8f7641d98
--- /dev/null
+++ b/main/mkinitfs/0001-inlude-ld64-uClibc-in-initramfs-image.patch
@@ -0,0 +1,27 @@
+From e282075798a15081a5aca8d8a5ad8c5ffe406cc2 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 25 Nov 2010 15:32:48 +0000
+Subject: [PATCH] inlude ld64-uClibc in initramfs image
+
+---
+ files.d/base |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/files.d/base b/files.d/base
+index 965b67c..06bb3d8 100644
+--- a/files.d/base
++++ b/files.d/base
+@@ -10,8 +10,8 @@
+ /lib/libuClibc-[0-9]*
+ /lib/libc.so.*
+ /lib/libz.*
+-/lib/ld-uClibc-[0-9]*
+-/lib/ld-uClibc.so*
++/lib/ld*-uClibc-[0-9]*
++/lib/ld*-uClibc.so*
+ /lib/mdev
+ /sbin/apk
+ /etc/modprobe.d/blacklist
+-- 
+1.7.3.2
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index a97058661..741c14bda 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,24 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
 pkgver=2.1.2
-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
+	0001-inlude-ld64-uClibc-in-initramfs-image.patch
 	"
 license="GPL-2"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	# If we are using eglibc we need to include eglibc libs
+	# backport patch for x86_64
+        patch -p1 -i "$srcdir"/0001-inlude-ld64-uClibc-in-initramfs-image.patch || return 1
+
+	# If we are using eglibc/glibc we need to include eglibc libs
 	# instead of uclibc libs.
-	if [ "$ALPINE_LIBC" = "eglibc" ]; then
+	case "$CHOST" in
+	*-gnu)
 	        patch -p1 -i "$srcdir"/eglibc.patch || return 1
-	fi
+		;;
+	esac
 }
 
 build() {
@@ -31,4 +37,5 @@ package() {
 	make install DESTDIR="$pkgdir" || return 1
 }
 md5sums="e35426eb23b379a648500a353031e719  mkinitfs-2.1.2.tar.bz2
-e59c2f7de496fe430b07e32fd812ebe0  eglibc.patch"
+e59c2f7de496fe430b07e32fd812ebe0  eglibc.patch
+80fc4dfe56ec4485b34c3916eb1c42c8  0001-inlude-ld64-uClibc-in-initramfs-image.patch"
-- 
cgit v1.2.3