Gentoo Archives: gentoo-commits

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