Gentoo Archives: gentoo-commits

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