Add support for sle12sp1 and other upstream patches. OBS-URL: https://build.opensuse.org/request/show/317805 OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=37
160 lines
5.5 KiB
Diff
160 lines
5.5 KiB
Diff
Subject: suse: Add opensuse 13.2 info
|
|
From: Lin Ma lma@suse.com Wed Jun 3 09:54:38 2015 +0800
|
|
Date: Thu Jun 4 15:59:56 2015 +0100:
|
|
Git: 1d08a23c320db2e207a810aaee0186d07f7b2535
|
|
|
|
Signed-off-by: Lin Ma <lma@suse.com>
|
|
|
|
diff --git a/data/oses/opensuse.xml.in b/data/oses/opensuse.xml.in
|
|
index 1c89d00..d922965 100644
|
|
--- a/data/oses/opensuse.xml.in
|
|
+++ b/data/oses/opensuse.xml.in
|
|
@@ -441,6 +441,40 @@
|
|
</resources>
|
|
</os>
|
|
|
|
+ <os id="http://opensuse.org/opensuse/13.2">
|
|
+ <short-id>opensuse13.2</short-id>
|
|
+ <_name>openSUSE 13.2</_name>
|
|
+ <version>13.2</version>
|
|
+ <_vendor>openSUSE</_vendor>
|
|
+ <family>linux</family>
|
|
+ <distro>opensuse</distro>
|
|
+ <upgrades id="http://opensuse.org/opensuse/13.1" />
|
|
+ <derives-from id="http://opensuse.org/opensuse/13.1" />
|
|
+
|
|
+ <release-date>2014-11-04</release-date>
|
|
+
|
|
+ <media arch="i686">
|
|
+ <url>http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-i586.iso</url>
|
|
+ <iso>
|
|
+ <volume-id>openSUSE-13.2-DVD</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/distribution/13.2/iso/openSUSE-13.2-DVD-x86_64.iso</url>
|
|
+ <iso>
|
|
+ <volume-id>openSUSE-13.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>
|
|
+ </os>
|
|
+
|
|
<!-- Generic entry for future openSUSE releases. Please update the
|
|
'upgrades', 'derives-from', 'volume-id' and 'resources' nodes
|
|
accordingly each time you add a new (specific) entry for a new
|
|
@@ -452,13 +486,13 @@
|
|
<_vendor>openSUSE</_vendor>
|
|
<family>linux</family>
|
|
<distro>opensuse</distro>
|
|
- <upgrades id="http://opensuse.org/opensuse/13.1" />
|
|
- <derives-from id="http://opensuse.org/opensuse/13.1" />
|
|
+ <upgrades id="http://opensuse.org/opensuse/13.2" />
|
|
+ <derives-from id="http://opensuse.org/opensuse/13.2" />
|
|
<release-status>prerelease</release-status>
|
|
|
|
<media arch="i686">
|
|
<iso>
|
|
- <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[2-9])-DVD</volume-id>
|
|
+ <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[3-9])-DVD</volume-id>
|
|
<system-id>LINUX</system-id>
|
|
<publisher-id>SUSE LINUX GmbH</publisher-id>
|
|
</iso>
|
|
@@ -467,7 +501,7 @@
|
|
</media>
|
|
<media arch="x86_64">
|
|
<iso>
|
|
- <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[2-9])-DVD-x86_64</volume-id>
|
|
+ <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[3-9])-DVD-x86_64</volume-id>
|
|
<system-id>LINUX</system-id>
|
|
<publisher-id>SUSE LINUX GmbH</publisher-id>
|
|
</iso>
|
|
@@ -498,8 +532,8 @@
|
|
<_vendor>openSUSE</_vendor>
|
|
<family>linux</family>
|
|
<distro>opensuse</distro>
|
|
- <upgrades id="http://opensuse.org/opensuse/13.1" />
|
|
- <derives-from id="http://opensuse.org/opensuse/13.1" />
|
|
+ <upgrades id="http://opensuse.org/opensuse/13.2" />
|
|
+ <derives-from id="http://opensuse.org/opensuse/13.2" />
|
|
<release-status>snapshot</release-status>
|
|
|
|
<media arch="i686">
|
|
diff --git a/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-i586.iso.txt b/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-i586.iso.txt
|
|
new file mode 100644
|
|
index 0000000..a2c3afd
|
|
--- /dev/null
|
|
+++ b/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-i586.iso.txt
|
|
@@ -0,0 +1,29 @@
|
|
+CD-ROM is in ISO 9660 format
|
|
+System id: LINUX
|
|
+Volume id: openSUSE-13.2-DVD-i5860054
|
|
+Volume set id:
|
|
+Publisher id: SUSE LINUX GmbH
|
|
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
|
|
+Application id: openSUSE-13.2-DVD-i586-Build0054-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: 2257566
|
|
+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 347 839
|
|
diff --git a/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-x86_64.iso.txt b/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-x86_64.iso.txt
|
|
new file mode 100644
|
|
index 0000000..f78c781
|
|
--- /dev/null
|
|
+++ b/test/isodata/opensuse/opensuse13.2/openSUSE-13.2-DVD-x86_64.iso.txt
|
|
@@ -0,0 +1,29 @@
|
|
+CD-ROM is in ISO 9660 format
|
|
+System id: LINUX
|
|
+Volume id: openSUSE-13.2-DVD-x86_640051
|
|
+Volume set id:
|
|
+Publisher id: SUSE LINUX GmbH
|
|
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
|
|
+Application id: openSUSE-13.2-DVD-x86_64-Build0051-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: 2284287
|
|
+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 16C2 5826
|