[apparmor] [PATCH] do not require /usr/include/linux/capability.h

Kees Cook kees at ubuntu.com
Sat May 5 20:17:14 UTC 2012


For non-Linux builds, the unused list_capabilities target requirements
blows up the build. It's valid for non-Linux systems to have an empty
capability list, since they do not build the real AppArmor parser.

Signed-off-by: Kees Cook <kees at ubuntu.com>

Index: apparmor-debian/common/Make.rules
===================================================================
--- apparmor-debian.orig/common/Make.rules	2012-05-05 12:36:17.000000000 -0700
+++ apparmor-debian/common/Make.rules	2012-05-05 12:45:30.658963850 -0700
@@ -160,7 +160,7 @@
 CAPABILITIES=$(shell echo "\#include <linux/capability.h>" | cpp -dM | LC_ALL=C sed -n -e '/CAP_EMPTY_SET/d' -e 's/^\#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$$/CAP_\1/p' | sort)
 
 .PHONY: list_capabilities
-list_capabilities: /usr/include/linux/capability.h
+list_capabilities:
 	@echo "$(CAPABILITIES)"
 
 # =====================

-- 
Kees Cook



More information about the AppArmor mailing list