- prep ebuild so bb may be used as our static rescue shell. we now install busybox and busybox.static when USE=static is not set.

(Portage version: 2.0.51.20-r5)

4 files changed, 242 insertions, 7 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 489d283c46a4..f80a2c5d3dd9 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.62 2005/04/16 07:01:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.63 2005/05/01 22:07:25 solar Exp $
+
+*busybox-1.00-r3 (01 May 2005)
+
+  01 May 2005; <solar@gentoo.org> +busybox-1.00-r3.ebuild:
+  - prep ebuild so bb may be used as our static rescue shell. we now install
+  busybox and busybox.static when USE=static is not set.
 
 *busybox-1.00-r2 (16 Apr 2005)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 3122b1835ba2..7f70bbdb829e 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,16 +1,18 @@
-MD5 4e321e3b5df6bef396b3798aa4d21297 ChangeLog 11834
 MD5 509f4ad475e3327a7977fe02afae735a busybox-1.00-r2.ebuild 6194
 MD5 3ad42325d46ae5577c445e5e31e8f950 busybox-1.00-r1.ebuild 6090
+MD5 005417c867db23e2aec31800d49e298c ChangeLog 12060
+MD5 722a56e81e400abe5aa9923fa3703102 busybox-1.00-r3.ebuild 6419
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
-MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r2 66
-MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804
+MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r1 66
+MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r2 66
+MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r3 66
 MD5 9750d4004e6507d35f9aa67d2785fdd3 files/dodeps 2015
 MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568
-MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
+MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804
 MD5 8eae5b311553ee77cda4524ab892468c files/busybox-1.00_rc3-amd64.patch 658
 MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
+MD5 4972a3b12accd80b77304ff4ff6b6a3a files/1.00/cp-posix-opts.patch 1245
+MD5 85560a8d547bfc101acf98d53dbecd45 files/1.00/more-insmod-arches.patch 1506
 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
diff --git a/sys-apps/busybox/busybox-1.00-r3.ebuild b/sys-apps/busybox/busybox-1.00-r3.ebuild
new file mode 100644
index 000000000000..3ba48611f38e
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.00-r3.ebuild
@@ -0,0 +1,226 @@
+# 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 $
+
+inherit eutils
+
+#SNAPSHOT=20040726
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug uclibc static savedconfig netboot floppyboot make-symlinks"
+
+DEPEND="virtual/libc
+	>=sys-apps/sed-4"
+RDEPEND="!static? ( virtual/libc )"
+
+S=${WORKDIR}/${MY_P}
+
+# <pebenito> then eventually turning on selinux would mean
+# adding a dep: selinux? ( sys-libs/libselinux )
+
+busybox_config_option() {
+	[[ -z $2 ]] && return 1
+	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;;
+		*) return 1;;
+	esac
+	einfo $(grep CONFIG_$2 .config)
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# patches for 1.00 go here.
+	epatch "${FILESDIR}"/1.00/busybox-read-timeout.patch
+	epatch "${FILESDIR}"/1.00/readlink-follow.patch
+	epatch "${FILESDIR}"/1.00/more-insmod-arches.patch
+	epatch "${FILESDIR}"/1.00/bash-tests.patch
+	epatch "${FILESDIR}"/1.00/cp-posix-opts.patch
+
+	# Don't let KBUILD_OUTPUT mess us up #88088
+	unset KBUILD_OUTPUT
+
+	#bunzip
+	#ftp://ftp.simtreas.ru/pub/my/bb/new/find.c.gz
+
+	# 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
+		[ -r .config ] && rm .config
+		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
+			configfile=/etc/${PN}/${CHOST}/${conf}.config
+			if [ -r ${configfile} ]; then
+				cp ${configfile} ${S}/.config
+				break;
+			fi
+		done
+		if [ -r "${S}/.config" ]; then
+			einfo "Found your ${configfile} and using it."
+			return 0
+		fi
+	fi
+	if use netboot ; then
+		cp ${FILESDIR}/config-netboot .config
+		sed -i \
+			-e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
+			networking/udhcp/libbb_udhcp.h \
+			|| die "fixing netboot/udhcpc"
+	elif use floppyboot ; then
+		cp ${FILESDIR}/config-floppyboot .config
+	fi
+
+	# busybox has changed quite a bit from 0.[5-6]* to 1.x so this
+	# config might not be cd ready.
+
+	make allyesconfig > /dev/null
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_SUID
+
+	# 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
+
+	use static \
+		&& busybox_config_option y STATIC \
+		|| busybox_config_option n STATIC
+
+	# 1.00-pre2 uses the old selinux api which is no longer
+	# maintained. perhaps the next stable release will include
+	# support. 
+	# 1.00-pre5  pebenito says busybox is still using the old se api.
+	#use selinux \
+	#	&& busybox_config_option y SELINUX \
+	#	|| 
+	busybox_config_option n SELINUX
+
+	use debug \
+		&& busybox_config_option y DEBUG \
+		|| busybox_config_option n DEBUG
+
+	#busybox_features=`grep CONFIG_ .config | tr '#' '\n' | 
+	#	awk  '{print $1}' | cut -d = -f 1 | grep -v ^$ | cut -c 8- | 
+	#		tr [A-Z] [a-z] | awk '{print "busybox_"$1}'`
+	#for f in $busybox_features; do
+	#	has $f ${FEATURES} && busybox_config_option y `echo ${f/busybox_/}|tr [a-z] [A-Z]`
+	#done
+	( echo | make clean oldconfig > /dev/null ) || :
+}
+
+busybox_set_cross_compiler() {
+	type -p ${CHOST}-ar && export CROSS=${CHOST}-
+}
+
+src_compile() {
+	busybox_set_cross_compiler
+	#emake -j1 CROSS="${CROSS}" include/config.h busybox || die
+	emake -j1 CROSS="${CROSS}" busybox || die
+	if ! use static; then
+		cp busybox{,.dyn}
+		rm busybox
+		emake -j1 LDFLAGS="${LDFLAGS} -static" CROSS="${CROSS}" busybox 2>/dev/null || die
+		cp busybox{,.static}
+		cp busybox{.dyn,}
+	fi
+}
+
+src_install() {
+	busybox_set_cross_compiler
+
+	into /
+	dobin busybox
+	use static || dobin busybox.static
+
+	if use make-symlinks ; then
+		if [ ! "${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
+		make CROSS="${CROSS}" install || die
+		dodir /bin
+		cp -a _install/bin/* ${D}/bin/
+		dodir /sbin
+		cp -a _install/sbin/* ${D}/sbin/
+		cd ${D}
+		local symlink
+		for symlink in {bin,sbin}/* ; do
+			[ -L "${symlink}" ] || continue
+			[ -e "${ROOT}/${symlink}" ] \
+				&& eerror "Deleting symlink ${symlink} because it exists in ${ROOT}" \
+				&& rm ${symlink}
+		done
+		cd ${S}
+	fi
+
+	dodoc AUTHORS Changelog README TODO
+
+	cd docs || die
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html *.sgml
+
+	# no man files?
+	# cd ../man && doman *.1
+
+	cd ../examples || die
+	docinto examples
+	dodoc inittab depmod.pl
+
+	cd bootfloppy || die
+	docinto bootfloppy
+	dodoc bootfloppy.txt display.txt mkdevs.sh etc/* etc/init.d/* 2>/dev/null
+
+	cd ../../ || die
+	if has buildpkg ${FEATURES} && has keepwork ${FEATURES} ; then
+		cd ${S}
+		# this should install to the ./_install/ dir by default.
+		# we make a micro pkg of busybox that can be used for
+		# embedded systems -solar
+		if ! use make-symlinks ; then
+			make CROSS="${CROSS}" install || die
+		fi
+		cd ./_install/ \
+			&& tar --no-same-owner -jcvf ${WORKDIR}/${MY_P}-${ARCH}.bz2 . \
+			&& cd ..
+	fi
+
+	if use savedconfig ; then
+		einfo "Saving this build config to /etc/${PN}/${CHOST}/${PN}-${PV}-${PR}.config"
+		einfo "Read this ebuild for more info on how to take advantage of this option"
+		insinto /etc/${PN}/${CHOST}/
+		newins ${S}/.config ${PN}-${PV}-${PR}.config
+	fi
+}
+
+pkg_postinst() {
+	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/digest-busybox-1.00-r3 b/sys-apps/busybox/files/digest-busybox-1.00-r3
new file mode 100644
index 000000000000..659145bbe83c
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.00-r3
@@ -0,0 +1 @@
+MD5 5c7ea9b5d3b3677dfcdcec38b281a756 busybox-1.00.tar.bz2 1118427