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

- Fix the length of string for the ISO volume id (bsc#1054986)

Browse Source 
fix-sle15sp1-volume-id-string.patch
  add-sle15sp2-support.patch
- Fix release date of SLE12-SP5
  add-sle12sp5-support.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/osinfo-db?expand=0&rev=94
This commit is contained in:
Charles Arnold 2020-03-03 18:10:36 +00:00 committed by Git OBS Bridge
parent 349c80eedf
commit 0f1ee526e4
5 changed files with 67 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
add-sle12sp5-support.patch
View File

@ -110,7 +110,7 @@ Index: osinfo-db-20181116/os/suse.com/sled-12.5.xml
+ <upgrades id="http://suse.com/sled/12.4"/>
+ <derives-from id="http://suse.com/sled/12.4"/>
+
+ <release-date>2019-12-06</release-date>
+ <release-date>2019-06-13</release-date>
+
+ <devices>
+ <device id="http://pcisig.com/pci/1af4/1041"/>

14
add-sle15sp2-support.patch
View File

@ -1,5 +1,7 @@
--- /dev/null 2019-09-04 05:15:19.437256156 -0600
+++ osinfo-db-20190805/os/suse.com/sle-15.2.xml 2019-09-04 15:47:49.866902082 -0600
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">
@ -26,7 +28,7 @@
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP2-Installer-DVD-x86\.001</volume-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>
@ -35,7 +37,7 @@
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP2-Installer-DVD-aar\.001</volume-id>
+ <volume-id>SLE-15-SP2.*-aarch64.*</volume-id>
+ </iso>
+ <kernel>boot/aarch64/linux</kernel>
+ <initrd>boot/aarch64/initrd</initrd>
@ -44,7 +46,7 @@
+ <media arch="ppc64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP2-Installer-DVD-ppc\.001</volume-id>
+ <volume-id>SLE-15-SP2.*-ppc64le.*</volume-id>
+ </iso>
+ <kernel>boot/ppc64le/linux</kernel>
+ <initrd>boot/ppc64le/initrd</initrd>
@ -53,7 +55,7 @@
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP2-Installer-DVD-s39\.001</volume-id>
+ <volume-id>SLE-15-SP2.*-s390x.*</volume-id>
+ </iso>
+ <kernel>boot/s390x/linux</kernel>
+ <initrd>boot/s390x/initrd</initrd>

47
fix-sle15sp1-volume-id-string.patch Normal file
View File

@ -0,0 +1,47 @@
Index: osinfo-db-20190805/os/suse.com/sle-15.1.xml
===================================================================
--- osinfo-db-20190805.orig/os/suse.com/sle-15.1.xml
+++ osinfo-db-20190805/os/suse.com/sle-15.1.xml
@@ -23,7 +23,7 @@
<media arch="x86_64">
<iso>
<system-id>LINUX</system-id>
- <volume-id>SLE-15-SP1-Installer-DVD-x86\.001</volume-id>
+ <volume-id>SLE-15-SP1-Installer-DVD-x86.*</volume-id>
</iso>
<kernel>boot/x86_64/loader/linux</kernel>
<initrd>boot/x86_64/loader/initrd</initrd>
@@ -32,7 +32,7 @@
<media arch="aarch64">
<iso>
<system-id>LINUX</system-id>
- <volume-id>SLE-15-SP1-Installer-DVD-aar\.001</volume-id>
+ <volume-id>SLE-15-SP1-Installer-DVD-aar.*</volume-id>
</iso>
<kernel>boot/aarch64/linux</kernel>
<initrd>boot/aarch64/initrd</initrd>
@@ -41,7 +41,7 @@
<media arch="ppc64">
<iso>
<system-id>LINUX</system-id>
- <volume-id>SLE-15-SP1-Installer-DVD-ppc\.001</volume-id>
+ <volume-id>SLE-15-SP1-Installer-DVD-ppc.*</volume-id>
</iso>
<kernel>boot/ppc64le/linux</kernel>
<initrd>boot/ppc64le/initrd</initrd>
@@ -50,7 +50,7 @@
<media arch="s390x">
<iso>
<system-id>LINUX</system-id>
- <volume-id>SLE-15-SP1-Installer-DVD-s39\.001</volume-id>
+ <volume-id>SLE-15-SP1-Installer-DVD-s39.*</volume-id>
</iso>
<kernel>boot/s390x/linux</kernel>
<initrd>boot/s390x/initrd</initrd>
@@ -69,4 +69,4 @@
</recommended>
</resources>
</os>
-</libosinfo>
\ No newline at end of file
+</libosinfo>

9
osinfo-db.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Feb 26 15:12:25 MST 2020 - carnold@suse.com
- Fix the length of string for the ISO volume id (bsc#1054986)
fix-sle15sp1-volume-id-string.patch
add-sle15sp2-support.patch
- Fix release date of SLE12-SP5
add-sle12sp5-support.patch
-------------------------------------------------------------------
Thu Jan 2 10:33:53 MST 2020 - carnold@suse.com

2
osinfo-db.spec
View File

@ -30,6 +30,7 @@ Patch22: add-caasp40-support.patch
Patch23: add-sle12sp5-support.patch
Patch24: add-sle15sp2-support.patch
Patch25: add-win-2k19-media-info.patch
Patch26: fix-sle15sp1-volume-id-string.patch
BuildRequires: intltool
BuildRequires: osinfo-db-tools
@ -45,6 +46,7 @@ provisioning of new virtual machines
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%build
cd %{_builddir}