On Tue, 2012-02-07 at 08:50 -0600, Jamie Strandboge wrote: > This patchset is to accomplish the code portion of the > security-p-app-isolation blueprint. aa-easyprof is a standalone CLI > application which can also be imported into developer SDKs. From the man > page: ... > * 0004-aa-easyprof-makefile.patch: Makefile integration
This patch adds aa-easyprof to utils/Makefile: - As some people may not want to ship aa-easyprof, I created the PYTOOLS variable. - The install target uses python-tools-setup.py so future python libraries or scripts can be updated there, thus keeping Makefile changes to a minimum. - the check target runs the unittests and also runs pyflakes on easyprof (via PYTOOLS), anything in the apparmor directory, test/*.py and aa-status. aa-status is added explicitly as adding it directly to PYTOOLS at this time might be contentious. - the clean target is updated as well -- Jamie Strandboge | http://www.canonical.com
diff -Naurp -x .bzr -x common apparmor-trunk/.bzrignore apparmor-trunk-easyprof/.bzrignore
--- apparmor-trunk/.bzrignore 2011-08-16 14:15:26.000000000 -0500
+++ apparmor-trunk-easyprof/.bzrignore 2012-02-06 18:01:23.000000000 -0600
@@ -165,3 +165,4 @@ tests/regression/apparmor/unix_fd_server
tests/regression/apparmor/unlink
tests/regression/apparmor/xattrs
tests/regression/apparmor/coredump
+utils/build
diff -Naurp -x .bzr -x common apparmor-trunk/utils/Makefile apparmor-trunk-easyprof/utils/Makefile
--- apparmor-trunk/utils/Makefile 2011-12-13 17:34:55.000000000 -0600
+++ apparmor-trunk-easyprof/utils/Makefile 2012-02-07 07:36:12.000000000 -0600
@@ -32,8 +32,10 @@ PERLTOOLS = aa-genprof aa-logprof aa-aut
TOOLS = ${PERLTOOLS} aa-decode aa-status
MODULES = ${MODDIR}/AppArmor.pm ${MODDIR}/Repository.pm \
${MODDIR}/Config.pm ${MODDIR}/Severity.pm
+PYTOOLS = aa-easyprof
+PYSETUP = python-tools-setup.py
-MANPAGES = ${TOOLS:=.8} logprof.conf.5
+MANPAGES = ${TOOLS:=.8} logprof.conf.5 ${PYTOOLS:=.8}
all: ${MANPAGES} ${HTMLMANPAGES}
$(MAKE) -C po all
@@ -45,8 +47,8 @@ CONFDIR=${DESTDIR}/etc/apparmor
VENDOR_PERL=$(shell perl -e 'use Config; print $$Config{"vendorlib"};')
PERLDIR=${DESTDIR}${VENDOR_PERL}/${MODDIR}
-po/${NAME}.pot: ${TOOLS}
- $(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${TOOLS} ${MODULES}"
+po/${NAME}.pot: ${TOOLS} ${PYTOOLS}
+ $(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${TOOLS} ${MODULES} ${PYTOOLS}"
.PHONY: install
install: ${MANPAGES} ${HTMLMANPAGES}
@@ -60,6 +62,7 @@ install: ${MANPAGES} ${HTMLMANPAGES}
$(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
$(MAKE) install_manpages DESTDIR=${DESTDIR}
ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
+ python ${PYSETUP} install --root=${DESTDIR} --version=${VERSION}
.PHONY: clean
.SILENT: clean
@@ -67,8 +70,20 @@ clean: _clean
rm -f core core.* *.o *.s *.a *~
rm -f Make.rules
$(MAKE) -C po clean
+ rm -rf staging/ build/
+ rm -f apparmor/*.pyc
check:
for i in ${MODULES} ${PERLTOOLS} ; do \
perl -c $$i || exit 1; \
done
+ tmpfile=$$(mktemp --tmpdir aa-pyflakes-XXXXXX); \
+ for i in ${PYTOOLS} apparmor aa-status test/*.py; do \
+ echo Checking $$i; \
+ pyflakes $$i 2>&1 | grep -v "undefined name '_'" > $$tmpfile; \
+ test -s $$tmpfile && cat $$tmpfile && rm -f $$tmpfile && exit 1; \
+ done; \
+ rm -f $$tmpfile
+ for i in test/* ; do \
+ python $$i || exit 1; \
+ done
signature.asc
Description: This is a digitally signed message part
-- AppArmor mailing list AppArmor@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
