[apparmor] [PATCH] profiles/Makefile: grep: use [[:space:]] instead of \s

Alban Crequy alban.crequy at collabora.co.uk
Tue Mar 25 17:21:34 UTC 2014


\s is a new feature of GNU grep 2.6 (released on 2010-03-23) and it does not
work in older versions. By using [[:space:]] instead, AppArmor can compile on
systems with older versions of grep.

AppArmor's use of \s was introduced by revno 2327 (make sure all profiles
have #include <local/...>).

Signed-off-by: Alban Crequy <alban.crequy at collabora.co.uk>
---
 profiles/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/Makefile b/profiles/Makefile
index 6af6ffe..ff15ada 100644
--- a/profiles/Makefile
+++ b/profiles/Makefile
@@ -44,7 +44,7 @@ local:
 	for profile in ${TOPLEVEL_PROFILES}; do \
 		fn=$$(basename $$profile); \
 		echo "# Site-specific additions and overrides for '$$fn'" > ${PROFILES_SOURCE}/local/$$fn; \
-		grep "include\\s\\s*<local/$$fn>" "$$profile" >/dev/null || { echo "$$profile doesn't contain #include <local/$$fn>" ; exit 1; } ; \
+		grep "include[[:space:]]\\+<local/$$fn>" "$$profile" >/dev/null || { echo "$$profile doesn't contain #include <local/$$fn>" ; exit 1; } ; \
 	done; \
 
 .PHONY: install
-- 
1.9.1




More information about the AppArmor mailing list