Author: jow
Date: 2015-01-29 22:59:17 +0100 (Thu, 29 Jan 2015)
New Revision: 44207

Modified:
   trunk/include/package-ipkg.mk
Log:
include: use anchored patterns for dependency checking

Anchor search pattern when testing dependencies, otherwise the check may
succeed in cases where it shouldn't, e.g. when matching "udp_tunnel.ko"
against "ip6_udp_tunnel.ko".

Signed-off-by: Jo-Philipp Wich <[email protected]>

Modified: trunk/include/package-ipkg.mk
===================================================================
--- trunk/include/package-ipkg.mk       2015-01-29 21:59:10 UTC (rev 44206)
+++ trunk/include/package-ipkg.mk       2015-01-29 21:59:17 UTC (rev 44207)
@@ -66,7 +66,7 @@
                                XARGS="$(XARGS)"; \
                        $(SCRIPT_DIR)/gen-dependencies.sh "$$(IDIR_$(1))"; \
                ) | while read FILE; do \
-                       grep -q "$$$$FILE" $(PKG_INFO_DIR)/$(1).provides || \
+                       grep -qE "^$$$$FILE$$$$" $(PKG_INFO_DIR)/$(1).provides 
|| \
                                echo "$$$$FILE" >> 
$(PKG_INFO_DIR)/$(1).missing; \
                done; \
                if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to