From: John Crispin Date: Tue, 3 Feb 2015 10:11:06 +0000 (+0000) Subject: Fix possible fail to check for dependencies X-Git-Tag: reboot~4451 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4a1d29c5fce88fd62ed479dc5dd1bcfd17fbb5b2;p=openwrt%2Fstaging%2Fchunkeey.git 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Å‚awomir Demeszko SVN-Revision: 44247 --- diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 11edb9aeaa..b7dc0ad1e8 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -66,7 +66,7 @@ ifneq ($(PKG_NAME),toolchain) 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 \