build: move merged package directory from bin/ to staging_dir

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/Makefile b/Makefile
index 5bd4fb2ca71a3b6d83702d52cf26b64b4c70500b..59320d4a207bfe1611241224d2d3189623eab532 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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)

diff --git a/include/feeds.mk b/include/feeds.mk
index cbb3997a8dca7491ed1dd72ebac8003004433636..c79c941ffa571230d0df1a2180933f509a76f555 100644 (file)
--- 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 \