From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Thu, 07 Feb 2013 01:07:35 +0100 Subject: [Buildroot] [PATCH 2/5] package: remove scripts listed in _CONFIG_SCRIPTS from target In-Reply-To: <1360192218-30930-3-git-send-email-thomas.petazzoni@free-electrons.com> References: <1360192218-30930-1-git-send-email-thomas.petazzoni@free-electrons.com> <1360192218-30930-3-git-send-email-thomas.petazzoni@free-electrons.com> Message-ID: <5112F047.1010108@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/02/13 00:10, Thomas Petazzoni wrote: > The -config scripts are useless on the target, since they are > only needed for development, so we remove them automatically. > > Signed-off-by: Thomas Petazzoni Acked-by: Arnout Vandecappelle (Essensium/Mind) > --- > docs/manual/adding-packages-generic.txt | 11 ++++++++++- > package/pkg-generic.mk | 5 +++++ > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt > index 13d200d..1450907 100644 > --- a/docs/manual/adding-packages-generic.txt > +++ b/docs/manual/adding-packages-generic.txt > @@ -90,6 +90,11 @@ The argument to be given to +LIBFOO_CONFIG_SCRIPTS+ is the file name(s) > of the shell script(s) needing fixing. All these names are relative to > '$(STAGING_DIR)/usr/bin' and if needed multiple names can be given. > > +In addition, the scripts listed in +LIBFOO_CONFIG_SCRIPTS+ are removed > +from +$(TARGET_DIR)/usr/bin+ if they are not needed (i.e, when the > +installation of development files on the target has not been selected, > +which is the default). I wouldn't document deprecated things. So just remove "if they are not needed ...". > + > Example 1: > > Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'. > @@ -288,7 +293,11 @@ information is (assuming the package name is +libfoo+) : > * +LIBFOO_CONFIG_SCRIPTS+ lists the names of the files in > '$(STAGING_DIR)/usr/bin' that need some special fixing to make them > cross-compiling friendly. Multiple file names separated by space can > - be given and all are relative to '$(STAGING_DIR)/usr/bin'. > + be given and all are relative to '$(STAGING_DIR)/usr/bin'. The files > + listed in +LIBFOO_CONFIG_SCRIPTS+ are also removed from > + +$(TARGET_DIR)/usr/bin+ if they are not needed (i.e, when the > + installation of development files on the target has not been > + selected, which is the default). Same here. Regards, Arnout > > * +LIBFOO_DEVICES+ lists the device files to be created by Buildroot > when using the static device table. The syntax to use is the > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 066b6c8..57b0fd0 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -153,6 +153,11 @@ $(BUILD_DIR)/%/.stamp_target_installed: > $($(PKG)_INSTALL_INIT_SYSV)) > $($(PKG)_INSTALL_TARGET_CMDS) > $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) > +ifeq ($(BR2_HAVE_DEVFILES),) > + $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ > + $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \ > + fi > +endif > $(Q)touch $@ > > # Clean package > -- 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: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F