* [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.20.1.ebuild ChangeLog
@ 2012-05-30 18:27 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2012-05-30 18:27 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/30 18:27:48
Modified: ChangeLog
Added: busybox-1.20.1.ebuild
Log:
Version bump.
(Portage version: HEAD/cvs/Linux x86_64)
Revision Changes Path
1.310 sys-apps/busybox/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.310&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.310&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.309&r2=1.310
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- ChangeLog 26 May 2012 00:07:11 -0000 1.309
+++ ChangeLog 30 May 2012 18:27:47 -0000 1.310
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/busybox
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.309 2012/05/26 00:07:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.310 2012/05/30 18:27:47 vapier Exp $
+
+*busybox-1.20.1 (30 May 2012)
+
+ 30 May 2012; Mike Frysinger <vapier@gentoo.org> +busybox-1.20.1.ebuild:
+ Version bump.
26 May 2012; Mike Frysinger <vapier@gentoo.org> busybox-1.19.3-r1.ebuild,
busybox-1.20.0.ebuild, busybox-9999.ebuild:
1.1 sys-apps/busybox/busybox-1.20.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.20.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.20.1.ebuild?rev=1.1&content-type=text/plain
Index: busybox-1.20.1.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.1.ebuild,v 1.1 2012/05/30 18:27:47 vapier Exp $
EAPI="4"
inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
################################################################################
# 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/busybox-*
# make menuconfig
#
# (3) Save your configuration to the default location and copy it to the
# one of the locations listed in /usr/portage/eclass/savedconfig.eclass
#
# (4) Emerge busybox with USE=savedconfig to use the configuration file you
# just generated.
#
################################################################################
#
# (1) Alternatively skip the above steps and simply emerge busybox without
# USE=savedconfig.
#
# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
#
# (3) Remerge busybox as using USE=savedconfig.
#
################################################################################
DESCRIPTION="Utilities for rescue and embedded systems"
HOMEPAGE="http://www.busybox.net/"
if [[ ${PV} == "9999" ]] ; then
MY_P=${PN}
EGIT_REPO_URI="git://busybox.net/busybox.git"
inherit git-2
else
MY_P=${PN}-${PV/_/-}
SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2"
SLOT="0"
IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static"
RESTRICT="test"
RDEPEND="selinux? ( sys-libs/libselinux )
pam? ( sys-libs/pam )"
DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-2.6.39"
S=${WORKDIR}/${MY_P}
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 || echo Could not find CONFIG_$2 ...)
}
src_prepare() {
unset KBUILD_OUTPUT #88088
append-flags -fno-strict-aliasing #310413
use ppc64 && append-flags -mminimal-toc #130943
# patches go here!
epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
#epatch "${FILESDIR}"/${P}-*.patch
cp "${FILESDIR}"/ginit.c init/ || die
# flag cleanup
sed -i -r \
-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
Makefile.flags || die
#sed -i '/bbsh/s:^//::' include/applets.h
sed -i '/^#error Aborting compilation./d' applets/applets.c || die
use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
sed -i \
-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
Makefile || die
sed -i \
-e 's:-static-libgcc::' \
Makefile.flags || die
}
src_configure() {
# check for a busybox config before making one of our own.
# if one exist lets return and use it.
restore_config .config
if [ -f .config ]; then
yes "" | emake -j1 oldconfig > /dev/null
return 0
else
ewarn "Could not locate user configfile, so we will save a default one"
fi
# setup the config file
emake -j1 allyesconfig > /dev/null
# nommu forces a bunch of things off which we want on #387555
busybox_config_option n NOMMU
sed -i '/^#/d' .config
yes "" | emake -j1 oldconfig >/dev/null
# now turn off stuff we really don't want
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
busybox_config_option n MONOTONIC_SYSCALL
busybox_config_option n WERROR
# If these are not set and we are using a uclibc/busybox setup
# all calls to system() will fail.
busybox_config_option y ASH
busybox_config_option n HUSH
# disable ipv6 applets
if ! use ipv6; then
busybox_config_option n FEATURE_IPV6
busybox_config_option n TRACEROUTE6
busybox_config_option n PING6
fi
if use static && use pam ; then
ewarn "You cannot have USE='static pam'. Assuming static is more important."
fi
use static \
&& busybox_config_option n PAM \
|| busybox_config_option pam PAM
busybox_config_option static STATIC
busybox_config_option math FEATURE_AWK_LIBM
# all the debug options are compiler related, so punt them
busybox_config_option n DEBUG
busybox_config_option y NO_DEBUG_LIB
busybox_config_option n DMALLOC
busybox_config_option n EFENCE
busybox_config_option selinux SELINUX
# this opt only controls mounting with <linux-2.6.23
busybox_config_option n FEATURE_MOUNT_NFS
# default a bunch of uncommon options to off
local opt
for opt in \
ADD_SHELL \
BEEP BOOTCHARTD \
CRONTAB \
DC DEVFSD DNSD DPKG{,_DEB} \
FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
FEATURE_DEVFS \
HOSTID HUSH \
INETD INOTIFYD IPCALC \
LOCALE_SUPPORT LOGNAME LPD \
MAKEMIME MKFS_MINIX MSH \
OD \
RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
TASKSET TCPSVD \
RPM RPM2CPIO \
UDPSVD UUDECODE UUENCODE
do
busybox_config_option n ${opt}
done
emake -j1 oldconfig > /dev/null
}
src_compile() {
unset KBUILD_OUTPUT #88088
export SKIP_STRIP=y
emake V=1 busybox
if ! use static ; then
cp .config{,.bak}
mv busybox_unstripped{,.bak}
use pam && busybox_config_option n PAM
emake CONFIG_STATIC=y busybox
mv busybox_unstripped bb
mv busybox_unstripped{.bak,}
mv .config{.bak,}
else
# keeps src_install simpler
ln busybox_unstripped bb
fi
}
src_install() {
unset KBUILD_OUTPUT #88088
save_config .config
into /
dodir /bin
if use sep-usr ; then
# install /ginit to take care of mounting stuff
exeinto /
newexe bb ginit
dosym /ginit /bin/bb
if use static ; then
dosym bb /bin/busybox
else
newbin busybox_unstripped busybox
fi
else
newbin busybox_unstripped busybox
if use static ; then
dosym busybox /bin/bb
else
dobin bb
fi
fi
if use mdev ; then
dodir /$(get_libdir)/mdev/
use make-symlinks || dosym /bin/bb /sbin/mdev
cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
exeinto /$(get_libdir)/mdev/
doexe "${FILESDIR}"/mdev/*
newinitd "${FILESDIR}"/mdev.rc.1 mdev
fi
if use livecd ; then
dosym busybox /bin/vi
fi
# bundle up the symlink files for use later
emake DESTDIR="${ED}" install
rm _install/bin/busybox
tar cf busybox-links.tar -C _install . || : #;die
insinto /usr/share/${PN}
use make-symlinks && doins busybox-links.tar
dodoc AUTHORS README TODO
cd docs
docinto txt
dodoc *.txt
docinto pod
dodoc *.pod
dohtml *.html
cd ../examples
docinto examples
dodoc inittab depmod.pl *.conf *.script undeb unrpm
}
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 really what you want."
die "silly options will destroy your system"
fi
if use make-symlinks ; then
mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
fi
}
pkg_postinst() {
savedconfig_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 sep-usr ; then
elog "In order to use the sep-usr support, you have to update your"
elog "kernel command line. Add the option:"
elog " init=/ginit"
elog "To launch a different init than /sbin/init, use:"
elog " init=/ginit /sbin/yourinit"
elog "To get a rescue shell, you may boot with:"
elog " init=/ginit bb"
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-30 18:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 18:27 [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.20.1.ebuild ChangeLog Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox