williamh 15/01/23 01:32:41 Modified: busybox-9999.ebuild ChangeLog Log: sync live ebuild (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path 1.16 sys-apps/busybox/busybox-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild?r1=1.15&r2=1.16 Index: busybox-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- busybox-9999.ebuild 28 Feb 2013 22:43:20 -0000 1.15 +++ busybox-9999.ebuild 23 Jan 2015 01:32:41 -0000 1.16 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.15 2013/02/28 22:43:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.16 2015/01/23 01:32:41 williamh Exp $ # See `man savedconfig.eclass` for info on how to use USE=savedconfig. @@ -21,15 +21,16 @@ LICENSE="GPL-2" SLOT="0" - -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" +IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" RESTRICT="test" -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) +COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39" +RDEPEND="${COMMON_DEPEND} +mdev? ( !<sys-apps/openrc-0.13 )" S=${WORKDIR}/${MY_P} @@ -66,7 +67,7 @@ # patches go here! epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - #epatch "${FILESDIR}"/${P}-*.patch +# epatch "${FILESDIR}"/${P}-*.patch cp "${FILESDIR}"/ginit.c init/ || die # flag cleanup @@ -94,18 +95,18 @@ restore_config .config if [ -f .config ]; then - yes "" | emake -j1 oldconfig > /dev/null + yes "" | emake -j1 -s 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 + emake -j1 -s 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 + yes "" | emake -j1 -s oldconfig >/dev/null # now turn off stuff we really don't want busybox_config_option n DMALLOC @@ -127,6 +128,7 @@ busybox_config_option n FEATURE_IPV6 busybox_config_option n TRACEROUTE6 busybox_config_option n PING6 + busybox_config_option n UDHCPC6 fi if use static && use pam ; then @@ -143,6 +145,7 @@ busybox_config_option y NO_DEBUG_LIB busybox_config_option n DMALLOC busybox_config_option n EFENCE + busybox_config_option $(usex debug y n) TFTP_DEBUG busybox_config_option selinux SELINUX @@ -206,7 +209,7 @@ exeinto /$(get_libdir)/mdev/ doexe "${FILESDIR}"/mdev/* - newinitd "${FILESDIR}"/mdev.rc.1 mdev + newinitd "${FILESDIR}"/mdev.initd mdev fi if use livecd ; then dosym busybox /bin/vi 1.379 sys-apps/busybox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.379&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.379&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.378&r2=1.379 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v retrieving revision 1.378 retrieving revision 1.379 diff -u -r1.378 -r1.379 --- ChangeLog 22 Jan 2015 22:57:14 -0000 1.378 +++ ChangeLog 23 Jan 2015 01:32:41 -0000 1.379 @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.378 2015/01/22 22:57:14 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.379 2015/01/23 01:32:41 williamh Exp $ + + 23 Jan 2015; William Hubbs <willi...@gentoo.org> busybox-9999.ebuild: + sync live ebuild *busybox-1.23.0-r1 (22 Jan 2015)
