Author: blogic Date: 2015-02-03 11:11:06 +0100 (Tue, 03 Feb 2015) New Revision: 44247
Modified: trunk/include/package-ipkg.mk Log: Fix possible fail to check for dependencies Few characters in filenames (a plus sign, a dot) can be interpreted specially by grep. This can lead to the omission of missing package dependency. For example if we would have "some.file.so" then it matches also "some2file.so". -F switch off special meaning of any character and -x match against whole line. Signed-off-by: S?\197?\130awomir Demeszko <[email protected]> Modified: trunk/include/package-ipkg.mk =================================================================== --- trunk/include/package-ipkg.mk 2015-02-03 10:10:54 UTC (rev 44246) +++ trunk/include/package-ipkg.mk 2015-02-03 10:11:06 UTC (rev 44247) @@ -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 -qxF "$$$$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
