From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Sat, 11 Jul 2015 18:08:04 +0200 Subject: [Buildroot] [PATCH] busybox: Install udhcpc script only if enabled In-Reply-To: <1436629865-19506-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1436629865-19506-1-git-send-email-maxime.hadjinlian@gmail.com> Message-ID: <55A13F64.7060004@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net 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 Reviewed-by: Arnout Vandecappelle (Essensium/Mind) 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