From: Mike Frysinger Date: Mon, 2 Apr 2007 12:19:10 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2495bcaad7fcdc6c349c36546ede527b9423c7ec;p=gentoo.git old Package-Manager: portage-2.1.2.3 --- diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index e415a279e432..80c75529cb4a 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -9,14 +9,6 @@ AUX 1.2.0/gcc2.patch 458 RMD160 1517888a4e413f6092dea0806fabad53e7f65a90 SHA1 cd MD5 a63030f3253c0f7d7a231b3e3f7c1c6c files/1.2.0/gcc2.patch 458 RMD160 1517888a4e413f6092dea0806fabad53e7f65a90 files/1.2.0/gcc2.patch 458 SHA256 38a129a4aa4f157ad9d3ccbaa0a8a9f202f6899599332ddc2b6ca3f6568e6b79 files/1.2.0/gcc2.patch 458 -AUX 1.3.0/bb.patch 1215 RMD160 7453cb330851eaad1f1353203c7526dc505d41d7 SHA1 05401894ccaf30e22bd5e2cebd2595e2683ab5bb SHA256 48b67883b52fda4ddce675ed924d271151bfdb4088dd9a163a3867803bd35bfd -MD5 1dc2f6e57752b412fa4b1dc61543a1e8 files/1.3.0/bb.patch 1215 -RMD160 7453cb330851eaad1f1353203c7526dc505d41d7 files/1.3.0/bb.patch 1215 -SHA256 48b67883b52fda4ddce675ed924d271151bfdb4088dd9a163a3867803bd35bfd files/1.3.0/bb.patch 1215 -AUX 1.3.0/ld.patch 371 RMD160 d0f3f90f46e89c722e3ea153953deb8abfba38b0 SHA1 501bb1d9a88f63c77d465ae06c0f9a25fad0eff8 SHA256 c390421ec2d16e07a175c4aaacaa182ae43e4eb832b8bbc5fae14992f2cea732 -MD5 a979b18515d796ca910c433c238740ec files/1.3.0/ld.patch 371 -RMD160 d0f3f90f46e89c722e3ea153953deb8abfba38b0 files/1.3.0/ld.patch 371 -SHA256 c390421ec2d16e07a175c4aaacaa182ae43e4eb832b8bbc5fae14992f2cea732 files/1.3.0/ld.patch 371 AUX 1.4.0/bb.patch 866 RMD160 f1cce542de0814d6dbcf5f23cfad8d3249bf8839 SHA1 257b0dea76eb8656e2d0f03cc877af05415bcd0b SHA256 5e4ca94e7f5914d0e525bec1d661b978fd2e3d356cb1d1014701c6e486f4d7f8 MD5 3d19b371b9686743428acdae5c3dd9e4 files/1.4.0/bb.patch 866 RMD160 f1cce542de0814d6dbcf5f23cfad8d3249bf8839 files/1.4.0/bb.patch 866 @@ -42,8 +34,6 @@ MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853 DIST busybox-1.2.2.1.tar.bz2 1413458 RMD160 f61662f1ee12a7c65b9e65864c23242b6176a242 SHA1 41683c6a31f365ac884b84a376533d9ff372c05e SHA256 e31de8f3fc6639660af08446cc8b49f5831d5e5ecab0a56d9482c1d4eb89a701 -DIST busybox-1.3.1.shadow.patch 5561 RMD160 f10dd2af66b439bb4d46056e8fc15756080bb093 SHA1 29df47a3ebb262f50a11d8be4275574bfe922894 SHA256 46cf2a7fb0ec805650e80afab844b1b98fd434dac965ec2b02b852b9b56401a5 -DIST busybox-1.3.1.tar.bz2 1485979 RMD160 bdfb93353aa899ef246cea0180c7341c32e6a8ac SHA1 f054e6060c69e4527bab980a972954860191c028 SHA256 5bf9ead9cca99620d2e56ddf79fdf5fb306fd7f30087b5556e0956e3b1948206 DIST busybox-1.4.1.tar.bz2 1510432 RMD160 6ea5461718fae52b9ee3b966e49a226a0685fd28 SHA1 e349e3585448ba0f7c28504326301ea130eb2e35 SHA256 2936318008322392716a9d3566bcff071cf5c97cb1df1f5953ec5b5a8a1701bb DIST busybox-1.4.2.tar.bz2 1509690 RMD160 222c2f2bcabeba45b8233981c8071fe4f4d62bf3 SHA1 d654727c62f324ab13295095c219451b969beb87 SHA256 da1a9b1c9e210e3e129ab8a3b4e6af2fe093673e3f60722931e2c722d4c29b0f DIST busybox-1.5.0.tar.bz2 1550138 RMD160 e42100fcd35856a907db983b284a37c650425185 SHA1 3968b6816b44d5ffcfd7a2feee2eb84680c801e4 SHA256 e71a5e19d3beb6139012558c8b25966b308e425ae999bd0d2a105d9bcdb37b5c @@ -51,14 +41,6 @@ EBUILD busybox-1.2.2.1.ebuild 8396 RMD160 ffbef18529822cae10cc31eccdfd44f93a7c8a MD5 a011b6d6d45e98f79185530468b03cbd busybox-1.2.2.1.ebuild 8396 RMD160 ffbef18529822cae10cc31eccdfd44f93a7c8a60 busybox-1.2.2.1.ebuild 8396 SHA256 da92d568455d43bd1641cc8b08cb577c8d003c6706adab522261d9cfb37e8b73 busybox-1.2.2.1.ebuild 8396 -EBUILD busybox-1.3.1.ebuild 8290 RMD160 0f057d4b203789a701d69a122bd82630c7ac2ee4 SHA1 9023f65708225585ff2457bb4914b8646b19fb07 SHA256 db194013ce1a991c48c07e3538264264a89ccb165e71e238d32edb11b1e3fe2a -MD5 d5bd2e71ec5f8e32b910e908fa90d402 busybox-1.3.1.ebuild 8290 -RMD160 0f057d4b203789a701d69a122bd82630c7ac2ee4 busybox-1.3.1.ebuild 8290 -SHA256 db194013ce1a991c48c07e3538264264a89ccb165e71e238d32edb11b1e3fe2a busybox-1.3.1.ebuild 8290 -EBUILD busybox-1.4.1-r1.ebuild 8242 RMD160 26991c92f984f14a0bb9648148f59b00a1f7eadc SHA1 131773130c203754263f7dcdfa369855bbdb3cc2 SHA256 62b73f790869faa0e5e7904341cda3f68a476ebadf49bac564adf7b29627127b -MD5 f81ea3f600826d2b1808c82ce3ca23d0 busybox-1.4.1-r1.ebuild 8242 -RMD160 26991c92f984f14a0bb9648148f59b00a1f7eadc busybox-1.4.1-r1.ebuild 8242 -SHA256 62b73f790869faa0e5e7904341cda3f68a476ebadf49bac564adf7b29627127b busybox-1.4.1-r1.ebuild 8242 EBUILD busybox-1.4.1-r2.ebuild 7986 RMD160 c23f12392e7f3b8438c0e6ba99a098a82b2c336d SHA1 9b9459ffc2257fcb152f7012badde14a42e7ad2f SHA256 09dc526e3cb2c903860400476fff0dec6d1605d347464100cee44b36814f8be9 MD5 9951a53d297409c7306846d144215577 busybox-1.4.1-r2.ebuild 7986 RMD160 c23f12392e7f3b8438c0e6ba99a098a82b2c336d busybox-1.4.1-r2.ebuild 7986 @@ -82,12 +64,6 @@ SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e metadata MD5 25f839e8bd7a70105b2b44cf151b57fa files/digest-busybox-1.2.2.1 253 RMD160 aa8a187cdaf8ffc550a024deda2f779f31c60ae3 files/digest-busybox-1.2.2.1 253 SHA256 7334648f93857477ce8a8b8d36c2dadbdd6a32b58ad6d15644ed4fdbceafb0dd files/digest-busybox-1.2.2.1 253 -MD5 e3c1ff69996208807c431e77b8c82b6e files/digest-busybox-1.3.1 500 -RMD160 1c80c9921b3587cec0403fe3b42298b5e81644fd files/digest-busybox-1.3.1 500 -SHA256 c4f8d0daf45f3cbcc2214257e7413c453fd28656722045c6709f591df9f95912 files/digest-busybox-1.3.1 500 -MD5 a5150ef066e89f3b358fa27acad7e932 files/digest-busybox-1.4.1-r1 247 -RMD160 bc8a40b9b31f95d7bdc81173a67d5ce67b6f082b files/digest-busybox-1.4.1-r1 247 -SHA256 2669a53173c0714675b01a7293172ce8eaf36319abcd8ca389a9cd35b21f5b55 files/digest-busybox-1.4.1-r1 247 MD5 a5150ef066e89f3b358fa27acad7e932 files/digest-busybox-1.4.1-r2 247 RMD160 bc8a40b9b31f95d7bdc81173a67d5ce67b6f082b files/digest-busybox-1.4.1-r2 247 SHA256 2669a53173c0714675b01a7293172ce8eaf36319abcd8ca389a9cd35b21f5b55 files/digest-busybox-1.4.1-r2 247 @@ -100,7 +76,7 @@ SHA256 07a1d99470a24ffb961a0d1bdd253fc04e90a28f3e76e10b18c0c844ce54f8cd files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGEPRu8bi6rjpTunYRAuwNAJ9ffiNaIBpFysotUVprZCVzdE/4tACg1jFc -WMAVk3iVN70Eb4zdhRSrRKk= -=G0AY +iD8DBQFGEPTj8bi6rjpTunYRAm/qAJ0YrOvqQ777uxWwdi7KcA/D016RqACcDuVq +jw/jRcN1XZ/WupzBbiwOvL0= +=B0At -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.3.1.ebuild b/sys-apps/busybox/busybox-1.3.1.ebuild deleted file mode 100644 index dd3dae9577fc..000000000000 --- a/sys-apps/busybox/busybox-1.3.1.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.3.1.ebuild,v 1.8 2007/01/16 02:00:56 solar Exp $ - -inherit eutils flag-o-matic - -################################################################################ -# BUSYBOX ALTERNATE CONFIG MINI-HOWTO -# -# Busybox can be modified in many different ways. Here's a few ways to do it: -# -# (1) Emerge busybox with FEATURES=keepwork so the work directory won't -# get erased afterwards. Add a definition like ROOT=/my/root/path to the -# start of the line if you're installing to somewhere else than the root -# directory. This command will save the default configuration to -# ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not -# defined), and it will tell you that it has done this. Note the location -# where the config file was saved. -# -# FEATURES=keepwork USE=savedconfig emerge busybox -# -# (2) Go to the work directory and change the configuration of busybox using its -# menuconfig feature. -# -# cd /var/tmp/portage/busybox*/work -# make menuconfig -# -# -# (3) Save your configuration to the default location and copy it to the -# savedconfig location as follows. Replace X.X.X by the version of -# busybox, and change the path if you're overriding ${ROOT} or -# ${PORTAGE_CONFIGROOT}. The file should overwrite the default config -# file that was written by the ebuild during step 1. -# -# cp .config /etc/portage/savedconfig/busybox-X.X.X.config -# -# (4) Execute the same command as in step 1 to build the new busybox config; -# the FEATURES=keepwork option is probably no longer necessary unless you -# want to modify the configuration further. -# -################################################################################ -# -# (1) Alternatively skip the above steps and simply emerge busybox with -# USE=savedconfig and edit the file it saves by hand. Then remerge bb as -# needed. -# -################################################################################ - - -#SNAPSHOT=20040726 -SNAPSHOT="" - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ -n ${SNAPSHOT} ]] ; then - MY_P=${PN} - SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2" -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2 - http://busybox.net/downloads/fixes-1.3.1/busybox-1.3.1.shadow.patch" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="debug static savedconfig make-symlinks" -RESTRICT="test" - -DEPEND="" - -S=${WORKDIR}/${MY_P} - -# then eventually turning on selinux would mean -# adding a dep: selinux? ( sys-libs/libselinux ) - -pkg_setup() { - # Catch most people for now #159497 ... delete this check - # once we move to stable for releases - if [[ $(LC_ALL="C" date +%Z) == "Local time zone must be set--see zic manual page" ]] ; then - eerror "You forgot to set up your /etc/localtime." - eerror "You should do so now." - die "forgetful admin detected" - fi -} - -busybox_config_option() { - case $1 in - y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;; - n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;; - *) use $1 \ - && busybox_config_option y $2 \ - || busybox_config_option n $2 - return 0 - ;; - esac - einfo $(grep "CONFIG_$2[= ]" .config) -} - -src_unpack() { - unset KBUILD_OUTPUT #88088 - - unpack ${A} - cd "${S}" - - # patches go here! - epatch "${FILESDIR}"/1.3.0/bb.patch - epatch "${FILESDIR}"/1.3.0/ld.patch - epatch "${DISTDIR}"/${P}.shadow.patch - - # work around broken ass powerpc compilers - use ppc64 && append-flags -mminimal-toc - # flag cleanup - sed -i \ - -e 's: -Werror : :' \ - -e 's:-Os -falign-functions=1 -falign-jumps=1 -falign-loops=1::' \ - -e 's:-fomit-frame-pointer::' \ - Makefile.flags - sed -i "/^CFLAGS.*:=/s:$: ${CFLAGS}:" Makefile - echo "CROSS_COMPILE := ${CHOST}-" >> Makefile.flags - - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - # fine grained config control for user defined busybox configs. - # [package]-[version]-[revision].config - # [package]-[version].config - # [package].config - - if use savedconfig ; then - local conf root - [[ -r .config ]] && rm .config - for conf in {${PF},${P},${PN}}{,-${CHOST}} ; do - for root in "${PORTAGE_CONFIGROOT}" "${ROOT}" / ; do - configfile=${root}etc/portage/savedconfig/${conf}.config - if [[ -r ${configfile} ]] ; then - einfo "Found your ${configfile} and using it." - cp ${configfile} "${S}"/.config - yes "" | make oldconfig > /dev/null - return 0 - fi - done - done - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - make allyesconfig > /dev/null - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y FEATURE_SH_IS_ASH - busybox_config_option n FEATURE_SH_IS_NONE - - busybox_config_option static STATIC - busybox_config_option debug DEBUG - use debug \ - && busybox_config_option y NO_DEBUG_LIB \ - && busybox_config_option n DMALLOC \ - && busybox_config_option n EFENCE - - busybox_config_option selinux SELINUX - - # default a bunch of uncommon options to off - for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \ - LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \ - UUDECODE UUENCODE SULOGIN DC DEBUG_YANK_SUSv2 DEBUG_INIT \ - DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET - do - busybox_config_option n ${opt} - done - - make oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - - emake busybox || die "build failed" - if ! use static ; then - mv busybox_unstripped{,.bak} - LDFLAGS="${LDFLAGS} -static" emake busybox || die "static build failed" - mv busybox_unstripped bb - mv busybox_unstripped{.bak,} - fi -} - -src_install() { - unset KBUILD_OUTPUT #88088 - - into / - newbin busybox_unstripped busybox || die - use static \ - && dosym busybox /bin/bb \ - || dobin bb - dosym bb /bin/busybox.static - - # bundle up the symlink files for use later - emake install || die - rm _install/bin/busybox - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - doins busybox-links.tar || die - newins .config ${PF}.config || die - - dodoc AUTHORS README TODO - - cd docs || die - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html *.sgml - - cd ../examples || die - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm - - cd bootfloppy || die - docinto bootfloppy - dodoc * etc/* etc/init.d/* 2>/dev/null -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-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 - - if use make-symlinks ; then - mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi - if use savedconfig ; then - mv "${D}"/usr/share/${PN}/${PF}.config "${T}"/ || die - fi -} - -pkg_postinst() { - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use savedconfig ; then - local config_dir="${PORTAGE_CONFIGROOT:-${ROOT}}/etc/portage/savedconfig" - einfo "Saving this build config to ${config_dir}/${PF}.config" - einfo "Read this ebuild for more info on how to take advantage of this option" - mkdir -p "${config_dir}" - cp "${T}"/${PF}.config "${config_dir}"/${PF}.config - return 0 - fi - echo - einfo "This ebuild has support for user defined configs" - einfo "Please read this ebuild for more details and re-emerge as needed" - einfo "if you want to add or remove functionality for ${PN}" - echo -} diff --git a/sys-apps/busybox/busybox-1.4.1-r1.ebuild b/sys-apps/busybox/busybox-1.4.1-r1.ebuild deleted file mode 100644 index 9e7538eaab3e..000000000000 --- a/sys-apps/busybox/busybox-1.4.1-r1.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.1-r1.ebuild,v 1.2 2007/01/27 10:54:35 vapier Exp $ - -inherit eutils flag-o-matic - -################################################################################ -# BUSYBOX ALTERNATE CONFIG MINI-HOWTO -# -# Busybox can be modified in many different ways. Here's a few ways to do it: -# -# (1) Emerge busybox with FEATURES=keepwork so the work directory won't -# get erased afterwards. Add a definition like ROOT=/my/root/path to the -# start of the line if you're installing to somewhere else than the root -# directory. This command will save the default configuration to -# ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not -# defined), and it will tell you that it has done this. Note the location -# where the config file was saved. -# -# FEATURES=keepwork USE=savedconfig emerge busybox -# -# (2) Go to the work directory and change the configuration of busybox using its -# menuconfig feature. -# -# cd /var/tmp/portage/busybox*/work -# make menuconfig -# -# -# (3) Save your configuration to the default location and copy it to the -# savedconfig location as follows. Replace X.X.X by the version of -# busybox, and change the path if you're overriding ${ROOT} or -# ${PORTAGE_CONFIGROOT}. The file should overwrite the default config -# file that was written by the ebuild during step 1. -# -# cp .config /etc/portage/savedconfig/busybox-X.X.X.config -# -# (4) Execute the same command as in step 1 to build the new busybox config; -# the FEATURES=keepwork option is probably no longer necessary unless you -# want to modify the configuration further. -# -################################################################################ -# -# (1) Alternatively skip the above steps and simply emerge busybox with -# USE=savedconfig and edit the file it saves by hand. Then remerge bb as -# needed. -# -################################################################################ - - -#SNAPSHOT=20040726 -SNAPSHOT="" - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ -n ${SNAPSHOT} ]] ; then - MY_P=${PN} - SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2" -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="debug static savedconfig make-symlinks" -RESTRICT="test" - -DEPEND="" - -S=${WORKDIR}/${MY_P} - -# then eventually turning on selinux would mean -# adding a dep: selinux? ( sys-libs/libselinux ) - -pkg_setup() { - # Catch most people for now #159497 ... delete this check - # once we move to stable for releases - if [[ $(LC_ALL="C" date +%Z) == "Local time zone must be set--see zic manual page" ]] ; then - eerror "You forgot to set up your /etc/localtime." - eerror "You should do so now." - die "forgetful admin detected" - fi -} - -busybox_config_option() { - case $1 in - y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;; - n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;; - *) use $1 \ - && busybox_config_option y $2 \ - || busybox_config_option n $2 - return 0 - ;; - esac - einfo $(grep "CONFIG_$2[= ]" .config) -} - -src_unpack() { - unset KBUILD_OUTPUT #88088 - - unpack ${MY_P}.tar.bz2 - cd "${S}" - - # patches go here! - epatch "${FILESDIR}"/1.4.0/bb.patch - epatch "${FILESDIR}"/1.4.0/bin2hex.patch - - # work around broken ass powerpc compilers - use ppc64 && append-flags -mminimal-toc - # flag cleanup - sed -i \ - -e 's: -Werror : :' \ - -e 's:-Os -falign-functions=1 -falign-jumps=1 -falign-loops=1::' \ - -e 's:-fomit-frame-pointer::' \ - Makefile.flags - sed -i 's:-Wl,--gc-sections::' Makefile - sed -i "/^CFLAGS.*:=/s:$: ${CFLAGS}:" Makefile - echo "CROSS_COMPILE := ${CHOST}-" >> Makefile.flags - - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - # fine grained config control for user defined busybox configs. - # [package]-[version]-[revision].config - # [package]-[version].config - # [package].config - - if use savedconfig ; then - local conf root - [[ -r .config ]] && rm .config - for conf in {${PF},${P},${PN}}{,-${CHOST}} ; do - for root in "${PORTAGE_CONFIGROOT}" "${ROOT}" / ; do - configfile=${root}etc/portage/savedconfig/${conf}.config - if [[ -r ${configfile} ]] ; then - einfo "Found your ${configfile} and using it." - cp ${configfile} "${S}"/.config - yes "" | make oldconfig > /dev/null - return 0 - fi - done - done - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - make allyesconfig > /dev/null - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y FEATURE_SH_IS_ASH - busybox_config_option n FEATURE_SH_IS_NONE - - busybox_config_option static STATIC - busybox_config_option debug DEBUG - use debug \ - && busybox_config_option y NO_DEBUG_LIB \ - && busybox_config_option n DMALLOC \ - && busybox_config_option n EFENCE - - busybox_config_option selinux SELINUX - - # default a bunch of uncommon options to off - for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \ - LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \ - UUDECODE UUENCODE SULOGIN DC DEBUG_YANK_SUSv2 DEBUG_INIT \ - DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET - do - busybox_config_option n ${opt} - done - - make oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - - emake busybox || die "build failed" - if ! use static ; then - mv busybox_unstripped{,.bak} - LDFLAGS="${LDFLAGS} -static" emake busybox || die "static build failed" - mv busybox_unstripped bb - mv busybox_unstripped{.bak,} - fi -} - -src_install() { - unset KBUILD_OUTPUT #88088 - - into / - newbin busybox_unstripped busybox || die - use static \ - && dosym busybox /bin/bb \ - || dobin bb - dosym bb /bin/busybox.static - - # bundle up the symlink files for use later - emake install || die - rm _install/bin/busybox - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - doins busybox-links.tar || die - newins .config ${PF}.config || die - - dodoc AUTHORS README TODO - - cd docs || die - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html *.sgml - - cd ../examples || die - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm - - cd bootfloppy || die - docinto bootfloppy - dodoc * etc/* etc/init.d/* 2>/dev/null -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-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 - - if use make-symlinks ; then - mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi - if use savedconfig ; then - mv "${D}"/usr/share/${PN}/${PF}.config "${T}"/ || die - fi -} - -pkg_postinst() { - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use savedconfig ; then - local config_dir="${PORTAGE_CONFIGROOT:-${ROOT}}/etc/portage/savedconfig" - einfo "Saving this build config to ${config_dir}/${PF}.config" - einfo "Read this ebuild for more info on how to take advantage of this option" - mkdir -p "${config_dir}" - cp "${T}"/${PF}.config "${config_dir}"/${PF}.config - return 0 - fi - echo - einfo "This ebuild has support for user defined configs" - einfo "Please read this ebuild for more details and re-emerge as needed" - einfo "if you want to add or remove functionality for ${PN}" - echo -} diff --git a/sys-apps/busybox/files/1.3.0/bb.patch b/sys-apps/busybox/files/1.3.0/bb.patch deleted file mode 100644 index bbdcdd2cd01e..000000000000 --- a/sys-apps/busybox/files/1.3.0/bb.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- include/applets.h -+++ include/applets.h -@@ -61,11 +61,13 @@ - USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_AWK(APPLET(awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_BASENAME(APPLET(basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -+USE_ASH(APPLET_NOUSAGE(bb, ash, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER)) - //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - /* Always enabled. */ - APPLET_NOUSAGE(busybox, busybox, _BB_DIR_BIN, _BB_SUID_MAYBE) -+APPLET_NOUSAGE(busybox.static, busybox, _BB_DIR_BIN, _BB_SUID_MAYBE) - USE_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER, bzcat)) - USE_CAL(APPLET(cal, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_CAT(APPLET(cat, _BB_DIR_BIN, _BB_SUID_NEVER)) ---- shell/ash.c -+++ shell/ash.c -@@ -3740,6 +3740,8 @@ - if(find_applet_by_name(cmd) != NULL) { - /* re-exec ourselves with the new arguments */ - execve(CONFIG_BUSYBOX_EXEC_PATH,argv,envp); -+ execve("/bin/busybox.static",argv,envp); -+ execve("/bin/busybox",argv,envp); - /* If they called chroot or otherwise made the binary no longer - * executable, fall through */ - } diff --git a/sys-apps/busybox/files/1.3.0/ld.patch b/sys-apps/busybox/files/1.3.0/ld.patch deleted file mode 100644 index eb3c02fc163d..000000000000 --- a/sys-apps/busybox/files/1.3.0/ld.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile (revision 17102) -+++ Makefile (working copy) -@@ -273,7 +273,7 @@ MAKEFLAGS += -rR - # Make variables (CC, etc...) - - AS = $(CROSS_COMPILE)as --LD = $(CROSS_COMPILE)ld -+LD = $(CROSS_COMPILE)gcc -nostdlib - CC = $(CROSS_COMPILE)gcc - CPP = $(CC) -E - AR = $(CROSS_COMPILE)ar diff --git a/sys-apps/busybox/files/digest-busybox-1.3.1 b/sys-apps/busybox/files/digest-busybox-1.3.1 deleted file mode 100644 index 282957d72aaf..000000000000 --- a/sys-apps/busybox/files/digest-busybox-1.3.1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 3cc74cd6ac2200bbb168c64e17f85a78 busybox-1.3.1.shadow.patch 5561 -RMD160 f10dd2af66b439bb4d46056e8fc15756080bb093 busybox-1.3.1.shadow.patch 5561 -SHA256 46cf2a7fb0ec805650e80afab844b1b98fd434dac965ec2b02b852b9b56401a5 busybox-1.3.1.shadow.patch 5561 -MD5 571531cfa83726947ccb566de017ad4f busybox-1.3.1.tar.bz2 1485979 -RMD160 bdfb93353aa899ef246cea0180c7341c32e6a8ac busybox-1.3.1.tar.bz2 1485979 -SHA256 5bf9ead9cca99620d2e56ddf79fdf5fb306fd7f30087b5556e0956e3b1948206 busybox-1.3.1.tar.bz2 1485979 diff --git a/sys-apps/busybox/files/digest-busybox-1.4.1-r1 b/sys-apps/busybox/files/digest-busybox-1.4.1-r1 deleted file mode 100644 index cfce130998b1..000000000000 --- a/sys-apps/busybox/files/digest-busybox-1.4.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5728403bce309cdabcffa414e2e64052 busybox-1.4.1.tar.bz2 1510432 -RMD160 6ea5461718fae52b9ee3b966e49a226a0685fd28 busybox-1.4.1.tar.bz2 1510432 -SHA256 2936318008322392716a9d3566bcff071cf5c97cb1df1f5953ec5b5a8a1701bb busybox-1.4.1.tar.bz2 1510432