* [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/
@ 2012-12-01 14:37 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-12-01 14:37 UTC (permalink / raw
To: gentoo-commits
commit: 8d49ce780b2719114dfd4a6f356c16f9b3ec50cb
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 1 14:35:53 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 1 14:36:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=8d49ce78
sys-apps/busybox: dont USE flags, check .config for sysklogd, ntpd, watchdog
---
sys-apps/busybox/Manifest | 4 ++--
sys-apps/busybox/busybox-9999.ebuild | 27 ++++++++++++---------------
sys-apps/busybox/metadata.xml | 3 ---
3 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 0427f20..580051f 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -13,5 +13,5 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141
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 9414 SHA256 2a2734acf43b8574326b5aa18e376fbcbb58a2db1a70c9acd46c78d534d40a7e SHA512 5b3ce0dd551e85c2c889ad719c3484d19e253e568be4e0a0f9fa8ea53d6fa7eaa30bb611025ea435f794eab8bca124d30127a9c92d39859a1a1676384c950d60 WHIRLPOOL 79222b5bf719ba52baccc4a55477604a2f5f7b39f0f849feae971b550b68f8ea5bd28235766df2a803cfde6c3f5c5c652049a4ddf28d60aab1fe601fbb2ff8fd
-MISC metadata.xml 856 SHA256 96bd35614f2246ff9fbbcc5a3e78f524160279cb92c073b7bac2d9802e42de1a SHA512 974fa556e606efc3bd65d1486eefb2eefdef001fc882ba2ab436468313d948fe3d0a2701bd302f5107401604f6cdf4bf78f66f9b8f0ddf4be81e55c3958fffc2 WHIRLPOOL 5ccbbb9c8ee41a97074155eec2f602fc126597bf2030f9ae1c5ad8289e6765586ac83e6e1b58e9e411b20debb3fda959f58da8141948d60b5438a47ff24dcc06
+EBUILD busybox-9999.ebuild 9292 SHA256 2fce0ccf747047d6fd3935e17aa3681309ea014832279f04f680d24664ad54a5 SHA512 6989f63a237be62f0ad602c88093a1fb022bdd14c327d3b8102f74b9a49070fd122d26f293ed581bbd27f7d87b31e045540eee11e0444386eb3ff39249b7c49c WHIRLPOOL 241a40c458eaa4e22776731861e798c05da54888928312e3e4c1f5e693f47aa783540260b5e59f7af346f1f9bbf5db74cf907f1d74cc9c1490c00955ab750dd3
+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
index d891ca1..b360865 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -57,7 +57,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="ipv6 livecd make-symlinks math mdev ntpd -pam selinux sep-usr +static sysklogd systemd watchdog"
+IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static systemd"
RESTRICT="test"
RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
@@ -81,6 +81,14 @@ busybox_config_option() {
einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
}
+busybox_has() {
+ if grep "^CONFIG_$1=y" -q .config >/dev/null; then
+ return 0
+ else
+ return 1
+ fi
+}
+
src_prepare() {
unset KBUILD_OUTPUT #88088
append-flags -fno-strict-aliasing #310413
@@ -169,17 +177,6 @@ src_configure() {
# 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 SYSLOGD
- busybox_config_option y KLOGD
- fi
- use watchdog && busybox_config_option y WATCHDOG
-
# default a bunch of uncommon options to off
local opt
for opt in \
@@ -244,15 +241,15 @@ src_install() {
fi
# add busybox daemon's, bug #444718
- if use ntpd; then
+ if busybox_has NTPD && busybox_has FEATURE_NTPD_SERVER; then
newconfd "${FILESDIR}/busybox-ntpd.confd" "busybox-ntpd"
newinitd "${FILESDIR}/busybox-ntpd.initd" "busybox-ntpd"
fi
- if use sysklogd; then
+ if busybox_has SYSLOGD && busybox_has KLOGD; then
newconfd "${FILESDIR}/busybox-sysklogd.confd" "busybox-sysklogd"
newinitd "${FILESDIR}/busybox-sysklogd.initd" "busybox-sysklogd"
fi
- if use watchdog; then
+ if busybox_has WATCHDOG; then
newconfd "${FILESDIR}/busybox-watchdog.confd" "busybox-watchdog"
newinitd "${FILESDIR}/busybox-watchdog.initd" "busybox-watchdog"
fi
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
index e053635..72850fb 100644
--- a/sys-apps/busybox/metadata.xml
+++ b/sys-apps/busybox/metadata.xml
@@ -9,8 +9,5 @@
<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/
@ 2012-12-02 15:28 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2012-12-02 15:28 UTC (permalink / raw
To: gentoo-commits
commit: bb666b025c12e21696c994c9a6d52f7c59893c5c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 15:28:21 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 15:28:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=bb666b02
sys-apps/busybox: fix manifest
---
sys-apps/busybox/Manifest | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index ed6a0d2..89a61c4 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,7 +1,7 @@
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 611 SHA256 473743b82f34bfcab010ce93263d45e77d23bcbfd1dc400004809103a93b0314 SHA512 9abbadd168bb33a7a649f6a8d560c8990848ab8173c4d7ce570916a0a85e8bd48176e5ac99bc1ce4afa8027f628873538f98731e60156f23e26a588eca5272aa WHIRLPOOL 689038070ecabe920c83061bb442b4d195c70653b82b997a519f02ce314c783d766c98dd31b6c1199499e81fcdb0e98195b7effa01acab034ac8bee57195c776
+AUX klogd.initd 426 SHA256 9d4b43d5961a9581f1283bf6a1ca1e8e345a686192115bcc86bdf4fb3803cdf3 SHA512 fb0ebd944a2fbe326db0aab8425be5e848ad0fcb165f10ddc3c1295286842cad409c1a56a06957671ebe8f96dd21c69e253e78b1ec5e5789e10b81cc5da18acf WHIRLPOOL f63f13c61b3e206a7840b43863cdabe4440eefa59fd96b7eb6c04f1ecf41e7d5efc69a8b172e287f0841aa417e483884ad2f8fd3cc00f92296cb875d16528e11
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
@@ -10,10 +10,10 @@ AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052f
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 612 SHA256 40e97febc42ccd4e557c58ab024ef3f6955db8404d0c061ea81c0acfddbe721a SHA512 7e5813417a86948451043fb8b7a8c2cd9b9f98e11defca4b9ea06e2d3a3c4f4341e8df56d2286ad3b36027ae5ef4ae65cd7c0193fdac1dbc83e72a8e0b7e8d17 WHIRLPOOL 96dd02f150d70df1a4a370c7af5ed28ff305eb53ea9539157d35e6fe335444cee2a15a0ce6d4c5dfb1d4edf58b51487160ea537dd9a9c6e4bd889b56450d3b4d
+AUX ntpd.initd 432 SHA256 3c5f3098fd87573d22186e90406d9b7efc14924908e057ec2f1396f2284752ff SHA512 e68012988c1941d83fdf38820c139556be84c9e3b5dddf1c74585980f48ed928f7cfe011da9d489a630c1bd648f787a157dc0244bbc9933fb29252db8f3f76f4 WHIRLPOOL 0033ab33811493220e801bd139568375547e7f7518e750a365e15760d784f81cc78ee208ca80029cbf1063fe544100b2b880a801bf358622d7ba10d7dd300cc5
AUX syslogd.confd 234 SHA256 65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bfaf50e3514bc25 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52 WHIRLPOOL b0a9e82225968d44446025242ac6c9429dc2e01a3720d94349756f71ec3a11c3ff2217bce7c4f1a1ea8a2a8baecd3265c3cce01675138674c05a9f2a96ade2ae
-AUX syslogd.initd 703 SHA256 1770b34dbcdec83440b5daad76234c3ff30c54816ad85e00fca8909d9f0923c8 SHA512 42dafcccbc5d6a423ff6b11d0bd359e2f7c830ba84d6ed58d3f83df4b54b5a4ebe041a88fd0cb6ca0138376f6c277644fe099f63e73cc61358a324b70250ec27 WHIRLPOOL a3f2af95372552629cb5e3878abb312dd9662a3cfef7c35ab88f28aa8154970641d71b8d4154b9833d1622c20b0ee20c184ffd3c4c10fe72f4cf0edb494cec0f
+AUX syslogd.initd 446 SHA256 eba4fa0472ce0587758de17772e095e9abf65a1531d6740339a9524493d71074 SHA512 9e20df5a39d54185fe245e4f43316a33f6fd938da4c6912ae6cc09449afc64e0bf48fc9e775ff54e478ee556d905ee09d1f1825af80855832ecdb0d87a630e3a WHIRLPOOL 9ca11474ec793a9a2678610222ce890ae58c797bbb89e77a8e92355ca187a441f874099a2f1b29ce114351c498de0c2c820a6c1eef6a949c218edca318b42068
AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
-AUX watchdog.initd 654 SHA256 698d9de2945f29a2f38f81501d5634946fa02648cc4a3be965c08310b38110f4 SHA512 889e860500df5890285361c07ece2a66189626707fc61549e7780027f6c6f802a847a9e331ada872aa60a01ddffde356d3484bdb8bc2abcb761c73a782c5529b WHIRLPOOL a5129bbcee9eae374b50628cc1dc76e7ede0c24d4ff01fbe4579a1a89dea3f486626c48c2b915131203829f0bc806981a8b35bc4663da398216e254edbd04c9b
+AUX watchdog.initd 428 SHA256 246aff27249991079396f7a83a5310f16bc2b8e8409771412a7b1adeaa7e905d SHA512 663826e60fda7054a48ed3ff40437409c3d1514251b987ae6abc81cd568682b726c071f2612a9763eb3dc36631b9857d7bc41d58f590b15a13d3a023b4ea5d86 WHIRLPOOL 434cfc952d7508c1de2fe4d14ec403d9428593941b130393c007085051c05926ac3a69624b8626a72c4e7f27fd300f2cdef4131bca1ce93f11ef7130de370c5c
EBUILD busybox-9999.ebuild 9340 SHA256 b404de527efa708bbca40711c052e175f0d41ad887d14088a59e58ec590250d3 SHA512 a6827ef5afbc1a9fc79ac98fd32ca25ddb4ee3f0ba803196567cdba6e158adb88ae9e955fd40e8b1593eb931bcb7d5b3f016f19cef69ef28118b26734c20cbe7 WHIRLPOOL 194d4c9596cd3fa9e49023a0729363a9c2ca7b5e9e2f00840fdcdceec660c39f92d0aaa6d4a38c31d23f2159a5587e58bfa1cb79b4ae4ee8e4ae61aaa9944516
MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-02 15:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-02 15:28 [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2012-12-01 14:37 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