1 |
commit: 7dd114ba804c71465cc9b688742d69018603e140 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Apr 28 17:57:41 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Fri Apr 28 17:57:41 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7dd114ba |
7 |
|
8 |
sys-apps/busybox: version bump to 1.26.2-r1 |
9 |
|
10 |
drop 1.26.0 |
11 |
|
12 |
sys-apps/busybox/Manifest | 6 +- |
13 |
sys-apps/busybox/busybox-1.26.0.ebuild | 309 --------------------- |
14 |
...ybox-1.26.2.ebuild => busybox-1.26.2-r1.ebuild} | 1 + |
15 |
sys-apps/busybox/files/busybox-1.26.2-bb.patch | 29 +- |
16 |
4 files changed, 24 insertions(+), 321 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest |
19 |
index 444f044..49e3ada 100644 |
20 |
--- a/sys-apps/busybox/Manifest |
21 |
+++ b/sys-apps/busybox/Manifest |
22 |
@@ -1,6 +1,6 @@ |
23 |
AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8 |
24 |
AUX busybox-1.25.1-setfiles.patch 1153 SHA256 bd0f75f3d3eeab0d140cd7497617875330b5f70de14c04b78047e76aa1c08611 SHA512 2b3b4aba3be49437b1875ce00887e385abae275cc269ca0e80af797a6a6acfa2f20ea4bcf195e67490d8fe691c1ca7493adbf7e097bd4f6f0e1d7e07e493dca4 WHIRLPOOL 9442abafe26be8a1b2e60b81df2446957e6d135f2d7038ea71eba55f10e1ed3677743d93b2ffd7a1977d214d7ec3916ca4ec40c9cd46d16f5ba47ea3198357ec |
25 |
-AUX busybox-1.26.2-bb.patch 2172 SHA256 46893ff6666269df3af68fbe2bdd09cb1aca57f5e1166adfe93db3c29ec5ae28 SHA512 ead355aa1882ac7394d1803efb045d6a3039569c8f33bbd51e41654a1d50ca47c7d5f5caeadc8d36ddd360416e7b23bcd270cae1d515b524dd3ab08338b1b910 WHIRLPOOL 6dd0bbe52cc6a0b1e3ed98fc1c9bc3585d0cbcd5c7143096b5793d484b28733f79da56d09eea662cb2cb1ab172412273256f548a03b7b9a44e834e1d275ed5b5 |
26 |
+AUX busybox-1.26.2-bb.patch 2416 SHA256 260bc0e35c808fc71d73982adb29161c2649b76ed0afa23b66f148c6ebf09d95 SHA512 cb767a613ede504a7b1a87da3270992ffa44d3b6f76eebefceffc8a5a49119a99333c482420efab9d1e5a92a26280376c7e9ec62fcb2193d9172f4e7bc19f50e WHIRLPOOL 31a9278cad767fcf455b45ccf756f5e69e79f0d4ccafb4d8d42317e1226b638ce4df8df19d0497925e54bf8a145f1ac562f5650678bd715018d99407f1a36042 |
27 |
AUX ginit.c 3097 SHA256 fd6a4715d3dd10f6db479020433da3997d397658301335c847fb779129238b8c SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c WHIRLPOOL a1ec3ccc296033d88a9504b693c7d249d0bd11b1d75e3f59a62137c5e4b4c914fe2b8971c86dbca2cc8ccc0d86f3f8c2c45bb44cec85a3628c44f091476baa92 |
28 |
AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a |
29 |
AUX klogd.initd 245 SHA256 c8d6f43e5b658eeb54892fea21c0afaa15447e903c55c3bd3d011773f20bb773 SHA512 6c28b5f2db40eeeae14f859f56a5e4f96a034b69639f38da3a437eabd1f74f61240b87eac2f7e5ca9a3377ceb9a37e939ab69b7db6a70c962062e5ae29f7e835 WHIRLPOOL 949802460f708c3db1633fa4e070aa01c243912b437c3999e9c22887d8111195efc1b9f29cfcaeaa6ee5e5ccdd7fb37f89c5ebb3f035388a6ea0d8b5e5f611e2 |
30 |
@@ -16,9 +16,7 @@ AUX syslogd.initd 267 SHA256 e8dff11a6756650efccd7071331462026d3b1f3008a0f2d08c8 |
31 |
AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767 |
32 |
AUX watchdog.initd 219 SHA256 68831d9e8c460a605f20c2e476ff6f80dcf977412e509f4fcb5ee1f4f3b5d813 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5 WHIRLPOOL 69de35443fb58b3188b026787ded43997ca9fb6cafe6d971e72546d9fed4b17eef635fc400d2b3ee1a918eadb8e1dedc051e616f8d418687a8a933dd67865f4b |
33 |
DIST busybox-1.25.1.tar.bz2 2103070 SHA256 27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e SHA512 9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb WHIRLPOOL 4b7bc6d3a88559812797feb4574975b9fdeb6eac6ac7a0fe51e4750a3b05a614ecb8bd9d58547047cdf1e0b66d9bcd189c8a4193fc2f3b491a6268bc06761ad1 |
34 |
-DIST busybox-1.26.0.tar.bz2 2143958 SHA256 3ad227375ee870d529007f6ce83f173b8bd5a37df624ecb460295554261c0f4c SHA512 9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3 WHIRLPOOL c8a7419bd711d3e0249807ef9f9ff6123ff8d0767479ea3b3e54ef48f6132514942bc37b79334ca2afd6009d32c5e242712bd6b3995f49904c33040c66df9dcc |
35 |
DIST busybox-1.26.2.tar.bz2 2120931 SHA256 da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16 SHA512 9926d211d0b4f34b513d934d7b111ebbf933c2dc31206bdd80426a62d47d5b1475b70bec5aaa14a26b94a202ab1465d994062a002750a312dcb8167096eb3719 WHIRLPOOL 64fdbd3ede8e382d0237b1576000555f563c4ca93d58cfbb72f71374b662e3201863110a069f0e4a27dab7c0a6102d98ccfd4d57f1dfe44c9b12a17c6a30128a |
36 |
EBUILD busybox-1.25.1.ebuild 8864 SHA256 285e8b7dc579518db1bcf481bf8c5d7227694cea10eb1b281f2435709944a69e SHA512 4d5a177d70c8feddc4d1291e955d57c7f575b14202d2f2413581e7424a68ae73718110e9179eb6837519bdc142b48fdcc5d7ca9652ff9a4fc905f83dab42177f WHIRLPOOL d73b3963773fb610fc0c2b513be01df044cbce058d93a5ee1bb2e01a4f6b96a1ee5db1a4c1b4a808c97f359c6301417aec1c28d4d536f60a23b95aee8e259e85 |
37 |
-EBUILD busybox-1.26.0.ebuild 8878 SHA256 dbad583d3c3bb51eadb38dbeae45030e913a7b4dfc35b9000de55b9b6e36b650 SHA512 70ad67d759367fefb07ff7cef544c232fd5830da9b4f142d9c4c9482fbcf4702c1bf8dca06234e9996dd08a2a1c47c6442fcdcfcbbdbb8ab5e94b673676b837d WHIRLPOOL 85d4eaad13ce1ffaf28714664631d429377271c87509027120cfbf5ac89c903991aa46a48d89dbbdb62000fb4bc3e84ea1ad2d0d01b5ac6de4d7d9b27844fa5a |
38 |
-EBUILD busybox-1.26.2.ebuild 9130 SHA256 ff9f81278aff3bb6424b00ea5f58b4e7cfe4811524ee277cad8924094d90b8ea SHA512 e9bc3a464a43e580a98d16f3bf084429d7fb5e7d46f0e79aca81505e5c91c182b6effbfa5ae3fc51fc3b3393f44f86c491d718d6865ab26d5e9c79533aaa5289 WHIRLPOOL 2127552537e322c807153d1d44b3fca3286fdac72c89baad891be98f0c853f6376ee78e9db3759b124d26ce74459e77822747cba2af21edd754229c6ba6342ce |
39 |
+EBUILD busybox-1.26.2-r1.ebuild 9165 SHA256 213ce56b2cd667c573acfd3da9f2c92a18158cbad8926e5e6d0cb498ee791b77 SHA512 0803c10c8b59119af46d187fc9e18f80473e683e98bb633cf30e03d66ba037a8b9144a356b229630013b4944d86aff432278eab67b9d0cba11300818308f2af1 WHIRLPOOL 6d80e7e575752b0e20b1de1a97c7c7b4559f57238fed3aa2c8f949da72d8e762c49e1c8ccc8b5bb6e0e7ceda4a75420e785a667939cec63a64ea5b4964410e4b |
40 |
MISC metadata.xml 872 SHA256 1cf483a8d55e8cbe20edb30261276d71e0ba0a1b06d73621f849496d1f6c4a17 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 WHIRLPOOL 91b126a39ecd6937e6058814b88043e9fbbf7b434854e25a4e4a7ad8e666de37978b8bac0c8dca0255096a42af9afed412bb5bbccdffaf03ba75c2fd2e4b3428 |
41 |
|
42 |
diff --git a/sys-apps/busybox/busybox-1.26.0.ebuild b/sys-apps/busybox/busybox-1.26.0.ebuild |
43 |
deleted file mode 100644 |
44 |
index 5af2fa5..0000000 |
45 |
--- a/sys-apps/busybox/busybox-1.26.0.ebuild |
46 |
+++ /dev/null |
47 |
@@ -1,309 +0,0 @@ |
48 |
-# Copyright 1999-2016 Gentoo Foundation |
49 |
-# Distributed under the terms of the GNU General Public License v2 |
50 |
- |
51 |
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig. |
52 |
- |
53 |
-EAPI="5" |
54 |
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib |
55 |
- |
56 |
-DESCRIPTION="Utilities for rescue and embedded systems" |
57 |
-HOMEPAGE="https://www.busybox.net/" |
58 |
-if [[ ${PV} == "9999" ]] ; then |
59 |
- MY_P=${PN} |
60 |
- EGIT_REPO_URI="git://busybox.net/busybox.git" |
61 |
- inherit git-2 |
62 |
-else |
63 |
- MY_P=${PN}-${PV/_/-} |
64 |
- SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" |
65 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
66 |
-fi |
67 |
- |
68 |
-LICENSE="GPL-2" # GPL-2 only |
69 |
-SLOT="0" |
70 |
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" |
71 |
-REQUIRED_USE="pam? ( !static )" |
72 |
-RESTRICT="test" |
73 |
- |
74 |
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) |
75 |
- pam? ( sys-libs/pam )" |
76 |
-DEPEND="${COMMON_DEPEND} |
77 |
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) |
78 |
- >=sys-kernel/linux-headers-2.6.39" |
79 |
-RDEPEND="${COMMON_DEPEND} |
80 |
- mdev? ( !<sys-apps/openrc-0.13 )" |
81 |
- |
82 |
-S=${WORKDIR}/${MY_P} |
83 |
- |
84 |
-busybox_config_option() { |
85 |
- local flag=$1 ; shift |
86 |
- if [[ ${flag} != [yn] ]] ; then |
87 |
- busybox_config_option $(usex ${flag} y n) "$@" |
88 |
- return |
89 |
- fi |
90 |
- while [[ $# -gt 0 ]] ; do |
91 |
- if [[ ${flag} == "y" ]] ; then |
92 |
- sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config |
93 |
- else |
94 |
- sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config |
95 |
- fi |
96 |
- einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) |
97 |
- shift |
98 |
- done |
99 |
-} |
100 |
- |
101 |
-busybox_config_enabled() { |
102 |
- local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) |
103 |
- case ${val} in |
104 |
- "") return 1 ;; |
105 |
- y) return 0 ;; |
106 |
- *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; |
107 |
- esac |
108 |
-} |
109 |
- |
110 |
-src_prepare() { |
111 |
- unset KBUILD_OUTPUT #88088 |
112 |
- append-flags -fno-strict-aliasing #310413 |
113 |
- use ppc64 && append-flags -mminimal-toc #130943 |
114 |
- |
115 |
- # patches go here! |
116 |
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch |
117 |
-# epatch "${FILESDIR}"/${P}-*.patch |
118 |
- cp "${FILESDIR}"/ginit.c init/ || die |
119 |
- |
120 |
- # flag cleanup |
121 |
- sed -i -r \ |
122 |
- -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ |
123 |
- Makefile.flags || die |
124 |
- #sed -i '/bbsh/s:^//::' include/applets.h |
125 |
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die |
126 |
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile |
127 |
- sed -i \ |
128 |
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ |
129 |
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \ |
130 |
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \ |
131 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
132 |
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ |
133 |
- Makefile || die |
134 |
- sed -i \ |
135 |
- -e 's:-static-libgcc::' \ |
136 |
- Makefile.flags || die |
137 |
-} |
138 |
- |
139 |
-src_configure() { |
140 |
- # check for a busybox config before making one of our own. |
141 |
- # if one exist lets return and use it. |
142 |
- |
143 |
- restore_config .config |
144 |
- if [ -f .config ]; then |
145 |
- yes "" | emake -j1 -s oldconfig >/dev/null |
146 |
- return 0 |
147 |
- else |
148 |
- ewarn "Could not locate user configfile, so we will save a default one" |
149 |
- fi |
150 |
- |
151 |
- # setup the config file |
152 |
- emake -j1 -s allyesconfig >/dev/null |
153 |
- # nommu forces a bunch of things off which we want on #387555 |
154 |
- busybox_config_option n NOMMU |
155 |
- sed -i '/^#/d' .config |
156 |
- yes "" | emake -j1 -s oldconfig >/dev/null |
157 |
- |
158 |
- # now turn off stuff we really don't want |
159 |
- busybox_config_option n DMALLOC |
160 |
- busybox_config_option n FEATURE_SUID_CONFIG |
161 |
- busybox_config_option n BUILD_AT_ONCE |
162 |
- busybox_config_option n BUILD_LIBBUSYBOX |
163 |
- busybox_config_option n FEATURE_CLEAN_UP |
164 |
- busybox_config_option n MONOTONIC_SYSCALL |
165 |
- busybox_config_option n USE_PORTABLE_CODE |
166 |
- busybox_config_option n WERROR |
167 |
- # triming the BSS size may be dangerous |
168 |
- busybox_config_option n FEATURE_USE_BSS_TAIL |
169 |
- |
170 |
- # These cause trouble with musl. Since we don't really |
171 |
- # depend on busybox for most of the musl work, we'll lazily |
172 |
- # just turn them off. |
173 |
- busybox_config_option n FEATURE_UTMP |
174 |
- busybox_config_option n EXTRA_COMPAT |
175 |
- busybox_config_option n FEATURE_VI_REGEX_SEARCH |
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 ASH |
180 |
- busybox_config_option n HUSH |
181 |
- |
182 |
- # disable ipv6 applets |
183 |
- if ! use ipv6; then |
184 |
- busybox_config_option n FEATURE_IPV6 |
185 |
- busybox_config_option n TRACEROUTE6 |
186 |
- busybox_config_option n PING6 |
187 |
- busybox_config_option n UDHCPC6 |
188 |
- fi |
189 |
- |
190 |
- busybox_config_option pam PAM |
191 |
- busybox_config_option static STATIC |
192 |
- busybox_config_option syslog {K,SYS}LOGD LOGGER |
193 |
- busybox_config_option systemd FEATURE_SYSTEMD |
194 |
- busybox_config_option math FEATURE_AWK_LIBM |
195 |
- |
196 |
- # all the debug options are compiler related, so punt them |
197 |
- busybox_config_option n DEBUG_SANITIZE |
198 |
- busybox_config_option n DEBUG |
199 |
- busybox_config_option y NO_DEBUG_LIB |
200 |
- busybox_config_option n DMALLOC |
201 |
- busybox_config_option n EFENCE |
202 |
- busybox_config_option $(usex debug y n) TFTP_DEBUG |
203 |
- |
204 |
- busybox_config_option selinux SELINUX |
205 |
- |
206 |
- # this opt only controls mounting with <linux-2.6.23 |
207 |
- busybox_config_option n FEATURE_MOUNT_NFS |
208 |
- |
209 |
- # default a bunch of uncommon options to off |
210 |
- local opt |
211 |
- for opt in \ |
212 |
- ADD_SHELL \ |
213 |
- BEEP BOOTCHARTD \ |
214 |
- CRONTAB \ |
215 |
- DC DEVFSD DNSD DPKG{,_DEB} \ |
216 |
- FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ |
217 |
- FEATURE_DEVFS \ |
218 |
- HOSTID HUSH \ |
219 |
- INETD INOTIFYD IPCALC \ |
220 |
- LOCALE_SUPPORT LOGNAME LPD \ |
221 |
- MAKEMIME MKFS_MINIX MSH \ |
222 |
- OD \ |
223 |
- RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ |
224 |
- SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ |
225 |
- TASKSET TCPSVD \ |
226 |
- RPM RPM2CPIO \ |
227 |
- UDPSVD UUDECODE UUENCODE |
228 |
- do |
229 |
- busybox_config_option n ${opt} |
230 |
- done |
231 |
- |
232 |
- emake -j1 oldconfig > /dev/null |
233 |
-} |
234 |
- |
235 |
-src_compile() { |
236 |
- unset KBUILD_OUTPUT #88088 |
237 |
- export SKIP_STRIP=y |
238 |
- |
239 |
- emake V=1 busybox |
240 |
-} |
241 |
- |
242 |
-src_install() { |
243 |
- unset KBUILD_OUTPUT #88088 |
244 |
- save_config .config |
245 |
- |
246 |
- into / |
247 |
- dodir /bin |
248 |
- if use sep-usr ; then |
249 |
- # install /ginit to take care of mounting stuff |
250 |
- exeinto / |
251 |
- newexe busybox_unstripped ginit |
252 |
- dosym /ginit /bin/bb |
253 |
- dosym bb /bin/busybox |
254 |
- else |
255 |
- newbin busybox_unstripped busybox |
256 |
- dosym busybox /bin/bb |
257 |
- fi |
258 |
- if use mdev ; then |
259 |
- dodir /$(get_libdir)/mdev/ |
260 |
- use make-symlinks || dosym /bin/bb /sbin/mdev |
261 |
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf |
262 |
- |
263 |
- exeinto /$(get_libdir)/mdev/ |
264 |
- doexe "${FILESDIR}"/mdev/* |
265 |
- |
266 |
- newinitd "${FILESDIR}"/mdev.initd mdev |
267 |
- fi |
268 |
- if use livecd ; then |
269 |
- dosym busybox /bin/vi |
270 |
- fi |
271 |
- |
272 |
- # add busybox daemon's, bug #444718 |
273 |
- if busybox_config_enabled FEATURE_NTPD_SERVER; then |
274 |
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" |
275 |
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" |
276 |
- fi |
277 |
- if busybox_config_enabled SYSLOGD; then |
278 |
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" |
279 |
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" |
280 |
- fi |
281 |
- if busybox_config_enabled KLOGD; then |
282 |
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" |
283 |
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" |
284 |
- fi |
285 |
- if busybox_config_enabled WATCHDOG; then |
286 |
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" |
287 |
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" |
288 |
- fi |
289 |
- if busybox_config_enabled UDHCPC; then |
290 |
- local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) |
291 |
- exeinto "${path%/*}" |
292 |
- newexe examples/udhcp/simple.script "${path##*/}" |
293 |
- fi |
294 |
- if busybox_config_enabled UDHCPD; then |
295 |
- insinto /etc |
296 |
- doins examples/udhcp/udhcpd.conf |
297 |
- fi |
298 |
- |
299 |
- # bundle up the symlink files for use later |
300 |
- emake DESTDIR="${ED}" install |
301 |
- rm _install/bin/busybox |
302 |
- # for compatibility, provide /usr/bin/env |
303 |
- mkdir -p _install/usr/bin |
304 |
- ln -s /bin/env _install/usr/bin/env |
305 |
- tar cf busybox-links.tar -C _install . || : #;die |
306 |
- insinto /usr/share/${PN} |
307 |
- use make-symlinks && doins busybox-links.tar |
308 |
- |
309 |
- dodoc AUTHORS README TODO |
310 |
- |
311 |
- cd docs |
312 |
- docinto txt |
313 |
- dodoc *.txt |
314 |
- docinto pod |
315 |
- dodoc *.pod |
316 |
- dohtml *.html |
317 |
- |
318 |
- cd ../examples |
319 |
- docinto examples |
320 |
- dodoc inittab depmod.pl *.conf *.script undeb unrpm |
321 |
-} |
322 |
- |
323 |
-pkg_preinst() { |
324 |
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then |
325 |
- ewarn "setting USE=make-symlinks and emerging to / is very dangerous." |
326 |
- ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." |
327 |
- ewarn "If you are creating a binary only and not merging this is probably ok." |
328 |
- ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." |
329 |
- die "silly options will destroy your system" |
330 |
- fi |
331 |
- |
332 |
- if use make-symlinks ; then |
333 |
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die |
334 |
- fi |
335 |
-} |
336 |
- |
337 |
-pkg_postinst() { |
338 |
- savedconfig_pkg_postinst |
339 |
- |
340 |
- if use make-symlinks ; then |
341 |
- cd "${T}" || die |
342 |
- mkdir _install |
343 |
- tar xf busybox-links.tar -C _install || die |
344 |
- cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" |
345 |
- fi |
346 |
- |
347 |
- if use sep-usr ; then |
348 |
- elog "In order to use the sep-usr support, you have to update your" |
349 |
- elog "kernel command line. Add the option:" |
350 |
- elog " init=/ginit" |
351 |
- elog "To launch a different init than /sbin/init, use:" |
352 |
- elog " init=/ginit /sbin/yourinit" |
353 |
- elog "To get a rescue shell, you may boot with:" |
354 |
- elog " init=/ginit bb" |
355 |
- fi |
356 |
-} |
357 |
|
358 |
diff --git a/sys-apps/busybox/busybox-1.26.2.ebuild b/sys-apps/busybox/busybox-1.26.2-r1.ebuild |
359 |
similarity index 99% |
360 |
rename from sys-apps/busybox/busybox-1.26.2.ebuild |
361 |
rename to sys-apps/busybox/busybox-1.26.2-r1.ebuild |
362 |
index dc1c87d..a08d98c 100644 |
363 |
--- a/sys-apps/busybox/busybox-1.26.2.ebuild |
364 |
+++ b/sys-apps/busybox/busybox-1.26.2-r1.ebuild |
365 |
@@ -133,6 +133,7 @@ src_configure() { |
366 |
# If these are not set and we are using a uclibc/busybox setup |
367 |
# all calls to system() will fail. |
368 |
busybox_config_option y ASH |
369 |
+ busybox_config_option y SH_IS_ASH |
370 |
busybox_config_option n HUSH |
371 |
|
372 |
busybox_config_option '"/run"' PID_FILE_PATH |
373 |
|
374 |
diff --git a/sys-apps/busybox/files/busybox-1.26.2-bb.patch b/sys-apps/busybox/files/busybox-1.26.2-bb.patch |
375 |
index f120340..5e2405c 100644 |
376 |
--- a/sys-apps/busybox/files/busybox-1.26.2-bb.patch |
377 |
+++ b/sys-apps/busybox/files/busybox-1.26.2-bb.patch |
378 |
@@ -1,6 +1,11 @@ |
379 |
-diff -Naur busybox-1.26.2.orig/shell/ash.c busybox-1.26.2/shell/ash.c |
380 |
---- busybox-1.26.2.orig/shell/ash.c 2017-01-10 10:55:51.000000000 -0500 |
381 |
-+++ busybox-1.26.2/shell/ash.c 2017-01-28 17:02:08.961584737 -0500 |
382 |
+add `bb` and `bbsh` shortcuts as aliases to the main shell so we can install |
383 |
+symlinks in Gentoo at /bin/bb as our recovery shell. |
384 |
+ |
385 |
+we also add fallbacks to /bin/busybox and /bin/busybox.static in case /proc |
386 |
+is not yet mounted during early boot. |
387 |
+ |
388 |
+--- a/shell/ash.c |
389 |
++++ b/shell/ash.c |
390 |
@@ -144,6 +144,8 @@ |
391 |
//applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) |
392 |
//applet:IF_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) |
393 |
@@ -19,9 +24,8 @@ diff -Naur busybox-1.26.2.orig/shell/ash.c busybox-1.26.2/shell/ash.c |
394 |
/* If they called chroot or otherwise made the binary no longer |
395 |
* executable, fall through */ |
396 |
} |
397 |
-diff -Naur busybox-1.26.2.orig/shell/hush.c busybox-1.26.2/shell/hush.c |
398 |
---- busybox-1.26.2.orig/shell/hush.c 2017-01-10 10:55:51.000000000 -0500 |
399 |
-+++ busybox-1.26.2/shell/hush.c 2017-01-28 17:05:13.235936850 -0500 |
400 |
+--- a/shell/hush.c |
401 |
++++ b/shell/hush.c |
402 |
@@ -221,6 +221,8 @@ |
403 |
//applet:IF_MSH(APPLET_ODDNAME(msh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) |
404 |
//applet:IF_SH_IS_HUSH(APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) |
405 |
@@ -35,8 +39,17 @@ diff -Naur busybox-1.26.2.orig/shell/hush.c busybox-1.26.2/shell/hush.c |
406 |
if (SPECIAL_JOBSTOP_SIGS != 0) |
407 |
switch_off_special_sigs(G.special_sig_mask & SPECIAL_JOBSTOP_SIGS); |
408 |
execve(bb_busybox_exec_path, argv, pp); |
409 |
-+ execve("/bin/busybox.static", argv, envp); |
410 |
-+ execve("/bin/busybox", argv, envp); |
411 |
++ execve("/bin/busybox.static", argv, pp); |
412 |
++ execve("/bin/busybox", argv, pp); |
413 |
/* Fallback. Useful for init=/bin/hush usage etc */ |
414 |
if (argv[0][0] == '/') |
415 |
execve(argv[0], argv, pp); |
416 |
+@@ -6931,6 +6931,8 @@ |
417 |
+ if (SPECIAL_JOBSTOP_SIGS != 0) |
418 |
+ switch_off_special_sigs(G.special_sig_mask & SPECIAL_JOBSTOP_SIGS); |
419 |
+ execv(bb_busybox_exec_path, argv); |
420 |
++ execv("/bin/busybox.static", argv); |
421 |
++ execv("/bin/busybox", argv); |
422 |
+ /* If they called chroot or otherwise made the binary no longer |
423 |
+ * executable, fall through */ |
424 |
+ } |