[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/experimental] 2 commits: patches: Assign topic to all patches

[Guido Günther]

Guido Günther pushed to branch debian/experimental at Libvirt Packaging Team / libvirt


Commits:
1137e334 by Andrea Bolognani at 2020-08-22T17:03:30+02:00
patches: Assign topic to all patches

Divide them into three groups:

  * debian - patches that are Debian-specific;

  * backport - patches that have been cherry-picked from a
    newer libvirt version and will naturally be dropped as soon
    as that version is imported into Debian;

  * forward - patches that are not taken from upstream but are
    not inherently Debian-specific either. These should be sent
    upstream so that we can eventually drop them from the Debian
    package.

- - - - -
51e52ab3 by Andrea Bolognani at 2020-08-22T17:03:30+02:00
patches: Reorder patches

In order to make rebases more convenient and avoid unnecessary
churn, backports should be placed at the bottom of the patch
queue and Debian-specific patches at the very top.

- - - - -


12 changed files:

- debian/patches/tools-fix-libvirt-guests.sh-text-assignments.patch → debian/patches/backport/tools-fix-libvirt-guests.sh-text-assignments.patch
- debian/patches/virdevmapper-Don-t-cache-device-mapper-major.patch → debian/patches/backport/virdevmapper-Don-t-cache-device-mapper-major.patch
- debian/patches/virdevmapper-Handle-kernel-without-device-mapper-support.patch → debian/patches/backport/virdevmapper-Handle-kernel-without-device-mapper-support.patch
- debian/patches/virdevmapper-Ignore-all-errors-when-opening-dev-mapper-co.patch → debian/patches/backport/virdevmapper-Ignore-all-errors-when-opening-dev-mapper-co.patch
- debian/patches/Set-defaults-for-zfs-tools.patch → debian/patches/debian/Set-defaults-for-zfs-tools.patch
- debian/patches/debian/apparmor_profiles_local_include.patch
- debian/patches/Include-etc-pki-qemu-in-apparmor.patch → debian/patches/forward/Include-etc-pki-qemu-in-apparmor.patch
- debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch → debian/patches/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
- debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch → debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
- debian/patches/Skip-vircgrouptest.patch → debian/patches/forward/Skip-vircgrouptest.patch
- debian/patches/apparmor-Allow-run-pygrub.patch → debian/patches/forward/apparmor-Allow-run-pygrub.patch
- debian/patches/series


Changes:

=====================================
debian/patches/tools-fix-libvirt-guests.sh-text-assignments.patch → debian/patches/backport/tools-fix-libvirt-guests.sh-text-assignments.patch
=====================================


=====================================
debian/patches/virdevmapper-Don-t-cache-device-mapper-major.patch → debian/patches/backport/virdevmapper-Don-t-cache-device-mapper-major.patch
=====================================


=====================================
debian/patches/virdevmapper-Handle-kernel-without-device-mapper-support.patch → debian/patches/backport/virdevmapper-Handle-kernel-without-device-mapper-support.patch
=====================================


=====================================
debian/patches/virdevmapper-Ignore-all-errors-when-opening-dev-mapper-co.patch → debian/patches/backport/virdevmapper-Ignore-all-errors-when-opening-dev-mapper-co.patch
=====================================


=====================================
debian/patches/Set-defaults-for-zfs-tools.patch → debian/patches/debian/Set-defaults-for-zfs-tools.patch
=====================================


=====================================
debian/patches/debian/apparmor_profiles_local_include.patch
=====================================
@@ -20,10 +20,10 @@ index dd18c8a..be8b9ee 100644
    #include <local/usr.lib.libvirt.virt-aa-helper>
  }
 diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in
-index 1e13703..5ad1a62 100644
+index d7c0539..ab71848 100644
 --- a/src/security/apparmor/usr.sbin.libvirtd.in
 +++ b/src/security/apparmor/usr.sbin.libvirtd.in
-@@ -131,4 +131,7 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) {
+@@ -132,4 +132,7 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) {
  
     /usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix,
    }


=====================================
debian/patches/Include-etc-pki-qemu-in-apparmor.patch → debian/patches/forward/Include-etc-pki-qemu-in-apparmor.patch
=====================================


=====================================
debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch → debian/patches/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
=====================================


=====================================
debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch → debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
=====================================


=====================================
debian/patches/Skip-vircgrouptest.patch → debian/patches/forward/Skip-vircgrouptest.patch
=====================================


=====================================
debian/patches/apparmor-Allow-run-pygrub.patch → debian/patches/forward/apparmor-Allow-run-pygrub.patch
=====================================
@@ -7,7 +7,7 @@ Subject: apparmor: Allow run pygrub
  1 file changed, 1 insertion(+)
 
 diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in
-index 5ad1a62..ab71848 100644
+index 1e13703..d7c0539 100644
 --- a/src/security/apparmor/usr.sbin.libvirtd.in
 +++ b/src/security/apparmor/usr.sbin.libvirtd.in
 @@ -87,6 +87,7 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) {


=====================================
debian/patches/series
=====================================
@@ -1,16 +1,16 @@
-tools-fix-libvirt-guests.sh-text-assignments.patch
+backport/virdevmapper-Don-t-cache-device-mapper-major.patch
+backport/virdevmapper-Handle-kernel-without-device-mapper-support.patch
+backport/virdevmapper-Ignore-all-errors-when-opening-dev-mapper-co.patch
+backport/tools-fix-libvirt-guests.sh-text-assignments.patch
+forward/Skip-vircgrouptest.patch
+forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
+forward/Include-etc-pki-qemu-in-apparmor.patch
+forward/apparmor-Allow-run-pygrub.patch
 debian/Debianize-libvirt-guests.patch
 debian/Debianize-systemd-service-files.patch
 debian/Debianize-virtlockd.patch
 debian/Debianize-virtlogd.patch
-Skip-vircgrouptest.patch
-Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/apparmor_profiles_local_include.patch
-Set-defaults-for-zfs-tools.patch
-Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
+debian/Set-defaults-for-zfs-tools.patch
 debian/Prefer-sbin-over-usr-sbin.patch
-Include-etc-pki-qemu-in-apparmor.patch
-apparmor-Allow-run-pygrub.patch
-virdevmapper-Don-t-cache-device-mapper-major.patch
-virdevmapper-Handle-kernel-without-device-mapper-support.patch
-virdevmapper-Ignore-all-errors-when-opening-dev-mapper-co.patch



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/676d8ff8e5793c82b7997cdbc7b312f0ebd1de42...51e52ab3a2d987623410ada198a9f80a40db9de6

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/676d8ff8e5793c82b7997cdbc7b312f0ebd1de42...51e52ab3a2d987623410ada198a9f80a40db9de6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20200822/f32fc51d/attachment-0001.html>