Author: jow Date: 2014-08-07 17:35:12 +0200 (Thu, 07 Aug 2014) New Revision: 42041
Modified: trunk/package/Makefile Log: build: consider sub-directories when deploying packages to image with CONFIG_PER_FEED_REPO (#17430) Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/package/Makefile =================================================================== --- trunk/package/Makefile 2014-08-07 14:41:19 UTC (rev 42040) +++ trunk/package/Makefile 2014-08-07 15:35:12 UTC (rev 42041) @@ -94,7 +94,7 @@ - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 rm -rf $(TARGET_DIR) [ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp - @$(FIND) `sed -e 's|.*|$(PACKAGE_DIR)/&_*.ipk|' $(PACKAGE_INSTALL_FILES)` | sort -u | $(OPKG) install + @$(FIND) `sed -e 's|.*|$(PACKAGE_DIR)$(if $(CONFIG_PER_FEED_REPO),/*)/&_*.ipk|' $(PACKAGE_INSTALL_FILES)` | sort -u | $(OPKG) install @for file in $(PACKAGE_INSTALL_FILES); do \ [ -s $$file.flags ] || continue; \ for flag in `cat $$file.flags`; do \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
