[Pkg-libvirt-commits] [Git][libvirt-team/osinfo-db][ubuntu/jammy] Import Debian changes 0.20220214-1ubuntu2.1
Jeremy Bicha (@jbicha)
gitlab at salsa.debian.org
Wed May 24 19:12:45 BST 2023
Jeremy Bicha pushed to branch ubuntu/jammy at Libvirt Packaging Team / osinfo-db
Commits:
06fc8203 by Benjamin Drung at 2023-05-24T14:11:57-04:00
Import Debian changes 0.20220214-1ubuntu2.1
osinfo-db (0.20220214-1ubuntu2.1) jammy; urgency=medium
.
* Cherry-pick upstream tests fix: osinfo: skip supported='false' devices
* Disable virtio-gpu only for Ubuntu 22.04, i.e. enable it for
Ubuntu 18.04 to 21.10 and >= 22.10 again (LP: #1985148)
* ubuntu22.04: update ISO URLs for 22.04.1 release (LP: #1985219)
- - - - -
6 changed files:
- debian/changelog
- − debian/patches/Revert-ubuntu-Enable-3D-Acceleration-option-with-virtio1..patch
- debian/patches/series
- + debian/patches/tests-osinfo-skip-supported-false-devices.patch
- + debian/patches/ubuntu22.04-update-ISO-URLs-for-22.04.1-release.patch
- + debian/patches/ubuntu2204-Temporarily-disable-virtio1.0-gpu.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+osinfo-db (0.20220214-1ubuntu2.1) jammy; urgency=medium
+
+ * Cherry-pick upstream tests fix: osinfo: skip supported='false' devices
+ * Disable virtio-gpu only for Ubuntu 22.04, i.e. enable it for
+ Ubuntu 18.04 to 21.10 and >= 22.10 again (LP: #1985148)
+ * ubuntu22.04: update ISO URLs for 22.04.1 release (LP: #1985219)
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Fri, 12 Aug 2022 16:00:02 +0200
+
osinfo-db (0.20220214-1ubuntu2) jammy; urgency=medium
* Add patch to disable experimental 3D Acceleration feature for Ubuntu guests
=====================================
debian/patches/Revert-ubuntu-Enable-3D-Acceleration-option-with-virtio1..patch deleted
=====================================
@@ -1,31 +0,0 @@
-From: Jeremy Bicha <jeremy.bicha at canonical.com>
-Date: Tue, 19 Apr 2022 17:43:14 -0400
-Subject: Revert "ubuntu: Enable 3D Acceleration option with virtio1.0-gpu"
-
-This appears to have broken the non-3D Accleration
-Ubuntu on Wayland session for 22.04 LTS.
-Let's just disable this feature for now.
-https://launchpad.net/bugs/1969524
-
-This reverts commit f7f475dd0bdc7b73fbab8fecba0a5ec10731b94f.
-
-Signed-off-by: Jeremy Bicha <jeremy.bicha at canonical.com>
----
- data/os/ubuntu.com/ubuntu-18.04.xml.in | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in
-index 71f4c6c..e0f4200 100644
---- a/data/os/ubuntu.com/ubuntu-18.04.xml.in
-+++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in
-@@ -31,10 +31,6 @@
- </recommended>
- </resources>
-
-- <devices>
-- <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
-- </devices>
--
- <media arch="x86_64" live="true">
- <url>https://releases.ubuntu.com/releases/bionic/ubuntu-18.04.6-desktop-amd64.iso</url>
- <iso>
=====================================
debian/patches/series
=====================================
@@ -26,4 +26,6 @@ fix-Use-C.UTF-8-locale.patch
ubuntu-list-desktop-before-server.patch
ubuntu18.04-use-latest-available-ISOs.patch
ubuntu22.04-drop-prerelease-tag.patch
-Revert-ubuntu-Enable-3D-Acceleration-option-with-virtio1..patch
+tests-osinfo-skip-supported-false-devices.patch
+ubuntu2204-Temporarily-disable-virtio1.0-gpu.patch
+ubuntu22.04-update-ISO-URLs-for-22.04.1-release.patch
=====================================
debian/patches/tests-osinfo-skip-supported-false-devices.patch
=====================================
@@ -0,0 +1,27 @@
+From: Victor Toso <victortoso at redhat.com>
+Date: Thu, 12 May 2022 20:18:13 +0200
+Subject: tests: osinfo: skip supported='false' devices
+
+This patch is based on Cole Robinson's work.
+Related: https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/441
+
+Signed-off-by: Victor Toso <victortoso at redhat.com>
+Origin: upstream, commit fb42032e06832b34ab21f3d18a346487c08f010a
+---
+ tests/osinfo.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/osinfo.py b/tests/osinfo.py
+index 2268ffa..e74dbbc 100644
+--- a/tests/osinfo.py
++++ b/tests/osinfo.py
+@@ -74,7 +74,8 @@ class Os(_XMLBase):
+ devicelist = self._root.find('devices')
+ if devicelist is not None:
+ for device in devicelist.findall('device'):
+- devices.append(device.get('id'))
++ if device.get("supported") != "false":
++ devices.append(device.get('id'))
+ return devices
+
+ @_cache_property
=====================================
debian/patches/ubuntu22.04-update-ISO-URLs-for-22.04.1-release.patch
=====================================
@@ -0,0 +1,62 @@
+From: Pino Toscano <ptoscano at redhat.com>
+Date: Fri, 12 Aug 2022 08:56:46 +0200
+Subject: ubuntu22.04: update ISO URLs for 22.04.1 release
+
+https://lists.ubuntu.com/archives/ubuntu-announce/2022-August/000282.html
+
+Signed-off-by: Pino Toscano <ptoscano at redhat.com>
+LP: #1985219
+Origin: upstream, https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/497
+---
+ data/os/ubuntu.com/ubuntu-22.04.xml.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/os/ubuntu.com/ubuntu-22.04.xml.in b/data/os/ubuntu.com/ubuntu-22.04.xml.in
+index d3cada7..7b8661b 100644
+--- a/data/os/ubuntu.com/ubuntu-22.04.xml.in
++++ b/data/os/ubuntu.com/ubuntu-22.04.xml.in
+@@ -48,7 +48,7 @@
+ -->
+
+ <media arch="x86_64" live="true">
+- <url>https://releases.ubuntu.com/22.04/ubuntu-22.04-desktop-amd64.iso</url>
++ <url>https://releases.ubuntu.com/22.04/ubuntu-22.04.1-desktop-amd64.iso</url>
+ <iso>
+ <volume-id>Ubuntu 22.04(.\d\+?)?(.\d\+?)? LTS amd64</volume-id>
+ </iso>
+@@ -59,7 +59,7 @@
+ </installer>
+ </media>
+ <media arch="x86_64" live="true" installer-script="false">
+- <url>https://releases.ubuntu.com/22.04/ubuntu-22.04-live-server-amd64.iso</url>
++ <url>https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 22.04(.\d\+?)?(.\d\+?)? LTS amd64</volume-id>
+ </iso>
+@@ -67,7 +67,7 @@
+ <initrd>casper/initrd</initrd>
+ </media>
+ <media arch="aarch64" live="true" installer-script="false">
+- <url>https://cdimage.ubuntu.com/ubuntu/releases/22.04/release/ubuntu-22.04-live-server-arm64.iso</url>
++ <url>https://cdimage.ubuntu.com/ubuntu/releases/22.04/release/ubuntu-22.04.1-live-server-arm64.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 22.04(.\d\+?)?(.\d\+?)? LTS arm64</volume-id>
+ </iso>
+@@ -75,7 +75,7 @@
+ <initrd>casper/initrd</initrd>
+ </media>
+ <media arch="ppc64le" live="true" installer-script="false">
+- <url>https://cdimage.ubuntu.com/ubuntu/releases/22.04/release/ubuntu-22.04-live-server-ppc64el.iso</url>
++ <url>https://cdimage.ubuntu.com/ubuntu/releases/22.04/release/ubuntu-22.04.1-live-server-ppc64el.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 22.04(.\d\+?)?(.\d\+?)? LTS ppc64</volume-id>
+ </iso>
+@@ -83,7 +83,7 @@
+ <initrd>casper/initrd</initrd>
+ </media>
+ <media arch="s390x" live="true" installer-script="false">
+- <url>https://cdimage.ubuntu.com/ubuntu/releases/22.04/release/ubuntu-22.04-live-server-s390x.iso</url>
++ <url>https://cdimage.ubuntu.com/ubuntu/releases/22.04/release/ubuntu-22.04.1-live-server-s390x.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 22.04(.\d\+?)?(.\d\+?)? LTS s390x</volume-id>
+ </iso>
=====================================
debian/patches/ubuntu2204-Temporarily-disable-virtio1.0-gpu.patch
=====================================
@@ -0,0 +1,33 @@
+From: Jeremy Bicha <jeremy.bicha at canonical.com>
+Date: Thu, 21 Apr 2022 14:11:57 -0400
+Subject: ubuntu2204: Temporarily disable virtio1.0-gpu
+
+GNOME on Wayland is currently unusable (black screen) with
+this device unless the experimental 3D Accleration option is used
+
+This will be fixed with a future gnome-remote-desktop update
+
+https://launchpad.net/bugs/1971195
+
+Signed-off-by: Jeremy Bicha <jeremy.bicha at canonical.com>
+Origin: upstream, https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/441
+LP: #1985148
+---
+ data/os/ubuntu.com/ubuntu-22.04.xml.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/data/os/ubuntu.com/ubuntu-22.04.xml.in b/data/os/ubuntu.com/ubuntu-22.04.xml.in
+index 832b679..d3cada7 100644
+--- a/data/os/ubuntu.com/ubuntu-22.04.xml.in
++++ b/data/os/ubuntu.com/ubuntu-22.04.xml.in
+@@ -32,6 +32,10 @@
+ </recommended>
+ </resources>
+
++ <devices>
++ <device id="http://pcisig.com/pci/1af4/1050" supported="false"/> <!-- virtio1.0-gpu -->
++ </devices>
++
+ <!-- installer-script limitations
+ Server-Live media run with the new subiquity installer.
+ The new style for automated install provided isn't supported
View it on GitLab: https://salsa.debian.org/libvirt-team/osinfo-db/-/commit/06fc820309a01849d8380a346ad2733fe44f2dcd
--
View it on GitLab: https://salsa.debian.org/libvirt-team/osinfo-db/-/commit/06fc820309a01849d8380a346ad2733fe44f2dcd
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/20230524/a9cdac6d/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list