diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 8 |
2 files changed, 13 insertions, 2 deletions
@@ -426,6 +426,9 @@ GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) PACKAGES := PACKAGES_ALL := +TARGET_TARGETS := +IMAGE_TARGETS := + # silent mode requested? QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q) @@ -693,7 +696,7 @@ endif $(TARGETS_ROOTFS): target-finalize .PHONY: target-finalize -target-finalize: $(PACKAGES) +target-finalize: $(TARGET_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 @@ -762,7 +765,7 @@ endif $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) .PHONY: target-post-image -target-post-image: $(TARGETS_ROOTFS) target-finalize +target-post-image: $(TARGETS_ROOTFS) $(IMAGE_TARGETS) target-finalize @$(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)) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a2a12e7b56..74552a776d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -933,6 +933,14 @@ $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) PACKAGES += $(1) +ifneq ($$($(2)_INSTALL_STAGING)$$($(2)_INSTALL_TARGET),NONO) +TARGET_TARGETS += $(1) +endif + +ifeq ($$($(2)_INSTALL_IMAGES),YES) +IMAGE_TARGETS += $(1) +endif + ifneq ($$($(2)_PERMISSIONS),) PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) endif |
