rpm/osinfo-db
SHA256
1
0
Fork 0
forked from pool/osinfo-db
Code Pull Requests Activity

- Update database to version 20200804

Browse Source 
- Drop patches included in new tarball
  add-opensuse-leap-15.2-support.patch
  add-sle15sp2-support.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/osinfo-db?expand=0&rev=100
This commit is contained in:
Charles Arnold 2020-08-07 15:54:56 +00:00 committed by Git OBS Bridge
parent f01cc28b5d
commit 7655d38ef1
10 changed files with 55 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SLE-add-info-about-UEFI-support.patch
View File

@ -1,26 +1,24 @@
Index: osinfo-db-20200529/os/suse.com/sles-12.2.xml Index: osinfo-db-20200804/os/suse.com/sles-12.2.xml
=================================================================== ===================================================================
--- osinfo-db-20200529.orig/os/suse.com/sles-12.2.xml --- osinfo-db-20200804.orig/os/suse.com/sles-12.2.xml
+++ osinfo-db-20200529/os/suse.com/sles-12.2.xml +++ osinfo-db-20200804/os/suse.com/sles-12.2.xml
@@ -44,6 +44,8 @@ @@ -56,6 +56,7 @@
<device id="http://pcisig.com/pci/8086/293e"/> <device id="http://pcisig.com/pci/8086/293e"/>
<!-- ich9-hda -->
</devices> </devices>
+ <firmware arch="x86_64" type="efi"/> + <firmware arch="x86_64" type="efi"/>
+
<media arch="x86_64"> <media arch="x86_64">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
Index: osinfo-db-20200529/os/suse.com/sled-12.2.xml Index: osinfo-db-20200804/os/suse.com/sled-12.2.xml
=================================================================== ===================================================================
--- osinfo-db-20200529.orig/os/suse.com/sled-12.2.xml --- osinfo-db-20200804.orig/os/suse.com/sled-12.2.xml
+++ osinfo-db-20200529/os/suse.com/sled-12.2.xml +++ osinfo-db-20200804/os/suse.com/sled-12.2.xml
@@ -44,6 +44,8 @@ @@ -56,6 +56,7 @@
<device id="http://pcisig.com/pci/8086/293e"/> <device id="http://pcisig.com/pci/8086/293e"/>
<!-- ich9-hda -->
</devices> </devices>
+ <firmware arch="x86_64" type="efi"/> + <firmware arch="x86_64" type="efi"/>
+
<media arch="x86_64"> <media arch="x86_64">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>

125
add-opensuse-leap-15.2-support.patch
View File

@ -1,125 +0,0 @@
--- /dev/null 2020-05-18 08:31:58.984168313 -0600
+++ osinfo-db-20200214/os/opensuse.org/opensuse-15.2.xml 2020-05-22 10:39:56.073024784 -0600
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+
+ <os id="http://opensuse.org/opensuse/15.2">
+ <short-id>opensuse15.2</short-id>
+ <name>openSUSE Leap 15.2</name>
+ <name xml:lang="fr">openSUSE Leap 15.2</name>
+ <name xml:lang="pl">openSUSE Leap 15.2</name>
+ <name xml:lang="uk">openSUSE Leap 15.2</name>
+ <version>15.2</version>
+ <vendor>openSUSE</vendor>
+ <vendor xml:lang="ca">openSUSE</vendor>
+ <vendor xml:lang="de">openSUSE</vendor>
+ <vendor xml:lang="es">openSUSE</vendor>
+ <vendor xml:lang="fr">openSUSE</vendor>
+ <vendor xml:lang="id">openSUSE</vendor>
+ <vendor xml:lang="it">openSUSE</vendor>
+ <vendor xml:lang="ja">openSUSE</vendor>
+ <vendor xml:lang="pl">openSUSE</vendor>
+ <vendor xml:lang="pt_BR">openSUSE</vendor>
+ <vendor xml:lang="uk">openSUSE</vendor>
+ <family>linux</family>
+ <distro>opensuse</distro>
+ <upgrades id="http://opensuse.org/opensuse/15.1"/>
+ <derives-from id="http://opensuse.org/opensuse/15.1"/>
+
+ <release-date>2020-07-02</release-date>
+
+ <variant id="netinst">
+ <name>openSUSE Leap 15.2</name>
+ <name xml:lang="fr">openSUSE Leap 15.2</name>
+ <name xml:lang="pl">openSUSE Leap 15.2</name>
+ <name xml:lang="uk">openSUSE Leap 15.2</name>
+ </variant>
+
+
+ <media arch="x86_64">
+ <url>https://download.opensuse.org/distribution/leap/15.2/iso/openSUSE-Leap-15.2-DVD-x86_64.iso</url>
+ <iso>
+ <volume-id>openSUSE-Leap-15.2-DVD-x86_64*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX GmbH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+
+ <media arch="x86_64">
+ <variant id="netinst"/>
+ <url>https://download.opensuse.org/distribution/leap/15.2/iso/openSUSE-Leap-15.2-NET-x86_64.iso</url>
+ <iso>
+ <volume-id>openSUSE-Leap-15.2-NET-x86_64*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX GmbH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+
+ <media live="true" installer-script="false" arch="x86_64">
+ <url>https://download.opensuse.org/distribution/leap/15.2/live/openSUSE-Leap-15.2-GNOME-Live-x86_64-Current.iso</url>
+ <iso>
+ <volume-id>openSUSE_Leap_15.2_GNOME_Live</volume-id>
+ <publisher-id>SUSE LINUX GMBH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+
+ <media live="true" installer-script="false" arch="x86_64">
+ <url>https://download.opensuse.org/distribution/leap/15.2/live/openSUSE-Leap-15.2-KDE-Live-x86_64-Current.iso</url>
+ <iso>
+ <volume-id>openSUSE_Leap_15.2_KDE_Live</volume-id>
+ <publisher-id>SUSE LINUX GMBH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+
+ <media live="true" installer-script="false" arch="x86_64">
+ <url>https://download.opensuse.org/distribution/leap/15.2/live/openSUSE-Leap-15.2-Rescue-CD-x86_64-Current.iso</url>
+ <iso>
+ <volume-id>openSUSE_Leap_15.2_Rescue_CD</volume-id>
+ <publisher-id>SUSE LINUX GMBH</publisher-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+ <tree arch="x86_64">
+ <url>https://download.opensuse.org/pub/opensuse/distribution/leap/15.2/repo/oss/</url>
+ <treeinfo>
+ <family>openSUSE Leap</family>
+ <version>15.2</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+
+ <installer>
+ <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
+ <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
+ </installer>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>1600000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>1073741824</ram>
+ <storage>3221225472</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <ram>2147483648</ram>
+ <storage>17179869184</storage>
+ </recommended>
+ </resources>
+ </os>
+</libosinfo>

77
add-sle15sp2-support.patch
View File

@ -1,77 +0,0 @@
Index: osinfo-db-20190805/os/suse.com/sle-15.2.xml
===================================================================
--- /dev/null
+++ osinfo-db-20190805/os/suse.com/sle-15.2.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+
+ <os id="http://suse.com/sle/15.2">
+ <short-id>sle15sp2</short-id>
+ <name>SUSE Linux Enterprise 15 SP2</name>
+ <version>15.2</version>
+ <vendor>SUSE</vendor>
+ <vendor xml:lang="ca">SUSE</vendor>
+ <vendor xml:lang="es">SUSE</vendor>
+ <vendor xml:lang="fr">SUSE</vendor>
+ <vendor xml:lang="id">SUSE</vendor>
+ <vendor xml:lang="it">SUSE</vendor>
+ <vendor xml:lang="pl">SUSE</vendor>
+ <vendor xml:lang="uk">SUSE</vendor>
+ <family>linux</family>
+ <distro>sle</distro>
+ <upgrades id="http://suse.com/sle/15.1"/>
+ <derives-from id="http://suse.com/sle/15.1"/>
+
+ <release-date>2020-02-07</release-date>
+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP2.*-x86_64.*</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP2.*-aarch64.*</volume-id>
+ </iso>
+ <kernel>boot/aarch64/linux</kernel>
+ <initrd>boot/aarch64/initrd</initrd>
+ </media>
+
+ <media arch="ppc64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP2.*-ppc64le.*</volume-id>
+ </iso>
+ <kernel>boot/ppc64le/linux</kernel>
+ <initrd>boot/ppc64le/initrd</initrd>
+ </media>
+
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP2.*-s390x.*</volume-id>
+ </iso>
+ <kernel>boot/s390x/linux</kernel>
+ <initrd>boot/s390x/initrd</initrd>
+ </media>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>500000000</cpu>
+ <ram>536870912</ram>
+ <storage>1074151424</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <ram>1073741824</ram>
+ <storage>17179869184</storage>
+ </recommended>
+ </resources>
+ </os>
+</libosinfo>

13
add-win-2k19-media-info.patch
View File

@ -1,11 +1,11 @@
Index: osinfo-db-20200529/os/microsoft.com/win-2k19.xml Index: osinfo-db-20200804/os/microsoft.com/win-2k19.xml
=================================================================== ===================================================================
--- osinfo-db-20200529.orig/os/microsoft.com/win-2k19.xml --- osinfo-db-20200804.orig/os/microsoft.com/win-2k19.xml
+++ osinfo-db-20200529/os/microsoft.com/win-2k19.xml +++ osinfo-db-20200804/os/microsoft.com/win-2k19.xml
@@ -29,6 +29,23 @@ @@ -30,6 +30,22 @@
<derives-from id="http://microsoft.com/win/2k16"/>
<upgrades id="http://microsoft.com/win/2k16"/>
<release-date>2018-10-02</release-date> <release-date>2018-10-02</release-date>
+ <media arch="x86_64"> + <media arch="x86_64">
+ <variant id="standard"/> + <variant id="standard"/>
+ <iso> + <iso>
@ -22,7 +22,6 @@ Index: osinfo-db-20200529/os/microsoft.com/win-2k19.xml
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[A-Z0-9]*_([A-Z]*)</l10n-language> + <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[A-Z0-9]*_([A-Z]*)</l10n-language>
+ </iso> + </iso>
+ </media> + </media>
+
<resources arch="x86_64"> <resources arch="x86_64">
<minimum> <minimum>
<cpu>1400000000</cpu> <cpu>1400000000</cpu>

19
fix-sle15sp1-volume-id-string.patch
View File

@ -1,8 +1,8 @@
Index: osinfo-db-20200529/os/suse.com/sle-15.1.xml Index: osinfo-db-20200804/os/suse.com/sle-15.1.xml
=================================================================== ===================================================================
--- osinfo-db-20200529.orig/os/suse.com/sle-15.1.xml --- osinfo-db-20200804.orig/os/suse.com/sle-15.1.xml
+++ osinfo-db-20200529/os/suse.com/sle-15.1.xml +++ osinfo-db-20200804/os/suse.com/sle-15.1.xml
@@ -29,7 +29,7 @@ @@ -31,7 +31,7 @@
<media arch="x86_64"> <media arch="x86_64">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
@ -11,7 +11,7 @@ Index: osinfo-db-20200529/os/suse.com/sle-15.1.xml
</iso> </iso>
<kernel>boot/x86_64/loader/linux</kernel> <kernel>boot/x86_64/loader/linux</kernel>
<initrd>boot/x86_64/loader/initrd</initrd> <initrd>boot/x86_64/loader/initrd</initrd>
@@ -38,7 +38,7 @@ @@ -39,7 +39,7 @@
<media arch="aarch64"> <media arch="aarch64">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
@ -29,7 +29,7 @@ Index: osinfo-db-20200529/os/suse.com/sle-15.1.xml
</iso> </iso>
<kernel>boot/ppc64le/linux</kernel> <kernel>boot/ppc64le/linux</kernel>
<initrd>boot/ppc64le/initrd</initrd> <initrd>boot/ppc64le/initrd</initrd>
@@ -56,7 +56,7 @@ @@ -55,7 +55,7 @@
<media arch="s390x"> <media arch="s390x">
<iso> <iso>
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
@ -38,10 +38,3 @@ Index: osinfo-db-20200529/os/suse.com/sle-15.1.xml
</iso> </iso>
<kernel>boot/s390x/linux</kernel> <kernel>boot/s390x/linux</kernel>
<initrd>boot/s390x/initrd</initrd> <initrd>boot/s390x/initrd</initrd>
@@ -75,4 +75,4 @@
</recommended>
</resources>
</os>
-</libosinfo>
\ No newline at end of file
+</libosinfo>

30
fix-tumbleweed-order.patch
View File

@ -1,11 +1,11 @@
Index: osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml Index: osinfo-db-20200804/os/opensuse.org/opensuse-tumbleweed.xml
=================================================================== ===================================================================
--- osinfo-db-20200529.orig/os/opensuse.org/opensuse-tumbleweed.xml 2020-05-29 13:07:41.000000000 +0200 --- osinfo-db-20200804.orig/os/opensuse.org/opensuse-tumbleweed.xml
+++ osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml 2020-07-01 09:04:20.344096387 +0200 +++ osinfo-db-20200804/os/opensuse.org/opensuse-tumbleweed.xml
@@ -51,16 +51,6 @@ @@ -54,16 +54,6 @@
<name xml:lang="fr">openSUSE Tumbleweed (Kubic)</name>
</variant> </variant>
<!-- DVD Image -->
- <media arch="i686"> - <media arch="i686">
- <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso</url> - <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso</url>
- <iso> - <iso>
@ -19,12 +19,11 @@ Index: osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml
<media arch="x86_64"> <media arch="x86_64">
<url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Current.iso</url> <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Current.iso</url>
<iso> <iso>
@@ -71,13 +61,10 @@ @@ -74,18 +64,17 @@
<kernel>boot/x86_64/loader/linux</kernel> <kernel>boot/x86_64/loader/linux</kernel>
<initrd>boot/x86_64/loader/initrd</initrd> <initrd>boot/x86_64/loader/initrd</initrd>
</media> </media>
- - <!-- Network Image -->
-
<media arch="i686"> <media arch="i686">
- <variant id="netinst"/> - <variant id="netinst"/>
- <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-i586-Current.iso</url> - <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-i586-Current.iso</url>
@ -35,7 +34,14 @@ Index: osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml
<system-id>LINUX</system-id> <system-id>LINUX</system-id>
<publisher-id>SUSE LINUX GmbH</publisher-id> <publisher-id>SUSE LINUX GmbH</publisher-id>
</iso> </iso>
@@ -95,6 +84,17 @@ <kernel>boot/i386/loader/linux</kernel>
<initrd>boot/i386/loader/initrd</initrd>
</media>
+ <!-- Network Image -->
<media arch="x86_64">
<variant id="netinst"/>
<url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso</url>
@@ -97,6 +86,17 @@
<kernel>boot/x86_64/loader/linux</kernel> <kernel>boot/x86_64/loader/linux</kernel>
<initrd>boot/x86_64/loader/initrd</initrd> <initrd>boot/x86_64/loader/initrd</initrd>
</media> </media>
@ -50,6 +56,6 @@ Index: osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml
+ <kernel>boot/i386/loader/linux</kernel> + <kernel>boot/i386/loader/linux</kernel>
+ <initrd>boot/i386/loader/initrd</initrd> + <initrd>boot/i386/loader/initrd</initrd>
+ </media> + </media>
<!-- Kubic -->
<media arch="x86_64"> <media arch="x86_64">
<variant id="kubic"/>

3
osinfo-db-20200529.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3620b5beed29bd7663fd35637ac209b0c7eeb12417ee1ea56150565e64727955
size 104668

3
osinfo-db-20200804.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b7c8040f3b576857b305aebab90cb567b65117e7dbf930770e2cf40fcf4a8bf
size 112204

8
osinfo-db.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Aug 7 09:21:27 MDT 2020 - carnold@suse.com
- Update database to version 20200804
- Drop patches included in new tarball
add-opensuse-leap-15.2-support.patch
add-sle15sp2-support.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 1 07:06:24 UTC 2020 - Frederic Crozat <fcrozat@suse.com> Wed Jul 1 07:06:24 UTC 2020 - Frederic Crozat <fcrozat@suse.com>

8
osinfo-db.spec
View File

@ -17,7 +17,7 @@
Name: osinfo-db Name: osinfo-db
Version: 20200529 Version: 20200804
Release: 0 Release: 0
Summary: Osinfo database files Summary: Osinfo database files
License: LGPL-2.1+ and GPL-2.0+ License: LGPL-2.1+ and GPL-2.0+
@ -27,12 +27,10 @@ Url: https://gitlab.com/libosinfo/osinfo-db
Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
Patch21: add-oes-support.patch Patch21: add-oes-support.patch
Patch22: add-caasp40-support.patch Patch22: add-caasp40-support.patch
Patch23: add-sle15sp2-support.patch
Patch24: add-win-2k19-media-info.patch Patch24: add-win-2k19-media-info.patch
Patch25: fix-sle15sp1-volume-id-string.patch Patch25: fix-sle15sp1-volume-id-string.patch
Patch26: SLE-add-info-about-UEFI-support.patch Patch26: SLE-add-info-about-UEFI-support.patch
Patch27: add-opensuse-leap-15.2-support.patch Patch27: fix-tumbleweed-order.patch
Patch28: fix-tumbleweed-order.patch
BuildRequires: intltool BuildRequires: intltool
BuildRequires: osinfo-db-tools BuildRequires: osinfo-db-tools
@ -45,12 +43,10 @@ provisioning of new virtual machines
%setup -q %setup -q
%patch21 -p1 %patch21 -p1
%patch22 -p1 %patch22 -p1
%patch23 -p1
%patch24 -p1 %patch24 -p1
%patch25 -p1 %patch25 -p1
%patch26 -p1 %patch26 -p1
%patch27 -p1 %patch27 -p1
%patch28 -p1
%build %build
cd %{_builddir} cd %{_builddir}