Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: arch/um/, netboot/, defaults/
Date: Wed, 04 Jan 2012 14:33:21
Message-Id: b977d66940fdbbe552bb735a54141b69da873b5b.sping@gentoo
1 commit: b977d66940fdbbe552bb735a54141b69da873b5b
2 Author: Borg Onion <borg.onion <AT> gmail <DOT> com>
3 AuthorDate: Mon Dec 5 00:11:50 2011 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 4 14:32:16 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b977d669
7
8 Support for glibc-2.14 systems
9
10 Hello,
11
12 Due to the changes in glibc-2.14 busybox no longer compiles when NFS
13 support is enabled. This breaks genkernel. The following is a very
14 crude patch to just make things work on glibc-2.14 systems. A better
15 patch would be to detect glibc-2.14 and then make a config decision.
16 The best patch would be to port libtirpc to openssl, make busybox link
17 against libtirpc, restore NFS support, and put an end to this whole
18 mess. But in the meantime:
19
20 commit 80d1e89995f055a37f07f9f7f4c7e21660abd527
21 Author: Borg Onion <borg.onion <AT> gmail.com>
22 Date: Sat Dec 3 18:02:48 2011 -0800
23
24 Disable NFS support to enable glibc-2.14 compatibility
25
26 ---
27 arch/um/busy-config | 2 +-
28 defaults/busy-config | 2 +-
29 netboot/busy-config | 2 +-
30 3 files changed, 3 insertions(+), 3 deletions(-)
31
32 diff --git a/arch/um/busy-config b/arch/um/busy-config
33 index e45de93..c543820 100644
34 --- a/arch/um/busy-config
35 +++ b/arch/um/busy-config
36 @@ -384,7 +384,7 @@ CONFIG_SWITCH_ROOT=y
37 CONFIG_RDATE=y
38 CONFIG_SWAPONOFF=y
39 CONFIG_MOUNT=y
40 -CONFIG_NFSMOUNT=y
41 +CONFIG_NFSMOUNT=n
42 CONFIG_UMOUNT=y
43 # CONFIG_FEATURE_MOUNT_FORCE is not set
44
45
46 diff --git a/defaults/busy-config b/defaults/busy-config
47 index 51fdc8e..a1f6858 100644
48 --- a/defaults/busy-config
49 +++ b/defaults/busy-config
50 @@ -462,7 +462,7 @@ CONFIG_MDSTART=y
51 CONFIG_MORE=y
52 CONFIG_FEATURE_USE_TERMIOS=y
53 CONFIG_MOUNT=y
54 -CONFIG_FEATURE_MOUNT_NFS=y
55 +CONFIG_FEATURE_MOUNT_NFS=n
56 # CONFIG_FEATURE_MOUNT_CIFS is not set
57 CONFIG_FEATURE_MOUNT_FLAGS=y
58 CONFIG_FEATURE_MOUNT_FSTAB=y
59
60 diff --git a/netboot/busy-config b/netboot/busy-config
61 index 2aa4804..d4b9e29 100644
62 --- a/netboot/busy-config
63 +++ b/netboot/busy-config
64 @@ -474,7 +474,7 @@ CONFIG_MKSWAP=y
65 CONFIG_MORE=y
66 CONFIG_FEATURE_USE_TERMIOS=y
67 CONFIG_MOUNT=y
68 -CONFIG_FEATURE_MOUNT_NFS=y
69 +CONFIG_FEATURE_MOUNT_NFS=n
70 CONFIG_FEATURE_MOUNT_CIFS=y
71 CONFIG_FEATURE_MOUNT_FLAGS=y
72 CONFIG_FEATURE_MOUNT_FSTAB=y