[Pkg-libvirt-maintainers] Pushing Ubuntu's AppArmor-related delta into the Debian libvirt package?

[Serge Hallyn]

Quoting Stefan Bader (stefan.bader at canonical.com):
> On 22.09.2014 16:05, Serge Hallyn wrote:
> > Hi Stefan,
> > 
> > didn't mean to derail you with that.  I'd suggest just sending the delta minus
> > the local apparmor bit, then we can address that separately.
> > 
> Oh, I rather did derail myself because I wanted to get it right. Also was an
> opportunity to learn (or rather refresh my memory) on the compile environment
> for the git version. I think the piece missing after just installing everything
> that is build-dep on the Debian package was the dtd for xsltproc (because that
> gets called with "nonet").
> 
> So this would be the proposal to send to libvirt-devel. Not sure the local
> config file can be done cleaner. Would someone else know a way to cause a rename
> through Makefile.am?

Can you just add a install-data: rule that moves the file?

> -Stefan
> 
> ---
> 
> From 0f80c3291390696a5660857d10a6a9d7e69a7839 Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader at canonical.com>
> Date: Thu, 18 Sep 2014 14:15:17 +0200
> Subject: [PATCH] Add missing delta from Ubuntu to apparmor profiles
> 
> This fixes up the upstream profiles and would allow to drop apparmor
> related delta from the Ubuntu package.
> 
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  examples/apparmor/Makefile.am                    |  6 +++++
>  examples/apparmor/libvirt-lxc                    | 15 +++++++++++-
>  examples/apparmor/libvirt-qemu                   | 31 +++++++++++++++++++++++-
>  examples/apparmor/local-usr.sbin.libvirtd        |  2 ++
>  examples/apparmor/usr.lib.libvirt.virt-aa-helper | 25 ++++++++++++++++---
>  examples/apparmor/usr.sbin.libvirtd              | 17 ++++++++++++-
>  6 files changed, 90 insertions(+), 6 deletions(-)
>  create mode 100644 examples/apparmor/local-usr.sbin.libvirtd
> 
> diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am
> index 7a20e16..d81e967 100644
> --- a/examples/apparmor/Makefile.am
> +++ b/examples/apparmor/Makefile.am
> @@ -20,6 +20,7 @@ EXTRA_DIST=				\
>  	libvirt-qemu			\
>  	libvirt-lxc 			\
>  	usr.lib.libvirt.virt-aa-helper	\
> +	local-usr.sbin.libvirtd		\
>  	usr.sbin.libvirtd
> 
>  if WITH_APPARMOR_PROFILES
> @@ -29,6 +30,11 @@ apparmor_DATA = \
>  	usr.sbin.libvirtd \
>  	$(NULL)
> 
> +localdir = $(apparmordir)/local
> +local_DATA = \
> +	local-usr.sbin.libvirtd \
> +	$(NULL)
> +
>  abstractionsdir = $(apparmordir)/abstractions
>  abstractions_DATA = \
>  	libvirt-qemu \