build: move merged package directory from bin/ to staging_dir

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-08-03 12:22:04 +02:00
parent 2f8c355850
commit f2de33b2c9
2 changed files with 2 additions and 2 deletions

View File

@ -51,7 +51,7 @@ printdb:
prepare: $(target/stamp-compile) prepare: $(target/stamp-compile)
clean: FORCE clean: FORCE
rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) $(TOPDIR)/staging_dir/packages
dirclean: clean dirclean: clean
rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN) rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)

View File

@ -23,7 +23,7 @@ ifneq ($(CONFIG_PER_FEED_REPO),)
endif endif
endif endif
PACKAGE_DIR_ALL := $(PACKAGE_DIR)_all PACKAGE_DIR_ALL := $(TOPDIR)/staging_dir/packages/$(BOARD)
PKG_CONFIG_DEPENDS += \ PKG_CONFIG_DEPENDS += \
CONFIG_PER_FEED_REPO \ CONFIG_PER_FEED_REPO \