X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2FMakefile;h=9f39395bae6a7ef5e912c62300285d14f575ec12;hb=859d940c79e8cb1c66a3d0cccc18e9eac499415b;hp=87dfe68e06330e5a37daf32315468632b7244cac;hpb=5d30bf83039aa1089e70d8c80b6ad03ba92bfc2a;p=librecmc%2Flibrecmc.git

diff --git a/package/Makefile b/package/Makefile
index 87dfe68e06..9f39395bae 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -44,16 +44,20 @@ PACKAGE_INSTALL_FILES:= \
 $(curdir)/cleanup: $(TMP_DIR)/.build
 	rm -rf $(STAGING_DIR_ROOT)
 
-$(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install
+$(curdir)/merge:
+	rm -rf $(PACKAGE_DIR_ALL)
+	mkdir -p $(PACKAGE_DIR_ALL)
+	-$(foreach pdir,$(PACKAGE_SUBDIRS),$(if $(wildcard $(pdir)/*.ipk),ln -s $(pdir)/*.ipk $(PACKAGE_DIR_ALL);))
+
+$(curdir)/merge-index: $(curdir)/merge
+	(cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; )
+
+$(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index)
 	- find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
 	rm -rf $(TARGET_DIR)
 	[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
 	$(call opkg,$(TARGET_DIR)) install \
-		$(wildcard \
-		  $(foreach dir,$(PACKAGE_SUBDIRS), \
-		    $(foreach pkg, \
-		      $(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null), \
-		      $(dir)/$(pkg)_*.ipk)))
+		$(call opkg_package_files,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null))
 	@for file in $(PACKAGE_INSTALL_FILES); do \
 		[ -s $$file.flags ] || continue; \
 		for flag in `cat $$file.flags`; do \