KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

include/rootfs.mk: pass additional files dir to prepare_rootfs as an argument

Browse source 
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2018-03-06 21:06:30 +01:00
parent 6ab50bb10d
commit cf1c7c0f17
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/image.mk
View file

@ -305,7 +305,7 @@ target-dir-%: FORCE
$(call opkg_package_files,$(mkfs_packages_add))) $(call opkg_package_files,$(mkfs_packages_add)))
-$(CP) -T $(mkfs_cur_target_dir).opkg/ $(mkfs_cur_target_dir)/etc/opkg/ -$(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 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 $(KDIR)/root.%: kernel_prepare
$(call Image/mkfs/$(word 1,$(target_params)),$(target_params)) $(call Image/mkfs/$(word 1,$(target_params)),$(target_params))

6
include/rootfs.mk
View file

@ -63,9 +63,9 @@ ifdef CONFIG_CLEAN_IPKG
endif endif
define prepare_rootfs define prepare_rootfs
@if [ -d $(TOPDIR)/files ]; then \ $(if $(2),@if [ -d '$(2)' ]; then \
$(call file_copy,$(TOPDIR)/files/.,$(1)); \ $(call file_copy,$(2)/.,$(1)); \
fi fi)
@mkdir -p $(1)/etc/rc.d @mkdir -p $(1)/etc/rc.d
@mkdir -p $(1)/var/lock @mkdir -p $(1)/var/lock
@( \ @( \

2
package/Makefile
View file

@ -75,7 +75,7 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE
$(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG) $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG)
$(call prepare_rootfs,$(TARGET_DIR)) $(call prepare_rootfs,$(TARGET_DIR),$(TOPDIR)/files)
$(curdir)/index: FORCE $(curdir)/index: FORCE
@echo Generating package index... @echo Generating package index...