build: move merged package directory from bin/ to staging_dir

Signed-off-by: Felix Fietkau <nbd@nbd.name>
9 years ago · f2de33b2c9
parent 2f8c355850
commit f2de33b2c9
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -51,7 +51,7 @@ printdb:
 prepare: $(target/stamp-compile)

 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
 	rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
--- a/include/feeds.mk
+++ b/include/feeds.mk
@ -23,7 +23,7 @@ ifneq ($(CONFIG_PER_FEED_REPO),)
  endif
 endif

-PACKAGE_DIR_ALL := $(PACKAGE_DIR)_all
+PACKAGE_DIR_ALL := $(TOPDIR)/staging_dir/packages/$(BOARD)

 PKG_CONFIG_DEPENDS += \
 	CONFIG_PER_FEED_REPO \