jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: rename USER_HOOKS_EXTRA_ENV to EXTRA_ENV

Browse Source 
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: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2014-03-10 21:51:33 +01:00 committed by Thomas Petazzoni
parent e49a0c656a
commit 9806bf5a9a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -573,7 +573,7 @@ endif
@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
$(call MESSAGE,"Executing post-build script $(s)"); \ $(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) ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
@ -619,7 +619,7 @@ endif
target-post-image: $(TARGETS_ROOTFS) target-finalize target-post-image: $(TARGETS_ROOTFS) target-finalize
@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
$(call MESSAGE,"Executing post-image script $(s)"); \ $(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: toolchain-eclipse-register:
./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH) ./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)

4
package/Makefile.in
View File

@ -297,11 +297,11 @@ HOST_MAKE_ENV=PATH=$(BR_PATH) \
PKG_CONFIG_SYSROOT_DIR="/" \ PKG_CONFIG_SYSROOT_DIR="/" \
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" 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 # packages use that variable internally, eg. uboot), so we have to
# explicitly pass it to user-supplied external hooks (eg. post-build, # explicitly pass it to user-supplied external hooks (eg. post-build,
# post-images) # post-images)
USER_HOOKS_EXTRA_ENV=\ EXTRA_ENV=\
PATH=$(BR_PATH) \ PATH=$(BR_PATH) \
BUILD_DIR=$(BUILD_DIR) BUILD_DIR=$(BUILD_DIR)

2
package/pkg-generic.mk
View File

@ -58,7 +58,7 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time
# User-supplied script # User-supplied script
define step_user define step_user
@$(foreach user_hook, $(BR2_INSTRUMENTATION_SCRIPTS), \ @$(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 endef
ifneq ($(BR2_INSTRUMENTATION_SCRIPTS),) ifneq ($(BR2_INSTRUMENTATION_SCRIPTS),)
GLOBAL_INSTRUMENTATION_HOOKS += step_user GLOBAL_INSTRUMENTATION_HOOKS += step_user