Package: release.debian.org Severity: normal Tags: buster User: release.debian....@packages.debian.org Usertags: pu
Hi, The current version of osinfo-db in Buster is not supporting buster itself which is quite annoying (see #919486 and #935551). In addition to that, the download links for the stretch iso are no longer valid. I've prepared an update for buster version that fixes these two issues. My update also fixes an issue with the parameter name use in the automated installation profile as described in the documentation and used in the implementations. All the changes are already fixed in last upstream release (currently in unstable) Kind regards, Laurent Bigonville -- System Information: Debian Release: bullseye/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 5.2.0-2-amd64 (SMP w/8 CPU cores) Locale: LANG=fr_BE.UTF-8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8), LANGUAGE=fr_BE:fr (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff -Nru osinfo-db-0.20181120/debian/changelog osinfo-db-0.20181120/debian/changelog --- osinfo-db-0.20181120/debian/changelog 2018-11-20 22:41:36.000000000 +0100 +++ osinfo-db-0.20181120/debian/changelog 2019-08-24 10:06:02.000000000 +0200 @@ -1,3 +1,16 @@ +osinfo-db (0.20181120-1+deb10u1) buster; urgency=medium + + * debian/patches/debian9-update.patch: Fix the URL's to download the iso + files and point to the latest point release (9.9.0) + * debian/patches/debian10-Add-info.patch: Add information about the debian + buster/10 release (Closes: #935551) + * d/p/debian-preseed-Fix-typo-in-config-s-name.patch: Fix the name of the + parameter used to set the fullname when generating a preseed file, the + documentation explicitly talks about "user-realname" but the profile was + using "user-fullname" (the debconf parameter name) by mistake + + -- Laurent Bigonville <bi...@debian.org> Sat, 24 Aug 2019 10:06:02 +0200 + osinfo-db (0.20181120-1) unstable; urgency=medium * [aa777b6] New upstream version 0.20181120 diff -Nru osinfo-db-0.20181120/debian/patches/debian10-Add-info.patch osinfo-db-0.20181120/debian/patches/debian10-Add-info.patch --- osinfo-db-0.20181120/debian/patches/debian10-Add-info.patch 1970-01-01 01:00:00.000000000 +0100 +++ osinfo-db-0.20181120/debian/patches/debian10-Add-info.patch 2019-08-24 10:06:02.000000000 +0200 @@ -0,0 +1,223 @@ +From 13e84168d359b4ab1170451716098b5e72ac15f9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fiden...@redhat.com> +Date: Tue, 9 Jul 2019 08:55:30 +0200 +Subject: [PATCH] debian10: Add info +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Debian 10 has been released on July 6th, 2019. + +Signed-off-by: Fabiano Fidêncio <fiden...@redhat.com> +Reviewed-by: Cole Robinson <crobi...@redhat.com> +--- + data/os/debian.org/debian-10.xml.in | 203 ++++++++++++++++++++++++++++ + 1 file changed, 203 insertions(+) + create mode 100644 data/os/debian.org/debian-10.xml.in + +--- /dev/null ++++ b/data/os/debian.org/debian-10.xml.in +@@ -0,0 +1,203 @@ ++<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://debian.org/debian/10";> ++ <short-id>debian10</short-id> ++ <short-id>debianbuster</short-id> ++ <_name>Debian 10</_name> ++ <version>10</version> ++ <_vendor>Debian Project</_vendor> ++ <family>linux</family> ++ <distro>debian</distro> ++ <codename>buster</codename> ++ <upgrades id="http://debian.org/debian/9"/> ++ <derives-from id="http://debian.org/debian/9"/> ++ ++ <release-date>2019-07-06</release-date> ++ ++ <resources arch="all"> ++ <minimum> ++ <cpu>1000000000</cpu> ++ <n-cpus>1</n-cpus> ++ <ram>1073741824</ram> ++ <storage>10737418240</storage> ++ </minimum> ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ ++ <variant id="universal"> ++ <_name>Debian 10</_name> ++ </variant> ++ <variant id="universal-netinst"> ++ <_name>Debian 10</_name> ++ </variant> ++ ++ <!-- Network installer --> ++ <media arch="i686"> ++ <variant id="universal-netinst"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/i386/iso-cd/debian-10.0.0-i386-netinst.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ i386 n</volume-id> ++ </iso> ++ <kernel>install.386/vmlinuz</kernel> ++ <initrd>install.386/initrd.gz</initrd> ++ </media> ++ <media arch="x86_64"> ++ <variant id="universal-netinst"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/amd64/iso-cd/debian-10.0.0-amd64-netinst.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ amd64 n</volume-id> ++ </iso> ++ <kernel>install.amd/vmlinuz</kernel> ++ <initrd>install.amd/initrd.gz</initrd> ++ </media> ++ <media arch="aarch64"> ++ <variant id="universal-netinst"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/arm64/iso-cd/debian-10.0.0-arm64-netinst.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ arm64 n</volume-id> ++ </iso> ++ <kernel>install.a64/vmlinuz</kernel> ++ <initrd>install.a64/initrd.gz</initrd> ++ </media> ++ <media arch="armv7l"> ++ <variant id="universal-netinst"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/armhf/iso-cd/debian-10.0.0-armhf-netinst.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ armhf n</volume-id> ++ </iso> ++ <kernel>install.armhf/vmlinuz</kernel> ++ <initrd>install.armhf/initrd.gz</initrd> ++ </media> ++ <media arch="ppc64le"> ++ <variant id="universal-netinst"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/ppc64el/iso-cd/debian-10.0.0-ppc64el-netinst.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ ppc64el n</volume-id> ++ </iso> ++ <kernel>install/vmlinux</kernel> ++ <initrd>install/initrd.gz</initrd> ++ </media> ++ <media arch="s390x"> ++ <variant id="universal-netinst"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/s390x/iso-cd/debian-10.0.0-s390x-netinst.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ s390x n</volume-id> ++ </iso> ++ <kernel>boot/linux_vm</kernel> ++ <initrd>boot/root.bin</initrd> ++ </media> ++ ++ <!-- DVD --> ++ <media arch="i686"> ++ <variant id="universal"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/i386/iso-dvd/debian-10.0.0-i386-DVD-1.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ i386 (\d)+</volume-id> ++ </iso> ++ <kernel>install.386/vmlinuz</kernel> ++ <initrd>install.386/initrd.gz</initrd> ++ </media> ++ <media arch="x86_64"> ++ <variant id="universal"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/amd64/iso-dvd/debian-10.0.0-amd64-DVD-1.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ amd64 (\d)+</volume-id> ++ </iso> ++ <kernel>install.amd/vmlinuz</kernel> ++ <initrd>install.amd/initrd.gz</initrd> ++ </media> ++ <media arch="aarch64"> ++ <variant id="universal"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/arm64/iso-dvd/debian-10.0.0-arm64-DVD-1.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ arm64 (\d)+</volume-id> ++ </iso> ++ <kernel>install.a64/vmlinuz</kernel> ++ <initrd>install.a64/initrd.gz</initrd> ++ </media> ++ <media arch="armv7l"> ++ <variant id="universal"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/armhf/iso-dvd/debian-10.0.0-armhf-DVD-1.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ armhf (\d)+</volume-id> ++ </iso> ++ <kernel>install.armhf/vmlinuz</kernel> ++ <initrd>install.armhf/initrd.gz</initrd> ++ </media> ++ <media arch="ppc64le"> ++ <variant id="universal"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/ppc64el/iso-dvd/debian-10.0.0-ppc64el-DVD-1.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ ppc64el (\d)+</volume-id> ++ </iso> ++ <kernel>install/vmlinux</kernel> ++ <initrd>install/initrd.gz</initrd> ++ </media> ++ <media arch="s390x"> ++ <variant id="universal"/> ++ <url>http://cdimage.debian.org/cdimage/release/10.0.0/s390x/iso-dvd/debian-10.0.0-s390x-DVD-1.iso</url> ++ <iso> ++ <volume-id>Debian 10.(\d)+.(\d)+ s390x (\d)+</volume-id> ++ </iso> ++ <kernel>boot/linux_vm</kernel> ++ <initrd>boot/root.bin</initrd> ++ </media> ++ ++ <tree arch="i686"> ++ <url>http://deb.debian.org/debian/dists/buster/main/installer-i386</url> ++ <kernel>current/images/netboot/debian-installer/i386/linux</kernel> ++ <initrd>current/images/netboot/debian-installer/i386/initrd.gz</initrd> ++ </tree> ++ <tree arch="x86_64"> ++ <url>http://deb.debian.org/debian/dists/buster/main/installer-amd64</url> ++ <kernel>current/images/netboot/debian-installer/amd64/linux</kernel> ++ <initrd>current/images/netboot/debian-installer/amd64/initrd.gz</initrd> ++ </tree> ++ <tree arch="aarch64"> ++ <url>http://deb.debian.org/debian/dists/buster/main/installer-arm64</url> ++ <kernel>current/images/netboot/debian-installer/arm64/linux</kernel> ++ <initrd>current/images/netboot/debian-installer/arm64/initrd.gz</initrd> ++ </tree> ++ <tree arch="armv7l"> ++ <url>http://deb.debian.org/debian/dists/buster/main/installer-armhf</url> ++ <kernel>current/images/netboot/debian-installer/armhf/linux</kernel> ++ <initrd>current/images/netboot/debian-installer/armhf/initrd.gz</initrd> ++ </tree> ++ <tree arch="s390x"> ++ <url>http://deb.debian.org/debian/dists/buster/main/installer-s390x</url> ++ <kernel>current/images/generic/kernel.debian</kernel> ++ <initrd>current/images/generic/initrd.debian</initrd> ++ </tree> ++ <tree arch="ppc64le"> ++ <url>http://deb.debian.org/debian/dists/buster/main/installer-ppc64el</url> ++ <kernel>current/images/netboot/debian-installer/ppc64el/vmlinux</kernel> ++ <initrd>current/images/netboot/debian-installer/ppc64el/initrd.gz</initrd> ++ </tree> ++<!-- ++ <image arch="x86_64" format="qcow2" cloud-init="true"> ++ <url>https://cloud.debian.org/images/cloud/OpenStack/current-10/debian-10-openstack-amd64.qcow2</url> ++ </image> ++ ++ <image arch="x86_64" format="raw" cloud-init="true"> ++ <url>https://cloud.debian.org/images/cloud/OpenStack/current-10/debian-10-openstack-amd64.raw</url> ++ </image> ++ ++ <image arch="aarch64" format="qcow2" cloud-init="true"> ++ <url>https://cloud.debian.org/images/cloud/OpenStack/current-10/debian-10-openstack-arm64.qcow2</url> ++ </image> ++ ++ <image arch="aarch64" format="raw" cloud-init="true"> ++ <url>https://cloud.debian.org/images/cloud/OpenStack/current-10/debian-10-openstack-arm64.raw</url> ++ </image> ++--> ++ <installer> ++ <script id='http://debian.org/debian/preseed/jeos'/> ++ <script id='http://debian.org/debian/preseed/desktop'/> ++ </installer> ++ </os> ++</libosinfo> diff -Nru osinfo-db-0.20181120/debian/patches/debian9-update.patch osinfo-db-0.20181120/debian/patches/debian9-update.patch --- osinfo-db-0.20181120/debian/patches/debian9-update.patch 1970-01-01 01:00:00.000000000 +0100 +++ osinfo-db-0.20181120/debian/patches/debian9-update.patch 2019-08-24 10:06:02.000000000 +0200 @@ -0,0 +1,74 @@ +--- a/data/os/debian.org/debian-9.xml.in ++++ b/data/os/debian.org/debian-9.xml.in +@@ -52,7 +52,7 @@ + <!-- Network installer --> + <media arch="i686"> + <variant id="universal-netinst"/> +- <url>http://cdimage.debian.org/cdimage/release/9.6.0/i386/iso-cd/debian-9.6.0-i386-netinst.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.9.0/i386/iso-cd/debian-9.9.0-i386-netinst.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ i386 n</volume-id> + </iso> +@@ -61,7 +61,7 @@ + </media> + <media arch="x86_64"> + <variant id="universal-netinst"/> +- <url>http://cdimage.debian.org/cdimage/release/9.6.0/amd64/iso-cd/debian-9.6.0-amd64-netinst.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.9.0/amd64/iso-cd/debian-9.9.0-amd64-netinst.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ amd64 n</volume-id> + </iso> +@@ -70,7 +70,7 @@ + </media> + <media arch="aarch64"> + <variant id="universal-netinst"/> +- <url>http://cdimage.debian.org/cdimage/release/9.6.0/arm64/iso-cd/debian-9.6.0-arm64-netinst.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.9.0/arm64/iso-cd/debian-9.9.0-arm64-netinst.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ arm64 n</volume-id> + </iso> +@@ -79,7 +79,7 @@ + </media> + <media arch="armv7l"> + <variant id="universal-netinst"/> +- <url>http://cdimage.debian.org/cdimage/release/9.6.0/armhf/iso-cd/debian-9.6.0-armhf-netinst.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.9.0/armhf/iso-cd/debian-9.9.0-armhf-netinst.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ armhf n</volume-id> + </iso> +@@ -90,7 +90,7 @@ + <!-- DVD --> + <media arch="i686"> + <variant id="universal"/> +- <url>http://cdimage.debian.org/cdimage/release/9.6.0/i386/iso-dvd/debian-9.6.0-i386-DVD-1.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.9.0/i386/iso-dvd/debian-9.9.0-i386-DVD-1.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ i386 1</volume-id> + </iso> +@@ -99,7 +99,7 @@ + </media> + <media arch="x86_64"> + <variant id="universal"/> +- <url>http://cdimage.debian.org/cdimage/release/9.6.0/amd64/iso-dvd/debian-9.6.0-amd64-DVD-1.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.9.0/amd64/iso-dvd/debian-9.9.0-amd64-DVD-1.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ amd64 1</volume-id> + </iso> +@@ -108,7 +108,7 @@ + </media> + <media arch="aarch64"> + <variant id="universal"/> +- <url>http://cdimage.debian.org/cdimage/release/9.6.0/arm64/iso-dvd/debian-9.6.0-arm64-DVD-1.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.9.0/arm64/iso-dvd/debian-9.9.0-arm64-DVD-1.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ arm64 1</volume-id> + </iso> +@@ -117,7 +117,7 @@ + </media> + <media arch="armv7l"> + <variant id="universal"/> +- <url>http://cdimage.debian.org/cdimage/release/9.6.0/armhf/iso-dvd/debian-9.6.0-armhf-DVD-1.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/9.9.0/armhf/iso-dvd/debian-9.9.0-armhf-DVD-1.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ armhf 1</volume-id> + </iso> diff -Nru osinfo-db-0.20181120/debian/patches/debian-preseed-Fix-typo-in-config-s-name.patch osinfo-db-0.20181120/debian/patches/debian-preseed-Fix-typo-in-config-s-name.patch --- osinfo-db-0.20181120/debian/patches/debian-preseed-Fix-typo-in-config-s-name.patch 1970-01-01 01:00:00.000000000 +0100 +++ osinfo-db-0.20181120/debian/patches/debian-preseed-Fix-typo-in-config-s-name.patch 2019-08-24 10:06:02.000000000 +0200 @@ -0,0 +1,44 @@ +From 7d0c6c6d649294a935a4d52e05063e282df58470 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fiden...@redhat.com> +Date: Mon, 18 Feb 2019 10:40:25 +0100 +Subject: [PATCH 1/2] debian, preseed: Fix typo in config's name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We've been using "user-fullname" instead "user-realname" in different +profiles for quite a long time. + +Signed-off-by: Fabiano Fidêncio <fiden...@redhat.com> +Reviewed-by: Cole Robinson <crobi...@redhat.com> +--- + .../install-script/debian.org/debian-preseed-desktop.xml.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/install-script/debian.org/debian-preseed-desktop.xml.in b/data/install-script/debian.org/debian-preseed-desktop.xml.in +index 42ed421..5e6f701 100644 +--- a/data/install-script/debian.org/debian-preseed-desktop.xml.in ++++ b/data/install-script/debian.org/debian-preseed-desktop.xml.in +@@ -13,7 +13,7 @@ + + <!-- User options --> + <param name="user-login" policy="required"/> +- <param name="user-fullname" policy="optional"/> ++ <param name="user-realname" policy="optional"/> + <param name="user-password" policy="optional"/> + <param name="admin-password" policy="optional"/> + +@@ -72,8 +72,8 @@ + + <xsl:template name="user-fullname"> + <xsl:choose> +- <xsl:when test="config/user-fullname != ''"> +- <xsl:value-of select="config/user-fullname"/> ++ <xsl:when test="config/user-realname != ''"> ++ <xsl:value-of select="config/user-realname"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="config/user-login"/> +-- +2.23.0 + diff -Nru osinfo-db-0.20181120/debian/patches/series osinfo-db-0.20181120/debian/patches/series --- osinfo-db-0.20181120/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ osinfo-db-0.20181120/debian/patches/series 2019-08-24 10:06:02.000000000 +0200 @@ -0,0 +1,3 @@ +debian10-Add-info.patch +debian9-update.patch +debian-preseed-Fix-typo-in-config-s-name.patch
