aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/image.mk2
-rw-r--r--include/rootfs.mk6
-rw-r--r--package/Makefile2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/image.mk b/include/image.mk
index 723e4f1897..1cd8b75817 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -305,7 +305,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))
+ $(call prepare_rootfs,$(mkfs_cur_target_dir),$(TOPDIR)/files)
$(KDIR)/root.%: kernel_prepare
$(call Image/mkfs/$(word 1,$(target_params)),$(target_params))
diff --git a/include/rootfs.mk b/include/rootfs.mk
index a3a08c2851..bf26dd2415 100644
--- a/include/rootfs.mk
+++ b/include/rootfs.mk
@@ -63,9 +63,9 @@ ifdef CONFIG_CLEAN_IPKG
endif
define prepare_rootfs
- @if [ -d $(TOPDIR)/files ]; then \
- $(call file_copy,$(TOPDIR)/files/.,$(1)); \
- fi
+ $(if $(2),@if [ -d '$(2)' ]; then \
+ $(call file_copy,$(2)/.,$(1)); \
+ fi)
@mkdir -p $(1)/etc/rc.d
@mkdir -p $(1)/var/lock
@( \
diff --git a/package/Makefile b/package/Makefile
index 0aefbb8023..a83b350b06 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -75,7 +75,7 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE
$(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG)
- $(call prepare_rootfs,$(TARGET_DIR))
+ $(call prepare_rootfs,$(TARGET_DIR),$(TOPDIR)/files)
$(curdir)/index: FORCE
@echo Generating package index...