* [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/, sys-apps/busybox/files/mdev/
@ 2012-12-01 2:32 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-12-01 2:32 UTC (permalink / raw
To: gentoo-commits
commit: a5f1cc25d0a7ff42c9e5e6d197bec99fa691a806
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 1 02:31:54 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 1 02:31:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=a5f1cc25
sys-apps/busybox: merge busybox-{sysklogd,ntpd,watchdog}, bug #444718
Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xF52D4BBA
---
sys-apps/busybox/Manifest | 39 +++
sys-apps/busybox/busybox-9999.ebuild | 315 ++++++++++++++++++++
sys-apps/busybox/files/busybox-1.19.0-bb.patch | 22 ++
.../files/busybox-1.20.2-glibc-sys-resource.patch | 109 +++++++
.../files/busybox-1.20.2-selinux-pkg-config.patch | 67 ++++
sys-apps/busybox/files/busybox-ntpd.confd | 6 +
sys-apps/busybox/files/busybox-ntpd.initd | 21 ++
sys-apps/busybox/files/busybox-sysklogd.confd | 12 +
sys-apps/busybox/files/busybox-sysklogd.initd | 38 +++
sys-apps/busybox/files/busybox-watchdog.confd | 9 +
sys-apps/busybox/files/busybox-watchdog.initd | 21 ++
sys-apps/busybox/files/ginit.c | 124 ++++++++
sys-apps/busybox/files/mdev-start.sh | 125 ++++++++
sys-apps/busybox/files/mdev.rc | 9 +
sys-apps/busybox/files/mdev.rc.1 | 98 ++++++
sys-apps/busybox/files/mdev/dvbdev | 18 ++
sys-apps/busybox/files/mdev/ide_links | 23 ++
sys-apps/busybox/files/mdev/usbdev | 62 ++++
sys-apps/busybox/files/mdev/usbdisk_link | 34 ++
sys-apps/busybox/metadata.xml | 16 +
20 files changed, 1168 insertions(+), 0 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
new file mode 100644
index 0000000..a3b867b
--- /dev/null
+++ b/sys-apps/busybox/Manifest
@@ -0,0 +1,39 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
+AUX busybox-1.20.2-glibc-sys-resource.patch 3054 SHA256 03d64c3b864fc5caa9ec56e3d2bf3bcd43801ee82e27332dbfe412138c9502d7 SHA512 c895d7ad0bf379b3ff1c4114af7f8fe0d53b1e60371ac1faaaf3434c293e125be4d79a6ee17d1aa2a923629b09416b833dd3408b9b4dabf56dd74d630c24e9ff WHIRLPOOL ff3e347035a4eb500762d59e35ff8cd2a91130de1c73b0666331f62fc19c586646fd713814e6712d53449d484fc2479ec0e5c29dfe3a19feb2163350a9171fac
+AUX busybox-1.20.2-selinux-pkg-config.patch 2009 SHA256 09d34cafa860cfabfb6911b087fa5887dd7f8b0026955654904fdb79d5281e76 SHA512 7b9b5cfc890d6c751727c6873df66ada967973786a2056a33e76663358aefe2d5828b366f6ce85b573bc01737426a1019dd2f0177caceef9dfac32904ee01d84 WHIRLPOOL fef2b477065ed309298788e35b82fd77d3297eb52eb59f065ebb9c631ec4a3f849ef99a014bdf682469ee1e8683debc312993faf1ad094e2f9afd8ce99c955aa
+AUX busybox-ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
+AUX busybox-ntpd.initd 602 SHA256 95383156f6f417719bd4d5655e9291e2e7a3e9fa815329eb60c2b911e79f859b SHA512 6aff8dc4e7740f58f1d43aafd1aca22fecb9f138ec155e4a1bae43a214007e06d92bc648bf965f08fc151b00cc97c32f24bf0691847a79e684f3972ee7356d82 WHIRLPOOL 0b09ae03d45d9af92bda0f0f716c3c112c1be353e229fbe8d84614d87b844bc130d5d5cdb819d496382d943e584cca347465cc4139a9ed2d57212de85805d0bc
+AUX busybox-sysklogd.confd 319 SHA256 41a7dcb89156a80387a56579757e3a9f0f87ae4e0e955997e31092ab015a3152 SHA512 c9ddc5bec07c76b1ac4b3ceeb9dcdbaa96ef0791bc3a699b7cf1645d2765d74f5bb105e4d7912d67d8af0bf02e8447b6771edd789a05c7e4d9afeaf3a45896d2 WHIRLPOOL 6f2b18cea47118bfae04ecf932e62464a8574db1a2f45c5d4cb6d7a2352a117865bfffff9e367b51701c15103ef5a68f4b27a83b1e179ddfecb8529f68eb4038
+AUX busybox-sysklogd.initd 1256 SHA256 9302f0b7b4ee35c25195dc8c57bd3c2c55d85b3661aef7e551e39b3a5e26d604 SHA512 cdf95d8e39331f8887fc8955352587b39026f7aee00371499fca8e110f36f793ff58809de300da38b8fe58fbc0c953fbad70277eb13289087170fe93de86e4b5 WHIRLPOOL 05c5c4a9cf5e0524def3ef0210af9f39d669459c792f5fced46c92bec82337e621958d060ac86d3eb3d435a429401bcbd7310bd3e04e5bb0e431ff9f4cb46e8d
+AUX busybox-watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
+AUX busybox-watchdog.initd 640 SHA256 0cbfbf8fb77e678e609fc7bf7dc62700d3cf44acf40f3c53e2e522bc91de5c99 SHA512 85f9a13bedc6e55c7082c391c26dd85af9ca986810c0773adcb477b2c15240a1b1abf834fad8782d1595f651002d749ce80a139b00e524b75dcbcd209ed7df0e WHIRLPOOL ad085b343a299004e0f69b8c45e0003e5090b93d256ea16f74dbb39ef20cc71846ff61609455c2d638f7921419f68e8236ceb98f856149208d07ece2e1553ac0
+AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b
+AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea
+AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320
+AUX mdev.rc.1 2202 SHA256 5235a2cd5e4ce92032a5e3e314c6e2980d98df8a6a387d2cf3e0d30d29f62cd5 SHA512 27435ac949ee351aa957f23a31b08f8689f284449928fba495f9432c893e30cd8ab8f883ee131626310f09e9edc615908484c7402009df3cba3a6eaf137f8afc WHIRLPOOL 54c23164ed320efe654d36656bd4be2be383199c003a57806a850692b38556d4f961b9608c1561f16fa108bac64643ab2270a8a1a5edf8e5d1e24a967f549b76
+AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e201419b08c4e71de SHA512 ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a WHIRLPOOL ec24a4afe8333e2d4d856fe3853b844d113057daf3fe536a4c8ef481a5ec925254c7daeb09df378922fabb96400440f4bde40979417b7c35467934d7e2235739
+AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
+AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
+AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
+EBUILD busybox-9999.ebuild 9415 SHA256 57b91eeb0b135ce4f2e518e1beb5fbd1939e2b9240937efef86154da5b472612 SHA512 0335dee69882fb84a779aca4f32fe3d9d2511490b7ad35e245c7d7460ad68af67b6638dddc747e46ba30b3287d346a634a46ae827459ddd3c7a2b2e41492f49e WHIRLPOOL 29116f0016ec7c2e1244d6c655337cced07fd4b909afdedd911afd73d8cb7fc92e6e4873d30a78f5080e7cf1b7409d5d2b00567bc52f017935e33c2d0dd141e2
+MISC metadata.xml 856 SHA256 96bd35614f2246ff9fbbcc5a3e78f524160279cb92c073b7bac2d9802e42de1a SHA512 974fa556e606efc3bd65d1486eefb2eefdef001fc882ba2ab436468313d948fe3d0a2701bd302f5107401604f6cdf4bf78f66f9b8f0ddf4be81e55c3958fffc2 WHIRLPOOL 5ccbbb9c8ee41a97074155eec2f602fc126597bf2030f9ae1c5ad8289e6765586ac83e6e1b58e9e411b20debb3fda959f58da8141948d60b5438a47ff24dcc06
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQuWwaAAoJEJOE+m71LUu6RXEP/2exxbdryvRbkhdUZfm9+Ea0
+vtOeuh0e6rJxv+i1ng9hxy0s7DRVrBRMRS8Vby3pnOGOQ/Fl3jWP88U5ptT8P2lv
+azPF77DpYf83bcRh/oI5YnW50aXyMVh21ro5jAMfCoto8Cdp0WLPKW0B3r8bQNQ6
+/DCMrdmiriI614PgkflErrEC6JqehyqSP9zvH8ZagMIpp8ZWhBLCriskJMJTFK73
+wtqZRhvYiHZL2QzaIMxsJh9ZOv3yfOmK+ogFeO5ZOppNN7ITzj3/U15i68w81aND
+6ANEdJH4Opi6viC7GsFtsKPxvCYzRQbh9KGr+Blsgs2zu/b/XUHWhSlpzFCMVQm8
+caaWZq3mEdoXHA9aQXREMi5OcxF+vszcphnMnVNSUrzYjnUtOR5RZJLtGba3V5SK
+8h9IkP5ZkuTJH4zJ3tEhU8i2T+vblhpaj+9JkHcMLjF9rmM57eESSRzniMOs1mG7
+A2QfrpK+G7oKuIVp7o5/NfRH4DUHUr3HUn1G0gElZ9X4RXhcf5JHZ7whBDS3+twi
+XKnBqyXmYf6EXFUjlADD6nb3W8t12msngl0IAXC8jscfyeFgKKogqAYGsQUy3HE9
+gzOG12DgIV2u4sID4pshmYDkUUq/OQp2F5m1sM/u74H+nGxNGtYfQ5WKkO3m1s5v
+V+SSF+KJnr2Ab74xLhK4
+=iqxt
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
new file mode 100644
index 0000000..d19d5cf
--- /dev/null
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.7 2012/11/02 18:59:14 vapier Exp $
+
+EAPI="4"
+inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+
+################################################################################
+# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
+#
+# Busybox can be modified in many different ways. Here's a few ways to do it:
+#
+# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
+# get erased afterwards. Add a definition like ROOT=/my/root/path to the
+# start of the line if you're installing to somewhere else than the root
+# directory. This command will save the default configuration to
+# ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
+# defined), and it will tell you that it has done this. Note the location
+# where the config file was saved.
+#
+# FEATURES=keepwork USE=savedconfig emerge busybox
+#
+# (2) Go to the work directory and change the configuration of busybox using its
+# menuconfig feature.
+#
+# cd /var/tmp/portage/busybox*/work/busybox-*
+# make menuconfig
+#
+# (3) Save your configuration to the default location and copy it to the
+# one of the locations listed in /usr/portage/eclass/savedconfig.eclass
+#
+# (4) Emerge busybox with USE=savedconfig to use the configuration file you
+# just generated.
+#
+################################################################################
+#
+# (1) Alternatively skip the above steps and simply emerge busybox without
+# USE=savedconfig.
+#
+# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
+#
+# (3) Remerge busybox as using USE=savedconfig.
+#
+################################################################################
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+ MY_P=${PN}
+ EGIT_REPO_URI="git://busybox.net/busybox.git"
+ inherit git-2
+else
+ MY_P=${PN}-${PV/_/-}
+ SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ipv6 livecd make-symlinks math mdev ntpd -pam selinux sep-usr +static sysklogd systemd watchdog"
+RESTRICT="test"
+
+RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+ pam? ( sys-libs/pam )"
+DEPEND="${RDEPEND}
+ static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+ >=sys-kernel/linux-headers-2.6.39"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+ case $1 in
+ y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
+ n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
+ *) use $1 \
+ && busybox_config_option y $2 \
+ || busybox_config_option n $2
+ return 0
+ ;;
+ esac
+ einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
+}
+
+src_prepare() {
+ unset KBUILD_OUTPUT #88088
+ append-flags -fno-strict-aliasing #310413
+ use ppc64 && append-flags -mminimal-toc #130943
+
+ # patches go here!
+ epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+ epatch "${FILESDIR}"/${P}-*.patch
+ cp "${FILESDIR}"/ginit.c init/ || die
+
+ # flag cleanup
+ sed -i -r \
+ -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+ Makefile.flags || die
+ #sed -i '/bbsh/s:^//::' include/applets.h
+ sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+ use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+ sed -i \
+ -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+ -e "/^AR\>/s:=.*:= $(tc-getAR):" \
+ -e "/^CC\>/s:=.*:= $(tc-getCC):" \
+ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+ -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+ Makefile || die
+ sed -i \
+ -e 's:-static-libgcc::' \
+ Makefile.flags || die
+}
+
+src_configure() {
+ # check for a busybox config before making one of our own.
+ # if one exist lets return and use it.
+
+ restore_config .config
+ if [ -f .config ]; then
+ yes "" | emake -j1 oldconfig > /dev/null
+ return 0
+ else
+ ewarn "Could not locate user configfile, so we will save a default one"
+ fi
+
+ # setup the config file
+ emake -j1 allyesconfig > /dev/null
+ # nommu forces a bunch of things off which we want on #387555
+ busybox_config_option n NOMMU
+ sed -i '/^#/d' .config
+ yes "" | emake -j1 oldconfig >/dev/null
+
+ # now turn off stuff we really don't want
+ busybox_config_option n DMALLOC
+ busybox_config_option n FEATURE_SUID_CONFIG
+ busybox_config_option n BUILD_AT_ONCE
+ busybox_config_option n BUILD_LIBBUSYBOX
+ busybox_config_option n FEATURE_CLEAN_UP
+ busybox_config_option n MONOTONIC_SYSCALL
+ busybox_config_option n USE_PORTABLE_CODE
+ busybox_config_option n WERROR
+
+ # If these are not set and we are using a uclibc/busybox setup
+ # all calls to system() will fail.
+ busybox_config_option y ASH
+ busybox_config_option n HUSH
+
+ # disable ipv6 applets
+ if ! use ipv6; then
+ busybox_config_option n FEATURE_IPV6
+ busybox_config_option n TRACEROUTE6
+ busybox_config_option n PING6
+ fi
+
+ if use static && use pam ; then
+ ewarn "You cannot have USE='static pam'. Assuming static is more important."
+ fi
+ busybox_config_option $(usex static n pam) PAM
+ busybox_config_option static STATIC
+ busybox_config_option systemd FEATURE_SYSTEMD
+ busybox_config_option math FEATURE_AWK_LIBM
+
+ # all the debug options are compiler related, so punt them
+ busybox_config_option n DEBUG
+ busybox_config_option y NO_DEBUG_LIB
+ busybox_config_option n DMALLOC
+ busybox_config_option n EFENCE
+
+ busybox_config_option selinux SELINUX
+
+ # this opt only controls mounting with <linux-2.6.23
+ busybox_config_option n FEATURE_MOUNT_NFS
+
+ # add busybox daemon's, bug #444718
+ if use ntpd; then
+ busybox_config_option y NTPD
+ busybox_config_option y FEATURE_NTPD_SERVER
+ fi
+ if use sysklogd; then
+ busybox_config_option y KLOGD
+ busybox_config_option y FEATURE_KLOGD_KLOGCTL
+ fi
+ use watchdog && busybox_config_option y WATCHDOG
+
+ # default a bunch of uncommon options to off
+ local opt
+ for opt in \
+ ADD_SHELL \
+ BEEP BOOTCHARTD \
+ CRONTAB \
+ DC DEVFSD DNSD DPKG{,_DEB} \
+ FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+ FEATURE_DEVFS \
+ HOSTID HUSH \
+ INETD INOTIFYD IPCALC \
+ LOCALE_SUPPORT LOGNAME LPD \
+ MAKEMIME MKFS_MINIX MSH \
+ OD \
+ RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+ SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+ TASKSET TCPSVD \
+ RPM RPM2CPIO \
+ UDPSVD UUDECODE UUENCODE
+ do
+ busybox_config_option n ${opt}
+ done
+
+ emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+ unset KBUILD_OUTPUT #88088
+ export SKIP_STRIP=y
+
+ emake V=1 busybox
+}
+
+src_install() {
+ unset KBUILD_OUTPUT #88088
+ save_config .config
+
+ into /
+ dodir /bin
+ if use sep-usr ; then
+ # install /ginit to take care of mounting stuff
+ exeinto /
+ newexe busybox_unstripped ginit
+ dosym /ginit /bin/bb
+ dosym bb /bin/busybox
+ else
+ newbin busybox_unstripped busybox
+ dosym busybox /bin/bb
+ fi
+ if use mdev ; then
+ dodir /$(get_libdir)/mdev/
+ use make-symlinks || dosym /bin/bb /sbin/mdev
+ cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+ exeinto /$(get_libdir)/mdev/
+ doexe "${FILESDIR}"/mdev/*
+
+ newinitd "${FILESDIR}"/mdev.rc.1 mdev
+ fi
+ if use livecd ; then
+ dosym busybox /bin/vi
+ fi
+
+ # add busybox daemon's, bug #444718
+ if use ntpd; then
+ newconfd "${FILESDIR}/ntpd.confd" "ntpd-busybox"
+ newinitd "${FILESDIR}/ntpd.initd" "ntpd-busybox"
+ fi
+ if use sysklogd; then
+ newconfd "${FILESDIR}/sysklogd.confd" "sysklogd-busybox"
+ newinitd "${FILESDIR}/sysklogd.initd" "sysklogd-busybox"
+ fi
+ if use watchdog; then
+ newconfd "${FILESDIR}/watchdog.confd" "watchdog-busybox"
+ newinitd "${FILESDIR}/watchdog.initd" "watchdog-busybox"
+ fi
+
+ # bundle up the symlink files for use later
+ emake DESTDIR="${ED}" install
+ rm _install/bin/busybox
+ tar cf busybox-links.tar -C _install . || : #;die
+ insinto /usr/share/${PN}
+ use make-symlinks && doins busybox-links.tar
+
+ dodoc AUTHORS README TODO
+
+ cd docs
+ docinto txt
+ dodoc *.txt
+ docinto pod
+ dodoc *.pod
+ dohtml *.html
+
+ cd ../examples
+ docinto examples
+ dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+ if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+ ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+ ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+ ewarn "If you are creating a binary only and not merging this is probably ok."
+ ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+ die "silly options will destroy your system"
+ fi
+
+ if use make-symlinks ; then
+ mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+ fi
+}
+
+pkg_postinst() {
+ savedconfig_pkg_postinst
+
+ if use make-symlinks ; then
+ cd "${T}" || die
+ mkdir _install
+ tar xf busybox-links.tar -C _install || die
+ cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+ fi
+
+ if use sep-usr ; then
+ elog "In order to use the sep-usr support, you have to update your"
+ elog "kernel command line. Add the option:"
+ elog " init=/ginit"
+ elog "To launch a different init than /sbin/init, use:"
+ elog " init=/ginit /sbin/yourinit"
+ elog "To get a rescue shell, you may boot with:"
+ elog " init=/ginit bb"
+ fi
+}
diff --git a/sys-apps/busybox/files/busybox-1.19.0-bb.patch b/sys-apps/busybox/files/busybox-1.19.0-bb.patch
new file mode 100644
index 0000000..a66b45a
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.19.0-bb.patch
@@ -0,0 +1,22 @@
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -75,6 +75,8 @@
+ //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
+ //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh))
+ //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, bash))
++//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
++//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
+
+ //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
+ //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -7255,6 +7255,8 @@
+ }
+ /* re-exec ourselves with the new arguments */
+ execve(bb_busybox_exec_path, argv, envp);
++ execve("/bin/busybox.static", argv, envp);
++ execve("/bin/busybox", argv, envp);
+ /* If they called chroot or otherwise made the binary no longer
+ * executable, fall through */
+ }
diff --git a/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch b/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch
new file mode 100644
index 0000000..f682d00
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch
@@ -0,0 +1,109 @@
+https://bugs.gentoo.org/424954
+
+From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 5 Jul 2012 23:19:09 -0400
+Subject: [PATCH] include sys/resource.h where needed
+
+We use functions from sys/resource.h in misc applets, but don't include
+the header. This breaks building with newer glibc versions, so add the
+include where needed.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ loginutils/passwd.c | 1 +
+ miscutils/time.c | 1 +
+ networking/inetd.c | 1 +
+ networking/ntpd.c | 1 +
+ networking/ntpd_simple.c | 1 +
+ runit/chpst.c | 1 +
+ shell/shell_common.c | 1 +
+ 7 files changed, 7 insertions(+)
+
+diff --git a/loginutils/passwd.c b/loginutils/passwd.c
+index b83db00..a7006f0 100644
+--- a/loginutils/passwd.c
++++ b/loginutils/passwd.c
+@@ -15,6 +15,7 @@
+
+ #include "libbb.h"
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+
+ static void nuke_str(char *str)
+ {
+diff --git a/miscutils/time.c b/miscutils/time.c
+index 945f15f..ffed386 100644
+--- a/miscutils/time.c
++++ b/miscutils/time.c
+@@ -16,6 +16,7 @@
+ //usage: "\n -v Verbose"
+
+ #include "libbb.h"
++#include <sys/resource.h> /* getrusage */
+
+ /* Information on the resources used by a child process. */
+ typedef struct {
+diff --git a/networking/inetd.c b/networking/inetd.c
+index 1308d74..00baf69 100644
+--- a/networking/inetd.c
++++ b/networking/inetd.c
+@@ -165,6 +165,7 @@
+ //usage: "\n (default: 0 - disabled)"
+
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+ #include <sys/un.h>
+
+ #include "libbb.h"
+diff --git a/networking/ntpd.c b/networking/ntpd.c
+index 72e9d0b..5b92db6 100644
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -46,6 +46,7 @@
+ #include "libbb.h"
+ #include <math.h>
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #include <sys/timex.h>
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
+index 4ad44e4..1b7c66b 100644
+--- a/networking/ntpd_simple.c
++++ b/networking/ntpd_simple.c
+@@ -7,6 +7,7 @@
+ */
+ #include "libbb.h"
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+ #endif
+diff --git a/runit/chpst.c b/runit/chpst.c
+index ac296ba..ed72c8b 100644
+--- a/runit/chpst.c
++++ b/runit/chpst.c
+@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //usage: "\n a SIGXCPU after N seconds"
+
+ #include "libbb.h"
++#include <sys/resource.h> /* getrlimit */
+
+ /*
+ Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
+diff --git a/shell/shell_common.c b/shell/shell_common.c
+index 51c92d6..780e27e 100644
+--- a/shell/shell_common.c
++++ b/shell/shell_common.c
+@@ -18,6 +18,7 @@
+ */
+ #include "libbb.h"
+ #include "shell_common.h"
++#include <sys/resource.h> /* getrlimit */
+
+ const char defifsvar[] ALIGN1 = "IFS= \t\n";
+
+--
+1.7.9.7
+
diff --git a/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch b/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
new file mode 100644
index 0000000..5e9ef26
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
@@ -0,0 +1,67 @@
+From 5694afd72a0a424fcdd2ac85838229a1a86b7e84 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 20 Oct 2012 15:01:26 -0400
+Subject: [PATCH] build system: use pkg-config to look up selinux libs
+
+Newer versions of libselinux has started linking against more libs.
+Rather than continuing hardcoding things, switch to using pkg-config
+to query for its dependencies.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 1 +
+ Makefile.flags | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b2e9477..8995ff5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -297,6 +297,7 @@ NM = $(CROSS_COMPILE)nm
+ STRIP = $(CROSS_COMPILE)strip
+ OBJCOPY = $(CROSS_COMPILE)objcopy
+ OBJDUMP = $(CROSS_COMPILE)objdump
++PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config
+ AWK = awk
+ GENKSYMS = scripts/genksyms/genksyms
+ DEPMOD = /sbin/depmod
+diff --git a/Makefile.flags b/Makefile.flags
+index e77c0e5..307afa7 100644
+--- a/Makefile.flags
++++ b/Makefile.flags
+@@ -78,6 +78,12 @@ ARCH_FPIC ?= -fpic
+ ARCH_FPIE ?= -fpie
+ ARCH_PIE ?= -pie
+
++# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES))
++define pkg_check_modules
++$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2))
++$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2))
++endef
++
+ ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
+ # on i386: 14% smaller libbusybox.so
+ # (code itself is 9% bigger, we save on relocs/PLT/GOT)
+@@ -89,6 +95,7 @@ endif
+
+ ifeq ($(CONFIG_STATIC),y)
+ CFLAGS_busybox += -static
++PKG_CONFIG_FLAGS += --static
+ endif
+
+ ifeq ($(CONFIG_PIE),y)
+@@ -131,7 +138,10 @@ LDLIBS += pam pam_misc pthread
+ endif
+
+ ifeq ($(CONFIG_SELINUX),y)
+-LDLIBS += selinux sepol
++SELINUX_PC_MODULES = libselinux libsepol
++$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
++CPPFLAGS += $(SELINUX_CFLAGS)
++LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+ endif
+
+ ifeq ($(CONFIG_EFENCE),y)
+--
+1.7.12
+
diff --git a/sys-apps/busybox/files/busybox-ntpd.confd b/sys-apps/busybox/files/busybox-ntpd.confd
new file mode 100644
index 0000000..f50d4c2
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-ntpd.confd
@@ -0,0 +1,6 @@
+# Config file for /etc/init.d/busybox-ntpd
+
+# run "/sbin/ntpd --help" to see all possible options.
+
+# Get time from specified server and run in background
+NTPD_OPTS="-N -p pool.ntp.org"
diff --git a/sys-apps/busybox/files/busybox-ntpd.initd b/sys-apps/busybox/files/busybox-ntpd.initd
new file mode 100644
index 0000000..495bc53
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-ntpd.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/busybox-ntpd/files/busybox-ntpd.initd,v 1.1 2012/08/21 12:39:10 sbriesen Exp $
+
+depend() {
+ use net dns logger
+ after ntp-client
+}
+
+start() {
+ ebegin "Starting busybox-ntpd"
+ start-stop-daemon --start --quiet --exec /bin/busybox ntpd -- ${NTPD_OPTS}
+ eend ${?} "Failed to start ntpd"
+}
+
+stop() {
+ ebegin "Stopping busybox-ntpd"
+ start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox nptd
+ eend ${?} "Failed to stop ntpd"
+}
diff --git a/sys-apps/busybox/files/busybox-sysklogd.confd b/sys-apps/busybox/files/busybox-sysklogd.confd
new file mode 100644
index 0000000..793f475
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-sysklogd.confd
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/busybox-sysklogd
+
+# run "/sbin/syslogd --help" and "/sbin/klogd --help" to see all possible options.
+
+# activate if you need remote logging
+#rc_need="net"
+
+# Log to shared mem buffer (use logread to read it)
+SYSLOGD_OPTS="-C128"
+
+# send warnings and above to the console
+KLOGD_OPTS="-c 3"
diff --git a/sys-apps/busybox/files/busybox-sysklogd.initd b/sys-apps/busybox/files/busybox-sysklogd.initd
new file mode 100644
index 0000000..85e87d1
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-sysklogd.initd
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
+
+depend() {
+ need clock hostname
+ provide logger
+}
+
+start() {
+ local retval=0 daemon="busybox syslogd"
+ ebegin "Starting busybox-sysklogd"
+ start-stop-daemon --start --quiet --exec /bin/busybox syslogd --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
+ retval=${?}
+ if [ ${retval} -eq 0 ]; then
+ daemon="busybox klogd"
+ start-stop-daemon --start --quiet --exec /bin/busybox klogd -- ${KLOGD_OPTS}
+ retval=${?}
+ if [ ${retval} -ne 0 ]; then
+ start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox syslogd --pidfile /var/run/syslogd.pid
+ fi
+ fi
+ eend ${retval} "Failed to start ${daemon}"
+}
+
+stop() {
+ local retval=0 daemon="busybox klogd"
+ ebegin "Stopping busybox-sysklogd"
+ start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox klogd
+ retval=${?}
+ if [ ${retval} -eq 0 ]; then
+ daemon="busybox syslogd"
+ start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox syslogd --pidfile /var/run/syslogd.pid
+ retval=${?}
+ fi
+ eend ${retval} "Failed to stop ${daemon}"
+}
diff --git a/sys-apps/busybox/files/busybox-watchdog.confd b/sys-apps/busybox/files/busybox-watchdog.confd
new file mode 100644
index 0000000..bd6aec0
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-watchdog.confd
@@ -0,0 +1,9 @@
+# Config file for /etc/init.d/busybox-watchdog
+
+# run "/sbin/watchdog --help" to see all possible options.
+
+# Periodically write to watchdog device
+WATCHDOG_OPTS="/dev/watchdog"
+
+# optionally set the nice-level
+#SSD_NICELEVEL="-20"
diff --git a/sys-apps/busybox/files/busybox-watchdog.initd b/sys-apps/busybox/files/busybox-watchdog.initd
new file mode 100644
index 0000000..a9a681d
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-watchdog.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox-watchdog/files/busybox-watchdog.initd,v 1.2 2012/08/29 13:27:03 sbriesen Exp $
+
+depend() {
+ provide watchdog
+}
+
+start() {
+ export SSD_NICELEVEL
+ ebegin "Starting busybox-watchdog"
+ start-stop-daemon --start --quiet --exec /bin/busybox watchdog -- ${WATCHDOG_OPTS}
+ eend ${?} "Failed to start watchdog"
+}
+
+stop() {
+ ebegin "Stopping busybox-watchdog"
+ start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox watchdog
+ eend ${?} "Failed to stop watchdog"
+}
diff --git a/sys-apps/busybox/files/ginit.c b/sys-apps/busybox/files/ginit.c
new file mode 100644
index 0000000..355ae48
--- /dev/null
+++ b/sys-apps/busybox/files/ginit.c
@@ -0,0 +1,124 @@
+/*
+ * simple init to bootstrap sep-/usr
+ *
+ * Copyright (C) 2012 Mike Frysinger <vapier@gentoo.org>
+ *
+ * Licensed under GPLv2 or later
+ */
+
+//applet:IF_INIT(APPLET(ginit, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_GINIT) += ginit.o
+
+//config:config GINIT
+//config: bool "ginit"
+//config: default y
+//config: select MKDIR
+//config: select MDEV
+//config: select MOUNT
+//config: select MOUNTPOINT
+//config: help
+//config: sep-/usr bootstrapper
+
+//usage:#define ginit_trivial_usage NOUSAGE_STR
+//usage:#define ginit_full_usage ""
+
+#include "libbb.h"
+
+#define eprintf(fmt, args...) printf("%s" fmt, "sep-usr init: ", ## args)
+
+static void process_args(char **args)
+{
+ size_t i;
+
+ eprintf("running: ");
+ for (i = 0; args[i]; ++i) {
+ /* String needs to be writable, so dupe it */
+ args[i] = xstrdup(args[i]);
+ printf("'%s' ", args[i]);
+ }
+ printf("\n");
+}
+
+int ginit_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ginit_main(int argc UNUSED_PARAM, char **argv)
+{
+ FILE *mntlist;
+ bool ismnted_dev, ismnted_sys, ismnted_usr;
+ struct mntent *mntent;
+
+ /*
+ int fd = open("/dev/console", O_RDWR);
+ if (fd >= 0) {
+ dup2(fd, 0);
+ dup2(fd, 1);
+ dup2(fd, 2);
+ }
+ */
+
+ /* If given an argv[] with an applet name, run it instead.
+ * Makes recovering simple by doing: init=/ginit bb
+ */
+ if (argv[1] && argv[1][0] != '/') {
+ eprintf("running user requested applet %s\n", argv[1]);
+ return spawn_and_wait(argv+1);
+ }
+
+#define saw(argv...) \
+ ({ \
+ static const char *args[] = { argv, NULL }; \
+ /* These casts are fine -- see process_args for mem setup */ \
+ process_args((void *)args); \
+ spawn_and_wait((void *)args); \
+ })
+
+ /* First setup basic /dev */
+ if (saw("mountpoint", "-q", "/dev") != 0) {
+ /* Try /etc/fstab */
+ if (saw("mount", "-n", "/dev"))
+ /* Then devtmpfs */
+ if (saw("mount", "-n", "-t", "devtmpfs", "devtmpfs", "/dev"))
+ /* Finally normal tmpfs */
+ saw("mount", "-n", "-t", "tmpfs", "dev", "/dev");
+ } else {
+ eprintf("%s appears to be mounted; skipping its setup\n", "/dev");
+ }
+
+ /* If /dev is empty (e.g. tmpfs), run mdev to seed things */
+ if (access("/dev/console", F_OK) != 0) {
+ if (saw("mountpoint", "-q", "/sys") != 0) {
+ if (saw("mount", "-n", "/sys"))
+ saw("mount", "-n", "-t", "sysfs", "sysfs", "/sys");
+ } else {
+ eprintf("%s appears to be mounted; skipping its setup\n", "/sys");
+ }
+
+ /* Mount /proc as mdev will fork+exec /proc/self/exe */
+ if (saw("mountpoint", "-q", "/proc") != 0) {
+ /* Try /etc/fstab */
+ if (saw("mount", "-n", "/proc"))
+ saw("mount", "-n", "-t", "proc", "proc", "/proc");
+ }
+
+ saw("mdev", "-s");
+ }
+
+ /* Then seed the stuff we care about */
+ saw("mkdir", "-p", "/dev/pts", "/dev/shm");
+
+ /* Then mount /usr */
+ if (saw("mountpoint", "-q", "/usr") != 0) {
+ saw("mount", "-n", "/usr", "-o", "ro");
+ } else {
+ eprintf("%s appears to be mounted; skipping its setup\n", "/usr");
+ }
+
+ /* Now that we're all done, exec the real init */
+ if (!argv[1]) {
+ argv[0] = (void *)"/sbin/init";
+ argv[1] = NULL;
+ } else
+ ++argv;
+ process_args(argv);
+ return execv(argv[0], argv);
+}
diff --git a/sys-apps/busybox/files/mdev-start.sh b/sys-apps/busybox/files/mdev-start.sh
new file mode 100755
index 0000000..8784cd5
--- /dev/null
+++ b/sys-apps/busybox/files/mdev-start.sh
@@ -0,0 +1,125 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+find_mdev()
+{
+ if [ -x /sbin/mdev ] ; then
+ echo "/sbin/mdev"
+ else
+ echo "/bin/busybox mdev"
+ fi
+}
+
+populate_mdev()
+{
+ # populate /dev with devices already found by the kernel
+
+ if get_bootparam "nocoldplug" ; then
+ RC_COLDPLUG="no"
+ ewarn "Skipping mdev coldplug as requested in kernel cmdline"
+ fi
+
+ ebegin "Populating /dev with existing devices with mdev -s"
+ $(find_mdev) -s
+ eend $?
+
+ return 0
+}
+
+seed_dev()
+{
+ # Seed /dev with some things that we know we need
+
+ # creating /dev/console and /dev/tty1 to be able to write
+ # to $CONSOLE with/without bootsplash before mdev creates it
+ [ -c /dev/console ] || mknod /dev/console c 5 1
+ [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1
+
+ # udevd will dup its stdin/stdout/stderr to /dev/null
+ # and we do not want a file which gets buffered in ram
+ [ -c /dev/null ] || mknod /dev/null c 1 3
+
+ # copy over any persistant things
+ if [ -d /lib/mdev/devices ] ; then
+ cp -RPp /lib/mdev/devices/* /dev 2>/dev/null
+ fi
+
+ # Not provided by sysfs but needed
+ ln -snf /proc/self/fd /dev/fd
+ ln -snf fd/0 /dev/stdin
+ ln -snf fd/1 /dev/stdout
+ ln -snf fd/2 /dev/stderr
+ [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
+
+ # Create problematic directories
+ mkdir -p /dev/pts /dev/shm
+}
+
+mount_it_b1()
+{
+ if [ "${RC_USE_FSTAB}" = "yes" ] ; then
+ mntcmd=$(get_mount_fstab /dev)
+ else
+ unset mntcmd
+ fi
+ if [ -n "${mntcmd}" ] ; then
+ try mount -n ${mntcmd}
+ else
+ if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then
+ mntcmd="tmpfs"
+ else
+ mntcmd="ramfs"
+ fi
+ # many video drivers require exec access in /dev #92921
+ try mount -n -t "${mntcmd}" -o exec,nosuid,mode=0755 mdev /dev
+ fi
+}
+mount_it_b2()
+{
+ if fstabinfo --quiet /dev ; then
+ mount -n /dev
+ else
+ # Some devices require exec, Bug #92921
+ mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev
+ fi
+}
+mount_it()
+{
+ type fstabinfo && mount_it_b2 || mount_it_b1
+}
+
+main()
+{
+ # Setup temporary storage for /dev
+ ebegin "Mounting /dev for mdev"
+ mount_it
+ eend $?
+
+ # Create a file so that our rc system knows it's still in sysinit.
+ # Existance means init scripts will not directly run.
+ # rc will remove the file when done with sysinit.
+ touch /dev/.rcsysinit
+
+ # Selinux lovin; /selinux should be mounted by selinux-patched init
+ if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then
+ restorecon /dev > /selinux/null
+ fi
+
+ seed_dev
+
+ # Setup hotplugging (if possible)
+ if [ -e /proc/sys/kernel/hotplug ] ; then
+ ebegin "Setting up proper hotplug agent"
+ eindent
+ einfo "Setting /sbin/mdev as hotplug agent ..."
+ echo $(find_mdev) > /proc/sys/kernel/hotplug
+ eoutdent
+ eend 0
+ fi
+
+ populate_mdev
+}
+
+main
+
+# vim:ts=4
diff --git a/sys-apps/busybox/files/mdev.rc b/sys-apps/busybox/files/mdev.rc
new file mode 100755
index 0000000..5470404
--- /dev/null
+++ b/sys-apps/busybox/files/mdev.rc
@@ -0,0 +1,9 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.rc,v 1.1 2010/08/15 03:55:29 vapier Exp $
+
+start()
+{
+ . /lib/rcscripts/addons/mdev-start.sh
+}
diff --git a/sys-apps/busybox/files/mdev.rc.1 b/sys-apps/busybox/files/mdev.rc.1
new file mode 100755
index 0000000..569d540
--- /dev/null
+++ b/sys-apps/busybox/files/mdev.rc.1
@@ -0,0 +1,98 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.rc.1,v 1.2 2012/09/26 21:25:23 robbat2 Exp $
+
+depend()
+{
+ provide dev dev-mount
+ need sysfs
+}
+
+find_mdev()
+{
+ if [ -x /sbin/mdev ] ; then
+ echo "/sbin/mdev"
+ else
+ echo "/bin/busybox mdev"
+ fi
+}
+
+populate_mdev()
+{
+ # populate /dev with devices already found by the kernel
+
+ if get_bootparam "nocoldplug" ; then
+ RC_COLDPLUG="no"
+ ewarn "Skipping mdev coldplug as requested in kernel cmdline"
+ fi
+
+ ebegin "Populating /dev with existing devices with mdev -s"
+ $(find_mdev) -s
+ eend $?
+
+ return 0
+}
+
+seed_dev()
+{
+ # Seed /dev with some things that we know we need
+
+ # creating /dev/console and /dev/tty1 to be able to write
+ # to $CONSOLE with/without bootsplash before mdev creates it
+ [ -c /dev/console ] || mknod /dev/console c 5 1
+ [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1
+
+ # udevd will dup its stdin/stdout/stderr to /dev/null
+ # and we do not want a file which gets buffered in ram
+ [ -c /dev/null ] || mknod /dev/null c 1 3
+
+ # copy over any persistant things
+ if [ -d /lib/mdev/devices ] ; then
+ cp -RPp /lib/mdev/devices/* /dev 2>/dev/null
+ fi
+
+ # Not provided by sysfs but needed
+ ln -snf /proc/self/fd /dev/fd
+ ln -snf fd/0 /dev/stdin
+ ln -snf fd/1 /dev/stdout
+ ln -snf fd/2 /dev/stderr
+ [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
+
+ # Create problematic directories
+ mkdir -p /dev/pts /dev/shm
+}
+
+mount_it()
+{
+ if fstabinfo --quiet /dev ; then
+ mount -n /dev
+ else
+ # Some devices require exec, Bug #92921
+ mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev
+ fi
+}
+
+start()
+{
+ # Setup temporary storage for /dev
+ ebegin "Mounting /dev for mdev"
+ mount_it
+ eend $?
+
+ # Create a file so that our rc system knows it's still in sysinit.
+ # Existance means init scripts will not directly run.
+ # rc will remove the file when done with sysinit.
+ touch /dev/.rcsysinit
+
+ seed_dev
+
+ # Setup hotplugging (if possible)
+ if [ -e /proc/sys/kernel/hotplug ] ; then
+ ebegin "Setting up mdev as hotplug agent"
+ echo $(find_mdev) > /proc/sys/kernel/hotplug
+ eend 0
+ fi
+
+ populate_mdev
+}
diff --git a/sys-apps/busybox/files/mdev/dvbdev b/sys-apps/busybox/files/mdev/dvbdev
new file mode 100644
index 0000000..f0186c1
--- /dev/null
+++ b/sys-apps/busybox/files/mdev/dvbdev
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# MDEV=dvb0.demux1 -> ADAPTER=dvb0 -> N=0
+ADAPTER=${MDEV%.*}
+N=${ADAPTER#dvb}
+# MDEV=dvb0.demux1 -> DEVB_DEV=demux1
+DVB_DEV=${MDEV#*.}
+
+case "$ACTION" in
+ add|"")
+ mkdir -p dvb/adapter${N}
+ mv ${MDEV} dvb/adapter${N}/${DVB_DEV}
+ ;;
+ remove)
+ rm -f dvb/adapter${N}/${DVB_DEV}
+ rmdir dvb/adapter${N} 2>/dev/null
+ rmdir dvb/ 2>/dev/null
+esac
diff --git a/sys-apps/busybox/files/mdev/ide_links b/sys-apps/busybox/files/mdev/ide_links
new file mode 100644
index 0000000..be0c95a
--- /dev/null
+++ b/sys-apps/busybox/files/mdev/ide_links
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+[ -f /proc/ide/$MDEV/media ] || exit
+
+media=`cat /proc/ide/$MDEV/media`
+for i in $media $media[0-9]* ; do
+ if [ "`readlink $i 2>/dev/null`" = $MDEV ] ; then
+ LINK=$i
+ break
+ fi
+done
+
+# link exist, remove if necessary and exit
+if [ "$LINK" ] ; then
+ [ "$ACTION" = remove ] && rm $LINK
+ exit
+fi
+
+# create a link
+num=`ls $media[0-9]* 2>/dev/null | wc -l`
+ln -sf $MDEV "$media`echo $num`"
+[ -e "$media" ] || ln -sf $MDEV "$media"
+
diff --git a/sys-apps/busybox/files/mdev/usbdev b/sys-apps/busybox/files/mdev/usbdev
new file mode 100644
index 0000000..ea5b915
--- /dev/null
+++ b/sys-apps/busybox/files/mdev/usbdev
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# script is buggy; until patched just do exit 0
+#exit 0
+
+# add zeros to device or bus
+add_zeros () {
+ case "$(echo $1 | wc -L)" in
+ 1) echo "00$1" ;;
+ 2) echo "0$1" ;;
+ *) echo "$1"
+ esac
+ exit 0
+}
+
+
+# bus and device dirs in /sys
+USB_PATH=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/')
+USB_PATH=$(find /sys/devices -type d -name "$USB_PATH")
+USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/')
+
+# dir names in /dev
+BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/'))
+USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/'))
+
+
+# try to load the proper driver for usb devices
+case "$ACTION" in
+ add|"")
+ # load usb bus driver
+ for i in $USB_PATH/*/modalias ; do
+ modprobe `cat $i` 2>/dev/null
+ done
+ # load usb device driver if existent
+ if [ -d $USB_PATH/$USB_DEV_DIR ]; then
+ for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do
+ modprobe `cat $i` 2>/dev/null
+ done
+ fi
+ # move usb device file
+ mkdir -p bus/usb/$BUS
+ mv $MDEV bus/usb/$BUS/$USB_DEV
+ ;;
+ remove)
+ # unload device driver, if device dir is existent
+ if [ -d $USB_PATH/$USB_DEV_DIR ]; then
+ for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do
+ modprobe -r `cat $i` 2>/dev/null
+ done
+ fi
+ # unload usb bus driver. Does this make sense?
+ # what happens, if two usb devices are plugged in
+ # and one is removed?
+ for i in $USB_PATH/*/modalias ; do
+ modprobe -r `cat $i` 2>/dev/null
+ done
+ # remove device file and possible empty dirs
+ rm -f bus/usb/$BUS/$USB_DEV
+ rmdir bus/usb/$BUS/ 2>/dev/null
+ rmdir bus/usb/ 2>/dev/null
+ rmdir bus/ 2>/dev/null
+esac
diff --git a/sys-apps/busybox/files/mdev/usbdisk_link b/sys-apps/busybox/files/mdev/usbdisk_link
new file mode 100644
index 0000000..750242b
--- /dev/null
+++ b/sys-apps/busybox/files/mdev/usbdisk_link
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# NOTE: since mdev -s only provide $MDEV, don't depend on any hotplug vars.
+
+current=$(readlink usbdisk)
+
+if [ "$current" = "$MDEV" ] && [ "$ACTION" = "remove" ]; then
+ rm -f usbdisk usba1
+fi
+[ -n "$current" ] && exit
+
+if [ -e /sys/block/$MDEV ]; then
+ SYSDEV=$(readlink -f /sys/block/$MDEV/device)
+ # if /sys device path contains '/usb[0-9]' then we assume its usb
+ # also, if its an usb without partitions we require FAT
+ if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
+ # do not create link if there is not FAT
+ dd if=/dev/$MDEV bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0
+
+ ln -sf $MDEV usbdisk
+ # keep this for compat. people have it in fstab
+ ln -sf $MDEV usba1
+ fi
+
+elif [ -e /sys/block/*/$MDEV ] ; then
+ PARENT=$(dirname /sys/block/*/$MDEV)
+ SYSDEV=$(readlink -f $PARENT/device)
+ if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
+ ln -sf $MDEV usbdisk
+ # keep this for compat. people have it in fstab
+ ln -sf $MDEV usba1
+ fi
+fi
+
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
new file mode 100644
index 0000000..e053635
--- /dev/null
+++ b/sys-apps/busybox/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>embedded</herd>
+<use>
+<flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag>
+<flag name="math">Enable math support in gawk (requires libm)</flag>
+<flag name="mdev">Create the appropriate symlink in /sbin and install mdev.conf and support files</flag>
+<flag name="sep-usr">Support a separate /usr without needing an initramfs by booting with init=/ginit</flag>
+<flag name="static">Make the system rescue shell (/bin/bb) static so you can recover even when glibc is broken</flag>
+<flag name="systemd">Support systemd</flag>
+<flag name="ntpd">Enable ntpd daemon</flag>
+<flag name="sysklogd">Enable sysklogd daemon</flag>
+<flag name="watchdog">Enable watchdog daemon</flag>
+</use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/, sys-apps/busybox/files/mdev/
@ 2012-12-04 13:26 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-12-04 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 6b16208e1fdee628d66c2fa47da1a26889b8c7e7
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 4 13:26:37 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec 4 13:26:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6b16208e
sys-apps/busybox: moved to tree
Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xF52D4BBA
---
sys-apps/busybox/Manifest | 19 --
sys-apps/busybox/busybox-9999.ebuild | 311 ------------------------
sys-apps/busybox/files/busybox-1.19.0-bb.patch | 22 --
sys-apps/busybox/files/ginit.c | 124 ----------
sys-apps/busybox/files/klogd.confd | 9 -
sys-apps/busybox/files/klogd.initd | 12 -
sys-apps/busybox/files/mdev-start.sh | 125 ----------
sys-apps/busybox/files/mdev.rc | 9 -
sys-apps/busybox/files/mdev.rc.1 | 98 --------
sys-apps/busybox/files/mdev/dvbdev | 18 --
sys-apps/busybox/files/mdev/ide_links | 23 --
sys-apps/busybox/files/mdev/usbdev | 62 -----
sys-apps/busybox/files/mdev/usbdisk_link | 34 ---
sys-apps/busybox/files/ntpd.confd | 6 -
sys-apps/busybox/files/ntpd.initd | 13 -
sys-apps/busybox/files/syslogd.confd | 9 -
sys-apps/busybox/files/syslogd.initd | 14 -
sys-apps/busybox/files/watchdog.confd | 9 -
sys-apps/busybox/files/watchdog.initd | 12 -
sys-apps/busybox/metadata.xml | 13 -
20 files changed, 0 insertions(+), 942 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
deleted file mode 100644
index ee4b2b2..0000000
--- a/sys-apps/busybox/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
-AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b
-AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a
-AUX klogd.initd 351 SHA256 3b1c49ce6f7e672db1521ba279058ab5bc8a011246069de20cb0ee0dec9c050b SHA512 54f4255e48063f745613ab3291c06bcc96ba824567dd8dfceafbe98479ba0863aed2ce4b69dca86f303311047cae38307b68c7183e1c0afda1df34db7531207e WHIRLPOOL 33bc5d63144ca605efbeb2ed9eab9425b4ac546a0340623f1f9a71188ab78f60b315d4d57f6f707a3e7c01f152a903971c50a5f1071780baa88277af23de6f0c
-AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea
-AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320
-AUX mdev.rc.1 2202 SHA256 5235a2cd5e4ce92032a5e3e314c6e2980d98df8a6a387d2cf3e0d30d29f62cd5 SHA512 27435ac949ee351aa957f23a31b08f8689f284449928fba495f9432c893e30cd8ab8f883ee131626310f09e9edc615908484c7402009df3cba3a6eaf137f8afc WHIRLPOOL 54c23164ed320efe654d36656bd4be2be383199c003a57806a850692b38556d4f961b9608c1561f16fa108bac64643ab2270a8a1a5edf8e5d1e24a967f549b76
-AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e201419b08c4e71de SHA512 ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a WHIRLPOOL ec24a4afe8333e2d4d856fe3853b844d113057daf3fe536a4c8ef481a5ec925254c7daeb09df378922fabb96400440f4bde40979417b7c35467934d7e2235739
-AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
-AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
-AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
-AUX ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
-AUX ntpd.initd 357 SHA256 2d7516f62afa212203944cf242974c953e910398fe11ac76d5d52767dfaff7f3 SHA512 cac39044aff42a0091ad30f6af6eb7c39a7a6a9ff53d3cd5c5665e46f519cd06b81ea399dff56828be6ba5f38e597fc186848fd63ceb450895db375fb5b12814 WHIRLPOOL 347d532a302c6d8de314c02dfb4d7c96869285725a80d29f13f91579bcea4a9c85c11389540b811f607463b5ddd1d5638c65478c2661005b087e86314200ea27
-AUX syslogd.confd 234 SHA256 65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bfaf50e3514bc25 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52 WHIRLPOOL b0a9e82225968d44446025242ac6c9429dc2e01a3720d94349756f71ec3a11c3ff2217bce7c4f1a1ea8a2a8baecd3265c3cce01675138674c05a9f2a96ade2ae
-AUX syslogd.initd 402 SHA256 5b373477a0092c26f6c65c52b26edf6aedcacd2a33e610f24d5cd5d3ad919ed8 SHA512 f22196029a34c8227f65b86c37b8e02fc54464a1d96cd6bb4c8f13556c47c1d537244389ff8591f5c6641f501c0e92e352ca195e3d289f4ef8b93b8a87ad8618 WHIRLPOOL 6959a1e78cec14c93157a0b4eb070a47ea152e13c929be33b3edeba1a5a9ad06ca1559e456ee2210fde6c8272a32558c62596fca2d573579fb8c33cca9d8f7db
-AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
-AUX watchdog.initd 353 SHA256 cbe9f92feacbd5567388ce36a1233838836491e433402ad52575d20e196c4164 SHA512 d05cffe78e59fa9f4f1852da957b400fe20fab9aa12da3a5b435d1d1bd81c52d491fa24285cf9d99089f4f182988aed04bdfe2184aa6252f14935c2de67bc87a WHIRLPOOL bc60fc214cc2cbbf1017c713019002d48f35d12817b262877691db5072e0dee5329699948a461305c2ad5e5692f7e9ebca2be20e35699d9670793fd4a54e006b
-EBUILD busybox-9999.ebuild 9340 SHA256 b404de527efa708bbca40711c052e175f0d41ad887d14088a59e58ec590250d3 SHA512 a6827ef5afbc1a9fc79ac98fd32ca25ddb4ee3f0ba803196567cdba6e158adb88ae9e955fd40e8b1593eb931bcb7d5b3f016f19cef69ef28118b26734c20cbe7 WHIRLPOOL 194d4c9596cd3fa9e49023a0729363a9c2ca7b5e9e2f00840fdcdceec660c39f92d0aaa6d4a38c31d23f2159a5587e58bfa1cb79b4ae4ee8e4ae61aaa9944516
-MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
deleted file mode 100644
index 19fa0d2..0000000
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.7 2012/11/02 18:59:14 vapier Exp $
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-################################################################################
-# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
-#
-# Busybox can be modified in many different ways. Here's a few ways to do it:
-#
-# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
-# get erased afterwards. Add a definition like ROOT=/my/root/path to the
-# start of the line if you're installing to somewhere else than the root
-# directory. This command will save the default configuration to
-# ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
-# defined), and it will tell you that it has done this. Note the location
-# where the config file was saved.
-#
-# FEATURES=keepwork USE=savedconfig emerge busybox
-#
-# (2) Go to the work directory and change the configuration of busybox using its
-# menuconfig feature.
-#
-# cd /var/tmp/portage/busybox*/work/busybox-*
-# make menuconfig
-#
-# (3) Save your configuration to the default location and copy it to the
-# one of the locations listed in /usr/portage/eclass/savedconfig.eclass
-#
-# (4) Emerge busybox with USE=savedconfig to use the configuration file you
-# just generated.
-#
-################################################################################
-#
-# (1) Alternatively skip the above steps and simply emerge busybox without
-# USE=savedconfig.
-#
-# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
-#
-# (3) Remerge busybox as using USE=savedconfig.
-#
-################################################################################
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
- MY_P=${PN}
- EGIT_REPO_URI="git://busybox.net/busybox.git"
- inherit git-2
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
- pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
- >=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
- case $1 in
- y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
- n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
- *) use $1 \
- && busybox_config_option y $2 \
- || busybox_config_option n $2
- return 0
- ;;
- esac
- einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
-}
-
-busybox_config_enabled() {
- grep "^CONFIG_$1=y" -q .config
-}
-
-src_prepare() {
- unset KBUILD_OUTPUT #88088
- append-flags -fno-strict-aliasing #310413
- use ppc64 && append-flags -mminimal-toc #130943
-
- # patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
- cp "${FILESDIR}"/ginit.c init/ || die
-
- # flag cleanup
- sed -i -r \
- -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
- Makefile || die
- sed -i \
- -e 's:-static-libgcc::' \
- Makefile.flags || die
-}
-
-src_configure() {
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
-
- restore_config .config
- if [ -f .config ]; then
- yes "" | emake -j1 oldconfig > /dev/null
- return 0
- else
- ewarn "Could not locate user configfile, so we will save a default one"
- fi
-
- # setup the config file
- emake -j1 allyesconfig > /dev/null
- # nommu forces a bunch of things off which we want on #387555
- busybox_config_option n NOMMU
- sed -i '/^#/d' .config
- yes "" | emake -j1 oldconfig >/dev/null
-
- # now turn off stuff we really don't want
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_SUID_CONFIG
- busybox_config_option n BUILD_AT_ONCE
- busybox_config_option n BUILD_LIBBUSYBOX
- busybox_config_option n FEATURE_CLEAN_UP
- busybox_config_option n MONOTONIC_SYSCALL
- busybox_config_option n USE_PORTABLE_CODE
- busybox_config_option n WERROR
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y ASH
- busybox_config_option n HUSH
-
- # disable ipv6 applets
- if ! use ipv6; then
- busybox_config_option n FEATURE_IPV6
- busybox_config_option n TRACEROUTE6
- busybox_config_option n PING6
- fi
-
- if use static && use pam ; then
- ewarn "You cannot have USE='static pam'. Assuming static is more important."
- fi
- busybox_config_option $(usex static n pam) PAM
- busybox_config_option static STATIC
- busybox_config_option systemd FEATURE_SYSTEMD
- busybox_config_option math FEATURE_AWK_LIBM
-
- # all the debug options are compiler related, so punt them
- busybox_config_option n DEBUG
- busybox_config_option y NO_DEBUG_LIB
- busybox_config_option n DMALLOC
- busybox_config_option n EFENCE
-
- busybox_config_option selinux SELINUX
-
- # this opt only controls mounting with <linux-2.6.23
- busybox_config_option n FEATURE_MOUNT_NFS
-
- # default a bunch of uncommon options to off
- local opt
- for opt in \
- ADD_SHELL \
- BEEP BOOTCHARTD \
- CRONTAB \
- DC DEVFSD DNSD DPKG{,_DEB} \
- FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
- FEATURE_DEVFS \
- HOSTID HUSH \
- INETD INOTIFYD IPCALC \
- LOCALE_SUPPORT LOGNAME LPD \
- MAKEMIME MKFS_MINIX MSH \
- OD \
- RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
- SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
- TASKSET TCPSVD \
- RPM RPM2CPIO \
- UDPSVD UUDECODE UUENCODE
- do
- busybox_config_option n ${opt}
- done
-
- emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
- unset KBUILD_OUTPUT #88088
- export SKIP_STRIP=y
-
- emake V=1 busybox
-}
-
-src_install() {
- unset KBUILD_OUTPUT #88088
- save_config .config
-
- into /
- dodir /bin
- if use sep-usr ; then
- # install /ginit to take care of mounting stuff
- exeinto /
- newexe busybox_unstripped ginit
- dosym /ginit /bin/bb
- dosym bb /bin/busybox
- else
- newbin busybox_unstripped busybox
- dosym busybox /bin/bb
- fi
- if use mdev ; then
- dodir /$(get_libdir)/mdev/
- use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
- exeinto /$(get_libdir)/mdev/
- doexe "${FILESDIR}"/mdev/*
-
- newinitd "${FILESDIR}"/mdev.rc.1 mdev
- fi
- if use livecd ; then
- dosym busybox /bin/vi
- fi
-
- # add busybox daemon's, bug #444718
- if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
- fi
- if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
- fi
- if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
- fi
- if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
- fi
-
- # bundle up the symlink files for use later
- emake DESTDIR="${ED}" install
- rm _install/bin/busybox
- tar cf busybox-links.tar -C _install . || : #;die
- insinto /usr/share/${PN}
- use make-symlinks && doins busybox-links.tar
-
- dodoc AUTHORS README TODO
-
- cd docs
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html
-
- cd ../examples
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
- ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
- ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
- ewarn "If you are creating a binary only and not merging this is probably ok."
- ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
- die "silly options will destroy your system"
- fi
-
- if use make-symlinks ; then
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
- fi
-}
-
-pkg_postinst() {
- savedconfig_pkg_postinst
-
- if use make-symlinks ; then
- cd "${T}" || die
- mkdir _install
- tar xf busybox-links.tar -C _install || die
- cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
- fi
-
- if use sep-usr ; then
- elog "In order to use the sep-usr support, you have to update your"
- elog "kernel command line. Add the option:"
- elog " init=/ginit"
- elog "To launch a different init than /sbin/init, use:"
- elog " init=/ginit /sbin/yourinit"
- elog "To get a rescue shell, you may boot with:"
- elog " init=/ginit bb"
- fi
-}
diff --git a/sys-apps/busybox/files/busybox-1.19.0-bb.patch b/sys-apps/busybox/files/busybox-1.19.0-bb.patch
deleted file mode 100644
index a66b45a..0000000
--- a/sys-apps/busybox/files/busybox-1.19.0-bb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -75,6 +75,8 @@
- //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
- //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh))
- //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, bash))
-+//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
-+//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
-
- //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
- //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7255,6 +7255,8 @@
- }
- /* re-exec ourselves with the new arguments */
- execve(bb_busybox_exec_path, argv, envp);
-+ execve("/bin/busybox.static", argv, envp);
-+ execve("/bin/busybox", argv, envp);
- /* If they called chroot or otherwise made the binary no longer
- * executable, fall through */
- }
diff --git a/sys-apps/busybox/files/ginit.c b/sys-apps/busybox/files/ginit.c
deleted file mode 100644
index 355ae48..0000000
--- a/sys-apps/busybox/files/ginit.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * simple init to bootstrap sep-/usr
- *
- * Copyright (C) 2012 Mike Frysinger <vapier@gentoo.org>
- *
- * Licensed under GPLv2 or later
- */
-
-//applet:IF_INIT(APPLET(ginit, BB_DIR_SBIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_GINIT) += ginit.o
-
-//config:config GINIT
-//config: bool "ginit"
-//config: default y
-//config: select MKDIR
-//config: select MDEV
-//config: select MOUNT
-//config: select MOUNTPOINT
-//config: help
-//config: sep-/usr bootstrapper
-
-//usage:#define ginit_trivial_usage NOUSAGE_STR
-//usage:#define ginit_full_usage ""
-
-#include "libbb.h"
-
-#define eprintf(fmt, args...) printf("%s" fmt, "sep-usr init: ", ## args)
-
-static void process_args(char **args)
-{
- size_t i;
-
- eprintf("running: ");
- for (i = 0; args[i]; ++i) {
- /* String needs to be writable, so dupe it */
- args[i] = xstrdup(args[i]);
- printf("'%s' ", args[i]);
- }
- printf("\n");
-}
-
-int ginit_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ginit_main(int argc UNUSED_PARAM, char **argv)
-{
- FILE *mntlist;
- bool ismnted_dev, ismnted_sys, ismnted_usr;
- struct mntent *mntent;
-
- /*
- int fd = open("/dev/console", O_RDWR);
- if (fd >= 0) {
- dup2(fd, 0);
- dup2(fd, 1);
- dup2(fd, 2);
- }
- */
-
- /* If given an argv[] with an applet name, run it instead.
- * Makes recovering simple by doing: init=/ginit bb
- */
- if (argv[1] && argv[1][0] != '/') {
- eprintf("running user requested applet %s\n", argv[1]);
- return spawn_and_wait(argv+1);
- }
-
-#define saw(argv...) \
- ({ \
- static const char *args[] = { argv, NULL }; \
- /* These casts are fine -- see process_args for mem setup */ \
- process_args((void *)args); \
- spawn_and_wait((void *)args); \
- })
-
- /* First setup basic /dev */
- if (saw("mountpoint", "-q", "/dev") != 0) {
- /* Try /etc/fstab */
- if (saw("mount", "-n", "/dev"))
- /* Then devtmpfs */
- if (saw("mount", "-n", "-t", "devtmpfs", "devtmpfs", "/dev"))
- /* Finally normal tmpfs */
- saw("mount", "-n", "-t", "tmpfs", "dev", "/dev");
- } else {
- eprintf("%s appears to be mounted; skipping its setup\n", "/dev");
- }
-
- /* If /dev is empty (e.g. tmpfs), run mdev to seed things */
- if (access("/dev/console", F_OK) != 0) {
- if (saw("mountpoint", "-q", "/sys") != 0) {
- if (saw("mount", "-n", "/sys"))
- saw("mount", "-n", "-t", "sysfs", "sysfs", "/sys");
- } else {
- eprintf("%s appears to be mounted; skipping its setup\n", "/sys");
- }
-
- /* Mount /proc as mdev will fork+exec /proc/self/exe */
- if (saw("mountpoint", "-q", "/proc") != 0) {
- /* Try /etc/fstab */
- if (saw("mount", "-n", "/proc"))
- saw("mount", "-n", "-t", "proc", "proc", "/proc");
- }
-
- saw("mdev", "-s");
- }
-
- /* Then seed the stuff we care about */
- saw("mkdir", "-p", "/dev/pts", "/dev/shm");
-
- /* Then mount /usr */
- if (saw("mountpoint", "-q", "/usr") != 0) {
- saw("mount", "-n", "/usr", "-o", "ro");
- } else {
- eprintf("%s appears to be mounted; skipping its setup\n", "/usr");
- }
-
- /* Now that we're all done, exec the real init */
- if (!argv[1]) {
- argv[0] = (void *)"/sbin/init";
- argv[1] = NULL;
- } else
- ++argv;
- process_args(argv);
- return execv(argv[0], argv);
-}
diff --git a/sys-apps/busybox/files/klogd.confd b/sys-apps/busybox/files/klogd.confd
deleted file mode 100644
index 4c16096..0000000
--- a/sys-apps/busybox/files/klogd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/busybox-sysklogd
-
-# run "/sbin/klogd --help" to see all possible options.
-
-# activate if you need remote logging
-#rc_need="net"
-
-# send warnings and above to the console
-KLOGD_OPTS="-c 3"
diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd
deleted file mode 100644
index b0b32fc..0000000
--- a/sys-apps/busybox/files/klogd.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
-
-# Note: the klogd applet does not produce a pidfile
-command="/bin/busybox klogd"
-command_args="${KLOGD_OPTS}"
-
-depend() {
- need clock hostname
-}
diff --git a/sys-apps/busybox/files/mdev-start.sh b/sys-apps/busybox/files/mdev-start.sh
deleted file mode 100755
index 8784cd5..0000000
--- a/sys-apps/busybox/files/mdev-start.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-find_mdev()
-{
- if [ -x /sbin/mdev ] ; then
- echo "/sbin/mdev"
- else
- echo "/bin/busybox mdev"
- fi
-}
-
-populate_mdev()
-{
- # populate /dev with devices already found by the kernel
-
- if get_bootparam "nocoldplug" ; then
- RC_COLDPLUG="no"
- ewarn "Skipping mdev coldplug as requested in kernel cmdline"
- fi
-
- ebegin "Populating /dev with existing devices with mdev -s"
- $(find_mdev) -s
- eend $?
-
- return 0
-}
-
-seed_dev()
-{
- # Seed /dev with some things that we know we need
-
- # creating /dev/console and /dev/tty1 to be able to write
- # to $CONSOLE with/without bootsplash before mdev creates it
- [ -c /dev/console ] || mknod /dev/console c 5 1
- [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1
-
- # udevd will dup its stdin/stdout/stderr to /dev/null
- # and we do not want a file which gets buffered in ram
- [ -c /dev/null ] || mknod /dev/null c 1 3
-
- # copy over any persistant things
- if [ -d /lib/mdev/devices ] ; then
- cp -RPp /lib/mdev/devices/* /dev 2>/dev/null
- fi
-
- # Not provided by sysfs but needed
- ln -snf /proc/self/fd /dev/fd
- ln -snf fd/0 /dev/stdin
- ln -snf fd/1 /dev/stdout
- ln -snf fd/2 /dev/stderr
- [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
-
- # Create problematic directories
- mkdir -p /dev/pts /dev/shm
-}
-
-mount_it_b1()
-{
- if [ "${RC_USE_FSTAB}" = "yes" ] ; then
- mntcmd=$(get_mount_fstab /dev)
- else
- unset mntcmd
- fi
- if [ -n "${mntcmd}" ] ; then
- try mount -n ${mntcmd}
- else
- if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then
- mntcmd="tmpfs"
- else
- mntcmd="ramfs"
- fi
- # many video drivers require exec access in /dev #92921
- try mount -n -t "${mntcmd}" -o exec,nosuid,mode=0755 mdev /dev
- fi
-}
-mount_it_b2()
-{
- if fstabinfo --quiet /dev ; then
- mount -n /dev
- else
- # Some devices require exec, Bug #92921
- mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev
- fi
-}
-mount_it()
-{
- type fstabinfo && mount_it_b2 || mount_it_b1
-}
-
-main()
-{
- # Setup temporary storage for /dev
- ebegin "Mounting /dev for mdev"
- mount_it
- eend $?
-
- # Create a file so that our rc system knows it's still in sysinit.
- # Existance means init scripts will not directly run.
- # rc will remove the file when done with sysinit.
- touch /dev/.rcsysinit
-
- # Selinux lovin; /selinux should be mounted by selinux-patched init
- if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then
- restorecon /dev > /selinux/null
- fi
-
- seed_dev
-
- # Setup hotplugging (if possible)
- if [ -e /proc/sys/kernel/hotplug ] ; then
- ebegin "Setting up proper hotplug agent"
- eindent
- einfo "Setting /sbin/mdev as hotplug agent ..."
- echo $(find_mdev) > /proc/sys/kernel/hotplug
- eoutdent
- eend 0
- fi
-
- populate_mdev
-}
-
-main
-
-# vim:ts=4
diff --git a/sys-apps/busybox/files/mdev.rc b/sys-apps/busybox/files/mdev.rc
deleted file mode 100755
index 5470404..0000000
--- a/sys-apps/busybox/files/mdev.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.rc,v 1.1 2010/08/15 03:55:29 vapier Exp $
-
-start()
-{
- . /lib/rcscripts/addons/mdev-start.sh
-}
diff --git a/sys-apps/busybox/files/mdev.rc.1 b/sys-apps/busybox/files/mdev.rc.1
deleted file mode 100755
index 569d540..0000000
--- a/sys-apps/busybox/files/mdev.rc.1
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.rc.1,v 1.2 2012/09/26 21:25:23 robbat2 Exp $
-
-depend()
-{
- provide dev dev-mount
- need sysfs
-}
-
-find_mdev()
-{
- if [ -x /sbin/mdev ] ; then
- echo "/sbin/mdev"
- else
- echo "/bin/busybox mdev"
- fi
-}
-
-populate_mdev()
-{
- # populate /dev with devices already found by the kernel
-
- if get_bootparam "nocoldplug" ; then
- RC_COLDPLUG="no"
- ewarn "Skipping mdev coldplug as requested in kernel cmdline"
- fi
-
- ebegin "Populating /dev with existing devices with mdev -s"
- $(find_mdev) -s
- eend $?
-
- return 0
-}
-
-seed_dev()
-{
- # Seed /dev with some things that we know we need
-
- # creating /dev/console and /dev/tty1 to be able to write
- # to $CONSOLE with/without bootsplash before mdev creates it
- [ -c /dev/console ] || mknod /dev/console c 5 1
- [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1
-
- # udevd will dup its stdin/stdout/stderr to /dev/null
- # and we do not want a file which gets buffered in ram
- [ -c /dev/null ] || mknod /dev/null c 1 3
-
- # copy over any persistant things
- if [ -d /lib/mdev/devices ] ; then
- cp -RPp /lib/mdev/devices/* /dev 2>/dev/null
- fi
-
- # Not provided by sysfs but needed
- ln -snf /proc/self/fd /dev/fd
- ln -snf fd/0 /dev/stdin
- ln -snf fd/1 /dev/stdout
- ln -snf fd/2 /dev/stderr
- [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
-
- # Create problematic directories
- mkdir -p /dev/pts /dev/shm
-}
-
-mount_it()
-{
- if fstabinfo --quiet /dev ; then
- mount -n /dev
- else
- # Some devices require exec, Bug #92921
- mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev
- fi
-}
-
-start()
-{
- # Setup temporary storage for /dev
- ebegin "Mounting /dev for mdev"
- mount_it
- eend $?
-
- # Create a file so that our rc system knows it's still in sysinit.
- # Existance means init scripts will not directly run.
- # rc will remove the file when done with sysinit.
- touch /dev/.rcsysinit
-
- seed_dev
-
- # Setup hotplugging (if possible)
- if [ -e /proc/sys/kernel/hotplug ] ; then
- ebegin "Setting up mdev as hotplug agent"
- echo $(find_mdev) > /proc/sys/kernel/hotplug
- eend 0
- fi
-
- populate_mdev
-}
diff --git a/sys-apps/busybox/files/mdev/dvbdev b/sys-apps/busybox/files/mdev/dvbdev
deleted file mode 100644
index f0186c1..0000000
--- a/sys-apps/busybox/files/mdev/dvbdev
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# MDEV=dvb0.demux1 -> ADAPTER=dvb0 -> N=0
-ADAPTER=${MDEV%.*}
-N=${ADAPTER#dvb}
-# MDEV=dvb0.demux1 -> DEVB_DEV=demux1
-DVB_DEV=${MDEV#*.}
-
-case "$ACTION" in
- add|"")
- mkdir -p dvb/adapter${N}
- mv ${MDEV} dvb/adapter${N}/${DVB_DEV}
- ;;
- remove)
- rm -f dvb/adapter${N}/${DVB_DEV}
- rmdir dvb/adapter${N} 2>/dev/null
- rmdir dvb/ 2>/dev/null
-esac
diff --git a/sys-apps/busybox/files/mdev/ide_links b/sys-apps/busybox/files/mdev/ide_links
deleted file mode 100644
index be0c95a..0000000
--- a/sys-apps/busybox/files/mdev/ide_links
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-[ -f /proc/ide/$MDEV/media ] || exit
-
-media=`cat /proc/ide/$MDEV/media`
-for i in $media $media[0-9]* ; do
- if [ "`readlink $i 2>/dev/null`" = $MDEV ] ; then
- LINK=$i
- break
- fi
-done
-
-# link exist, remove if necessary and exit
-if [ "$LINK" ] ; then
- [ "$ACTION" = remove ] && rm $LINK
- exit
-fi
-
-# create a link
-num=`ls $media[0-9]* 2>/dev/null | wc -l`
-ln -sf $MDEV "$media`echo $num`"
-[ -e "$media" ] || ln -sf $MDEV "$media"
-
diff --git a/sys-apps/busybox/files/mdev/usbdev b/sys-apps/busybox/files/mdev/usbdev
deleted file mode 100644
index ea5b915..0000000
--- a/sys-apps/busybox/files/mdev/usbdev
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# script is buggy; until patched just do exit 0
-#exit 0
-
-# add zeros to device or bus
-add_zeros () {
- case "$(echo $1 | wc -L)" in
- 1) echo "00$1" ;;
- 2) echo "0$1" ;;
- *) echo "$1"
- esac
- exit 0
-}
-
-
-# bus and device dirs in /sys
-USB_PATH=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/')
-USB_PATH=$(find /sys/devices -type d -name "$USB_PATH")
-USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/')
-
-# dir names in /dev
-BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/'))
-USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/'))
-
-
-# try to load the proper driver for usb devices
-case "$ACTION" in
- add|"")
- # load usb bus driver
- for i in $USB_PATH/*/modalias ; do
- modprobe `cat $i` 2>/dev/null
- done
- # load usb device driver if existent
- if [ -d $USB_PATH/$USB_DEV_DIR ]; then
- for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do
- modprobe `cat $i` 2>/dev/null
- done
- fi
- # move usb device file
- mkdir -p bus/usb/$BUS
- mv $MDEV bus/usb/$BUS/$USB_DEV
- ;;
- remove)
- # unload device driver, if device dir is existent
- if [ -d $USB_PATH/$USB_DEV_DIR ]; then
- for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do
- modprobe -r `cat $i` 2>/dev/null
- done
- fi
- # unload usb bus driver. Does this make sense?
- # what happens, if two usb devices are plugged in
- # and one is removed?
- for i in $USB_PATH/*/modalias ; do
- modprobe -r `cat $i` 2>/dev/null
- done
- # remove device file and possible empty dirs
- rm -f bus/usb/$BUS/$USB_DEV
- rmdir bus/usb/$BUS/ 2>/dev/null
- rmdir bus/usb/ 2>/dev/null
- rmdir bus/ 2>/dev/null
-esac
diff --git a/sys-apps/busybox/files/mdev/usbdisk_link b/sys-apps/busybox/files/mdev/usbdisk_link
deleted file mode 100644
index 750242b..0000000
--- a/sys-apps/busybox/files/mdev/usbdisk_link
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# NOTE: since mdev -s only provide $MDEV, don't depend on any hotplug vars.
-
-current=$(readlink usbdisk)
-
-if [ "$current" = "$MDEV" ] && [ "$ACTION" = "remove" ]; then
- rm -f usbdisk usba1
-fi
-[ -n "$current" ] && exit
-
-if [ -e /sys/block/$MDEV ]; then
- SYSDEV=$(readlink -f /sys/block/$MDEV/device)
- # if /sys device path contains '/usb[0-9]' then we assume its usb
- # also, if its an usb without partitions we require FAT
- if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
- # do not create link if there is not FAT
- dd if=/dev/$MDEV bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0
-
- ln -sf $MDEV usbdisk
- # keep this for compat. people have it in fstab
- ln -sf $MDEV usba1
- fi
-
-elif [ -e /sys/block/*/$MDEV ] ; then
- PARENT=$(dirname /sys/block/*/$MDEV)
- SYSDEV=$(readlink -f $PARENT/device)
- if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
- ln -sf $MDEV usbdisk
- # keep this for compat. people have it in fstab
- ln -sf $MDEV usba1
- fi
-fi
-
diff --git a/sys-apps/busybox/files/ntpd.confd b/sys-apps/busybox/files/ntpd.confd
deleted file mode 100644
index f50d4c2..0000000
--- a/sys-apps/busybox/files/ntpd.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# Config file for /etc/init.d/busybox-ntpd
-
-# run "/sbin/ntpd --help" to see all possible options.
-
-# Get time from specified server and run in background
-NTPD_OPTS="-N -p pool.ntp.org"
diff --git a/sys-apps/busybox/files/ntpd.initd b/sys-apps/busybox/files/ntpd.initd
deleted file mode 100644
index 4959bd9..0000000
--- a/sys-apps/busybox/files/ntpd.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/busybox-ntpd/files/busybox-ntpd.initd,v 1.1 2012/08/21 12:39:10 sbriesen Exp $
-
-# Note: the ntpd applet does not produce a pidfile
-command="/bin/busybox ntpd"
-command_args="${NTPD_OPTS}"
-
-depend() {
- use net dns logger
- after ntp-client
-}
diff --git a/sys-apps/busybox/files/syslogd.confd b/sys-apps/busybox/files/syslogd.confd
deleted file mode 100644
index 7df6885..0000000
--- a/sys-apps/busybox/files/syslogd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/busybox-sysklogd
-
-# run "/sbin/syslogd --help" to see all possible options.
-
-# activate if you need remote logging
-#rc_need="net"
-
-# Log to shared mem buffer (use logread to read it)
-SYSLOGD_OPTS="-C128"
diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd
deleted file mode 100644
index b88dd2a..0000000
--- a/sys-apps/busybox/files/syslogd.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
-
-# Note: the syslogd pid file is hard coded
-command="/bin/busybox syslogd"
-command_args="${SYSLOGD_OPTS}"
-pidfile="/var/run/syslogd.pid"
-
-depend() {
- need clock hostname
- provide logger
-}
diff --git a/sys-apps/busybox/files/watchdog.confd b/sys-apps/busybox/files/watchdog.confd
deleted file mode 100644
index bd6aec0..0000000
--- a/sys-apps/busybox/files/watchdog.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/busybox-watchdog
-
-# run "/sbin/watchdog --help" to see all possible options.
-
-# Periodically write to watchdog device
-WATCHDOG_OPTS="/dev/watchdog"
-
-# optionally set the nice-level
-#SSD_NICELEVEL="-20"
diff --git a/sys-apps/busybox/files/watchdog.initd b/sys-apps/busybox/files/watchdog.initd
deleted file mode 100644
index 7483fb3..0000000
--- a/sys-apps/busybox/files/watchdog.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox-watchdog/files/busybox-watchdog.initd,v 1.2 2012/08/29 13:27:03 sbriesen Exp $
-
-# Note: the watchdog applet does not produce a pidfile
-command="/bin/busybox watchdog"
-command_args="${WATCHDOG_OPTS}"
-
-depend() {
- provide watchdog
-}
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
deleted file mode 100644
index 72850fb..0000000
--- a/sys-apps/busybox/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>embedded</herd>
-<use>
-<flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag>
-<flag name="math">Enable math support in gawk (requires libm)</flag>
-<flag name="mdev">Create the appropriate symlink in /sbin and install mdev.conf and support files</flag>
-<flag name="sep-usr">Support a separate /usr without needing an initramfs by booting with init=/ginit</flag>
-<flag name="static">Make the system rescue shell (/bin/bb) static so you can recover even when glibc is broken</flag>
-<flag name="systemd">Support systemd</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-04 13:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-04 13:26 [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/, sys-apps/busybox/files/mdev/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2012-12-01 2:32 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox