Fixed saveconfig and make-busybox-symlinks as per bugs #60982 and #60805.

4 files changed, 56 insertions, 21 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index d83bb59fe87b..7e43018323ef 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.41 2004/09/03 21:03:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.42 2004/09/11 08:08:42 dragonheart Exp $
+
+  11 Sep 2004; Daniel Black <dragonheart@gentoo.org> busybox-1.00_pre8.ebuild,
+  busybox-1.00_rc3.ebuild:
+  Fixed saveconfig and make-busybox-symlinks as per bugs #60982 and #60805.
+  Thanks to Edward Flick <eddy@cdf-imaging.com> and Dirk Heinrichs
+  <ext-dirk.heinrichs@nokia.com>
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   busybox-1.00_pre8.ebuild, busybox-1.00_rc3.ebuild:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index fef423193205..846059da68a8 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,11 +1,14 @@
-MD5 0e38580a849f579dc54ecd5ec60f2289 ChangeLog 8268
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c3583df2aef5319f1aeeb51f8e91e344 ChangeLog 8554
+MD5 48fd4e5389c1854546cb5c407ba49ea0 busybox-1.00_rc3.ebuild 6550
 MD5 f98f75be102af5709caff4cf84eaeb90 busybox-0.60.3-r1.ebuild 1091
-MD5 bb58878c35f17f5bad4aa060f1dcc25e busybox-0.60.3-r2.ebuild 1183
 MD5 bc6b0e4b7611df0d97f0c380b9fa7c07 busybox-0.60.5-r1.ebuild 1407
-MD5 850bd351d581d0e98c74552826d24eae busybox-0.60.5-r2.ebuild 2280
-MD5 dfab56adc3ea8e61f19a93f759ad230e busybox-1.00_pre8.ebuild 5646
-MD5 74e657e6decff8405a5910e9b7c584b5 busybox-1.00_rc3.ebuild 6073
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 bb58878c35f17f5bad4aa060f1dcc25e busybox-0.60.3-r2.ebuild 1183
+MD5 6f67ee9e2bbbad38eb6687bb6c56677a busybox-1.00_pre8.ebuild 6124
+MD5 850bd351d581d0e98c74552826d24eae busybox-0.60.5-r2.ebuild 2280
 MD5 9ce965b12114a360496fe06e952139a8 files/Config.h 11695
 MD5 24ec3839ecb3e429bf29a819398b7753 files/Config.h-0.60.2-cd 13772
 MD5 af127cfced92352c0a43cbf63cde52bd files/Config.h-0.60.3-cd 14319
@@ -13,12 +16,19 @@ MD5 1bce86c66f42d204c0780faee28004d6 files/Config.h-0.60.5-cd 14299
 MD5 9af76647376bd7228609763aaad090e8 files/busybox-0.60.5-dietlibc.diff 13526
 MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804
 MD5 3d2f032de478151319a640c020fa492e files/busybox-1.00_pre8-amd64.patch 862
-MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568
+MD5 75d3d96c0d23ddd4ffae3daa59e0fb1e files/digest-busybox-1.00_rc3 70
 MD5 2a162a491ef2162ee773767a8dbca4da files/digest-busybox-0.60.3-r1 513
-MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66
 MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5-r1 66
 MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5-r2 66
-MD5 607bbb12af0241b696df9dbfcd71d8c4 files/digest-busybox-1.00_pre8 70
-MD5 75d3d96c0d23ddd4ffae3daa59e0fb1e files/digest-busybox-1.00_rc3 70
 MD5 9750d4004e6507d35f9aa67d2785fdd3 files/dodeps 2015
 MD5 3a4b93f7ec6f3aaade20029a81562b88 files/msh.diff 433
+MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66
+MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568
+MD5 607bbb12af0241b696df9dbfcd71d8c4 files/digest-busybox-1.00_pre8 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBQrNGmdTrptrqvGERAsXbAKCHVBtBTCwW2W0vouYwyWKnbW1reACfY1l7
+LoPMhmuIlJbV0w1BWeVOA1I=
+=mDW+
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.00_pre8.ebuild b/sys-apps/busybox/busybox-1.00_pre8.ebuild
index 3b2c0836192d..75519afc6477 100644
--- a/sys-apps/busybox/busybox-1.00_pre8.ebuild
+++ b/sys-apps/busybox/busybox-1.00_pre8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_pre8.ebuild,v 1.11 2004/09/03 21:03:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_pre8.ebuild,v 1.12 2004/09/11 08:08:42 dragonheart Exp $
 
 inherit eutils
 
@@ -48,14 +48,15 @@ src_unpack() {
 
 	if use savedconfig ; then
 		[ -r .config ] && rm .config
-		for conf in {${PN}-${PV}-${PR},${PN}-${PV},${PN}}.config; do
-			if [ -r /etc/${PN}/${CCHOST}/${conf} ]; then
-				cp /etc/${PN}/${CCHOST}/${conf} ${S}/.config
+		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
+			configfile=/etc/${PN}/${CCHOST}/${conf}.config
+			if [ -r ${configfile} ]; then
+				cp ${configfile} ${S}/.config
 				break;
 			fi
 		done
 		if [ -r "${S}/.config" ]; then
-			einfo "Found your /etc/${PN}/${CCHOST}/${conf} and using it."
+			einfo "Found your ${configfile} and using it."
 			return 0
 		fi
 	fi
@@ -135,7 +136,16 @@ src_install() {
 
 	into /
 	dobin busybox
-	if use make-busybox-symlinks ; then
+	if use make-busybox-symlinks ;
+	then
+		if [ ! "${VERY_BRAVE_OR_VERY_DUMB}" = "yes" ] && [ "${ROOT}" = "/" ];
+		then
+			ewarn "setting USE=make-busybox-symlinks and emerging to / is very dangerous."
+			ewarn "It WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+			ewarn "If you are creating a binary only and not merging this is probably ok."
+			ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is realy what you want."
+			die "silly options will destroy your system"
+		fi
 		make CROSS="${CROSS}" install || die
 		dodir /bin
 		cp -a _install/bin/* ${D}/bin/
diff --git a/sys-apps/busybox/busybox-1.00_rc3.ebuild b/sys-apps/busybox/busybox-1.00_rc3.ebuild
index 7778c73063c1..ad8d2ee78c64 100644
--- a/sys-apps/busybox/busybox-1.00_rc3.ebuild
+++ b/sys-apps/busybox/busybox-1.00_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_rc3.ebuild,v 1.4 2004/09/03 21:03:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_rc3.ebuild,v 1.5 2004/09/11 08:08:42 dragonheart Exp $
 
 inherit eutils
 
@@ -59,14 +59,15 @@ src_unpack() {
 
 	if use savedconfig ; then
 		[ -r .config ] && rm .config
-		for conf in {${PN}-${PV}-${PR},${PN}-${PV},${PN}}.config; do
-			if [ -r /etc/${PN}/${CCHOST}/${conf} ]; then
-				cp /etc/${PN}/${CCHOST}/${conf} ${S}/.config
+		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
+			configfile=/etc/${PN}/${CCHOST}/${conf}.config
+			if [ -r ${configfile} ]; then
+				cp ${configfile} ${S}/.config
 				break;
 			fi
 		done
 		if [ -r "${S}/.config" ]; then
-			einfo "Found your /etc/${PN}/${CCHOST}/${conf} and using it."
+			einfo "Found your ${configfile} and using it."
 			return 0
 		fi
 	fi
@@ -154,6 +155,14 @@ src_install() {
 	into /
 	dobin busybox
 	if use make-busybox-symlinks ; then
+		if [ ! "${VERY_BRAVE_OR_VERY_DUMB}" = "yes" ] && [ "${ROOT}" = "/" ];
+		then
+			ewarn "setting USE=make-busybox-symlinks and emerging to / is very dangerous."
+			ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+			ewarn "If you are creating a binary only and not merging this is probably ok."
+			ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is realy what you want."
+			die "silly options will destroy your system"
+		fi
 		make CROSS="${CROSS}" install || die
 		dodir /bin
 		cp -a _install/bin/* ${D}/bin/