[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 7 commits: changelog: Create entry for 9.4.0-1

Andrea Bolognani (@abologna) gitlab at salsa.debian.org
Fri Jun 2 18:20:29 BST 2023 


Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt


Commits:
14b6c330 by Andrea Bolognani at 2023-06-02T16:45:19+02:00
changelog: Create entry for 9.4.0-1

Gbp-Dch: Ignore

- - - - -
6bc6ecf6 by Andrea Bolognani at 2023-06-02T16:47:01+02:00
symbols: Bump symbol versions

No new public symbols.

Gbp-Dch: Ignore

- - - - -
d0f1ab7a by Andrea Bolognani at 2023-06-02T17:49:58+02:00
patches: Drop debian/Debianize-systemd-service-files.patch

It's no longer needed, as the upstream build system now provides
a way to configure service files so that their configuration is
loaded from /etc/default instead of /etc/sysconfig.

- - - - -
e03bf6da by Andrea Bolognani at 2023-06-02T17:51:39+02:00
patches: Refresh patches

Similarly to the Debian-specific patch that was just dropped,
the hunk changing /etc/sysconfig to /etc/default is no longer
needed.

Gbp-Dch: Ignore

- - - - -
50473a17 by Andrea Bolognani at 2023-06-02T18:18:38+02:00
rules: Pass initconfdir

The upstream build system is already set up so that /etc/default
will be used for Debian and Debian-derived distros, but it's
always better to be explicit.

Gbp-Dch: Ignore

- - - - -
34f2810b by Andrea Bolognani at 2023-06-02T18:19:04+02:00
libvirt0: Add SapphireRapids CPU model

Gbp-Dch: Ignore

- - - - -
71d0cdd7 by Andrea Bolognani at 2023-06-02T18:23:19+02:00
Document changes and release 9.4.0-1

- - - - -


7 changed files:

- debian/changelog
- debian/libvirt0.install
- debian/libvirt0.symbols
- debian/patches/debian/Debianize-libvirt-guests.patch
- − debian/patches/debian/Debianize-systemd-service-files.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libvirt (9.4.0-1) experimental; urgency=medium
+
+  * [98c5c4c] New upstream version 9.4.0
+  * [d0f1ab7] patches: Drop debian/Debianize-systemd-service-files.patch
+    - Changes to the upstream build system make these
+      Debian-specific modifications no longer necessary
+
+ -- Andrea Bolognani <eof at kiyuko.org>  Fri, 02 Jun 2023 18:21:20 +0200
+
 libvirt (9.3.0-2) experimental; urgency=medium
 
   * [4e3ec2a] links: Link /usr/share/doc/* to /usr/share/doc/libvirt0


=====================================
debian/libvirt0.install
=====================================
@@ -63,6 +63,7 @@ usr/share/libvirt/cpu_map/x86_Opteron_G5.xml
 usr/share/libvirt/cpu_map/x86_Penryn.xml
 usr/share/libvirt/cpu_map/x86_SandyBridge-IBRS.xml
 usr/share/libvirt/cpu_map/x86_SandyBridge.xml
+usr/share/libvirt/cpu_map/x86_SapphireRapids.xml
 usr/share/libvirt/cpu_map/x86_Skylake-Client-IBRS.xml
 usr/share/libvirt/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
 usr/share/libvirt/cpu_map/x86_Skylake-Client.xml


=====================================
debian/libvirt0.symbols
=====================================
@@ -98,7 +98,7 @@ libvirt.so.0 libvirt0 #MINVER#
  *@LIBVIRT_8.4.0 8.4.0
  *@LIBVIRT_8.5.0 8.5.0
  *@LIBVIRT_9.0.0 9.0.0
- *@LIBVIRT_PRIVATE_9.3.0 9.3.0
+ *@LIBVIRT_PRIVATE_9.4.0 9.4.0
 
 libvirt-qemu.so.0 libvirt0 #MINVER#
  *@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -116,4 +116,4 @@ libvirt-admin.so.0 libvirt0 #MINVER#
  *@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
  *@LIBVIRT_ADMIN_3.0.0 3.0.0
  *@LIBVIRT_ADMIN_8.6.0 8.9.0
- *@LIBVIRT_ADMIN_PRIVATE_9.3.0 9.3.0
+ *@LIBVIRT_ADMIN_PRIVATE_9.4.0 9.4.0


=====================================
debian/patches/debian/Debianize-libvirt-guests.patch
=====================================
@@ -5,11 +5,11 @@ Subject: Debianize libvirt-guests
 Forwarded: not-needed
 ---
  docs/manpages/libvirt-guests.rst |  4 ++--
- tools/libvirt-guests.sh.in       | 21 ++++++++++-----------
- 2 files changed, 12 insertions(+), 13 deletions(-)
+ tools/libvirt-guests.sh.in       | 17 ++++++++---------
+ 2 files changed, 10 insertions(+), 11 deletions(-)
 
 diff --git a/docs/manpages/libvirt-guests.rst b/docs/manpages/libvirt-guests.rst
-index bea08e3..e52c8c1 100644
+index f27eaad..62b279c 100644
 --- a/docs/manpages/libvirt-guests.rst
 +++ b/docs/manpages/libvirt-guests.rst
 @@ -51,7 +51,7 @@ The following variables are supported:
@@ -31,11 +31,11 @@ index bea08e3..e52c8c1 100644
    Action taken on host shutdown
  
 diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index 87f96af..9fe1c4c 100644
+index 0160142..0141f05 100644
 --- a/tools/libvirt-guests.sh.in
 +++ b/tools/libvirt-guests.sh.in
-@@ -20,30 +20,30 @@ sysconfdir="@sysconfdir@"
- localstatedir="@localstatedir@"
+@@ -21,19 +21,19 @@ localstatedir="@localstatedir@"
+ initconfdir="@initconfdir@"
  libvirtd="@sbindir@"/libvirtd
  
 -# Source function library.
@@ -60,13 +60,8 @@ index 87f96af..9fe1c4c 100644
  SHUTDOWN_TIMEOUT=300
  PARALLEL_SHUTDOWN=0
  START_DELAY=0
- BYPASS_CACHE=0
- SYNC_TIME=0
- 
--test -f "$sysconfdir"/sysconfig/libvirt-guests &&
--    . "$sysconfdir"/sysconfig/libvirt-guests
-+test -f "$sysconfdir"/default/libvirt-guests &&
-+    . "$sysconfdir"/default/libvirt-guests
+@@ -44,7 +44,7 @@ test -f "$initconfdir"/libvirt-guests &&
+     . "$initconfdir"/libvirt-guests
  
  LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
 -VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
@@ -74,7 +69,7 @@ index 87f96af..9fe1c4c 100644
  
  RETVAL=0
  
-@@ -562,8 +562,7 @@ gueststatus() {
+@@ -563,8 +563,7 @@ gueststatus() {
  
  # rh_status
  # Display current status: whether saved state exists, and whether start


=====================================
debian/patches/debian/Debianize-systemd-service-files.patch deleted
=====================================
@@ -1,64 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 26 Jun 2012 09:30:39 +0200
-Subject: Debianize systemd service files
-
-Forwarded: not-needed
----
- src/locking/virtlockd.service.in | 2 +-
- src/logging/virtlogd.service.in  | 2 +-
- src/remote/libvirtd.service.in   | 2 +-
- tools/libvirt-guests.service.in  | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index 19271d1..bd45fcc 100644
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -8,7 +8,7 @@ Documentation=https://libvirt.org
- 
- [Service]
- Environment=VIRTLOCKD_ARGS=
--EnvironmentFile=- at sysconfdir@/sysconfig/virtlockd
-+EnvironmentFile=- at sysconfdir@/default/virtlockd
- ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
- ExecReload=/bin/kill -USR1 $MAINPID
- # Losing the locks is a really bad thing that will
-diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
-index 8ab5478..dd25c7c 100644
---- a/src/logging/virtlogd.service.in
-+++ b/src/logging/virtlogd.service.in
-@@ -7,7 +7,7 @@ Documentation=man:virtlogd(8)
- Documentation=https://libvirt.org
- 
- [Service]
--EnvironmentFile=- at sysconfdir@/sysconfig/virtlogd
-+EnvironmentFile=- at sysconfdir@/default/virtlogd
- ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
- ExecReload=/bin/kill -USR1 $MAINPID
- # Losing the logs is a really bad thing that will
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 3058827..ad1314d 100644
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -28,7 +28,7 @@ Documentation=https://libvirt.org
- [Service]
- Type=notify
- Environment=LIBVIRTD_ARGS="--timeout 120"
--EnvironmentFile=- at sysconfdir@/sysconfig/libvirtd
-+EnvironmentFile=- at sysconfdir@/default/libvirtd
- ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index 1c569c3..b98e58a 100644
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -14,7 +14,7 @@ Documentation=man:libvirt-guests(8)
- Documentation=https://libvirt.org
- 
- [Service]
--EnvironmentFile=- at sysconfdir@/sysconfig/libvirt-guests
-+EnvironmentFile=- at sysconfdir@/default/libvirt-guests
- # Hack just call traditional service until we factor
- # out the code
- ExecStart=@libexecdir@/libvirt-guests.sh start


=====================================
debian/patches/series
=====================================
@@ -1,6 +1,5 @@
 forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
 forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
 debian/Debianize-libvirt-guests.patch
-debian/Debianize-systemd-service-files.patch
 debian/apparmor_profiles_local_include.patch
 debian/Use-sensible-editor-by-default.patch


=====================================
debian/rules
=====================================
@@ -97,6 +97,7 @@ endif
 DEB_CONFIGURE_EXTRA_ARGS := \
     --libexecdir=/usr/lib/libvirt \
     -Drunstatedir=/run \
+    -Dinitconfdir=/etc/default \
     -Dpackager="$(DEB_VENDOR)" \
     -Dpackager_version="$(DEB_VERSION)" \
     -Ddriver_qemu=enabled \



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/30d22d0f0d17f0aebb152c0232811020983d1b4f...71d0cdd74d8329b91a1b83f7aa74ebddbb42fa27

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/30d22d0f0d17f0aebb152c0232811020983d1b4f...71d0cdd74d8329b91a1b83f7aa74ebddbb42fa27
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/20230602/38d1421f/attachment-0001.htm>

More information about the Pkg-libvirt-commits mailing list