From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Tue, 18 Oct 2022 13:50:46 +0000 (+0300)
Subject: build: use per-target files directory
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=20c1bfdccc041ed5c3e8c8b84a18dca04fc12324;p=openwrt%2Fstaging%2Fstintel.git

build: use per-target files directory
---

diff --git a/include/image.mk b/include/image.mk
index fae4d32a8b..e2dc4c6754 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -333,7 +333,7 @@ target-dir-%: FORCE
 			$(call opkg_package_files,$(mkfs_packages_add)))
 	-$(CP) -T $(mkfs_cur_target_dir).opkg/ $(mkfs_cur_target_dir)/etc/opkg/
 	rm -rf $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir).conf
-	$(call prepare_rootfs,$(mkfs_cur_target_dir),$(TOPDIR)/files)
+	$(call prepare_rootfs,$(mkfs_cur_target_dir),$(TOPDIR)/files/$(TARGET))
 
 $(KDIR)/root.%: kernel_prepare
 	$(call Image/mkfs/$(word 1,$(target_params)),$(target_params))
diff --git a/package/Makefile b/package/Makefile
index 4b8df7f484..5d9c218652 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -79,7 +79,7 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE
 
 	$(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG)
 
-	$(call prepare_rootfs,$(TARGET_DIR),$(TOPDIR)/files)
+	$(call prepare_rootfs,$(TARGET_DIR),$(TOPDIR)/files/$(TARGET))
 
 $(curdir)/index: FORCE
 	@echo Generating package index...