[Pkg-libvirt-commits] [Git][libvirt-team/osinfo-db][ubuntu/lunar] Drop all patches, applied in new release
Jeremy Bicha (@jbicha)
gitlab at salsa.debian.org
Thu May 25 22:13:37 BST 2023
Jeremy Bicha pushed to branch ubuntu/lunar at Libvirt Packaging Team / osinfo-db
Commits:
71a38caf by Jeremy Bicha at 2023-05-25T17:09:35-04:00
Drop all patches, applied in new release
- - - - -
6 changed files:
- − debian/patches/Add-Lunar-data-for-upcoming-Ubuntu-release.patch
- − debian/patches/Re-enable-ubuntu-22.10-desktop-installer-script.patch
- − debian/patches/Remove-lunar-prerelease-status-and-add-release-date.patch
- − debian/patches/Update-ubuntu-22.10-release-date-metadata.patch
- debian/patches/series
- − debian/patches/upstream_debian12-fix-short-id-with-version.patch
Changes:
=====================================
debian/patches/Add-Lunar-data-for-upcoming-Ubuntu-release.patch deleted
=====================================
@@ -1,303 +0,0 @@
-From: Jarred Wilson <jarred.wilson12 at gmail.com>
-Date: Wed, 5 Apr 2023 12:27:00 -0400
-Subject: Add Lunar data for upcoming Ubuntu release
-
-Signed-off-by: Jarred Wilson <jarred.wilson12 at gmail.com>
----
- data/os/ubuntu.com/ubuntu-23.04.xml.in | 114 +++++++++++++++++++++
- .../ubuntu23.04/ubuntu-23.04-desktop-amd64.iso.txt | 29 ++++++
- .../ubuntu-23.04-live-server-amd64-iso.txt | 29 ++++++
- .../ubuntu-23.04-live-server-arm64-iso.txt | 29 ++++++
- .../ubuntu-23.04-live-server-ppc64el-iso.txt | 16 +++
- .../ubuntu-23.04-live-server-s390x-iso.txt | 30 ++++++
- 6 files changed, 247 insertions(+)
- create mode 100644 data/os/ubuntu.com/ubuntu-23.04.xml.in
- create mode 100644 tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-desktop-amd64.iso.txt
- create mode 100644 tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-amd64-iso.txt
- create mode 100644 tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-arm64-iso.txt
- create mode 100644 tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-ppc64el-iso.txt
- create mode 100644 tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-s390x-iso.txt
-
-diff --git a/data/os/ubuntu.com/ubuntu-23.04.xml.in b/data/os/ubuntu.com/ubuntu-23.04.xml.in
-new file mode 100644
-index 0000000..d8a337d
---- /dev/null
-+++ b/data/os/ubuntu.com/ubuntu-23.04.xml.in
-@@ -0,0 +1,114 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+<!-- Licensed under the GNU General Public License version 2 or later.
-+ See http://www.gnu.org/licenses/ for a copy of the license text -->
-+ <os id="http://ubuntu.com/ubuntu/23.04">
-+ <short-id>ubuntu23.04</short-id>
-+ <short-id>ubuntulunar</short-id>
-+ <name>Ubuntu 23.04</name>
-+ <version>23.04</version>
-+ <vendor>Canonical Ltd</vendor>
-+ <family>linux</family>
-+ <distro>ubuntu</distro>
-+ <codename>Lunar Lobster</codename>
-+ <upgrades id="http://ubuntu.com/ubuntu/22.10"/>
-+ <derives-from id="http://ubuntu.com/ubuntu/22.10"/>
-+
-+ <release-status>prerelease</release-status>
-+
-+ <resources arch="all">
-+ <minimum>
-+ <cpu>1000000000</cpu>
-+ <n-cpus>1</n-cpus>
-+ <ram>3221225472</ram>
-+ <storage>21474836480</storage>
-+ </minimum>
-+ <recommended>
-+ <cpu>2000000000</cpu>
-+ <ram>4294967296</ram>
-+ <storage>26843545600</storage>
-+ </recommended>
-+ </resources>
-+
-+ <!-- installer-script limitations
-+ Server-Live media run with the new subiquity installer.
-+ The new style for automated install provided isn't supported
-+ yet in libosinfo and associated tools, therefore for now
-+ it is marked installer-script="false"
-+ More details about the new installer can be found at:
-+ - https://discourse.ubuntu.com/t/server-installer-plans-for-20-04-lts/13631
-+ - https://wiki.ubuntu.com/FoundationsTeam/AutomatedServerInstalls
-+ - https://discourse.ubuntu.com/t/please-review-design-for-automated-server-installs
-+ -->
-+
-+ <media arch="x86_64" live="true" installer-script="false">
-+ <url>https://releases.ubuntu.com/23.04/ubuntu-23.04-desktop-amd64.iso</url>
-+ <iso>
-+ <volume-id>Ubuntu 23.04(.\d\+?)?(.\d\+?)? amd64</volume-id>
-+ </iso>
-+ <kernel>casper/vmlinuz</kernel>
-+ <initrd>casper/initrd</initrd>
-+ </media>
-+ <media arch="x86_64" live="true" installer-script="false">
-+ <url>https://releases.ubuntu.com/23.04/ubuntu-23.04-live-server-amd64.iso</url>
-+ <iso>
-+ <volume-id>Ubuntu-Server 23.04(.\d\+?)?(.\d\+?)? amd64</volume-id>
-+ </iso>
-+ <kernel>casper/vmlinuz</kernel>
-+ <initrd>casper/initrd</initrd>
-+ </media>
-+ <media arch="aarch64" live="true" installer-script="false">
-+ <url>https://cdimage.ubuntu.com/ubuntu/releases/23.04/release/ubuntu-23.04-live-server-arm64.iso</url>
-+ <iso>
-+ <volume-id>Ubuntu-Server 23.04(.\d\+?)?(.\d\+?)? arm64</volume-id>
-+ </iso>
-+ <kernel>casper/vmlinuz</kernel>
-+ <initrd>casper/initrd</initrd>
-+ </media>
-+ <media arch="ppc64le" live="true" installer-script="false">
-+ <url>https://cdimage.ubuntu.com/ubuntu/releases/23.04/release/ubuntu-23.04-live-server-ppc64el.iso</url>
-+ <iso>
-+ <volume-id>Ubuntu-Server 23.04(.\d\+?)?(.\d\+?)? ppc64</volume-id>
-+ </iso>
-+ <kernel>casper/vmlinuz</kernel>
-+ <initrd>casper/initrd</initrd>
-+ </media>
-+ <media arch="s390x" live="true" installer-script="false">
-+ <url>https://cdimage.ubuntu.com/ubuntu/releases/23.04/release/ubuntu-23.04-live-server-s390x.iso</url>
-+ <iso>
-+ <volume-id>Ubuntu-Server 23.04(.\d\+?)?(.\d\+?)? s390x</volume-id>
-+ </iso>
-+ <kernel>casper/vmlinuz</kernel>
-+ <initrd>casper/initrd</initrd>
-+ </media>
-+
-+ <image arch="x86_64" format="qcow2" cloud-init="true">
-+ <url>https://cloud-images.ubuntu.com/lunar/current/lunar-server-cloudimg-amd64.img</url>
-+ </image>
-+
-+ <image arch="x86_64" format="vmdk" cloud-init="true">
-+ <url>https://cloud-images.ubuntu.com/lunar/current/lunar-server-cloudimg-amd64.vmdk</url>
-+ </image>
-+
-+ <image arch="aarch64" format="qcow2" cloud-init="true">
-+ <url>https://cloud-images.ubuntu.com/lunar/current/lunar-server-cloudimg-arm64.img</url>
-+ </image>
-+
-+ <image arch="armv7l" format="qcow2" cloud-init="true">
-+ <url>https://cloud-images.ubuntu.com/lunar/current/lunar-server-cloudimg-armhf.img</url>
-+ </image>
-+
-+ <image arch="ppc64le" format="qcow2" cloud-init="true">
-+ <url>https://cloud-images.ubuntu.com/lunar/current/lunar-server-cloudimg-ppc64el.img</url>
-+ </image>
-+
-+ <image arch="s390x" format="qcow2" cloud-init="true">
-+ <url>https://cloud-images.ubuntu.com/lunar/current/lunar-server-cloudimg-s390x.img</url>
-+ </image>
-+
-+ <installer>
-+ <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
-+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
-+ </installer>
-+ </os>
-+</libosinfo>
-diff --git a/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-desktop-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-desktop-amd64.iso.txt
-new file mode 100644
-index 0000000..ea47113
---- /dev/null
-+++ b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-desktop-amd64.iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id:
-+Volume id: Ubuntu 23.04 amd64
-+Volume set id:
-+Publisher id:
-+Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2
-+Application id:
-+Copyright File id:
-+Abstract File id:
-+Bibliographic File id:
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 2393115
-+El Torito VD version 1 found, boot catalog is in sector 818
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+ Hid 1
-+ Arch 0 (x86)
-+ ID ''
-+ Key 55 AA
-+ Eltorito defaultboot header:
-+ Bootid 88 (bootable)
-+ Boot media 0 (No Emulation Boot)
-+ Load segment 0
-+ Sys type 0
-+ Nsect 4
-+ Bootoff 333 819
-diff --git a/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-amd64-iso.txt b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-amd64-iso.txt
-new file mode 100644
-index 0000000..228fd6a
---- /dev/null
-+++ b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-amd64-iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id:
-+Volume id: Ubuntu-Server 23.04 amd64
-+Volume set id:
-+Publisher id:
-+Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2
-+Application id:
-+Copyright File id:
-+Abstract File id:
-+Bibliographic File id:
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1305485
-+El Torito VD version 1 found, boot catalog is in sector 790
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+ Hid 1
-+ Arch 0 (x86)
-+ ID ''
-+ Key 55 AA
-+ Eltorito defaultboot header:
-+ Bootid 88 (bootable)
-+ Boot media 0 (No Emulation Boot)
-+ Load segment 0
-+ Sys type 0
-+ Nsect 4
-+ Bootoff 317 791
-diff --git a/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-arm64-iso.txt b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-arm64-iso.txt
-new file mode 100644
-index 0000000..16288f6
---- /dev/null
-+++ b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-arm64-iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id:
-+Volume id: Ubuntu-Server 23.04 arm64
-+Volume set id:
-+Publisher id:
-+Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2
-+Application id:
-+Copyright File id:
-+Abstract File id:
-+Bibliographic File id:
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1032342
-+El Torito VD version 1 found, boot catalog is in sector 650
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+ Hid 1
-+ Arch 239 (Unknown Arch)
-+ ID ''
-+ Key 55 AA
-+ Eltorito defaultboot header:
-+ Bootid 88 (bootable)
-+ Boot media 0 (No Emulation Boot)
-+ Load segment 0
-+ Sys type 0
-+ Nsect 2F40
-+ Bootoff FB430 1029168
-diff --git a/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-ppc64el-iso.txt b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-ppc64el-iso.txt
-new file mode 100644
-index 0000000..2f95f0b
---- /dev/null
-+++ b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-ppc64el-iso.txt
-@@ -0,0 +1,16 @@
-+CD-ROM is in ISO 9660 format
-+System id:
-+Volume id: Ubuntu-Server 23.04 ppc64
-+Volume set id:
-+Publisher id:
-+Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2
-+Application id:
-+Copyright File id:
-+Abstract File id:
-+Bibliographic File id:
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 882092
-+NO Joliet present
-+Rock Ridge signatures version 1 found
-diff --git a/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-s390x-iso.txt b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-s390x-iso.txt
-new file mode 100644
-index 0000000..dbdb730
---- /dev/null
-+++ b/tests/isodata/ubuntu/ubuntu23.04/ubuntu-23.04-live-server-s390x-iso.txt
-@@ -0,0 +1,30 @@
-+isoinfo -d -i ./lunar-live-server-s390x.iso
-+CD-ROM is in ISO 9660 format
-+System id:
-+Volume id: Ubuntu-Server 23.04 s390x
-+Volume set id:
-+Publisher id:
-+Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2
-+Application id:
-+Copyright File id:
-+Abstract File id:
-+Bibliographic File id:
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 552355
-+El Torito VD version 1 found, boot catalog is in sector 156
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+ Hid 1
-+ Arch 0 (x86)
-+ ID ''
-+ Key 55 AA
-+ Eltorito defaultboot header:
-+ Bootid 88 (bootable)
-+ Boot media 0 (No Emulation Boot)
-+ Load segment 0
-+ Sys type 0
-+ Nsect FFFFFFFF
-+ Bootoff 9D 157
=====================================
debian/patches/Re-enable-ubuntu-22.10-desktop-installer-script.patch deleted
=====================================
@@ -1,23 +0,0 @@
-From: Jarred Wilson <jarred.wilson12 at gmail.com>
-Date: Wed, 5 Apr 2023 14:03:59 -0400
-Subject: Re-enable ubuntu 22.10 desktop installer script
-
-Signed-off-by: Jarred Wilson <jarred.wilson12 at gmail.com>
-Signed-off-by: Jarred Wilson <jarred.wilson at canonical.com>
----
- data/os/ubuntu.com/ubuntu-22.10.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/os/ubuntu.com/ubuntu-22.10.xml.in b/data/os/ubuntu.com/ubuntu-22.10.xml.in
-index 48b09d4..fe77218 100644
---- a/data/os/ubuntu.com/ubuntu-22.10.xml.in
-+++ b/data/os/ubuntu.com/ubuntu-22.10.xml.in
-@@ -41,7 +41,7 @@
- - https://discourse.ubuntu.com/t/please-review-design-for-automated-server-installs
- -->
-
-- <media arch="x86_64" live="true" installer-script="false">
-+ <media arch="x86_64" live="true" installer-script="true">
- <url>https://releases.ubuntu.com/22.10/ubuntu-22.10-desktop-amd64.iso</url>
- <iso>
- <volume-id>Ubuntu 22.10(.\d\+?)?(.\d\+?)? amd64</volume-id>
=====================================
debian/patches/Remove-lunar-prerelease-status-and-add-release-date.patch deleted
=====================================
@@ -1,21 +0,0 @@
-From: Jarred Wilson <jarred.wilson at canonical.com>
-Date: Thu, 6 Apr 2023 15:08:09 -0400
-Subject: Remove lunar prerelease status and add release date
-
----
- data/os/ubuntu.com/ubuntu-23.04.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/os/ubuntu.com/ubuntu-23.04.xml.in b/data/os/ubuntu.com/ubuntu-23.04.xml.in
-index d8a337d..8c4be6a 100644
---- a/data/os/ubuntu.com/ubuntu-23.04.xml.in
-+++ b/data/os/ubuntu.com/ubuntu-23.04.xml.in
-@@ -14,7 +14,7 @@
- <upgrades id="http://ubuntu.com/ubuntu/22.10"/>
- <derives-from id="http://ubuntu.com/ubuntu/22.10"/>
-
-- <release-status>prerelease</release-status>
-+ <release-date>2023-04-20</release-date>
-
- <resources arch="all">
- <minimum>
=====================================
debian/patches/Update-ubuntu-22.10-release-date-metadata.patch deleted
=====================================
@@ -1,23 +0,0 @@
-From: Jarred Wilson <jarred.wilson12 at gmail.com>
-Date: Wed, 5 Apr 2023 14:05:28 -0400
-Subject: Update ubuntu 22.10 release date metadata
-
-Signed-off-by: Jarred Wilson <jarred.wilson12 at gmail.com>
-Signed-off-by: Jarred Wilson <jarred.wilson at canonical.com>
----
- data/os/ubuntu.com/ubuntu-22.10.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/os/ubuntu.com/ubuntu-22.10.xml.in b/data/os/ubuntu.com/ubuntu-22.10.xml.in
-index df1b28f..48b09d4 100644
---- a/data/os/ubuntu.com/ubuntu-22.10.xml.in
-+++ b/data/os/ubuntu.com/ubuntu-22.10.xml.in
-@@ -14,7 +14,7 @@
- <upgrades id="http://ubuntu.com/ubuntu/22.04"/>
- <derives-from id="http://ubuntu.com/ubuntu/22.04"/>
-
-- <release-status>prerelease</release-status>
-+ <release-date>2022-10-20</release-date>
-
- <resources arch="all">
- <minimum>
=====================================
debian/patches/series
=====================================
@@ -1,5 +0,0 @@
-upstream_debian12-fix-short-id-with-version.patch
-Add-Lunar-data-for-upcoming-Ubuntu-release.patch
-Update-ubuntu-22.10-release-date-metadata.patch
-Re-enable-ubuntu-22.10-desktop-installer-script.patch
-Remove-lunar-prerelease-status-and-add-release-date.patch
=====================================
debian/patches/upstream_debian12-fix-short-id-with-version.patch deleted
=====================================
@@ -1,30 +0,0 @@
-From 61c86b242bf3bb8be18f8970670bad3dbadee952 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <ptoscano at redhat.com>
-Date: Thu, 9 Mar 2023 09:44:34 +0100
-Subject: [PATCH] debian12: fix <short-id> with version
-
-It should be "12", not "11".
-
-Fixes commit dcfcdc36f0d07c4939309c9d5f5a44a95d037345.
-
-Signed-off-by: Pino Toscano <ptoscano at redhat.com>
----
- data/os/debian.org/debian-12.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/os/debian.org/debian-12.xml.in b/data/os/debian.org/debian-12.xml.in
-index edddf403..ad382869 100644
---- a/data/os/debian.org/debian-12.xml.in
-+++ b/data/os/debian.org/debian-12.xml.in
-@@ -2,7 +2,7 @@
- <!-- Licensed under the GNU General Public License version 2 or later.
- See http://www.gnu.org/licenses/ for a copy of the license text -->
- <os id="http://debian.org/debian/12">
-- <short-id>debian11</short-id>
-+ <short-id>debian12</short-id>
- <short-id>debianbookworm</short-id>
- <name>Debian 12</name>
- <version>12</version>
---
-2.39.2
-
View it on GitLab: https://salsa.debian.org/libvirt-team/osinfo-db/-/commit/71a38caf66e6b4c11897050024bccd5915c3656a
--
View it on GitLab: https://salsa.debian.org/libvirt-team/osinfo-db/-/commit/71a38caf66e6b4c11897050024bccd5915c3656a
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/20230525/5ce0725b/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list