Commit 9806bf5a authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

Makefile: rename USER_HOOKS_EXTRA_ENV to EXTRA_ENV 



This variable contains extra environment variables that we can not export
since they are clashing with some build systems (eg. BUILD_DIR with
u-boot).

So, we may need these variables for uses other than the user's hooks
for instrumentation. For example, we'll use them later on to export
BUILD_DIR to the download helper scripts.

Fix comment, too.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: default avatarSamuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent e49a0c65

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ endif 


	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \

		$(call MESSAGE,"Executing post-build script $(s)"); \

		$(USER_HOOKS_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))$(sep))



ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)

LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
@@ -619,7 +619,7 @@ endif 
target-post-image: $(TARGETS_ROOTFS) target-finalize

	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \

		$(call MESSAGE,"Executing post-image script $(s)"); \

		$(USER_HOOKS_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))$(sep))



toolchain-eclipse-register:

	./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)

package/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -297,11 +297,11 @@ HOST_MAKE_ENV=PATH=$(BR_PATH) \ 
		PKG_CONFIG_SYSROOT_DIR="/" \

		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"



# This extra environment we can not export ourselves (eg. because some

# This is extra environment we can not export ourselves (eg. because some

# packages use that variable internally, eg. uboot), so we have to

# explicitly pass it to user-supplied external hooks (eg. post-build,

# post-images)

USER_HOOKS_EXTRA_ENV=\

EXTRA_ENV=\

	PATH=$(BR_PATH) \

	BUILD_DIR=$(BUILD_DIR)

package/pkg-generic.mk

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time 
# User-supplied script

define step_user

	@$(foreach user_hook, $(BR2_INSTRUMENTATION_SCRIPTS), \

		$(USER_HOOKS_EXTRA_ENV) $(user_hook) "$(1)" "$(2)" "$(3)"$(sep))

		$(EXTRA_ENV) $(user_hook) "$(1)" "$(2)" "$(3)"$(sep))

endef

ifneq ($(BR2_INSTRUMENTATION_SCRIPTS),)

GLOBAL_INSTRUMENTATION_HOOKS += step_user