pool/libosinfo
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 380985 from hardware

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/380985
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosinfo?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2016-04-03 21:05:58 +00:00 committed by Git OBS Bridge
commit a4494dce2a
8 changed files with 559 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

303
0ae4f0db-add-missing-sles-distros.patch Normal file
View File

@ -0,0 +1,303 @@
Subject: data: add missing SLES/SLED distro information
From: Charles Arnold carnold@suse.com Tue Mar 22 15:57:17 2016 -0600
Date: Thu Mar 24 11:41:25 2016 +0100:
Git: 0ae4f0dbe8ce237c1dc8725acd1a0e30593622d4
Add missing SLES/SLED distro information.
Added os data and isodata for the following distros:
SUSE Linux Enterprise Server 12 SP1
SUSE Linux Enterprise Desktop 12 SP1
Added isodata for the following distros:
SUSE Linux Enterprise Server 11 SP4
SUSE Linux Enterprise Desktop 11 SP4
diff --git a/data/os/suse.com/sled-12.1.xml.in b/data/os/suse.com/sled-12.1.xml.in
new file mode 100644
index 0000000..1d0167f
--- /dev/null
+++ b/data/os/suse.com/sled-12.1.xml.in
@@ -0,0 +1,23 @@
+<libosinfo version="0.0.1">
+ <os id="http://suse.com/sled/12.1">
+ <short-id>sled12sp1</short-id>
+ <_name>SUSE Linux Enterprise Desktop 12 SP1</_name>
+ <version>12.1</version>
+ <_vendor>SUSE</_vendor>
+ <family>linux</family>
+ <distro>sled</distro>
+ <upgrades id="http://suse.com/sled/12"/>
+ <derives-from id="http://suse.com/sled/12"/>
+
+ <release-date>2015-12-18</release-date>
+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-12-SP1-Desktop-DVD-x86_64*</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ </os>
+</libosinfo>
diff --git a/data/os/suse.com/sles-12.1.xml.in b/data/os/suse.com/sles-12.1.xml.in
new file mode 100644
index 0000000..5956ce1
--- /dev/null
+++ b/data/os/suse.com/sles-12.1.xml.in
@@ -0,0 +1,23 @@
+<libosinfo version="0.0.1">
+ <os id="http://suse.com/sles/12.1">
+ <short-id>sles12sp1</short-id>
+ <_name>SUSE Linux Enterprise Server 12 SP1</_name>
+ <version>12.1</version>
+ <_vendor>SUSE</_vendor>
+ <family>linux</family>
+ <distro>sles</distro>
+ <upgrades id="http://suse.com/sles/12"/>
+ <derives-from id="http://suse.com/sles/12"/>
+
+ <release-date>2015-12-18</release-date>
+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-12-SP1-Server-DVD-x86_64*</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3698ef8..9097b71 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -304,6 +304,7 @@ data/os/suse.com/sled-11.3.xml.in
data/os/suse.com/sled-11.4.xml.in
data/os/suse.com/sled-11.xml.in
data/os/suse.com/sled-12.xml.in
+data/os/suse.com/sled-12.1.xml.in
data/os/suse.com/sles-9.xml.in
data/os/suse.com/sles-10.xml.in
data/os/suse.com/sles-11.1.xml.in
@@ -312,6 +313,7 @@ data/os/suse.com/sles-11.3.xml.in
data/os/suse.com/sles-11.4.xml.in
data/os/suse.com/sles-11.xml.in
data/os/suse.com/sles-12.xml.in
+data/os/suse.com/sles-12.1.xml.in
data/os/ubuntu.com/ubuntu-4.10.xml.in
data/os/ubuntu.com/ubuntu-5.04.xml.in
data/os/ubuntu.com/ubuntu-5.10.xml.in
diff --git a/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-i586-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-i586-GM-DVD1.iso.txt
new file mode 100644
index 0000000..9e704fd
--- /dev/null
+++ b/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-i586-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLED-11-SP4-DVD-i58610211
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLED-11-SP4-DVD-i586-Build1021-Media1
+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: 2204975
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 218 536
diff --git a/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..fd876a0
--- /dev/null
+++ b/test/isodata/sled/sled11sp4/SLED-11-SP4-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLED-11-SP4-DVD-x86_6410211
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLED-11-SP4-DVD-x86_64-Build1021-Media1
+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: 2266410
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 146A 5226
diff --git a/test/isodata/sled/sled12sp1/SLE-12-SP1-Desktop-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sled/sled12sp1/SLE-12-SP1-Desktop-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..09f89d1
--- /dev/null
+++ b/test/isodata/sled/sled12sp1/SLE-12-SP1-Desktop-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP1-Desktop-DVD-x86_64343
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP1-Desktop-DVD-x86_64-Build3432-Media1
+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: 2246625
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 14F0 5360
diff --git a/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-i586-GM-DVD1.iso.txt b/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-i586-GM-DVD1.iso.txt
new file mode 100644
index 0000000..e4220a1
--- /dev/null
+++ b/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-i586-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLES-11-SP4-DVD-i58612211
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLES-11-SP4-DVD-i586-Build1221-Media1
+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: 1578152
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 1AD 429
diff --git a/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..0580ae4
--- /dev/null
+++ b/test/isodata/sles/sles11sp4/SLES-11-SP4-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLES-11-SP4-DVD-x86_6412211
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLES-11-SP4-DVD-x86_64-Build1221-Media1
+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: 1652460
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 13A2 5026
diff --git a/test/isodata/sles/sles12sp1/SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso.txt b/test/isodata/sles/sles12sp1/SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..b0d8723
--- /dev/null
+++ b/test/isodata/sles/sles12sp1/SLE-12-SP1-Server-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP1-Server-DVD-x86_643247
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP1-Server-DVD-x86_64-Build3247-Media1
+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: 1547794
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 14C6 5318

214
92c55cab-add-missing-opensuse-distros.patch Normal file
View File

@ -0,0 +1,214 @@
Subject: data: add missing openSUSE distro information
From: Charles Arnold carnold@suse.com Tue Mar 22 15:56:09 2016 -0600
Date: Thu Mar 24 11:44:18 2016 +0100:
Git: 92c55cab6b219d1f4e7e360f92e2562d016b81d5
Add missing openSUSE distro information.
Added os data and isodata for the following distros:
openSUSE Leap 42.1
openSUSE Tumbleweed
diff --git a/data/os/opensuse.org/opensuse-42.1.xml.in b/data/os/opensuse.org/opensuse-42.1.xml.in
new file mode 100644
index 0000000..e116de0
--- /dev/null
+++ b/data/os/opensuse.org/opensuse-42.1.xml.in
@@ -0,0 +1,25 @@
+<libosinfo version="0.0.1">
+ <os id="http://opensuse.org/opensuse/42.1">
+ <short-id>opensuse42.1</short-id>
+ <_name>openSUSE Leap 42.1</_name>
+ <version>42.1</version>
+ <_vendor>openSUSE</_vendor>
+ <family>linux</family>
+ <distro>opensuse</distro>
+ <upgrades id="http://opensuse.org/opensuse/13.2" />
+ <derives-from id="http://opensuse.org/opensuse/13.2" />
+
+ <release-date>2015-11-04</release-date>
+
+ <media arch="x86_64">
+ <url>http://download.opensuse.org/distribution/leap/42.1/iso/openSUSE-Leap-42.1-DVD-x86_64.iso</url>
+ <iso>
+ <volume-id>openSUSE-Leap-42.1-DVD-x86_64026</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>
+ </os>
+</libosinfo>
diff --git a/data/os/opensuse.org/opensuse-tumbleweed.xml.in b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
new file mode 100644
index 0000000..99b2fbc
--- /dev/null
+++ b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
@@ -0,0 +1,48 @@
+<libosinfo version="0.0.1">
+ <os id="http://opensuse.org/opensuse/tumbleweed">
+ <short-id>opensusetumbleweed</short-id>
+ <_name>openSUSE Tumbleweed</_name>
+ <version>tumbleweed</version>
+ <_vendor>openSUSE</_vendor>
+ <family>linux</family>
+ <distro>opensuse</distro>
+ <upgrades id="http://download.opensuse.org/tumbleweed/repo" />
+ <derives-from id="http://download.opensuse.org/tumbleweed/repo" />
+
+ <media arch="i686">
+ <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso</url>
+ <iso>
+ <volume-id>openSUSE-Tumbleweed-DVD-i586*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX GmbH</publisher-id>
+ </iso>
+ <kernel>boot/i386/loader/linux</kernel>
+ <initrd>boot/i386/loader/initrd</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Current.iso</url>
+ <iso>
+ <volume-id>openSUSE-Tumbleweed-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>
+
+ <resources arch="all">
+ <!-- http://en.opensuse.org/Hardware_requirements -->
+ <minimum>
+ <cpu>500000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>1073741824</ram>
+ <storage>3221225472</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <ram>2147483648</ram>
+ <storage>5368709120</storage>
+ </recommended>
+ </resources>
+ </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9097b71..fecdd95 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -217,6 +217,8 @@ data/os/opensuse.org/opensuse-12.2.xml.in
data/os/opensuse.org/opensuse-12.3.xml.in
data/os/opensuse.org/opensuse-13.1.xml.in
data/os/opensuse.org/opensuse-13.2.xml.in
+data/os/opensuse.org/opensuse-42.1.xml.in
+data/os/opensuse.org/opensuse-tumbleweed.xml.in
data/os/opensuse.org/opensuse-factory.xml.in
data/os/opensuse.org/opensuse-unknown.xml.in
data/os/oracle.com/solaris-11.xml.in
diff --git a/test/isodata/opensuse/opensuse42.1/openSUSE-42.1-DVD-x86_64.iso.txt b/test/isodata/opensuse/opensuse42.1/openSUSE-42.1-DVD-x86_64.iso.txt
new file mode 100644
index 0000000..da37cd6
--- /dev/null
+++ b/test/isodata/opensuse/opensuse42.1/openSUSE-42.1-DVD-x86_64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: openSUSE-Leap-42.1-DVD-x86_64026
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: openSUSE-Leap-42.1-DVD-x86_64-Build0265-Media
+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: 2269201
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 1628 5672
diff --git a/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-i586-Current.iso.txt b/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-i586-Current.iso.txt
new file mode 100644
index 0000000..c96327c
--- /dev/null
+++ b/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-i586-Current.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: openSUSE-Tumbleweed-DVD-i5860005
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: openSUSE-Tumbleweed-DVD-i586-Build0005-Media
+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: 2008612
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 363 867
diff --git a/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-x86_64-Current.iso.txt b/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-x86_64-Current.iso.txt
new file mode 100644
index 0000000..ac95688
--- /dev/null
+++ b/test/isodata/opensuse/opensusetumbleweed/openSUSE-Tumbleweed-DVD-x86_64-Current.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: openSUSE-Tumbleweed-DVD-x86_6400
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: openSUSE-Tumbleweed-DVD-x86_64-Build0004-Media
+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: 2250813
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 160A 5642

30
add-opensuse-leap-42.1-support.patch
View File

@ -1,30 +0,0 @@
Index: libosinfo-0.3.0/data/os/opensuse.org/opensuse-42.1.xml.in
===================================================================
--- /dev/null
+++ libosinfo-0.3.0/data/os/opensuse.org/opensuse-42.1.xml.in
@@ -0,0 +1,25 @@
+<libosinfo version="0.0.1">
+ <os id="http://opensuse.org/opensuse/42.1">
+ <short-id>opensuse42.1</short-id>
+ <_name>openSUSE Leap 42.1</_name>
+ <version>42.1</version>
+ <_vendor>openSUSE</_vendor>
+ <family>linux</family>
+ <distro>opensuse</distro>
+ <upgrades id="http://opensuse.org/opensuse/13.2" />
+ <derives-from id="http://opensuse.org/opensuse/13.2" />
+
+ <release-date>2015-11-04</release-date>
+
+ <media arch="x86_64">
+ <url>http://download.opensuse.org/distribution/leap/42.1/iso/openSUSE-Leap-42.1-DVD-x86_64.iso</url>
+ <iso>
+ <volume-id>openSUSE-Leap-42.1-DVD-x86_64026</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>
+ </os>
+</libosinfo>

56
add-sle12sp1-support.patch
View File

@ -1,56 +0,0 @@
Index: libosinfo-0.3.0/data/os/suse.com/sles-12.1.xml.in
===================================================================
--- /dev/null
+++ libosinfo-0.3.0/data/os/suse.com/sles-12.1.xml.in
@@ -0,0 +1,23 @@
+<libosinfo version="0.0.1">
+ <os id="http://suse.com/sles/12.1">
+ <short-id>sles12sp1</short-id>
+ <_name>SUSE Linux Enterprise Server 12 SP1</_name>
+ <version>12.1</version>
+ <_vendor>SUSE</_vendor>
+ <family>linux</family>
+ <distro>sles</distro>
+ <upgrades id="http://suse.com/sles/12"/>
+ <derives-from id="http://suse.com/sles/12"/>
+
+ <release-date>2015-12-18</release-date>
+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-12-SP1-Server-DVD-x86_643247</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ </os>
+</libosinfo>
Index: libosinfo-0.3.0/data/os/suse.com/sled-12.1.xml.in
===================================================================
--- /dev/null
+++ libosinfo-0.3.0/data/os/suse.com/sled-12.1.xml.in
@@ -0,0 +1,23 @@
+<libosinfo version="0.0.1">
+ <os id="http://suse.com/sled/12.1">
+ <short-id>sled12sp1</short-id>
+ <_name>SUSE Linux Enterprise Desktop 12 SP1</_name>
+ <version>12.1</version>
+ <_vendor>SUSE</_vendor>
+ <family>linux</family>
+ <distro>sled</distro>
+ <upgrades id="http://suse.com/sled/12"/>
+ <derives-from id="http://suse.com/sled/12"/>
+
+ <release-date>2015-12-18</release-date>
+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-12-SP1-Desktop-DVD-x86_64343</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ </os>
+</libosinfo>

2
add-sle12sp2-support.patch
View File

@ -35,7 +35,7 @@ Index: libosinfo-0.3.0/data/os/suse.com/sled-12.2.xml.in
+ <os id="http://suse.com/sled/12.2">
+ <short-id>sled12sp2</short-id>
+ <_name>SUSE Linux Enterprise Desktop 12 SP2</_name>
+ <version>12.1</version>
+ <version>12.2</version>
+ <_vendor>SUSE</_vendor>
+ <family>linux</family>
+ <distro>sled</distro>

51
add-tumbleweed-support.patch
View File

@ -1,51 +0,0 @@
--- /dev/null 2016-02-02 14:21:10.885009574 -0700
+++ libosinfo-0.3.0/data/os/opensuse.org/opensuse-tumbleweed.xml.in 2016-02-02 13:56:55.000000000 -0700
@@ -0,0 +1,48 @@
+<libosinfo version="0.0.1">
+ <os id="http://opensuse.org/opensuse/tumbleweed">
+ <short-id>opensuse-tumbleweed</short-id>
+ <_name>openSUSE Tumbleweed</_name>
+ <version>tumbleweed</version>
+ <_vendor>openSUSE</_vendor>
+ <family>linux</family>
+ <distro>opensuse</distro>
+ <upgrades id="http://opensuse.org/opensuse/tumbleweed" />
+ <derives-from id="http://opensuse.org/opensuse/tumbleweed" />
+
+ <media arch="i686">
+ <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso</url>
+ <iso>
+ <volume-id>openSUSE-Tumbleweed-DVD-i586*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX GmbH</publisher-id>
+ </iso>
+ <kernel>boot/i386/loader/linux</kernel>
+ <initrd>boot/i386/loader/initrd</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Current.iso</url>
+ <iso>
+ <volume-id>openSUSE-Tumbleweed-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>
+
+ <resources arch="all">
+ <!-- http://en.opensuse.org/Hardware_requirements -->
+ <minimum>
+ <cpu>500000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>1073741824</ram>
+ <storage>3221225472</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <ram>2147483648</ram>
+ <storage>5368709120</storage>
+ </recommended>
+ </resources>
+ </os>
+</libosinfo>

35
libosinfo.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Thu Mar 24 10:40:07 MDT 2016 - carnold@suse.com
- Replace patches with upstream version
0ae4f0db-add-missing-sles-distros.patch
92c55cab-add-missing-opensuse-distros.patch
- Dropped
add-missing-sles-distros.patch
add-missing-opensuse-distros.patch
-------------------------------------------------------------------
Wed Mar 23 09:29:57 MDT 2016 - carnold@suse.com
- Replace patches with newer versions
add-missing-opensuse-distros.patch
add-missing-sles-distros.patch
- Dropped patches:
add-opensuse-leap-42.1-support.patch
add-tumbleweed-support.patch with
add-sle12sp1-support.patch with
-------------------------------------------------------------------
Wed Mar 16 11:45:34 MDT 2016 - carnold@suse.com
- Fix version string for sled12sp2
add-sle12sp2-support.patch
-------------------------------------------------------------------
Tue Mar 15 16:07:47 MDT 2016 - carnold@suse.com
- bsc#971077 - virt-manager error: 'maximum recursion depth
exceeded while calling a Python object' when installing TW as a
KVM guest
add-tumbleweed-support.patch
-------------------------------------------------------------------
Tue Feb 3 11:44:59 MST 2016 - carnold@suse.com

14
libosinfo.spec
View File

@ -28,11 +28,10 @@ Group: System/Libraries
Url: http://libosinfo.org/
Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.gz
Source1: ids.tar.bz2
Patch10: add-sle12sp1-support.patch
Patch11: add-opensuse-leap-42.1-support.patch
Patch12: Fix_derives-from_and_add_tablet_item.patch
Patch13: add-sle12sp2-support.patch
Patch14: add-tumbleweed-support.patch
Patch1: 0ae4f0db-add-missing-sles-distros.patch
Patch2: 92c55cab-add-missing-opensuse-distros.patch
Patch10: Fix_derives-from_and_add_tablet_item.patch
Patch11: add-sle12sp2-support.patch
BuildRequires: intltool
BuildRequires: libtool
BuildRequires: vala
@ -97,11 +96,10 @@ the API is available in all common programming languages.
%endif
%prep
%setup -q -a 1
%patch1 -p1
%patch2 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%build
%configure \