Grand profile repository re-organization. Move directories around to

make the final install layout match the layout in the repository (at
long last :) -- now we can use a single 'make check' target to check the
profiles in the repository against both apparmor_parser and logprof.

profiles/Makefile

@@ -33,21 +33,25 @@ common/Make.rules: $(COMMONDIR)/Make.rules
 endif
 
 DESTDIR=/
-EXTRASDIR=${DESTDIR}/usr/src/immunix/SubDomain/profiles/extras
+PROFILES_DEST=${DESTDIR}/etc/apparmor.d
+EXTRAS_DEST=${DESTDIR}/etc/apparmor/profiles/extras/
+PROFILES_SOURCE=./apparmor.d
+EXTRAS_SOURCE=./apparmor/profiles/extras/
+SUBDIRS_MUST_BE_SKIPPED=${PROFILES_SOURCE}/abstractions ${PROFILES_SOURCE}/program-chunks ${PROFILES_SOURCE}/tunables
+PROFILES_TO_COPY=$(filter-out ${SUBDIRS_MUST_BE_SKIPPED}, $(wildcard ${PROFILES_SOURCE}/*))
 
 .PHONY: install
 install: 
-	install -d ${DESTDIR}/etc/apparmor.d
+	install -m 755 -d ${PROFILES_DEST}
-	install -m 644 enabled/* ${DESTDIR}/etc/apparmor.d
+	install -m 755 -d ${PROFILES_DEST}/abstractions \
-	install -d ${EXTRASDIR}
+                          ${PROFILES_DEST}/program-chunks \
-	install -m 644 extras/* ${EXTRASDIR}
+                          ${PROFILES_DEST}/tunables
-	install -m 755 -d ${DESTDIR}/etc/apparmor.d/abstractions \
+	install -m 644 ${PROFILES_TO_COPY} ${PROFILES_DEST}
-                   ${DESTDIR}/etc/apparmor.d/program-chunks \
+	install -m 644 ${PROFILES_SOURCE}/abstractions/* ${PROFILES_DEST}/abstractions
-                   ${DESTDIR}/etc/apparmor.d/tunables
+	install -m 644 ${PROFILES_SOURCE}/program-chunks/* ${PROFILES_DEST}/program-chunks
-	install -m 644 abstractions/* ${DESTDIR}/etc/apparmor.d/abstractions
+	install -m 644 ${PROFILES_SOURCE}/tunables/* ${PROFILES_DEST}/tunables
-	install -m 644 program-chunks/* ${DESTDIR}/etc/apparmor.d/program-chunks
+	install -m 755 -d ${EXTRAS_DEST}
-	install -m 644 tunables/* ${DESTDIR}/etc/apparmor.d/tunables
+	install -m 644 ${EXTRAS_SOURCE}/* ${EXTRAS_DEST}
-
 
 .PHONY: clean
 clean:
@@ -69,21 +73,15 @@ ifndef LOGPROF
 LOGPROF=/usr/sbin/aa-logprof
 endif
 
-ENABLED_PATH=./enabled
+EXTRAS_PATH=${EXTRAS_SOURCE}/profiles/extras
-EXTRAS_PATH=./extras
 IGNORE_FILES=${EXTRAS_PATH}/README
-CHECK_PROFILES=$(filter-out ${IGNORE_FILES}, $(wildcard ${ENABLED_PATH}/*) $(wildcard ${EXTRAS_PATH}/*))
+CHECK_PROFILES=$(filter-out ${IGNORE_FILES}, $(wildcard ${PROFILES_SOURCE}/*) $(wildcard ${EXTRAS_PATH}/*))
-CHECK_INCLUDES=${PWD}
 
 .PHONY: check
 check:
-	@echo "*** Checking profiles against apparmor_parser"
+	@echo "*** Checking profiles from ${PROFILES_SOURCE} and ${EXTRAS_PATH} against apparmor_parser"
 	$(Q)for profile in ${CHECK_PROFILES} ; do \
-		${PARSER} -S -b ${CHECK_INCLUDES} $${profile} > /dev/null ; \
+		${PARSER} -S -I ${PWD}/apparmor.d $${profile} > /dev/null ; \
 	done
-
+	@echo "*** Checking profiles from ${PROFILES_SOURCE} against logprof"
-.PHONY: check-install
+	$(Q)${LOGPROF} -d ${PROFILES_SOURCE} -f /dev/null
-check-install:
-	$(Q)make check ENABLED_PATH=${DESTDIR}/etc/apparmor.d EXTRAS_PATH=${EXTRASDIR} CHECK_INCLUDES=${DESTDIR}/etc/apparmor.d
-	@echo "*** Checking profiles against logprof"
-	$(Q)${LOGPROF} -d ${DESTDIR}/etc/apparmor.d -f /dev/null

profiles/apparmor-profiles.spec.in

@@ -55,8 +55,7 @@ This package is part of a suite of tools that used to be named SubDomain.
 
 %install
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro} \
+make install DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro}
-	     EXTRASDIR=${RPM_BUILD_ROOT}/%{extras_dir}/
 
 %clean 
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf $RPM_BUILD_ROOT

profiles/apparmor/profiles/extras/usr.X11R6.bin.acroread

@@ -1,4 +1,4 @@
-# $Id:$
+# $Id$
 # ------------------------------------------------------------------
 #
 #    Copyright (C) 2002-2005 Novell/SUSE