build: use per-target files directory

diff --git a/include/image.mk b/include/image.mk
index 9736e4e1642ed404d729c6932751127be6d09e0c..05c40a6615a84b14efd8984bb9a283fa4f941418 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -340,7 +340,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 8e72d4ec726dbcfeb6502820bcf29d16813d3551..8d2c9c1aaaca77e8a3f03b015b2b950be262fb06 100644 (file)
--- 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...