From: Borg Onion <borg.onion@gmail.com>
Date: Mon, 5 Dec 2011 00:11:50 +0000 (-0800)
Subject: Support for glibc-2.14 systems
X-Git-Tag: v3.4.21.1~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b977d66940fdbbe552bb735a54141b69da873b5b;p=genkernel.git

Support for glibc-2.14 systems

Hello,

Due to the changes in glibc-2.14 busybox no longer compiles when NFS
support is enabled.  This breaks genkernel.  The following is a very
crude patch to just make things work on glibc-2.14 systems.  A better
patch would be to detect glibc-2.14 and then make a config decision.
The best patch would be to port libtirpc to openssl, make busybox link
against libtirpc, restore NFS support, and put an end to this whole
mess.  But in the meantime:

commit 80d1e89995f055a37f07f9f7f4c7e21660abd527
Author: Borg Onion <borg.onion@gmail.com>
Date:   Sat Dec 3 18:02:48 2011 -0800

    Disable NFS support to enable glibc-2.14 compatibility
---

diff --git a/arch/um/busy-config b/arch/um/busy-config
index e45de93..c543820 100644
--- a/arch/um/busy-config
+++ b/arch/um/busy-config
@@ -384,7 +384,7 @@ CONFIG_SWITCH_ROOT=y
 CONFIG_RDATE=y
 CONFIG_SWAPONOFF=y
 CONFIG_MOUNT=y
-CONFIG_NFSMOUNT=y
+CONFIG_NFSMOUNT=n
 CONFIG_UMOUNT=y
 # CONFIG_FEATURE_MOUNT_FORCE is not set
 
diff --git a/defaults/busy-config b/defaults/busy-config
index 51fdc8e..a1f6858 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -462,7 +462,7 @@ CONFIG_MDSTART=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_NFS=n
 # CONFIG_FEATURE_MOUNT_CIFS is not set
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
diff --git a/netboot/busy-config b/netboot/busy-config
index 2aa4804..d4b9e29 100644
--- a/netboot/busy-config
+++ b/netboot/busy-config
@@ -474,7 +474,7 @@ CONFIG_MKSWAP=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_NFS=n
 CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y