| Message ID | 1436629865-19506-1-git-send-email-maxime.hadjinlian@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
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 > >
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
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
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(-)