| 1 |
vapier 07/12/03 00:14:07 |
| 2 |
|
| 3 |
Modified: busybox-1.8.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Revert some changes while keeping others. |
| 6 |
(Portage version: 2.1.4_rc4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 sys-apps/busybox/busybox-1.8.2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: busybox-1.8.2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- busybox-1.8.2.ebuild 30 Nov 2007 21:49:34 -0000 1.2 |
| 22 |
+++ busybox-1.8.2.ebuild 3 Dec 2007 00:14:07 -0000 1.3 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.2 2007/11/30 21:49:34 alonbl Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.3 2007/12/03 00:14:07 vapier Exp $ |
| 28 |
|
| 29 |
inherit eutils flag-o-matic savedconfig toolchain-funcs |
| 30 |
|
| 31 |
@@ -58,7 +58,7 @@ |
| 32 |
LICENSE="GPL-2" |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 35 |
-IUSE="debug pam static make-symlinks selinux uclibc" |
| 36 |
+IUSE="debug make-symlinks pam selinux static" |
| 37 |
RESTRICT="test" |
| 38 |
|
| 39 |
DEPEND="selinux? ( sys-libs/libselinux ) |
| 40 |
@@ -88,18 +88,22 @@ |
| 41 |
# patches go here! |
| 42 |
epatch "${FILESDIR}"/busybox-1.7.0-bb.patch |
| 43 |
|
| 44 |
- # set build environment |
| 45 |
- MAKE_CONFIG="CROSS_COMPILE=${CHOST}- ARCH=$(tc-arch-kernel) HOSTCC=${CBUILD}-gcc" |
| 46 |
- |
| 47 |
# work around broken ass powerpc compilers |
| 48 |
use ppc64 && append-flags -mminimal-toc |
| 49 |
- if ! use uclibc; then |
| 50 |
- epatch "${FILESDIR}/${P}-flags-strip.patch" |
| 51 |
- sed -i 's:-Wl,--gc-sections::' scripts/trylink |
| 52 |
- sed -i '/^#error Aborting compilation./d' applets/applets.c |
| 53 |
- fi |
| 54 |
+ # flag cleanup |
| 55 |
+ sed -i -r \ |
| 56 |
+ -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ |
| 57 |
+ Makefile.flags || die |
| 58 |
+ sed -i '/^#error Aborting compilation./d' applets/applets.c || die |
| 59 |
+ use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile |
| 60 |
+ cat <<-EOF >> Makefile.flags |
| 61 |
+ CROSS_COMPILE := ${CHOST}- |
| 62 |
+ HOSTCC := $(tc-getBUILD_CC) |
| 63 |
+ SKIP_STRIP = y |
| 64 |
+ EOF |
| 65 |
|
| 66 |
# check for a busybox config before making one of our own. |
| 67 |
+ # if one exist lets return and use it. |
| 68 |
|
| 69 |
restore_config .config |
| 70 |
if [ -f .config ]; then |
| 71 |
@@ -107,30 +111,20 @@ |
| 72 |
return 0 |
| 73 |
else |
| 74 |
ewarn "Could not locate user configfile, so we will save a default one" |
| 75 |
- |
| 76 |
- # setup the config file |
| 77 |
- make allyesconfig > /dev/null |
| 78 |
- busybox_config_option n DMALLOC |
| 79 |
- busybox_config_option n FEATURE_SUID_CONFIG |
| 80 |
- busybox_config_option n BUILD_AT_ONCE |
| 81 |
- busybox_config_option n BUILD_LIBBUSYBOX |
| 82 |
- |
| 83 |
- # If these are not set and we are using a uclibc/busybox setup |
| 84 |
- # all calls to system() will fail. |
| 85 |
- busybox_config_option y FEATURE_SH_IS_ASH |
| 86 |
- busybox_config_option n FEATURE_SH_IS_NONE |
| 87 |
- |
| 88 |
- # default a bunch of uncommon options to off |
| 89 |
- for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \ |
| 90 |
- LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \ |
| 91 |
- UUDECODE UUENCODE SULOGIN DC DEBUG_INIT \ |
| 92 |
- DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET \ |
| 93 |
- WERROR |
| 94 |
- do |
| 95 |
- busybox_config_option n ${opt} |
| 96 |
- done |
| 97 |
fi |
| 98 |
|
| 99 |
+ # setup the config file |
| 100 |
+ make allyesconfig > /dev/null |
| 101 |
+ busybox_config_option n DMALLOC |
| 102 |
+ busybox_config_option n FEATURE_SUID_CONFIG |
| 103 |
+ busybox_config_option n BUILD_AT_ONCE |
| 104 |
+ busybox_config_option n BUILD_LIBBUSYBOX |
| 105 |
+ |
| 106 |
+ # If these are not set and we are using a uclibc/busybox setup |
| 107 |
+ # all calls to system() will fail. |
| 108 |
+ busybox_config_option y FEATURE_SH_IS_ASH |
| 109 |
+ busybox_config_option n FEATURE_SH_IS_NONE |
| 110 |
+ |
| 111 |
if use static && use pam ; then |
| 112 |
ewarn "You cannot have USE='static pam'. Assuming static is more important." |
| 113 |
fi |
| 114 |
@@ -146,16 +140,25 @@ |
| 115 |
|
| 116 |
busybox_config_option selinux SELINUX |
| 117 |
|
| 118 |
+ # default a bunch of uncommon options to off |
| 119 |
+ for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \ |
| 120 |
+ LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \ |
| 121 |
+ UUDECODE UUENCODE SULOGIN DC DEBUG_YANK_SUSv2 DEBUG_INIT \ |
| 122 |
+ DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET |
| 123 |
+ do |
| 124 |
+ busybox_config_option n ${opt} |
| 125 |
+ done |
| 126 |
+ |
| 127 |
make oldconfig > /dev/null |
| 128 |
} |
| 129 |
|
| 130 |
src_compile() { |
| 131 |
unset KBUILD_OUTPUT #88088 |
| 132 |
|
| 133 |
- emake busybox ${MAKE_CONFIG} || die "build failed" |
| 134 |
+ emake busybox || die "build failed" |
| 135 |
if ! use static && ! use pam ; then |
| 136 |
mv busybox_unstripped{,.bak} |
| 137 |
- emake busybox CONFIG_STATIC=y ${MAKE_CONFIG} || die "static build failed" |
| 138 |
+ emake CONFIG_STATIC=y busybox || die "static build failed" |
| 139 |
mv busybox_unstripped bb |
| 140 |
mv busybox_unstripped{.bak,} |
| 141 |
fi |
| 142 |
@@ -178,7 +181,7 @@ |
| 143 |
doins "${FILESDIR}"/mdev-start.sh || die |
| 144 |
|
| 145 |
# bundle up the symlink files for use later |
| 146 |
- emake install ${MAKE_CONFIG} || die |
| 147 |
+ emake install || die |
| 148 |
rm _install/bin/busybox |
| 149 |
tar cf busybox-links.tar -C _install . || : #;die |
| 150 |
insinto /usr/share/${PN} |
| 151 |
|
| 152 |
|
| 153 |
|
| 154 |
1.167 sys-apps/busybox/ChangeLog |
| 155 |
|
| 156 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.167&view=markup |
| 157 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.167&content-type=text/plain |
| 158 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.166&r2=1.167 |
| 159 |
|
| 160 |
Index: ChangeLog |
| 161 |
=================================================================== |
| 162 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v |
| 163 |
retrieving revision 1.166 |
| 164 |
retrieving revision 1.167 |
| 165 |
diff -u -r1.166 -r1.167 |
| 166 |
--- ChangeLog 2 Dec 2007 23:33:19 -0000 1.166 |
| 167 |
+++ ChangeLog 3 Dec 2007 00:14:07 -0000 1.167 |
| 168 |
@@ -1,6 +1,10 @@ |
| 169 |
# ChangeLog for sys-apps/busybox |
| 170 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 171 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.166 2007/12/02 23:33:19 vapier Exp $ |
| 172 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.167 2007/12/03 00:14:07 vapier Exp $ |
| 173 |
+ |
| 174 |
+ 03 Dec 2007; Mike Frysinger <vapier@g.o> |
| 175 |
+ -files/busybox-1.8.2-flags-strip.patch, busybox-1.8.2.ebuild: |
| 176 |
+ Revert some changes while keeping others. |
| 177 |
|
| 178 |
*busybox-1.7.4 (02 Dec 2007) |
| 179 |
|
| 180 |
|
| 181 |
|
| 182 |
|
| 183 |
-- |
| 184 |
gentoo-commits@g.o mailing list |
Archives