* [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.8.2.ebuild ChangeLog
@ 2007-12-03 0:14 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2007-12-03 0:14 UTC (permalink / raw
To: gentoo-commits
vapier 07/12/03 00:14:07
Modified: busybox-1.8.2.ebuild ChangeLog
Log:
Revert some changes while keeping others.
(Portage version: 2.1.4_rc4)
Revision Changes Path
1.3 sys-apps/busybox/busybox-1.8.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?r1=1.2&r2=1.3
Index: busybox-1.8.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- busybox-1.8.2.ebuild 30 Nov 2007 21:49:34 -0000 1.2
+++ busybox-1.8.2.ebuild 3 Dec 2007 00:14:07 -0000 1.3
@@ -1,6 +1,6 @@
# 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.8.2.ebuild,v 1.2 2007/11/30 21:49:34 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.3 2007/12/03 00:14:07 vapier Exp $
inherit eutils flag-o-matic savedconfig toolchain-funcs
@@ -58,7 +58,7 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug pam static make-symlinks selinux uclibc"
+IUSE="debug make-symlinks pam selinux static"
RESTRICT="test"
DEPEND="selinux? ( sys-libs/libselinux )
@@ -88,18 +88,22 @@
# patches go here!
epatch "${FILESDIR}"/busybox-1.7.0-bb.patch
- # set build environment
- MAKE_CONFIG="CROSS_COMPILE=${CHOST}- ARCH=$(tc-arch-kernel) HOSTCC=${CBUILD}-gcc"
-
# work around broken ass powerpc compilers
use ppc64 && append-flags -mminimal-toc
- if ! use uclibc; then
- epatch "${FILESDIR}/${P}-flags-strip.patch"
- sed -i 's:-Wl,--gc-sections::' scripts/trylink
- sed -i '/^#error Aborting compilation./d' applets/applets.c
- fi
+ # 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 '/^#error Aborting compilation./d' applets/applets.c || die
+ use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+ cat <<-EOF >> Makefile.flags
+ CROSS_COMPILE := ${CHOST}-
+ HOSTCC := $(tc-getBUILD_CC)
+ SKIP_STRIP = y
+ EOF
# 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
@@ -107,30 +111,20 @@
return 0
else
ewarn "Could not locate user configfile, so we will save a default one"
-
- # 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
-
- # 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_INIT \
- DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET \
- WERROR
- do
- busybox_config_option n ${opt}
- done
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
+
if use static && use pam ; then
ewarn "You cannot have USE='static pam'. Assuming static is more important."
fi
@@ -146,16 +140,25 @@
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 ${MAKE_CONFIG} || die "build failed"
+ emake busybox || die "build failed"
if ! use static && ! use pam ; then
mv busybox_unstripped{,.bak}
- emake busybox CONFIG_STATIC=y ${MAKE_CONFIG} || die "static build failed"
+ emake CONFIG_STATIC=y busybox || die "static build failed"
mv busybox_unstripped bb
mv busybox_unstripped{.bak,}
fi
@@ -178,7 +181,7 @@
doins "${FILESDIR}"/mdev-start.sh || die
# bundle up the symlink files for use later
- emake install ${MAKE_CONFIG} || die
+ emake install || die
rm _install/bin/busybox
tar cf busybox-links.tar -C _install . || : #;die
insinto /usr/share/${PN}
1.167 sys-apps/busybox/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.166&r2=1.167
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ChangeLog 2 Dec 2007 23:33:19 -0000 1.166
+++ ChangeLog 3 Dec 2007 00:14:07 -0000 1.167
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/busybox
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.166 2007/12/02 23:33:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.167 2007/12/03 00:14:07 vapier Exp $
+
+ 03 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+ -files/busybox-1.8.2-flags-strip.patch, busybox-1.8.2.ebuild:
+ Revert some changes while keeping others.
*busybox-1.7.4 (02 Dec 2007)
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.8.2.ebuild ChangeLog
@ 2008-01-16 18:35 Raul Porcel (armin76)
0 siblings, 0 replies; 2+ messages in thread
From: Raul Porcel (armin76) @ 2008-01-16 18:35 UTC (permalink / raw
To: gentoo-commits
armin76 08/01/16 18:35:22
Modified: busybox-1.8.2.ebuild ChangeLog
Log:
alpha/ia64/sparc/x86 stable
(Portage version: 2.1.3.19)
Revision Changes Path
1.4 sys-apps/busybox/busybox-1.8.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?r1=1.3&r2=1.4
Index: busybox-1.8.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- busybox-1.8.2.ebuild 3 Dec 2007 00:14:07 -0000 1.3
+++ busybox-1.8.2.ebuild 16 Jan 2008 18:35:21 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.3 2007/12/03 00:14:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.4 2008/01/16 18:35:21 armin76 Exp $
inherit eutils flag-o-matic savedconfig toolchain-funcs
@@ -57,7 +57,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
IUSE="debug make-symlinks pam selinux static"
RESTRICT="test"
1.174 sys-apps/busybox/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.174&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.174&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.173&r2=1.174
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- ChangeLog 4 Dec 2007 19:55:16 -0000 1.173
+++ ChangeLog 16 Jan 2008 18:35:21 -0000 1.174
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/busybox
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.173 2007/12/04 19:55:16 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.174 2008/01/16 18:35:21 armin76 Exp $
+
+ 16 Jan 2008; Raúl Porcel <armin76@gentoo.org> busybox-1.8.2.ebuild:
+ alpha/ia64/sparc/x86 stable
04 Dec 2007; Markus Rothe <corsair@gentoo.org> busybox-1.7.4.ebuild:
Stable on ppc64; bug #201036
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-01-16 18:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-16 18:35 [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.8.2.ebuild ChangeLog Raul Porcel (armin76)
-- strict thread matches above, loose matches on Subject: below --
2007-12-03 0:14 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