1 |
solar 08/04/30 17:17:35 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: busybox-1.10.1-r2.ebuild |
5 |
Removed: busybox-1.10.1-r1.ebuild |
6 |
Log: |
7 |
- update patches from busybox.net. Fixes hppa compile bug 219516 |
8 |
(Portage version: 2.1.3.19) |
9 |
|
10 |
Revision Changes Path |
11 |
1.187 sys-apps/busybox/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.187&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.187&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.186&r2=1.187 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v |
20 |
retrieving revision 1.186 |
21 |
retrieving revision 1.187 |
22 |
diff -u -r1.186 -r1.187 |
23 |
--- ChangeLog 26 Apr 2008 19:24:24 -0000 1.186 |
24 |
+++ ChangeLog 30 Apr 2008 17:17:34 -0000 1.187 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for sys-apps/busybox |
27 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.186 2008/04/26 19:24:24 solar Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.187 2008/04/30 17:17:34 solar Exp $ |
30 |
+ |
31 |
+*busybox-1.10.1-r2 (30 Apr 2008) |
32 |
+ |
33 |
+ 30 Apr 2008; <solar@g.o> -busybox-1.10.1-r1.ebuild, |
34 |
+ +busybox-1.10.1-r2.ebuild: |
35 |
+ - update patches from busybox.net. Fixes hppa compile bug 219516 |
36 |
|
37 |
*busybox-1.10.1-r1 (26 Apr 2008) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 sys-apps/busybox/busybox-1.10.1-r2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.10.1-r2.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.10.1-r2.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: busybox-1.10.1-r2.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2008 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.10.1-r2.ebuild,v 1.1 2008/04/30 17:17:34 solar Exp $ |
52 |
|
53 |
inherit eutils flag-o-matic savedconfig toolchain-funcs |
54 |
|
55 |
################################################################################ |
56 |
# BUSYBOX ALTERNATE CONFIG MINI-HOWTO |
57 |
# |
58 |
# Busybox can be modified in many different ways. Here's a few ways to do it: |
59 |
# |
60 |
# (1) Emerge busybox with FEATURES=keepwork so the work directory won't |
61 |
# get erased afterwards. Add a definition like ROOT=/my/root/path to the |
62 |
# start of the line if you're installing to somewhere else than the root |
63 |
# directory. This command will save the default configuration to |
64 |
# ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not |
65 |
# defined), and it will tell you that it has done this. Note the location |
66 |
# where the config file was saved. |
67 |
# |
68 |
# FEATURES=keepwork USE=savedconfig emerge busybox |
69 |
# |
70 |
# (2) Go to the work directory and change the configuration of busybox using its |
71 |
# menuconfig feature. |
72 |
# |
73 |
# cd /var/tmp/portage/busybox*/work |
74 |
# make menuconfig |
75 |
# |
76 |
# (3) Save your configuration to the default location and copy it to the |
77 |
# one of the locations listed in /usr/portage/eclass/savedconfig.eclass |
78 |
# |
79 |
# (4) Emerge busybox with USE=savedconfig to use the configuration file you |
80 |
# just generated. |
81 |
# |
82 |
################################################################################ |
83 |
# |
84 |
# (1) Alternatively skip the above steps and simply emerge busybox without |
85 |
# USE=savedconfig. |
86 |
# |
87 |
# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF} |
88 |
# |
89 |
# (3) Remerge busybox as using USE=savedconfig. |
90 |
# |
91 |
################################################################################ |
92 |
|
93 |
#SNAPSHOT=20040726 |
94 |
SNAPSHOT="" |
95 |
|
96 |
DESCRIPTION="Utilities for rescue and embedded systems" |
97 |
HOMEPAGE="http://www.busybox.net/" |
98 |
if [[ -n ${SNAPSHOT} ]] ; then |
99 |
MY_P=${PN} |
100 |
SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2" |
101 |
else |
102 |
MY_P=${PN}-${PV/_/-} |
103 |
SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" |
104 |
fi |
105 |
SRC_URI="${SRC_URI} mirror://gentoo/busybox-1.10.1-20080430_09_28.tar.bz2" |
106 |
LICENSE="GPL-2" |
107 |
SLOT="0" |
108 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
109 |
IUSE="debug make-symlinks pam selinux static" |
110 |
RESTRICT="test" |
111 |
|
112 |
DEPEND="selinux? ( sys-libs/libselinux ) |
113 |
pam? ( sys-libs/pam )" |
114 |
|
115 |
S=${WORKDIR}/${MY_P} |
116 |
|
117 |
busybox_config_option() { |
118 |
case $1 in |
119 |
y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;; |
120 |
n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;; |
121 |
*) use $1 \ |
122 |
&& busybox_config_option y $2 \ |
123 |
|| busybox_config_option n $2 |
124 |
return 0 |
125 |
;; |
126 |
esac |
127 |
einfo $(grep "CONFIG_$2[= ]" .config) |
128 |
} |
129 |
|
130 |
src_unpack() { |
131 |
unset KBUILD_OUTPUT #88088 |
132 |
|
133 |
unpack ${MY_P}.tar.bz2 |
134 |
unpack busybox-1.10.1-20080430_09_28.tar.bz2 |
135 |
cd "${S}" |
136 |
|
137 |
# patches go here! |
138 |
epatch "${FILESDIR}"/busybox-1.7.0-bb.patch |
139 |
# include this upstream later.. |
140 |
epatch "${FILESDIR}"/busybox-devmem.patch |
141 |
# bug fixes. http://busybox.net/downloads/fixes-1.10.1/ |
142 |
rm -f "${WORKDIR}"/patches/busybox-1.10.1-proc.patch |
143 |
epatch "${WORKDIR}"/patches/*.patch |
144 |
|
145 |
# work around broken ass powerpc compilers |
146 |
use ppc64 && append-flags -mminimal-toc |
147 |
# flag cleanup |
148 |
sed -i -r \ |
149 |
-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ |
150 |
Makefile.flags || die |
151 |
sed -i '/^#error Aborting compilation./d' applets/applets.c || die |
152 |
use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile |
153 |
cat <<-EOF >> Makefile.flags |
154 |
CROSS_COMPILE := ${CHOST}- |
155 |
HOSTCC := $(tc-getBUILD_CC) |
156 |
SKIP_STRIP = y |
157 |
EOF |
158 |
|
159 |
# check for a busybox config before making one of our own. |
160 |
# if one exist lets return and use it. |
161 |
|
162 |
restore_config .config |
163 |
if [ -f .config ]; then |
164 |
yes "" | emake -j1 oldconfig > /dev/null |
165 |
return 0 |
166 |
else |
167 |
ewarn "Could not locate user configfile, so we will save a default one" |
168 |
fi |
169 |
|
170 |
# setup the config file |
171 |
emake -j1 allyesconfig > /dev/null |
172 |
busybox_config_option n DMALLOC |
173 |
busybox_config_option n FEATURE_SUID_CONFIG |
174 |
busybox_config_option n BUILD_AT_ONCE |
175 |
busybox_config_option n BUILD_LIBBUSYBOX |
176 |
busybox_config_option n NOMMU |
177 |
|
178 |
# If these are not set and we are using a uclibc/busybox setup |
179 |
# all calls to system() will fail. |
180 |
busybox_config_option y FEATURE_SH_IS_ASH |
181 |
busybox_config_option n FEATURE_SH_IS_NONE |
182 |
|
183 |
if use static && use pam ; then |
184 |
ewarn "You cannot have USE='static pam'. Assuming static is more important." |
185 |
fi |
186 |
use static \ |
187 |
&& busybox_config_option n PAM \ |
188 |
|| busybox_config_option pam PAM |
189 |
busybox_config_option static STATIC |
190 |
busybox_config_option debug DEBUG |
191 |
use debug \ |
192 |
&& busybox_config_option y NO_DEBUG_LIB \ |
193 |
&& busybox_config_option n DMALLOC \ |
194 |
&& busybox_config_option n EFENCE |
195 |
|
196 |
busybox_config_option selinux SELINUX |
197 |
|
198 |
# default a bunch of uncommon options to off |
199 |
for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \ |
200 |
LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \ |
201 |
UUDECODE UUENCODE SULOGIN DC DEBUG_YANK_SUSv2 DEBUG_INIT \ |
202 |
DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET |
203 |
do |
204 |
busybox_config_option n ${opt} |
205 |
done |
206 |
|
207 |
emake -j1 oldconfig > /dev/null |
208 |
} |
209 |
|
210 |
src_compile() { |
211 |
unset KBUILD_OUTPUT #88088 |
212 |
|
213 |
emake busybox || die "build failed" |
214 |
if ! use static && ! use pam ; then |
215 |
mv busybox_unstripped{,.bak} |
216 |
emake CONFIG_STATIC=y busybox || die "static build failed" |
217 |
mv busybox_unstripped bb |
218 |
mv busybox_unstripped{.bak,} |
219 |
fi |
220 |
} |
221 |
|
222 |
src_install() { |
223 |
unset KBUILD_OUTPUT #88088 |
224 |
save_config .config |
225 |
|
226 |
into / |
227 |
newbin busybox_unstripped busybox || die |
228 |
if use static || use pam ; then |
229 |
dosym busybox /bin/bb || die |
230 |
dosym bb /bin/busybox.static || die |
231 |
else |
232 |
dobin bb || die |
233 |
fi |
234 |
|
235 |
insinto /$(get_libdir)/rcscripts/addons |
236 |
doins "${FILESDIR}"/mdev-start.sh || die |
237 |
|
238 |
# bundle up the symlink files for use later |
239 |
emake install || die |
240 |
rm _install/bin/busybox |
241 |
tar cf busybox-links.tar -C _install . || : #;die |
242 |
insinto /usr/share/${PN} |
243 |
doins busybox-links.tar || die |
244 |
newins .config ${PF}.config || die |
245 |
|
246 |
dodoc AUTHORS README TODO |
247 |
|
248 |
cd docs || die |
249 |
docinto txt |
250 |
dodoc *.txt |
251 |
docinto pod |
252 |
dodoc *.pod |
253 |
dohtml *.html *.sgml |
254 |
|
255 |
cd ../examples || die |
256 |
docinto examples |
257 |
dodoc inittab depmod.pl *.conf *.script undeb unrpm |
258 |
|
259 |
cd bootfloppy || die |
260 |
docinto bootfloppy |
261 |
dodoc * etc/* etc/init.d/* 2>/dev/null |
262 |
} |
263 |
|
264 |
pkg_preinst() { |
265 |
if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then |
266 |
ewarn "setting USE=make-symlinks and emerging to / is very dangerous." |
267 |
ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." |
268 |
ewarn "If you are creating a binary only and not merging this is probably ok." |
269 |
ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is realy what you want." |
270 |
die "silly options will destroy your system" |
271 |
fi |
272 |
|
273 |
if use make-symlinks ; then |
274 |
mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die |
275 |
fi |
276 |
} |
277 |
|
278 |
pkg_postinst() { |
279 |
if use make-symlinks ; then |
280 |
cd "${T}" || die |
281 |
mkdir _install |
282 |
tar xf busybox-links.tar -C _install || die |
283 |
cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" |
284 |
fi |
285 |
|
286 |
echo |
287 |
einfo "This ebuild has support for user defined configs" |
288 |
einfo "Please read this ebuild for more details and re-emerge as needed" |
289 |
einfo "if you want to add or remove functionality for ${PN}" |
290 |
echo |
291 |
} |
292 |
|
293 |
|
294 |
|
295 |
-- |
296 |
gentoo-commits@l.g.o mailing list |