Skip to content

Commit f2de33b

Browse files
committed
build: move merged package directory from bin/ to staging_dir
Signed-off-by: Felix Fietkau <[email protected]>
1 parent 2f8c355 commit f2de33b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ printdb:
5151
prepare: $(target/stamp-compile)
5252

5353
clean: FORCE
54-
rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR)
54+
rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) $(TOPDIR)/staging_dir/packages
5555

5656
dirclean: clean
5757
rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)

include/feeds.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ifneq ($(CONFIG_PER_FEED_REPO),)
2323
endif
2424
endif
2525

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

2828
PKG_CONFIG_DEPENDS += \
2929
CONFIG_PER_FEED_REPO \

0 commit comments

Comments
 (0)