diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 8 |
2 files changed, 13 insertions, 2 deletions
@@ -427,6 +427,9 @@ GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) PACKAGES := PACKAGES_ALL := +PACKAGE_TARGETS := +IMAGE_TARGETS := + # silent mode requested? QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) @@ -735,7 +738,7 @@ staging-finalize: @ln -snf $(STAGING_DIR) $(BASE_DIR)/staging .PHONY: target-finalize -target-finalize: $(PACKAGES) host-finalize +target-finalize: $(PACKAGE_TARGETS) host-localedef @$(call MESSAGE,"Finalizing target directory") # Check files that are touched by more than one package ./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt @@ -809,7 +812,7 @@ endif # merged /usr touch $(TARGET_DIR)/usr .PHONY: target-post-image -target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize +target-post-image: $(TARGETS_ROOTFS) $(IMAGE_TARGETS) target-finalize @rm -f $(ROOTFS_COMMON_TAR) @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 4353bd3868..3a99df13d4 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1014,6 +1014,14 @@ $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) PACKAGES += $(1) +ifneq ($$($(2)_INSTALL_STAGING)$$($(2)_INSTALL_TARGET),NONO) +PACKAGE_TARGETS += $(1) +endif + +ifeq ($$($(2)_INSTALL_IMAGES),YES) +IMAGE_TARGETS += $(1) +endif + ifneq ($$($(2)_PERMISSIONS),) PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) endif |
