From 118c1a2c6db28a67af47146ae117b96f3cab22b6 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Fri, 4 Jan 2013 17:24:56 +0100
Subject: main/mkinitfs: fix eglibc support

---
 main/mkinitfs/APKBUILD     |  2 +-
 main/mkinitfs/eglibc.patch | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'main/mkinitfs')

diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 6c5c92361..1341fe6a7 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -49,4 +49,4 @@ md5sums="7373acb2159e24ba120ee46b0deb6bc4  mkinitfs-2.4.3.tar.bz2
 ba969f3b8d8a0dd74319492eb41a712b  0001-init-fix-inittab-for-users-who-upgrades-from-pre-ope.patch
 bd9fd3813c9c28b42a1eeb30f65718e5  0001-init-search-boot-repositories-after-relocation.patch
 7aea167ef747a6f0d92081628358083a  0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch
-e59c2f7de496fe430b07e32fd812ebe0  eglibc.patch"
+067649665a767ff1a08578e1f4e61524  eglibc.patch"
diff --git a/main/mkinitfs/eglibc.patch b/main/mkinitfs/eglibc.patch
index 24f1e1e9a..25eb92626 100644
--- a/main/mkinitfs/eglibc.patch
+++ b/main/mkinitfs/eglibc.patch
@@ -1,6 +1,6 @@
---- a/files.d/base
-+++ b/files.d/base
-@@ -7,11 +7,11 @@
+--- mkinitfs-2.4.2.orig/files.d/base
++++ mkinitfs-2.4.2/files.d/base
+@@ -7,11 +7,10 @@
  /lib/libdl.so*
  /lib/libm-[0-9]*
  /lib/libm.so.*
@@ -8,10 +8,10 @@
 +/lib/libc-[0-9]*
  /lib/libc.so.*
  /lib/libz.*
--/lib/ld-uClibc-[0-9]*
--/lib/ld-uClibc.so*
-+/lib/ld-[0-9]*
-+/lib/ld-linux.so*
+-/lib/ld*-uClibc-[0-9]*
+-/lib/ld*-uClibc.so*
++/lib/ld*.so*
  /lib/mdev
  /sbin/apk
- /etc/modprobe.d/blacklist
+ /etc/modprobe.d/*.conf
+
-- 
cgit v1.2.3