From 9c684c3a579b147059a6a8af065b41f2382177a41ad61f06793762dfc90d7d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 22 Jul 2015 09:09:19 +0000 Subject: [PATCH] Accepting request 317805 from Virtualization 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 --- 1d08a23c-add-opensuse-13.2-support.patch | 159 ++++++++++++ 6c3ddecb-add-rhel7.1-support.patch | 301 +++++++++++++++++++++++ 7b31e3ac-add-qemu-2.3-support.patch | 122 +++++++++ a563ad22-fix-fedora-unknown-regexp.patch | 44 ++++ add-sle12sp1-support.patch | 56 +++++ libosinfo.changes | 16 ++ libosinfo.spec | 10 + 7 files changed, 708 insertions(+) create mode 100644 1d08a23c-add-opensuse-13.2-support.patch create mode 100644 6c3ddecb-add-rhel7.1-support.patch create mode 100644 7b31e3ac-add-qemu-2.3-support.patch create mode 100644 a563ad22-fix-fedora-unknown-regexp.patch create mode 100644 add-sle12sp1-support.patch diff --git a/1d08a23c-add-opensuse-13.2-support.patch b/1d08a23c-add-opensuse-13.2-support.patch new file mode 100644 index 0000000..038f26d --- /dev/null +++ b/1d08a23c-add-opensuse-13.2-support.patch @@ -0,0 +1,159 @@ +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 + +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 @@ + + + ++ ++ opensuse13.2 ++ <_name>openSUSE 13.2 ++ 13.2 ++ <_vendor>openSUSE ++ linux ++ opensuse ++ ++ ++ ++ 2014-11-04 ++ ++ ++ http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-i586.iso ++ ++ openSUSE-13.2-DVD ++ LINUX ++ SUSE LINUX GmbH ++ ++ boot/i386/loader/linux ++ boot/i386/loader/initrd ++ ++ ++ http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-x86_64.iso ++ ++ openSUSE-13.2-DVD-x86_64 ++ LINUX ++ SUSE LINUX GmbH ++ ++ boot/x86_64/loader/linux ++ boot/x86_64/loader/initrd ++ ++ ++ + ++ ++ ++ LINUX ++ RHEL.*Atomic.*7 x86_64.* ++ 652435456 ++ ++ isolinux/vmlinuz ++ isolinux/initrd.img ++ ++ ++ ++ ++ ++ LINUX ++ RHEL.*Atomic.*7 x86_64.* ++ 654243840 ++ ++ isolinux/vmlinuz ++ isolinux/initrd.img ++ ++ ++ ++ ++ 1 ++ 1000000000 ++ 1073741824 ++ 10737418240 ++ ++ ++ ++ 400000000 ++ 1073741824 ++ 9663676416 ++ ++ ++ + +diff --git a/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt +new file mode 100644 +index 0000000..10fb7ce +--- /dev/null ++++ b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt +@@ -0,0 +1,29 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: RHEL Atomic Host 7 x86_64 ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM ++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: 318572 ++El Torito VD version 1 found, boot catalog is in sector 46 ++Joliet with UCS level 3 found ++Rock Ridge signatures version 1 found ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 456D 17773 +diff --git a/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt +new file mode 100644 +index 0000000..f6569fa +--- /dev/null ++++ b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt +@@ -0,0 +1,29 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: RHEL Atomic Host 7 x86_64 ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM ++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: 319455 ++El Torito VD version 1 found, boot catalog is in sector 46 ++Joliet with UCS level 3 found ++Rock Ridge signatures version 1 found ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 458B 17803 +diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt +new file mode 100644 +index 0000000..92b8597 +--- /dev/null ++++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt +@@ -0,0 +1,29 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: RHEL-7.1 Client.x86_64 ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM ++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: 1870122 ++El Torito VD version 1 found, boot catalog is in sector 986 ++Joliet with UCS level 3 found ++Rock Ridge signatures version 1 found ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 2AE29 175657 +diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt +new file mode 100644 +index 0000000..8aba100 +--- /dev/null ++++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt +@@ -0,0 +1,29 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: RHEL-7.1 Server.x86_64 ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM ++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: 1899146 ++El Torito VD version 1 found, boot catalog is in sector 1102 ++Joliet with UCS level 3 found ++Rock Ridge signatures version 1 found ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 2AE9E 175774 +diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt +new file mode 100644 +index 0000000..dea75a5 +--- /dev/null ++++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt +@@ -0,0 +1,29 @@ ++CD-ROM is in ISO 9660 format ++System id: LINUX ++Volume id: RHEL-7.1 Workstation.x86_64 ++Volume set id: ++Publisher id: ++Data preparer id: ++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM ++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: 2152803 ++El Torito VD version 1 found, boot catalog is in sector 1121 ++Joliet with UCS level 3 found ++Rock Ridge signatures version 1 found ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 2AEB0 175792 diff --git a/7b31e3ac-add-qemu-2.3-support.patch b/7b31e3ac-add-qemu-2.3-support.patch new file mode 100644 index 0000000..a71783b --- /dev/null +++ b/7b31e3ac-add-qemu-2.3-support.patch @@ -0,0 +1,122 @@ +Subject: Added support for qemu upto version 2.3.0 +From: T A Mahadevan ta.mahadevan@gmail.com Wed Jul 8 18:46:44 2015 +0530 +Date: Thu Jul 16 17:36:59 2015 +0200: +Git: 7b31e3ac4fdd58922035cd7b9d83e00aea6c5532 + + +diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in +index 03590a3..8fa2e0b 100644 +--- a/data/hypervisors/qemu.xml.in ++++ b/data/hypervisors/qemu.xml.in +@@ -253,4 +253,111 @@ + + + ++ ++ qemu-1.7.1 ++ <_name>QEMU 1.7.1 ++ <_vendor>qemu.org ++ 1.7.1 ++ 2014-03-03 ++ ++ ++ ++ ++ qemu-1.7.2 ++ <_name>QEMU 1.7.2 ++ <_vendor>qemu.org ++ 1.7.2 ++ 2014-07-21 ++ ++ ++ ++ ++ qemu-2.0.0 ++ <_name>QEMU 2.0.0 ++ <_vendor>qemu.org ++ 2.0.0 ++ 2014-04-17 ++ ++ ++ ++ ++ qemu-2.0.1 ++ <_name>QEMU 2.0.1 ++ <_vendor>qemu.org ++ 2.0.1 ++ 2014-08-15 ++ ++ ++ ++ ++ qemu-2.0.2 ++ <_name>QEMU 2.0.2 ++ <_vendor>qemu.org ++ 2.0.2 ++ 2014-08-18 ++ ++ ++ ++ ++ qemu-2.1.0 ++ <_name>QEMU 2.1.0 ++ <_vendor>qemu.org ++ 2.1.0 ++ 2014-08-01 ++ ++ ++ ++ ++ qemu-2.1.1 ++ <_name>QEMU 2.1.1 ++ <_vendor>qemu.org ++ 2.1.1 ++ 2014-09-10 ++ ++ ++ ++ ++ qemu-2.1.2 ++ <_name>QEMU 2.1.2 ++ <_vendor>qemu.org ++ 2.1.2 ++ 2014-09-25 ++ ++ ++ ++ ++ qemu-2.1.3 ++ <_name>QEMU 2.1.3 ++ <_vendor>qemu.org ++ 2.1.3 ++ 2015-01-22 ++ ++ ++ ++ ++ qemu-2.2.0 ++ <_name>QEMU 2.2.0 ++ <_vendor>qemu.org ++ 2.2.0 ++ 2014-12-09 ++ ++ ++ ++ ++ qemu-2.2.1 ++ <_name>QEMU 2.2.1 ++ <_vendor>qemu.org ++ 2.2.1 ++ 2015-03-10 ++ ++ ++ ++ ++ qemu-2.3.0 ++ <_name>QEMU 2.3.0 ++ <_vendor>qemu.org ++ 2.3.0 ++ 2015-04-24 ++ ++ + diff --git a/a563ad22-fix-fedora-unknown-regexp.patch b/a563ad22-fix-fedora-unknown-regexp.patch new file mode 100644 index 0000000..428ee80 --- /dev/null +++ b/a563ad22-fix-fedora-unknown-regexp.patch @@ -0,0 +1,44 @@ +Subject: fedora: Fix fedora-unknown regexp +From: Christophe Fergeau cfergeau@redhat.com Thu Jul 16 17:55:01 2015 +0200 +Date: Fri Jul 17 09:43:08 2015 +0200: +Git: a563ad22b34963a1c0a5364efea9e17c62d16909 + +It's currently matching fedora 21 and fedora 22, causing make distcheck +failures. + +diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in +index 0fc2cfe..b81f3c9 100644 +--- a/data/oses/fedora.xml.in ++++ b/data/oses/fedora.xml.in +@@ -4263,13 +4263,13 @@ + + + +- Fedora.*-([2-9][1-9]|[0-9]{3,}).*-i386 ++ Fedora.*-([2-9][3-9]|[0-9]{3,}).*-i386 + LINUX + + + + +- Fedora.*-([2-9][1-9]|[0-9]{3,}).*-x86_64 ++ Fedora.*-([2-9][3-9]|[0-9]{3,}).*-x86_64 + LINUX + + isolinux/vmlinuz +@@ -4278,13 +4278,13 @@ + + + +- Fedora-Live-.*-i686-([2-9][1-9]|[0-9]{3,}) ++ Fedora-Live-.*-i686-([2-9][3-9]|[0-9]{3,}) + LINUX + + + + +- Fedora-Live-.*-x86_64-([2-9][1-9]|[0-9]{3,}) ++ Fedora-Live-.*-x86_64-([2-9][3-9]|[0-9]{3,}) + LINUX + + diff --git a/add-sle12sp1-support.patch b/add-sle12sp1-support.patch new file mode 100644 index 0000000..85679ec --- /dev/null +++ b/add-sle12sp1-support.patch @@ -0,0 +1,56 @@ +Index: libosinfo-0.2.12/data/oses/suse.xml.in +=================================================================== +--- libosinfo-0.2.12.orig/data/oses/suse.xml.in ++++ libosinfo-0.2.12/data/oses/suse.xml.in +@@ -170,6 +170,26 @@ + + + ++ ++ sles12 ++ <_name>SUSE Linux Enterprise Server 12 SP1 ++ 12.1 ++ <_vendor>SUSE ++ linux ++ sles ++ ++ ++ ++ ++ ++ LINUX ++ SLE-12-SP1-Server-DVD-x86_64 ++ ++ boot/x86_64/loader/linux ++ boot/x86_64/loader/initrd ++ ++ ++ + + sled9 + <_name>SUSE Linux Enterprise Desktop 9 +@@ -360,4 +380,24 @@ + + + ++ ++ sled12sp1 ++ <_name>SUSE Linux Enterprise Desktop 12 SP1 ++ 12.1 ++ <_vendor>SUSE ++ linux ++ sled ++ ++ ++ ++ ++ ++ LINUX ++ SLE-12-SP1-Desktop-DVD-x86_64 ++ ++ boot/x86_64/loader/linux ++ boot/x86_64/loader/initrd ++ ++ ++ + diff --git a/libosinfo.changes b/libosinfo.changes index 10a53d0..61ece6d 100644 --- a/libosinfo.changes +++ b/libosinfo.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jul 20 16:25:14 MDT 2015 - carnold@suse.com + +- bsc#938843 - Libosinfo has no support for sles/sled 12 sp1 + add-sle12sp1-support.patch +- Add additional support and fixes + 6c3ddecb-add-rhel7.1-support.patch + 7b31e3ac-add-qemu-2.3-support.patch + a563ad22-fix-fedora-unknown-regexp.patch + +------------------------------------------------------------------- +Fri Jun 5 14:11:08 MDT 2015 - carnold@suse.com + +- Add support for openSUSE 13.2 + 1d08a23c-add-opensuse-13.2-support.patch + ------------------------------------------------------------------- Thu May 28 08:00:18 UTC 2015 - zaitor@opensuse.org diff --git a/libosinfo.spec b/libosinfo.spec index a08416a..ed78783 100644 --- a/libosinfo.spec +++ b/libosinfo.spec @@ -27,6 +27,11 @@ License: LGPL-2.1+ and GPL-2.0+ Group: System/Libraries Url: http://libosinfo.org/ Source: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.gz +Patch1: 1d08a23c-add-opensuse-13.2-support.patch +Patch2: 6c3ddecb-add-rhel7.1-support.patch +Patch3: 7b31e3ac-add-qemu-2.3-support.patch +Patch4: a563ad22-fix-fedora-unknown-regexp.patch +Patch5: add-sle12sp1-support.patch BuildRequires: intltool BuildRequires: libtool BuildRequires: vala @@ -91,6 +96,11 @@ the API is available in all common programming languages. %endif %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %configure \