@@ -584,7 +584,9 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
prepare: $(BUILD_DIR)/buildroot-config/auto.conf
@$(foreach s, $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT)), \
$(call MESSAGE,"Executing pre-build script $(s)"); \
- $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
+ $(EXTRA_ENV) $(s) $(TARGET_DIR) \
+ $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS)) \
+ $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT_ARGS))$(sep))
.PHONY: world
world: target-post-image
@@ -801,7 +803,9 @@ endif # merged /usr
$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
@$(call MESSAGE,"Executing post-build script $(s)")$(sep) \
- $(Q)$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
+ $(Q)$(EXTRA_ENV) $(s) $(TARGET_DIR) \
+ $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS)) \
+ $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS))$(sep))
touch $(TARGET_DIR)/usr
@@ -819,7 +823,9 @@ target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize
$(Q)mkdir -p $(BINARIES_DIR)
@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
$(call MESSAGE,"Executing post-image script $(s)"); \
- $(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
+ $(EXTRA_ENV) $(s) $(BINARIES_DIR) \
+ $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS)) \
+ $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS))$(sep))
.PHONY: source
source: $(foreach p,$(PACKAGES),$(p)-all-source)
@@ -26,6 +26,11 @@ arguments will be passed to the script too. All the scripts will be
passed the exact same set of arguments, it is not possible to pass
different sets of arguments to each script.
+Note that the arguments from +BR2_ROOTFS_POST_SCRIPT_ARGS+ will also be
+passed to post-build and post-fakeroot scripts. If you want to use
+arguments that are only used for the post-image scripts you can use
++BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS+.
+
Again just like for the post-build scripts, the scripts have access to
the environment variables +BR2_CONFIG+, +HOST_DIR+, +STAGING_DIR+,
+TARGET_DIR+, +BUILD_DIR+, +BINARIES_DIR+, +CONFIG_DIR+ and
@@ -56,6 +56,12 @@ The post-build scripts are run with the main Buildroot tree as current
passed to the script too. All the scripts will be passed the exact
same set of arguments, it is not possible to pass different sets of
arguments to each script.
+
+ Note that the arguments from +BR2_ROOTFS_POST_SCRIPT_ARGS+ will also be
+ passed to post-image and post-fakeroot scripts. If you want to use
+ arguments that are only used for the post-build scripts you can use
+ +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS+.
+
+
In addition, you may also use these environment variables:
@@ -182,7 +182,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES)
$$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep))
$$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\
echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \
- echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep))
+ echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) $$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep))
$$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\
$$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep))
@@ -695,20 +695,60 @@ config BR2_ROOTFS_POST_IMAGE_SCRIPT
config BR2_ROOTFS_POST_SCRIPT_ARGS
string "Extra arguments passed to custom scripts"
- depends on BR2_ROOTFS_POST_BUILD_SCRIPT != "" \
+ depends on BR2_ROOTFS_PRE_BUILD_SCRIPT != "" \
+ || BR2_ROOTFS_POST_BUILD_SCRIPT != "" \
|| BR2_ROOTFS_POST_FAKEROOT_SCRIPT != "" \
|| BR2_ROOTFS_POST_IMAGE_SCRIPT != ""
help
- Pass these additional arguments to each post-build or
- post-image scripts.
+ Pass these additional arguments to each pre-build, post-build,
+ post-fakeroot and post-image scripts.
Note that all the post-build and post-image scripts will be
passed the same set of arguments, you can not pass different
arguments to each script.
Note also, as stated in their respective help text, that the
- first argument to each post-build or post-image script is the
- target directory / images directory. The arguments in this
- option will be passed *after* those.
+ first argument to each script is the target directory / images
+ directory. The arguments in this option will be passed *after* those.
+
+config BR2_ROOTFS_PRE_BUILD_SCRIPT_ARGS
+ string "Extra arguments passed to BR2_ROOTFS_PRE_BUILD_SCRIPT"
+ depends on BR2_ROOTFS_PRE_BUILD_SCRIPT != ""
+ help
+ Pass these additional arguments to the pre-build script.
+
+ Note also, as stated in the respective help text, that the
+ first argument to each script is the target directory.
+ The arguments in this option will be passed *after* those.
+
+config BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS
+ string "Extra arguments passed to BR2_ROOTFS_POST_BUILD_SCRIPT"
+ depends on BR2_ROOTFS_POST_BUILD_SCRIPT != ""
+ help
+ Pass these additional arguments to the post-build script.
+
+ Note also, as stated in the respective help text, that the
+ first argument to each script is the target directory.
+ The arguments in this option will be passed *after* those.
+
+config BR2_ROOTFS_POST_FAKEROOT_SCRIPT_ARGS
+ string "Extra arguments passed to BR2_ROOTFS_POST_FAKEROOT_SCRIPT"
+ depends on BR2_ROOTFS_POST_FAKEROOT_SCRIPT != ""
+ help
+ Pass these additional arguments to the post-fakeroot script.
+
+ Note also, as stated in the respective help text, that the
+ first argument to each script is the target directory.
+ The arguments in this option will be passed *after* those.
+
+config BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS
+ string "Extra arguments passed to POST_IMAGE_SCRIPT"
+ depends on BR2_ROOTFS_POST_IMAGE_SCRIPT != ""
+ help
+ Pass these additional arguments to the post-image script.
+
+ Note also, as stated in the respective help text, that the
+ first argument to each script is the images directory.
+ The arguments in this option will be passed *after* those.
endmenu
You only can specify one list of arguments that are passed to several scripts (BR2_ROOTFS_PRE_BUILD_SCRIPT, BR2_ROOTFS_POST_BUILD_SCRIPT, BR2_ROOTFS_POST_FAKEROOT_SCRIPT and BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS). So you have to be careful that the arguments for these scripts do not collide. To allow specifiying dedicated arguments to each of the script the new config options are introduced. For backward compatibility the value of BR2_ROOTFS_POST_SCRIPT_ARGS is still passed to the scripts. But now you can add specfic arguments from the new config option. Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> --- v2: - now add the specific arguments after the ones from BR2_ROOTFS_POST_SCRIPT_ARGS - reword the docu - reword the commit message Makefile | 12 +++++-- docs/manual/customize-post-image.adoc | 5 +++ docs/manual/customize-rootfs.adoc | 6 ++++ fs/common.mk | 2 +- system/Config.in | 52 +++++++++++++++++++++++---- 5 files changed, 67 insertions(+), 10 deletions(-) -- 2.39.2