Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/
Date: Wed, 26 Apr 2017 21:12:38
Message-Id: 1493241146.c9f27aae390b12539067eae6bbf79dae5acefaac.vapier@gentoo
1 commit: c9f27aae390b12539067eae6bbf79dae5acefaac
2 Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
3 AuthorDate: Wed Apr 26 21:08:36 2017 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 26 21:12:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f27aae
7
8 sys-apps/busybox: drop 1.26.0 version
9
10 sys-apps/busybox/Manifest | 1 -
11 sys-apps/busybox/busybox-1.26.0.ebuild | 302 ---------------------------------
12 2 files changed, 303 deletions(-)
13
14 diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
15 index f15dd27a571..c90d483a958 100644
16 --- a/sys-apps/busybox/Manifest
17 +++ b/sys-apps/busybox/Manifest
18 @@ -1,3 +1,2 @@
19 DIST busybox-1.25.1.tar.bz2 2103070 SHA256 27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e SHA512 9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb WHIRLPOOL 4b7bc6d3a88559812797feb4574975b9fdeb6eac6ac7a0fe51e4750a3b05a614ecb8bd9d58547047cdf1e0b66d9bcd189c8a4193fc2f3b491a6268bc06761ad1
20 -DIST busybox-1.26.0.tar.bz2 2143958 SHA256 3ad227375ee870d529007f6ce83f173b8bd5a37df624ecb460295554261c0f4c SHA512 9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3 WHIRLPOOL c8a7419bd711d3e0249807ef9f9ff6123ff8d0767479ea3b3e54ef48f6132514942bc37b79334ca2afd6009d32c5e242712bd6b3995f49904c33040c66df9dcc
21 DIST busybox-1.26.2.tar.bz2 2120931 SHA256 da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16 SHA512 9926d211d0b4f34b513d934d7b111ebbf933c2dc31206bdd80426a62d47d5b1475b70bec5aaa14a26b94a202ab1465d994062a002750a312dcb8167096eb3719 WHIRLPOOL 64fdbd3ede8e382d0237b1576000555f563c4ca93d58cfbb72f71374b662e3201863110a069f0e4a27dab7c0a6102d98ccfd4d57f1dfe44c9b12a17c6a30128a
22
23 diff --git a/sys-apps/busybox/busybox-1.26.0.ebuild b/sys-apps/busybox/busybox-1.26.0.ebuild
24 deleted file mode 100644
25 index 3a206255a5b..00000000000
26 --- a/sys-apps/busybox/busybox-1.26.0.ebuild
27 +++ /dev/null
28 @@ -1,302 +0,0 @@
29 -# Copyright 1999-2016 Gentoo Foundation
30 -# Distributed under the terms of the GNU General Public License v2
31 -
32 -# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
33 -
34 -EAPI="5"
35 -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
36 -
37 -DESCRIPTION="Utilities for rescue and embedded systems"
38 -HOMEPAGE="https://www.busybox.net/"
39 -if [[ ${PV} == "9999" ]] ; then
40 - MY_P=${PN}
41 - EGIT_REPO_URI="git://busybox.net/busybox.git"
42 - inherit git-2
43 -else
44 - MY_P=${PN}-${PV/_/-}
45 - SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
46 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
47 -fi
48 -
49 -LICENSE="GPL-2" # GPL-2 only
50 -SLOT="0"
51 -IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
52 -REQUIRED_USE="pam? ( !static )"
53 -RESTRICT="test"
54 -
55 -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
56 - pam? ( sys-libs/pam )"
57 -DEPEND="${COMMON_DEPEND}
58 - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
59 - >=sys-kernel/linux-headers-2.6.39"
60 -RDEPEND="${COMMON_DEPEND}
61 - mdev? ( !<sys-apps/openrc-0.13 )"
62 -
63 -S=${WORKDIR}/${MY_P}
64 -
65 -busybox_config_option() {
66 - local flag=$1 ; shift
67 - if [[ ${flag} != [yn] ]] ; then
68 - busybox_config_option $(usex ${flag} y n) "$@"
69 - return
70 - fi
71 - while [[ $# -gt 0 ]] ; do
72 - if [[ ${flag} == "y" ]] ; then
73 - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
74 - else
75 - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
76 - fi
77 - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
78 - shift
79 - done
80 -}
81 -
82 -busybox_config_enabled() {
83 - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
84 - case ${val} in
85 - "") return 1 ;;
86 - y) return 0 ;;
87 - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
88 - esac
89 -}
90 -
91 -src_prepare() {
92 - unset KBUILD_OUTPUT #88088
93 - append-flags -fno-strict-aliasing #310413
94 - use ppc64 && append-flags -mminimal-toc #130943
95 -
96 - # patches go here!
97 - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
98 -# epatch "${FILESDIR}"/${P}-*.patch
99 - cp "${FILESDIR}"/ginit.c init/ || die
100 -
101 - # flag cleanup
102 - sed -i -r \
103 - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
104 - Makefile.flags || die
105 - #sed -i '/bbsh/s:^//::' include/applets.h
106 - sed -i '/^#error Aborting compilation./d' applets/applets.c || die
107 - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
108 - sed -i \
109 - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
110 - -e "/^AR\>/s:=.*:= $(tc-getAR):" \
111 - -e "/^CC\>/s:=.*:= $(tc-getCC):" \
112 - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
113 - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
114 - Makefile || die
115 - sed -i \
116 - -e 's:-static-libgcc::' \
117 - Makefile.flags || die
118 -}
119 -
120 -src_configure() {
121 - # check for a busybox config before making one of our own.
122 - # if one exist lets return and use it.
123 -
124 - restore_config .config
125 - if [ -f .config ]; then
126 - yes "" | emake -j1 -s oldconfig >/dev/null
127 - return 0
128 - else
129 - ewarn "Could not locate user configfile, so we will save a default one"
130 - fi
131 -
132 - # setup the config file
133 - emake -j1 -s allyesconfig >/dev/null
134 - # nommu forces a bunch of things off which we want on #387555
135 - busybox_config_option n NOMMU
136 - sed -i '/^#/d' .config
137 - yes "" | emake -j1 -s oldconfig >/dev/null
138 -
139 - # now turn off stuff we really don't want
140 - busybox_config_option n DMALLOC
141 - busybox_config_option n FEATURE_SUID_CONFIG
142 - busybox_config_option n BUILD_AT_ONCE
143 - busybox_config_option n BUILD_LIBBUSYBOX
144 - busybox_config_option n FEATURE_CLEAN_UP
145 - busybox_config_option n MONOTONIC_SYSCALL
146 - busybox_config_option n USE_PORTABLE_CODE
147 - busybox_config_option n WERROR
148 - # triming the BSS size may be dangerous
149 - busybox_config_option n FEATURE_USE_BSS_TAIL
150 -
151 - # If these are not set and we are using a uclibc/busybox setup
152 - # all calls to system() will fail.
153 - busybox_config_option y ASH
154 - busybox_config_option n HUSH
155 -
156 - # disable ipv6 applets
157 - if ! use ipv6; then
158 - busybox_config_option n FEATURE_IPV6
159 - busybox_config_option n TRACEROUTE6
160 - busybox_config_option n PING6
161 - busybox_config_option n UDHCPC6
162 - fi
163 -
164 - busybox_config_option pam PAM
165 - busybox_config_option static STATIC
166 - busybox_config_option syslog {K,SYS}LOGD LOGGER
167 - busybox_config_option systemd FEATURE_SYSTEMD
168 - busybox_config_option math FEATURE_AWK_LIBM
169 -
170 - # all the debug options are compiler related, so punt them
171 - busybox_config_option n DEBUG_SANITIZE
172 - busybox_config_option n DEBUG
173 - busybox_config_option y NO_DEBUG_LIB
174 - busybox_config_option n DMALLOC
175 - busybox_config_option n EFENCE
176 - busybox_config_option $(usex debug y n) TFTP_DEBUG
177 -
178 - busybox_config_option selinux SELINUX
179 -
180 - # this opt only controls mounting with <linux-2.6.23
181 - busybox_config_option n FEATURE_MOUNT_NFS
182 -
183 - # default a bunch of uncommon options to off
184 - local opt
185 - for opt in \
186 - ADD_SHELL \
187 - BEEP BOOTCHARTD \
188 - CRONTAB \
189 - DC DEVFSD DNSD DPKG{,_DEB} \
190 - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
191 - FEATURE_DEVFS \
192 - HOSTID HUSH \
193 - INETD INOTIFYD IPCALC \
194 - LOCALE_SUPPORT LOGNAME LPD \
195 - MAKEMIME MKFS_MINIX MSH \
196 - OD \
197 - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
198 - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
199 - TASKSET TCPSVD \
200 - RPM RPM2CPIO \
201 - UDPSVD UUDECODE UUENCODE
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 - export SKIP_STRIP=y
212 -
213 - emake V=1 busybox
214 -}
215 -
216 -src_install() {
217 - unset KBUILD_OUTPUT #88088
218 - save_config .config
219 -
220 - into /
221 - dodir /bin
222 - if use sep-usr ; then
223 - # install /ginit to take care of mounting stuff
224 - exeinto /
225 - newexe busybox_unstripped ginit
226 - dosym /ginit /bin/bb
227 - dosym bb /bin/busybox
228 - else
229 - newbin busybox_unstripped busybox
230 - dosym busybox /bin/bb
231 - fi
232 - if use mdev ; then
233 - dodir /$(get_libdir)/mdev/
234 - use make-symlinks || dosym /bin/bb /sbin/mdev
235 - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
236 -
237 - exeinto /$(get_libdir)/mdev/
238 - doexe "${FILESDIR}"/mdev/*
239 -
240 - newinitd "${FILESDIR}"/mdev.initd mdev
241 - fi
242 - if use livecd ; then
243 - dosym busybox /bin/vi
244 - fi
245 -
246 - # add busybox daemon's, bug #444718
247 - if busybox_config_enabled FEATURE_NTPD_SERVER; then
248 - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
249 - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
250 - fi
251 - if busybox_config_enabled SYSLOGD; then
252 - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
253 - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
254 - fi
255 - if busybox_config_enabled KLOGD; then
256 - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
257 - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
258 - fi
259 - if busybox_config_enabled WATCHDOG; then
260 - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
261 - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
262 - fi
263 - if busybox_config_enabled UDHCPC; then
264 - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
265 - exeinto "${path%/*}"
266 - newexe examples/udhcp/simple.script "${path##*/}"
267 - fi
268 - if busybox_config_enabled UDHCPD; then
269 - insinto /etc
270 - doins examples/udhcp/udhcpd.conf
271 - fi
272 -
273 - # bundle up the symlink files for use later
274 - emake DESTDIR="${ED}" install
275 - rm _install/bin/busybox
276 - # for compatibility, provide /usr/bin/env
277 - mkdir -p _install/usr/bin
278 - ln -s /bin/env _install/usr/bin/env
279 - tar cf busybox-links.tar -C _install . || : #;die
280 - insinto /usr/share/${PN}
281 - use make-symlinks && doins busybox-links.tar
282 -
283 - dodoc AUTHORS README TODO
284 -
285 - cd docs
286 - docinto txt
287 - dodoc *.txt
288 - docinto pod
289 - dodoc *.pod
290 - dohtml *.html
291 -
292 - cd ../examples
293 - docinto examples
294 - dodoc inittab depmod.pl *.conf *.script undeb unrpm
295 -}
296 -
297 -pkg_preinst() {
298 - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
299 - ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
300 - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
301 - ewarn "If you are creating a binary only and not merging this is probably ok."
302 - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
303 - die "silly options will destroy your system"
304 - fi
305 -
306 - if use make-symlinks ; then
307 - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
308 - fi
309 -}
310 -
311 -pkg_postinst() {
312 - savedconfig_pkg_postinst
313 -
314 - if use make-symlinks ; then
315 - cd "${T}" || die
316 - mkdir _install
317 - tar xf busybox-links.tar -C _install || die
318 - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
319 - fi
320 -
321 - if use sep-usr ; then
322 - elog "In order to use the sep-usr support, you have to update your"
323 - elog "kernel command line. Add the option:"
324 - elog " init=/ginit"
325 - elog "To launch a different init than /sbin/init, use:"
326 - elog " init=/ginit /sbin/yourinit"
327 - elog "To get a rescue shell, you may boot with:"
328 - elog " init=/ginit bb"
329 - fi
330 -}