[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] add AppArmor test and examples to dist



tests/virt-aa-helper-test and examples/apparmor are not included in
official tarballs, but should be. Attached is a patch to fix that
which works when apparmor is and is not available. Thanks to Daniel P.
Berrange for pointing me in the right direction.

Jamie

-- 
Jamie Strandboge             | http://www.canonical.com
diff -Naurp libvirt.orig/configure.in libvirt/configure.in
--- libvirt.orig/configure.in	2009-11-30 17:04:23.000000000 -0600
+++ libvirt/configure.in	2009-12-01 09:25:33.000000000 -0600
@@ -1788,6 +1788,7 @@ AC_OUTPUT(Makefile src/Makefile include/
           tests/xmconfigdata/Makefile \
           tests/xencapsdata/Makefile \
           tests/confdata/Makefile \
+          examples/apparmor/Makefile \
           examples/domain-events/events-c/Makefile \
           examples/domsuspend/Makefile \
           examples/dominfo/Makefile \
diff -Naurp libvirt.orig/examples/apparmor/Makefile.am libvirt/examples/apparmor/Makefile.am
--- libvirt.orig/examples/apparmor/Makefile.am	1969-12-31 18:00:00.000000000 -0600
+++ libvirt/examples/apparmor/Makefile.am	2009-12-01 09:23:42.000000000 -0600
@@ -0,0 +1,5 @@
+EXTRA_DIST=				\
+	TEMPLATE			\
+	libvirt-qemu			\
+	usr.lib.libvirt.virt-aa-helper	\
+	usr.sbin.libvirtd
diff -Naurp libvirt.orig/Makefile.am libvirt/Makefile.am
--- libvirt.orig/Makefile.am	2009-11-06 08:05:31.000000000 -0600
+++ libvirt/Makefile.am	2009-12-01 09:24:52.000000000 -0600
@@ -5,7 +5,7 @@ GENHTML = genhtml
 
 SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
   python tests po examples/domain-events/events-c examples/hellolibvirt \
-  examples/dominfo examples/domsuspend examples/python
+  examples/dominfo examples/domsuspend examples/python examples/apparmor
 
 ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
diff -Naurp libvirt.orig/tests/Makefile.am libvirt/tests/Makefile.am
--- libvirt.orig/tests/Makefile.am	2009-10-22 09:18:40.000000000 -0500
+++ libvirt/tests/Makefile.am	2009-12-01 09:18:39.000000000 -0600
@@ -135,7 +135,10 @@ endif
 
 if WITH_SECDRIVER_APPARMOR
 test_scripts += virt-aa-helper-test
+else
+EXTRA_DIST += virt-aa-helper-test
 endif
+
 EXTRA_DIST += $(test_scripts)
 
 TESTS = virshtest \

Attachment: signature.asc
Description: Digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]