diff options
| -rw-r--r-- | include/rootfs.mk | 3 | ||||
| -rw-r--r-- | package/Makefile | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/rootfs.mk b/include/rootfs.mk index 90ee312619..2143ef804d 100644 --- a/include/rootfs.mk +++ b/include/rootfs.mk @@ -47,6 +47,9 @@ opkg = \ --add-arch all:100 \ --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 +opkg_package_files = $(wildcard \ + $(foreach dir,$(PACKAGE_SUBDIRS), \ + $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk))) define prepare_rootfs @if [ -d $(TOPDIR)/files ]; then \ diff --git a/package/Makefile b/package/Makefile index 87dfe68e06..f5a7395643 100644 --- a/package/Makefile +++ b/package/Makefile @@ -49,11 +49,7 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install 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 \ |