On Tue, 2012-02-07 at 09:18 -0600, Jamie Strandboge wrote:
> 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
> 
Attached is a patch to set PYPREFIX which allows for specifying
--prefix=${PYPREFIX} to python-tools-setup.py. Committed to local
branch.

-- 
Jamie Strandboge             | http://www.canonical.com
------------------------------------------------------------
revno: 1950
committer: Jamie Strandboge <ja...@canonical.com>
branch nick: apparmor-trunk-easyprof
timestamp: Wed 2012-02-15 09:26:42 -0600
message:
  utils/Makefile: add PYPREFIX and use --prefox=${PYPREFIX} in call to
  python-tools-setup.py
diff:
=== modified file 'utils/Makefile'
--- utils/Makefile	2012-02-07 17:05:47 +0000
+++ utils/Makefile	2012-02-15 15:26:42 +0000
@@ -46,6 +46,7 @@
 CONFDIR=${DESTDIR}/etc/apparmor
 VENDOR_PERL=$(shell perl -e 'use Config; print $$Config{"vendorlib"};')
 PERLDIR=${DESTDIR}${VENDOR_PERL}/${MODDIR}
+PYPREFIX=/usr
 
 po/${NAME}.pot: ${TOOLS} ${PYTOOLS}
 	$(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${TOOLS} ${MODULES} ${PYTOOLS}"
@@ -62,7 +63,7 @@
 	$(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}
+	python ${PYSETUP} install --prefix=${PYPREFIX} --root=${DESTDIR} --version=${VERSION}
 
 .PHONY: clean
 .SILENT: clean

Attachment: 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

Reply via email to