|
@@ -799,9 +799,9 @@ endif
|
|
|
# counterparts are appropriately setup as symlinks ones to the others.
|
|
|
ifeq ($(BR2_ROOTFS_MERGED_USR),y)
|
|
|
|
|
|
- @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
|
|
|
- $(call MESSAGE,"Sanity check in overlay $(d)"); \
|
|
|
- not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \
|
|
|
+ $(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
|
|
|
+ @$(call MESSAGE,"Sanity check in overlay $(d)")$(sep) \
|
|
|
+ $(Q)not_merged_dirs="$$(support/scripts/check-merged-usr.sh $(d))"; \
|
|
|
test -n "$$not_merged_dirs" && { \
|
|
|
echo "ERROR: The overlay in $(d) is not" \
|
|
|
"using a merged /usr for the following directories:" \
|
|
@@ -811,9 +811,9 @@ ifeq ($(BR2_ROOTFS_MERGED_USR),y)
|
|
|
|
|
|
endif # merged /usr
|
|
|
|
|
|
- @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
|
|
|
- $(call MESSAGE,"Copying overlay $(d)"); \
|
|
|
- $(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep))
|
|
|
+ $(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
|
|
|
+ @$(call MESSAGE,"Copying overlay $(d)")$(sep) \
|
|
|
+ $(Q)$(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep))
|
|
|
|
|
|
$(Q)$(if $(TARGET_DIR_FILES_LISTS), \
|
|
|
cat $(TARGET_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list.txt
|
|
@@ -822,9 +822,9 @@ endif # merged /usr
|
|
|
$(Q)$(if $(STAGING_DIR_FILES_LISTS), \
|
|
|
cat $(STAGING_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list-staging.txt
|
|
|
|
|
|
- @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
|
|
|
- $(call MESSAGE,"Executing post-build script $(s)"); \
|
|
|
- $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
|
|
|
+ $(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))
|
|
|
|
|
|
touch $(TARGET_DIR)/usr
|
|
|
|