diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/busybox/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/busybox/Manifest | 14 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.00-r3.ebuild | 8 |
3 files changed, 15 insertions, 12 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index f80a2c5d3dd9..910056a32c54 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.63 2005/05/01 22:07:25 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.64 2005/05/07 13:15:18 solar Exp $ + + 07 May 2005; <solar@gentoo.org> busybox-1.00-r3.ebuild: + - have savedconfig look in ROOT first then fallback to / if nothing is found *busybox-1.00-r3 (01 May 2005) diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 7151e6f7e1dc..2c1ebe7f120f 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -3,8 +3,8 @@ Hash: SHA1 MD5 509f4ad475e3327a7977fe02afae735a busybox-1.00-r2.ebuild 6194 MD5 3ad42325d46ae5577c445e5e31e8f950 busybox-1.00-r1.ebuild 6090 -MD5 17ce9c27c2422c89653799c4a7aae36a ChangeLog 12059 -MD5 e60a0ab89f0cc905ba6df1216772d45b busybox-1.00-r3.ebuild 6418 +MD5 894106c829dc4fa16dc4aa218320a3a1 ChangeLog 12197 +MD5 4bf69d151555c144c6942846abc818e6 busybox-1.00-r3.ebuild 6480 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r1 66 @@ -22,9 +22,9 @@ MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iQCVAwUBQnVSzJ4WFLgrx1GWAQL1nwP+JJSZw0NVzzZX5oneFvSYjOKAFNOq/a1i -yh4HlLOHXwiLLz7lsE0hUjn+Oxn79SGdt4lTcBfvjMZLkJ24Kbok+zjdW17FhZvp -qNaoeQhNFdh7NGjiZQ45Mpf8AcBaJMdTRRqGpj48DlaGevLM7COmtNO0q149JgEY -iUi4GZb1c+I= -=/OUe +iQCVAwUBQny/EZ4WFLgrx1GWAQJs7QP/Rtm8uuE4H3sEpmi4XVHkxpdWHY+YzCVj +mrSaAJBv1xkXr9sdDPQMl/NowAdlGA3BEFAG1pP+gTa0im52KoqHhQPA6TjaoGJx +kss2uk3Mv8ON+RYUMnRIz/MCDBAiSiE8PFMLeamX+g+OMsO1l2/k6msMVDFNVl1p +HPrQ24MfCMc= +=x6wv -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.00-r3.ebuild b/sys-apps/busybox/busybox-1.00-r3.ebuild index 3ba48611f38e..120f54c53448 100644 --- a/sys-apps/busybox/busybox-1.00-r3.ebuild +++ b/sys-apps/busybox/busybox-1.00-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r3.ebuild,v 1.1 2005/05/01 22:07:25 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r3.ebuild,v 1.2 2005/05/07 13:15:18 solar Exp $ inherit eutils @@ -21,8 +21,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug uclibc static savedconfig netboot floppyboot make-symlinks" -DEPEND="virtual/libc - >=sys-apps/sed-4" +DEPEND="virtual/libc" RDEPEND="!static? ( virtual/libc )" S=${WORKDIR}/${MY_P} @@ -67,7 +66,8 @@ src_unpack() { if use savedconfig ; then [ -r .config ] && rm .config for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do - configfile=/etc/${PN}/${CHOST}/${conf}.config + configfile=${ROOT}/etc/${PN}/${CHOST}/${conf}.config + [ -r ${configfile} ] || configfile=/etc/${PN}/${CHOST}/${conf}.config if [ -r ${configfile} ]; then cp ${configfile} ${S}/.config break; |