[Pkg-libvirt-maintainers] [PATCH/RFC] Add missing delta from Ubuntu to apparmor profiles

[intrigeri]

Hi,

Stefan Bader wrote (30 May 2016 14:01:39 GMT) :
> This is the updated version against libvirt-1.3.4.

Thanks!

I wanted to try it out, but I've failed to apply this patch series on
top of the v1.3.4 upstream Git tag, so I wonder: what tree is it
supposed to apply on?

FWIW here's what I see:

  checking file configure.ac
  Hunk #1 succeeded at 1506 (offset -4 lines).
  checking file examples/Makefile.am
  checking file examples/apparmor/profile-preprocess
  checking file examples/apparmor/libvirt-lxc
  checking file examples/apparmor/libvirt-lxc.in
  checking file examples/apparmor/libvirt-qemu
  Reversed (or previously applied) patch detected!  Assume -R? [n] 
  Apply anyway? [n] y
  Hunk #1 FAILED at 1.
  Not deleting file examples/apparmor/libvirt-qemu as content differs from patch
  1 out of 1 hunk FAILED

It seems that the patch that tries to delete
examples/apparmor/libvirt-qemu expects these three lines to be present
in that file:

  /usr/share/OVMF/** r,
  /usr/share/AAVMF/** r,
  /usr/share/qemu-efi/** r,

… while they are not in the upstream version.

Might it be that you generated this patch on top of an extracted
Ubuntu source package that had debian/patches/series applied already,
or something similar?

Cheers,
-- 
intrigeri