From 827d01a3188e76e7790c9020c368c476eecd9463 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Tue, 18 Oct 2022 16:50:46 +0300 Subject: [PATCH] build: use per-target files directory --- include/image.mk | 2 +- package/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/image.mk b/include/image.mk index 9736e4e164..05c40a6615 100644 --- 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 8e72d4ec72..8d2c9c1aaa 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... -- 2.30.2