diff options
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.21.0.ebuild | 20 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-9999.ebuild | 18 |
3 files changed, 38 insertions, 6 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 2f254260a9de..843d0197ba67 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.340 2013/02/19 01:42:39 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.341 2013/02/27 05:44:01 vapier Exp $ + + 27 Feb 2013; Mike Frysinger <vapier@gentoo.org> busybox-1.21.0.ebuild, + busybox-9999.ebuild: + Install the udhcp config files when features are enabled. 19 Feb 2013; Zac Medico <zmedico@gentoo.org> busybox-1.21.0.ebuild, busybox-9999.ebuild: diff --git a/sys-apps/busybox/busybox-1.21.0.ebuild b/sys-apps/busybox/busybox-1.21.0.ebuild index 889067e9a2cb..2a94485712f1 100644 --- a/sys-apps/busybox/busybox-1.21.0.ebuild +++ b/sys-apps/busybox/busybox-1.21.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.6 2013/02/19 01:42:39 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.7 2013/02/27 05:44:01 vapier Exp $ # See `man savedconfig.eclass` for info on how to use USE=savedconfig. @@ -51,7 +51,12 @@ busybox_config_option() { } busybox_config_enabled() { - grep "^CONFIG_$1=y" -q .config + local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) + case ${val} in + "") return 1 ;; + y) return 0 ;; + *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; + esac } src_prepare() { @@ -61,7 +66,7 @@ src_prepare() { # patches go here! epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/${P}-*.patch + #epatch "${FILESDIR}"/${P}-*.patch cp "${FILESDIR}"/ginit.c init/ || die # flag cleanup @@ -224,6 +229,15 @@ src_install() { newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" fi + if busybox_config_enabled UDHCPC; then + local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) + insinto "${path%/*}" + newins examples/udhcp/simple.script "${path##*/}" + fi + if busybox_config_enabled UDHCPD; then + insinto /etc + doins examples/udhcp/udhcpd.conf + fi # bundle up the symlink files for use later emake DESTDIR="${ED}" install diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 3dce51d8f69c..a5b7eb34005c 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.12 2013/02/19 01:42:39 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.13 2013/02/27 05:44:01 vapier Exp $ # See `man savedconfig.eclass` for info on how to use USE=savedconfig. @@ -51,7 +51,12 @@ busybox_config_option() { } busybox_config_enabled() { - grep "^CONFIG_$1=y" -q .config + local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) + case ${val} in + "") return 1 ;; + y) return 0 ;; + *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; + esac } src_prepare() { @@ -224,6 +229,15 @@ src_install() { newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" fi + if busybox_config_enabled UDHCPC; then + local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) + insinto "${path%/*}" + newins examples/udhcp/simple.script "${path##*/}" + fi + if busybox_config_enabled UDHCPD; then + insinto /etc + doins examples/udhcp/udhcpd.conf + fi # bundle up the symlink files for use later emake DESTDIR="${ED}" install |