[apparmor] [patch] utils: don't install two copies of aa-easyprof

Steve Beattie steve at nxnw.org
Tue Mar 25 21:19:03 UTC 2014

With the conversion of the python utils, aa-easyprof got added to the
list of tools to be installed (in /usr/sbin/), but is already installed
(in /usr/bin) by the python-tools-setup.py distutils script, leaving two
copies of the tool in place. This patch filters out aa-easyprof from the
list of tools for the makefile to install itself, leaving it to
(continue to) be installed by the distutils script.

Signed-off-by: Steve Beattie <steve at nxnw.org>
 utils/Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: b/utils/Makefile
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -54,7 +54,8 @@ install: ${MANPAGES} ${HTMLMANPAGES}
 	install -m 644 logprof.conf severity.db notify.conf ${CONFDIR}
 	install -d ${BINDIR}
 	ln -sf aa-status ${BINDIR}/apparmor_status
-	install -m 755 ${TOOLS} ${BINDIR}
+	# aa-easyprof is installed by python-tools-setup.py
+	install -m 755 $(filter-out aa-easyprof, ${TOOLS}) ${BINDIR}
 	$(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
 	$(MAKE) -C vim install DESTDIR=${DESTDIR}

Steve Beattie
<sbeattie at ubuntu.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140325/ebe61711/attachment.pgp>

More information about the AppArmor mailing list