When I corrected the profiles/Makefile to automatically find files to
install, I converted one variable name but missed a later location where
that variable was used, which broke the 'make check' target, because
directories would be handed to the apparmor parser. This patch corrects
that and also makes the VERBOSE flag report each profile name as it's
being handed to the parser.

---
 profiles/Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: b/profiles/Makefile
===================================================================
--- a/profiles/Makefile
+++ b/profiles/Makefile
@@ -81,12 +81,13 @@ LOGPROF=perl -I../utils/ ../utils/aa-log
 endif
 
 IGNORE_FILES=${EXTRAS_SOURCE}/README
-CHECK_PROFILES=$(filter-out ${IGNORE_FILES} ${SUBDIRS_MUST_BE_SKIPPED}, 
$(wildcard ${PROFILES_SOURCE}/*) $(wildcard ${EXTRAS_SOURCE}/*))
+CHECK_PROFILES=$(filter-out ${IGNORE_FILES} ${SUBDIRS}, $(wildcard 
${PROFILES_SOURCE}/*) $(wildcard ${EXTRAS_SOURCE}/*))
 
 .PHONY: check
 check:
        @echo "*** Checking profiles from ${PROFILES_SOURCE} and 
${EXTRAS_SOURCE} against apparmor_parser"
        $(Q)for profile in ${CHECK_PROFILES} ; do \
+               [ -n "${VERBOSE}" ] && echo "Testing $${profile}" ; \
                ${PARSER} -S -b ${PWD}/apparmor.d $${profile} > /dev/null || 
exit 1; \
        done
        @echo "*** Checking profiles from ${PROFILES_SOURCE} against logprof"


-- 
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/apparmor

Reply via email to