* [Buildroot] [PATCH] busybox: Install udhcpc script only if enabled
@ 2015-07-11 15:51 Maxime Hadjinlian
2015-07-11 16:08 ` Arnout Vandecappelle
2015-07-11 22:25 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Maxime Hadjinlian @ 2015-07-11 15:51 UTC (permalink / raw)
To: buildroot
It doesn't make sense to install such a scripts if UDHCPC was not
selected.
Also remove the entry from BUSYBOX_PERMISSIONS as the install command
does the same job.
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
package/busybox/busybox.mk | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 51b35bc..92874cd 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -52,7 +52,6 @@ BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
define BUSYBOX_PERMISSIONS
/bin/busybox f 4755 0 0 - - - - -
- /usr/share/udhcpc/default.script f 755 0 0 - - - - -
endef
# If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
@@ -127,6 +126,15 @@ define BUSYBOX_INTERNAL_SHADOW_PASSWORDS
endef
endif
+define BUSYBOX_INSTALL_UDHCPC_SCRIPT
+ if grep -q CONFIG_UDHCPC=y $(@D)/.config; then \
+ $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
+ $(TARGET_DIR)/usr/share/udhcpc/default.script; \
+ $(INSTALL) -m 0755 -d \
+ $(TARGET_DIR)/usr/share/udhcpc/default.script.d; \
+ fi
+endef
+
ifeq ($(BR2_INIT_BUSYBOX),y)
define BUSYBOX_SET_INIT
$(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG))
@@ -189,10 +197,7 @@ endef
define BUSYBOX_INSTALL_TARGET_CMDS
$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install
- $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
- $(TARGET_DIR)/usr/share/udhcpc/default.script
- $(INSTALL) -m 0755 -d \
- $(TARGET_DIR)/usr/share/udhcpc/default.script.d
+ $(BUSYBOX_INSTALL_UDHCPC_SCRIPT)
$(BUSYBOX_INSTALL_MDEV_CONF)
endef
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] busybox: Install udhcpc script only if enabled
2015-07-11 15:51 [Buildroot] [PATCH] busybox: Install udhcpc script only if enabled Maxime Hadjinlian
@ 2015-07-11 16:08 ` Arnout Vandecappelle
2015-07-11 22:25 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2015-07-11 16:08 UTC (permalink / raw)
To: buildroot
On 07/11/15 17:51, Maxime Hadjinlian wrote:
> It doesn't make sense to install such a scripts if UDHCPC was not
> selected.
> Also remove the entry from BUSYBOX_PERMISSIONS as the install command
> does the same job.
>
> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/busybox/busybox.mk | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 51b35bc..92874cd 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -52,7 +52,6 @@ BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
>
> define BUSYBOX_PERMISSIONS
> /bin/busybox f 4755 0 0 - - - - -
> - /usr/share/udhcpc/default.script f 755 0 0 - - - - -
> endef
>
> # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
> @@ -127,6 +126,15 @@ define BUSYBOX_INTERNAL_SHADOW_PASSWORDS
> endef
> endif
>
> +define BUSYBOX_INSTALL_UDHCPC_SCRIPT
> + if grep -q CONFIG_UDHCPC=y $(@D)/.config; then \
> + $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
> + $(TARGET_DIR)/usr/share/udhcpc/default.script; \
> + $(INSTALL) -m 0755 -d \
> + $(TARGET_DIR)/usr/share/udhcpc/default.script.d; \
> + fi
> +endef
> +
> ifeq ($(BR2_INIT_BUSYBOX),y)
> define BUSYBOX_SET_INIT
> $(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG))
> @@ -189,10 +197,7 @@ endef
>
> define BUSYBOX_INSTALL_TARGET_CMDS
> $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install
> - $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
> - $(TARGET_DIR)/usr/share/udhcpc/default.script
> - $(INSTALL) -m 0755 -d \
> - $(TARGET_DIR)/usr/share/udhcpc/default.script.d
> + $(BUSYBOX_INSTALL_UDHCPC_SCRIPT)
> $(BUSYBOX_INSTALL_MDEV_CONF)
> endef
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] busybox: Install udhcpc script only if enabled
2015-07-11 15:51 [Buildroot] [PATCH] busybox: Install udhcpc script only if enabled Maxime Hadjinlian
2015-07-11 16:08 ` Arnout Vandecappelle
@ 2015-07-11 22:25 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2015-07-11 22:25 UTC (permalink / raw)
To: buildroot
Dear Maxime Hadjinlian,
On Sat, 11 Jul 2015 17:51:05 +0200, Maxime Hadjinlian wrote:
> It doesn't make sense to install such a scripts if UDHCPC was not
> selected.
> Also remove the entry from BUSYBOX_PERMISSIONS as the install command
> does the same job.
>
> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> ---
> package/busybox/busybox.mk | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-11 22:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-11 15:51 [Buildroot] [PATCH] busybox: Install udhcpc script only if enabled Maxime Hadjinlian
2015-07-11 16:08 ` Arnout Vandecappelle
2015-07-11 22:25 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox