diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-06-03 22:15:55 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-06-03 22:15:55 +0000 |
| commit | 799cfe4f4e6baa058323fc76c94a687765a40d6a (patch) | |
| tree | 5823732b3deb2ebfdac822bb210d88900f7ea9a3 /sys-apps | |
| parent | use pam eclass (diff) | |
| download | historical-799cfe4f4e6baa058323fc76c94a687765a40d6a.tar.gz historical-799cfe4f4e6baa058323fc76c94a687765a40d6a.tar.bz2 historical-799cfe4f4e6baa058323fc76c94a687765a40d6a.zip | |
add more error messages and fix use static logic in install
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/busybox/Manifest | 32 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.00-r4.ebuild | 13 |
2 files changed, 18 insertions, 27 deletions
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 083adce79eb7..12069b5f606e 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,33 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 0ade6284270598ea4c5161ab6ba187c8 ChangeLog 13137 MD5 bb8e7d385422646c5c1de481e9ebe3d7 busybox-1.00-r2.ebuild 6186 -MD5 d17b468561111cd0665c318f0c357a8a busybox-1.00-r4.ebuild 6460 MD5 65f9d58ae4d54a1521081a2e15f3b66b busybox-1.00-r1.ebuild 6082 -MD5 0ade6284270598ea4c5161ab6ba187c8 ChangeLog 13137 MD5 1fe139692f8bffc43b4d01249289b358 busybox-1.00-r3.ebuild 6473 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 -MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853 -MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r1 66 +MD5 2ef38ab1045e1fa753f005f755fdb189 busybox-1.00-r4.ebuild 6513 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r2 66 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r3 66 MD5 8eca6aae55dad92090e0136b58a9fcf7 files/digest-busybox-1.00-r4 142 +MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r1 66 +MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853 MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474 -MD5 02bde866363ce5357e8dfadcf870b230 files/1.00/bb.patch 155 -MD5 e4391db361a2ab2985811ec466f08cdc files/1.00/standalone.patch 1007 -MD5 593c8f8e26c0a381db171d9be08076c0 files/1.00/sum.patch 6723 -MD5 4972a3b12accd80b77304ff4ff6b6a3a files/1.00/cp-posix-opts.patch 1245 +MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964 +MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795 MD5 85560a8d547bfc101acf98d53dbecd45 files/1.00/more-insmod-arches.patch 1506 +MD5 4972a3b12accd80b77304ff4ff6b6a3a files/1.00/cp-posix-opts.patch 1245 +MD5 e4391db361a2ab2985811ec466f08cdc files/1.00/standalone.patch 1007 MD5 6209b38225ac1d7cc77f84799acbe3ca files/1.00/nice.patch 4571 -MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964 MD5 0e50cd0ad938a8c15f1af8b59028c959 files/1.00/printenv.patch 3365 -MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iQCVAwUBQqBhUJ4WFLgrx1GWAQKS9AP9Gn435iGNp65UeqIF9nwQqoEmUrSYDIkd -UUkPusA8rvbEWUAhbpgEibh2qtysMt48E6LPUekrCg4oHF2x+Pno4taT+KxemF6X -bZjHbU2ixvUDFTlLpC250eWbr0kGXvkhTR0onwtiLRLvQY4eBQB4z/bDRNULdO15 -tpfzCz47g6A= -=g976 ------END PGP SIGNATURE----- +MD5 593c8f8e26c0a381db171d9be08076c0 files/1.00/sum.patch 6723 +MD5 02bde866363ce5357e8dfadcf870b230 files/1.00/bb.patch 155 diff --git a/sys-apps/busybox/busybox-1.00-r4.ebuild b/sys-apps/busybox/busybox-1.00-r4.ebuild index 288b8036a238..7498041d0a03 100644 --- a/sys-apps/busybox/busybox-1.00-r4.ebuild +++ b/sys-apps/busybox/busybox-1.00-r4.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-r4.ebuild,v 1.7 2005/06/03 13:55:21 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r4.ebuild,v 1.8 2005/06/03 22:15:55 vapier Exp $ inherit eutils @@ -133,10 +133,13 @@ busybox_set_cross_compiler() { src_compile() { busybox_set_cross_compiler #emake -j1 CROSS="${CROSS}" include/config.h busybox || die - emake -j1 CROSS="${CROSS}" busybox || die + emake -j1 CROSS="${CROSS}" busybox || die "build failed" if ! use static ; then mv busybox{,.bak} - emake -j1 LDFLAGS="${LDFLAGS} -static" CROSS="${CROSS}" busybox || die + emake -j1 \ + LDFLAGS="${LDFLAGS} -static" \ + CROSS="${CROSS}" \ + busybox || die "static build failed" mv busybox bb mv busybox{.bak,} fi @@ -148,8 +151,8 @@ src_install() { into / dobin busybox use static \ - || dobin bb \ - || dosym busybox /bin/bb + && dosym busybox /bin/bb \ + || dobin bb if use make-symlinks ; then if [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then |