Gentoo Archives: gentoo-commits

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