From f2de33b2c94b633194b802570d87502988c22c6e Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Wed, 3 Aug 2016 12:22:04 +0200
Subject: [PATCH] build: move merged package directory from bin/ to staging_dir

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 Makefile         | 2 +-
 include/feeds.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5bd4fb2ca7..59320d4a20 100644
--- 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 cbb3997a8d..c79c941ffa 100644
--- 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 \