From cfergeau at redhat.com Thu Jun 2 12:01:15 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 14:01:15 +0200
Subject: [Libosinfo] [PATCH 1/6] rhel: Add RHEL Atomic 7.2 data
Message-ID: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
---
data/os/redhat.com/rhel-atomic-7.2.xml.in | 38 ++++++++++++++++++++++
po/POTFILES.in | 1 +
.../rhel-atomic-installer-7.2-10.x86_64.iso.txt | 29 +++++++++++++++++
3 files changed, 68 insertions(+)
create mode 100644 data/os/redhat.com/rhel-atomic-7.2.xml.in
create mode 100644 test/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt
diff --git a/data/os/redhat.com/rhel-atomic-7.2.xml.in b/data/os/redhat.com/rhel-atomic-7.2.xml.in
new file mode 100644
index 0000000..5431e7f
--- /dev/null
+++ b/data/os/redhat.com/rhel-atomic-7.2.xml.in
@@ -0,0 +1,38 @@
+
+
+ rhel-atomic-7.2
+ <_name>Red Hat Enterprise Linux Atomic Host 7.2
+ 7.2
+ <_vendor>Red Hat, Inc
+ linux
+ rhel
+
+
+
+
+
+
+ LINUX
+ Red Hat Enterprise Linux Atomic
+ 727855104
+
+ isolinux/vmlinuz
+ isolinux/initrd.img
+
+
+
+
+ 1
+ 1000000000
+ 1073741824
+ 10737418240
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8e377c0..50b7e0b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -278,6 +278,7 @@ data/os/redhat.com/rhel-7.1.xml.in
data/os/redhat.com/rhel-7.2.xml.in
data/os/redhat.com/rhel-atomic-7.0.xml.in
data/os/redhat.com/rhel-atomic-7.1.xml.in
+data/os/redhat.com/rhel-atomic-7.2.xml.in
data/os/redhat.com/rhl-1.0.xml.in
data/os/redhat.com/rhl-1.1.xml.in
data/os/redhat.com/rhl-2.0.xml.in
diff --git a/test/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt
new file mode 100644
index 0000000..f7c74ee
--- /dev/null
+++ b/test/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Red Hat Enterprise Linux Atomic
+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: 355398
+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 4980 18816
--
2.7.4
From cfergeau at redhat.com Thu Jun 2 12:01:16 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 14:01:16 +0200
Subject: [Libosinfo] [PATCH 2/6] rhel: Add RHEL 6.8 data
In-Reply-To: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464868880-29375-2-git-send-email-cfergeau@redhat.com>
---
data/os/redhat.com/rhel-6.8.xml.in | 50 ++++++++++++++++++++++
po/POTFILES.in | 1 +
.../rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt | 29 +++++++++++++
3 files changed, 80 insertions(+)
create mode 100644 data/os/redhat.com/rhel-6.8.xml.in
create mode 100644 test/isodata/rhel/rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt
diff --git a/data/os/redhat.com/rhel-6.8.xml.in b/data/os/redhat.com/rhel-6.8.xml.in
new file mode 100644
index 0000000..fd207c6
--- /dev/null
+++ b/data/os/redhat.com/rhel-6.8.xml.in
@@ -0,0 +1,50 @@
+
+
+ rhel6.8
+ <_name>Red Hat Enterprise Linux 6.8
+ 6.8
+ <_vendor>Red Hat, Inc
+ linux
+ rhel
+ Santiago
+
+
+
+ 2016-05-10
+
+
+
+ LINUX
+ RHEL-6.8 .*.i386.*
+
+ isolinux/vmlinuz
+ isolinux/initrd.img
+
+
+
+ LINUX
+ .*RHEL-6.8 .*.x86_64.*
+
+ isolinux/vmlinuz
+ isolinux/initrd.img
+
+
+
+
+ 1
+ 536870912
+
+
+
+ 400000000
+ 1073741824
+ 9663676416
+
+
+
+
+
+
+
+
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 50b7e0b..c0e3746 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -273,6 +273,7 @@ data/os/redhat.com/rhel-6.4.xml.in
data/os/redhat.com/rhel-6.5.xml.in
data/os/redhat.com/rhel-6.6.xml.in
data/os/redhat.com/rhel-6.7.xml.in
+data/os/redhat.com/rhel-6.8.xml.in
data/os/redhat.com/rhel-7.0.xml.in
data/os/redhat.com/rhel-7.1.xml.in
data/os/redhat.com/rhel-7.2.xml.in
diff --git a/test/isodata/rhel/rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt
new file mode 100644
index 0000000..5384cbe
--- /dev/null
+++ b/test/isodata/rhel/rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL-6.8 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: 1893612
+El Torito VD version 1 found, boot catalog is in sector 1001
+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 1D6D7 120535
--
2.7.4
From cfergeau at redhat.com Thu Jun 2 12:01:19 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 14:01:19 +0200
Subject: [Libosinfo] [PATCH 5/6] opensuse: Rename autoinst files according
to their id
In-Reply-To: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464868880-29375-5-git-send-email-cfergeau@redhat.com>
This causes warnings when running ./test/test-isodetect if they are not
named as expected:
** (process:28952): WARNING **: Entity http://opensuse.org/opensuse/autoyast/desktop
should be in file install-script/opensuse.org/opensuse-autoyast-desktop.xml not
install-script/opensuse.org/autoinst-desktop.xml
---
.../{autoinst-desktop.xml.in => opensuse-autoyast-desktop.xml.in} | 0
.../opensuse.org/{autoinst-jeos.xml.in => opensuse-autoyast-jeos.xml.in} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename data/install-script/opensuse.org/{autoinst-desktop.xml.in => opensuse-autoyast-desktop.xml.in} (100%)
rename data/install-script/opensuse.org/{autoinst-jeos.xml.in => opensuse-autoyast-jeos.xml.in} (100%)
diff --git a/data/install-script/opensuse.org/autoinst-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
similarity index 100%
rename from data/install-script/opensuse.org/autoinst-desktop.xml.in
rename to data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
diff --git a/data/install-script/opensuse.org/autoinst-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
similarity index 100%
rename from data/install-script/opensuse.org/autoinst-jeos.xml.in
rename to data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
--
2.7.4
From cfergeau at redhat.com Thu Jun 2 12:01:17 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 14:01:17 +0200
Subject: [Libosinfo] [PATCH 3/6] ubuntu: Add Ubuntu 15.10 test cases
In-Reply-To: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464868880-29375-3-git-send-email-cfergeau@redhat.com>
Detection was already present, but not the corresponding test files.
---
.../ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt | 29 ++++++++++++++++++++++
.../ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt | 29 ++++++++++++++++++++++
.../ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt | 29 ++++++++++++++++++++++
.../ubuntu15.10/ubuntu-15.10-server-i386.iso.txt | 29 ++++++++++++++++++++++
4 files changed, 116 insertions(+)
create mode 100644 test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-i386.iso.txt
diff --git a/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt
new file mode 100644
index 0000000..ce3aaf7
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu 15.10 amd64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+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: 575384
+El Torito VD version 1 found, boot catalog is in sector 170
+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 87011 552977
diff --git a/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt
new file mode 100644
index 0000000..356a18b
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu 15.10 i386
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
+Application id:
+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: 599104
+El Torito VD version 1 found, boot catalog is in sector 244
+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 917A8 595880
diff --git a/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt
new file mode 100644
index 0000000..725327d
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 15.10 amd64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+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: 323584
+El Torito VD version 1 found, boot catalog is in sector 1857
+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 BD54 48468
diff --git a/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-i386.iso.txt b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-i386.iso.txt
new file mode 100644
index 0000000..de18892
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 15.10 i386
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
+Application id:
+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: 321536
+El Torito VD version 1 found, boot catalog is in sector 3616
+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 110D0 69840
--
2.7.4
From cfergeau at redhat.com Thu Jun 2 12:01:20 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 14:01:20 +0200
Subject: [Libosinfo] [PATCH 6/6] opensuse: Fix id of x11-keyboard datamap
In-Reply-To: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464868880-29375-6-git-send-email-cfergeau@redhat.com>
The correct id is http://x.org/x11-keyboard and not
http://libosinfo.fedorahosted.org/x11-keyboard
---
data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in | 2 +-
data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
index d62560e..653fb34 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
@@ -6,7 +6,7 @@
autoinst.xml
-
+
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
index 73899d0..3c788f0 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
@@ -6,7 +6,7 @@
autoinst.xml
-
+
--
2.7.4
From cfergeau at redhat.com Thu Jun 2 12:01:18 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 14:01:18 +0200
Subject: [Libosinfo] [PATCH 4/6] ubuntu: Add Ubuntu 16.04 data
In-Reply-To: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464868880-29375-4-git-send-email-cfergeau@redhat.com>
---
data/os/ubuntu.com/ubuntu-16.04.xml.in | 86 ++++++++++++++++++++++
po/POTFILES.in | 1 +
.../ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt | 29 ++++++++
.../ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt | 29 ++++++++
.../ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt | 29 ++++++++
.../ubuntu16.04/ubuntu-16.04-server-i386.iso.txt | 29 ++++++++
.../ubuntu-16.04-server-powerpc.iso.txt | 17 +++++
.../ubuntu-16.04-server-ppc64el.iso.txt | 17 +++++
.../ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt | 29 ++++++++
9 files changed, 266 insertions(+)
create mode 100644 data/os/ubuntu.com/ubuntu-16.04.xml.in
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
new file mode 100644
index 0000000..dd50fd3
--- /dev/null
+++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
@@ -0,0 +1,86 @@
+
+
+ ubuntu16.04
+ ubuntutxenial
+ <_name>Ubuntu 16.04
+ 16.04
+ <_vendor>Canonical Ltd
+ linux
+ ubuntu
+ Xenial Xerus
+
+
+
+ 2016-04-21
+ 2021-04-22
+
+
+
+ 1000000000
+ 1
+ 1073741824
+ 5368709120
+
+
+ 1000000000
+ 1073741824
+ 16106127360
+
+
+
+
+ http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-i386.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS i386
+
+ casper/vmlinuz
+ casper/initrd.img
+
+
+ http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-amd64.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS amd64
+
+ casper/vmlinuz
+ casper/initrd.img
+
+
+ http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-i386.iso
+
+ Ubuntu 16.04(.\d)? LTS i386
+
+ casper/vmlinuz
+ casper/initrd.img
+
+
+ http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-amd64.iso
+
+ Ubuntu 16.04(.\d)? LTS amd64
+
+ casper/vmlinuz
+ casper/initrd.img
+
+
+ http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-powerpc.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS ppc
+
+
+
+ http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-ppc64el.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS ppc64
+
+
+
+ http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-s390x.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS s390x
+
+
+
+
+
+
+
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c0e3746..446432a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -344,6 +344,7 @@ data/os/ubuntu.com/ubuntu-14.04.xml.in
data/os/ubuntu.com/ubuntu-14.10.xml.in
data/os/ubuntu.com/ubuntu-15.04.xml.in
data/os/ubuntu.com/ubuntu-15.10.xml.in
+data/os/ubuntu.com/ubuntu-16.04.xml.in
data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
new file mode 100644
index 0000000..aa2b24a
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu 16.04 LTS amd64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+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: 725528
+El Torito VD version 1 found, boot catalog is in sector 166
+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 AF6CA 718538
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
new file mode 100644
index 0000000..cd34bb8
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu 16.04 LTS i386
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
+Application id:
+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: 734400
+El Torito VD version 1 found, boot catalog is in sector 252
+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 B26BE 730814
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
new file mode 100644
index 0000000..102d6f1
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 16.04 LTS amd64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+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: 335360
+El Torito VD version 1 found, boot catalog is in sector 1938
+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 343C0 213952
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
new file mode 100644
index 0000000..2fdef8e
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 16.04 LTS i386
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
+Application id:
+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: 331264
+El Torito VD version 1 found, boot catalog is in sector 3788
+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 34DF5 216565
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
new file mode 100644
index 0000000..4a0f992
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
@@ -0,0 +1,17 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 16.04 LTS ppc
+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: 364644
+CD-ROM uses ISO 9660:1999 relaxed format
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
new file mode 100644
index 0000000..c430fa9
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
@@ -0,0 +1,17 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 16.04 LTS ppc64
+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: 319480
+CD-ROM uses ISO 9660:1999 relaxed format
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
new file mode 100644
index 0000000..6ab2887
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 16.04 LTS s390x
+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: 281237
+El Torito VD version 1 found, boot catalog is in sector 1845
+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 FFFFD8D0
+ Bootoff 736 1846
--
2.7.4
From fidencio at redhat.com Thu Jun 2 15:51:59 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 2 Jun 2016 17:51:59 +0200
Subject: [Libosinfo] [PATCH 4/6] ubuntu: Add Ubuntu 16.04 data
In-Reply-To: <1464868880-29375-4-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
<1464868880-29375-4-git-send-email-cfergeau@redhat.com>
Message-ID:
Christophe,
On Thu, Jun 2, 2016 at 2:01 PM, Christophe Fergeau wrote:
> ---
> data/os/ubuntu.com/ubuntu-16.04.xml.in | 86 ++++++++++++++++++++++
> po/POTFILES.in | 1 +
> .../ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt | 29 ++++++++
> .../ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt | 29 ++++++++
> .../ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt | 29 ++++++++
> .../ubuntu16.04/ubuntu-16.04-server-i386.iso.txt | 29 ++++++++
> .../ubuntu-16.04-server-powerpc.iso.txt | 17 +++++
> .../ubuntu-16.04-server-ppc64el.iso.txt | 17 +++++
> .../ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt | 29 ++++++++
> 9 files changed, 266 insertions(+)
> create mode 100644 data/os/ubuntu.com/ubuntu-16.04.xml.in
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
IIRC, the kernel and inirtd path for Ubuntu are wrong and have been
wrong for quite a long time.
I'm not asking you to fix the old ones, I'll do it at some point in
the future when I get back to the Ubuntu's express installation, but
can you double check that these values are correct?
>
> diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
> new file mode 100644
> index 0000000..dd50fd3
> --- /dev/null
> +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
> @@ -0,0 +1,86 @@
> +
> +
> + ubuntu16.04
> + ubuntutxenial
> + <_name>Ubuntu 16.04
> + 16.04
> + <_vendor>Canonical Ltd
> + linux
> + ubuntu
> + Xenial Xerus
> +
> +
> +
> + 2016-04-21
> + 2021-04-22
> +
> +
> +
> + 1000000000
> + 1
> + 1073741824
> + 5368709120
> +
> +
> + 1000000000
> + 1073741824
> + 16106127360
> +
> +
> +
> +
> + http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-i386.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS i386
> +
> + casper/vmlinuz
> + casper/initrd.img
> +
> +
> + http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-amd64.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS amd64
> +
> + casper/vmlinuz
> + casper/initrd.img
> +
> +
> + http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-i386.iso
> +
> + Ubuntu 16.04(.\d)? LTS i386
> +
> + casper/vmlinuz
> + casper/initrd.img
> +
> +
> + http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-amd64.iso
> +
> + Ubuntu 16.04(.\d)? LTS amd64
> +
> + casper/vmlinuz
> + casper/initrd.img
> +
> +
> + http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-powerpc.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS ppc
> +
> +
> +
> + http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-ppc64el.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS ppc64
> +
> +
> +
> + http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-s390x.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS s390x
> +
> +
> +
> +
> +
> +
> +
> +
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index c0e3746..446432a 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -344,6 +344,7 @@ data/os/ubuntu.com/ubuntu-14.04.xml.in
> data/os/ubuntu.com/ubuntu-14.10.xml.in
> data/os/ubuntu.com/ubuntu-15.04.xml.in
> data/os/ubuntu.com/ubuntu-15.10.xml.in
> +data/os/ubuntu.com/ubuntu-16.04.xml.in
> data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
> data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
> data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
> new file mode 100644
> index 0000000..aa2b24a
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu 16.04 LTS amd64
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
> +Application id:
> +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: 725528
> +El Torito VD version 1 found, boot catalog is in sector 166
> +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 AF6CA 718538
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
> new file mode 100644
> index 0000000..cd34bb8
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu 16.04 LTS i386
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
> +Application id:
> +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: 734400
> +El Torito VD version 1 found, boot catalog is in sector 252
> +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 B26BE 730814
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
> new file mode 100644
> index 0000000..102d6f1
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu-Server 16.04 LTS amd64
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
> +Application id:
> +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: 335360
> +El Torito VD version 1 found, boot catalog is in sector 1938
> +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 343C0 213952
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
> new file mode 100644
> index 0000000..2fdef8e
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu-Server 16.04 LTS i386
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
> +Application id:
> +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: 331264
> +El Torito VD version 1 found, boot catalog is in sector 3788
> +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 34DF5 216565
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
> new file mode 100644
> index 0000000..4a0f992
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
> @@ -0,0 +1,17 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Ubuntu-Server 16.04 LTS ppc
> +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: 364644
> +CD-ROM uses ISO 9660:1999 relaxed format
> +NO Joliet present
> +Rock Ridge signatures version 1 found
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
> new file mode 100644
> index 0000000..c430fa9
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
> @@ -0,0 +1,17 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Ubuntu-Server 16.04 LTS ppc64
> +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: 319480
> +CD-ROM uses ISO 9660:1999 relaxed format
> +NO Joliet present
> +Rock Ridge signatures version 1 found
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
> new file mode 100644
> index 0000000..6ab2887
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Ubuntu-Server 16.04 LTS s390x
> +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: 281237
> +El Torito VD version 1 found, boot catalog is in sector 1845
> +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 FFFFD8D0
> + Bootoff 736 1846
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
From fidencio at redhat.com Thu Jun 2 15:52:58 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 2 Jun 2016 17:52:58 +0200
Subject: [Libosinfo] [PATCH 1/6] rhel: Add RHEL Atomic 7.2 data
In-Reply-To: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
Message-ID:
On Thu, Jun 2, 2016 at 2:01 PM, Christophe Fergeau wrote:
> ---
> data/os/redhat.com/rhel-atomic-7.2.xml.in | 38 ++++++++++++++++++++++
> po/POTFILES.in | 1 +
> .../rhel-atomic-installer-7.2-10.x86_64.iso.txt | 29 +++++++++++++++++
> 3 files changed, 68 insertions(+)
> create mode 100644 data/os/redhat.com/rhel-atomic-7.2.xml.in
> create mode 100644 test/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt
>
> diff --git a/data/os/redhat.com/rhel-atomic-7.2.xml.in b/data/os/redhat.com/rhel-atomic-7.2.xml.in
> new file mode 100644
> index 0000000..5431e7f
> --- /dev/null
> +++ b/data/os/redhat.com/rhel-atomic-7.2.xml.in
> @@ -0,0 +1,38 @@
> +
> +
> + rhel-atomic-7.2
> + <_name>Red Hat Enterprise Linux Atomic Host 7.2
> + 7.2
> + <_vendor>Red Hat, Inc
> + linux
> + rhel
> +
> +
> +
> +
> +
> +
> + LINUX
> + Red Hat Enterprise Linux Atomic
> + 727855104
> +
> + isolinux/vmlinuz
> + isolinux/initrd.img
> +
> +
I'm assuming you double checked the kernel and initrd path.
> +
> +
> + 1
> + 1000000000
> + 1073741824
> + 10737418240
> +
> +
> +
> + 400000000
> + 1073741824
> + 9663676416
> +
> +
> +
> +
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index 8e377c0..50b7e0b 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -278,6 +278,7 @@ data/os/redhat.com/rhel-7.1.xml.in
> data/os/redhat.com/rhel-7.2.xml.in
> data/os/redhat.com/rhel-atomic-7.0.xml.in
> data/os/redhat.com/rhel-atomic-7.1.xml.in
> +data/os/redhat.com/rhel-atomic-7.2.xml.in
> data/os/redhat.com/rhl-1.0.xml.in
> data/os/redhat.com/rhl-1.1.xml.in
> data/os/redhat.com/rhl-2.0.xml.in
> diff --git a/test/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt
> new file mode 100644
> index 0000000..f7c74ee
> --- /dev/null
> +++ b/test/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Red Hat Enterprise Linux Atomic
> +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: 355398
> +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 4980 18816
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From fidencio at redhat.com Thu Jun 2 15:53:31 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 2 Jun 2016 17:53:31 +0200
Subject: [Libosinfo] [PATCH 2/6] rhel: Add RHEL 6.8 data
In-Reply-To: <1464868880-29375-2-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
<1464868880-29375-2-git-send-email-cfergeau@redhat.com>
Message-ID:
On Thu, Jun 2, 2016 at 2:01 PM, Christophe Fergeau wrote:
> ---
> data/os/redhat.com/rhel-6.8.xml.in | 50 ++++++++++++++++++++++
> po/POTFILES.in | 1 +
> .../rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt | 29 +++++++++++++
> 3 files changed, 80 insertions(+)
> create mode 100644 data/os/redhat.com/rhel-6.8.xml.in
> create mode 100644 test/isodata/rhel/rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt
>
> diff --git a/data/os/redhat.com/rhel-6.8.xml.in b/data/os/redhat.com/rhel-6.8.xml.in
> new file mode 100644
> index 0000000..fd207c6
> --- /dev/null
> +++ b/data/os/redhat.com/rhel-6.8.xml.in
> @@ -0,0 +1,50 @@
> +
> +
> + rhel6.8
> + <_name>Red Hat Enterprise Linux 6.8
> + 6.8
> + <_vendor>Red Hat, Inc
> + linux
> + rhel
> + Santiago
> +
> +
> +
> + 2016-05-10
> +
> +
> +
> + LINUX
> + RHEL-6.8 .*.i386.*
> +
> + isolinux/vmlinuz
> + isolinux/initrd.img
> +
> +
> +
> + LINUX
> + .*RHEL-6.8 .*.x86_64.*
> +
> + isolinux/vmlinuz
> + isolinux/initrd.img
> +
Same comment here about kernel and initrd path.
> +
> +
> +
> + 1
> + 536870912
> +
> +
> +
> + 400000000
> + 1073741824
> + 9663676416
> +
> +
> +
> +
> +
> +
> +
> +
> +
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index 50b7e0b..c0e3746 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -273,6 +273,7 @@ data/os/redhat.com/rhel-6.4.xml.in
> data/os/redhat.com/rhel-6.5.xml.in
> data/os/redhat.com/rhel-6.6.xml.in
> data/os/redhat.com/rhel-6.7.xml.in
> +data/os/redhat.com/rhel-6.8.xml.in
> data/os/redhat.com/rhel-7.0.xml.in
> data/os/redhat.com/rhel-7.1.xml.in
> data/os/redhat.com/rhel-7.2.xml.in
> diff --git a/test/isodata/rhel/rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt
> new file mode 100644
> index 0000000..5384cbe
> --- /dev/null
> +++ b/test/isodata/rhel/rhel6.8/rhel-server-6.8-x86_64-dvd.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: RHEL-6.8 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: 1893612
> +El Torito VD version 1 found, boot catalog is in sector 1001
> +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 1D6D7 120535
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From fidencio at redhat.com Thu Jun 2 15:53:49 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 2 Jun 2016 17:53:49 +0200
Subject: [Libosinfo] [PATCH 3/6] ubuntu: Add Ubuntu 15.10 test cases
In-Reply-To: <1464868880-29375-3-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
<1464868880-29375-3-git-send-email-cfergeau@redhat.com>
Message-ID:
On Thu, Jun 2, 2016 at 2:01 PM, Christophe Fergeau wrote:
> Detection was already present, but not the corresponding test files.
> ---
> .../ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt | 29 ++++++++++++++++++++++
> .../ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt | 29 ++++++++++++++++++++++
> .../ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt | 29 ++++++++++++++++++++++
> .../ubuntu15.10/ubuntu-15.10-server-i386.iso.txt | 29 ++++++++++++++++++++++
> 4 files changed, 116 insertions(+)
> create mode 100644 test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-i386.iso.txt
>
> diff --git a/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt
> new file mode 100644
> index 0000000..ce3aaf7
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-amd64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu 15.10 amd64
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
> +Application id:
> +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: 575384
> +El Torito VD version 1 found, boot catalog is in sector 170
> +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 87011 552977
> diff --git a/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt
> new file mode 100644
> index 0000000..356a18b
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-desktop-i386.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu 15.10 i386
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
> +Application id:
> +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: 599104
> +El Torito VD version 1 found, boot catalog is in sector 244
> +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 917A8 595880
> diff --git a/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt
> new file mode 100644
> index 0000000..725327d
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-amd64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu-Server 15.10 amd64
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
> +Application id:
> +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: 323584
> +El Torito VD version 1 found, boot catalog is in sector 1857
> +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 BD54 48468
> diff --git a/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-i386.iso.txt b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-i386.iso.txt
> new file mode 100644
> index 0000000..de18892
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu15.10/ubuntu-15.10-server-i386.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu-Server 15.10 i386
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
> +Application id:
> +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: 321536
> +El Torito VD version 1 found, boot catalog is in sector 3616
> +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 110D0 69840
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From fidencio at redhat.com Thu Jun 2 15:55:42 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 2 Jun 2016 17:55:42 +0200
Subject: [Libosinfo] [PATCH 5/6] opensuse: Rename autoinst files
according to their id
In-Reply-To: <1464868880-29375-5-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
<1464868880-29375-5-git-send-email-cfergeau@redhat.com>
Message-ID:
On Thu, Jun 2, 2016 at 2:01 PM, Christophe Fergeau wrote:
> This causes warnings when running ./test/test-isodetect if they are not
> named as expected:
>
> ** (process:28952): WARNING **: Entity http://opensuse.org/opensuse/autoyast/desktop
> should be in file install-script/opensuse.org/opensuse-autoyast-desktop.xml not
> install-script/opensuse.org/autoinst-desktop.xml
Hmmm. I don't remember seeing these warnings before pushing these patches. :-\
Wouldn't be the case to, somehow, make the test fail in case of these warnings?
> ---
> .../{autoinst-desktop.xml.in => opensuse-autoyast-desktop.xml.in} | 0
> .../opensuse.org/{autoinst-jeos.xml.in => opensuse-autoyast-jeos.xml.in} | 0
> 2 files changed, 0 insertions(+), 0 deletions(-)
> rename data/install-script/opensuse.org/{autoinst-desktop.xml.in => opensuse-autoyast-desktop.xml.in} (100%)
> rename data/install-script/opensuse.org/{autoinst-jeos.xml.in => opensuse-autoyast-jeos.xml.in} (100%)
>
> diff --git a/data/install-script/opensuse.org/autoinst-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
> similarity index 100%
> rename from data/install-script/opensuse.org/autoinst-desktop.xml.in
> rename to data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
> diff --git a/data/install-script/opensuse.org/autoinst-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
> similarity index 100%
> rename from data/install-script/opensuse.org/autoinst-jeos.xml.in
> rename to data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From fidencio at redhat.com Thu Jun 2 15:56:00 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 2 Jun 2016 17:56:00 +0200
Subject: [Libosinfo] [PATCH 6/6] opensuse: Fix id of x11-keyboard datamap
In-Reply-To: <1464868880-29375-6-git-send-email-cfergeau@redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
<1464868880-29375-6-git-send-email-cfergeau@redhat.com>
Message-ID:
On Thu, Jun 2, 2016 at 2:01 PM, Christophe Fergeau wrote:
> The correct id is http://x.org/x11-keyboard and not
> http://libosinfo.fedorahosted.org/x11-keyboard
> ---
> data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in | 2 +-
> data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
> index d62560e..653fb34 100644
> --- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
> +++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
> @@ -6,7 +6,7 @@
> autoinst.xml
>
>
> -
> +
>
>
>
> diff --git a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
> index 73899d0..3c788f0 100644
> --- a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
> +++ b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
> @@ -6,7 +6,7 @@
> autoinst.xml
>
>
> -
> +
>
>
>
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From cfergeau at redhat.com Thu Jun 2 16:25:38 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 18:25:38 +0200
Subject: [Libosinfo] [PATCH 1/6] rhel: Add RHEL Atomic 7.2 data
In-Reply-To:
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
Message-ID: <20160602162538.GB9290@edamame.cdg.redhat.com>
On Thu, Jun 02, 2016 at 05:52:58PM +0200, Fabiano Fid?ncio wrote:
> On Thu, Jun 2, 2016 at 2:01 PM, Christophe Fergeau wrote:
> > ---
> > data/os/redhat.com/rhel-atomic-7.2.xml.in | 38 ++++++++++++++++++++++
> > po/POTFILES.in | 1 +
> > .../rhel-atomic-installer-7.2-10.x86_64.iso.txt | 29 +++++++++++++++++
> > 3 files changed, 68 insertions(+)
> > create mode 100644 data/os/redhat.com/rhel-atomic-7.2.xml.in
> > create mode 100644 test/isodata/rhel/rhel-atomic-7.2/rhel-atomic-installer-7.2-10.x86_64.iso.txt
> >
> > diff --git a/data/os/redhat.com/rhel-atomic-7.2.xml.in b/data/os/redhat.com/rhel-atomic-7.2.xml.in
> > new file mode 100644
> > index 0000000..5431e7f
> > --- /dev/null
> > +++ b/data/os/redhat.com/rhel-atomic-7.2.xml.in
> > @@ -0,0 +1,38 @@
> > +
> > +
> > + rhel-atomic-7.2
> > + <_name>Red Hat Enterprise Linux Atomic Host 7.2
> > + 7.2
> > + <_vendor>Red Hat, Inc
> > + linux
> > + rhel
> > +
> > +
> > +
> > +
> > +
> > +
> > + LINUX
> > + Red Hat Enterprise Linux Atomic
> > + 727855104
> > +
> > + isolinux/vmlinuz
> > + isolinux/initrd.img
> > +
> > +
>
> I'm assuming you double checked the kernel and initrd path.
I did now, and this is correct.
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL:
From cfergeau at redhat.com Thu Jun 2 16:57:19 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 18:57:19 +0200
Subject: [Libosinfo] [PATCH 5/6] opensuse: Rename autoinst files
according to their id
In-Reply-To:
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
<1464868880-29375-5-git-send-email-cfergeau@redhat.com>
Message-ID: <20160602165719.GC9290@edamame.cdg.redhat.com>
On Thu, Jun 02, 2016 at 05:55:42PM +0200, Fabiano Fid?ncio wrote:
> On Thu, Jun 2, 2016 at 2:01 PM, Christophe Fergeau wrote:
> > This causes warnings when running ./test/test-isodetect if they are not
> > named as expected:
> >
> > ** (process:28952): WARNING **: Entity http://opensuse.org/opensuse/autoyast/desktop
> > should be in file install-script/opensuse.org/opensuse-autoyast-desktop.xml not
> > install-script/opensuse.org/autoinst-desktop.xml
>
> Hmmm. I don't remember seeing these warnings before pushing these patches. :-\
> Wouldn't be the case to, somehow, make the test fail in case of these warnings?
The test could set warnings to be fatal through g_log_set_fatal_mask().
However, iirc there were somewhat valid warnings when the database
layout changed. We can try to make warnings fatals for a while, and
disable it if it proves to be too much of a pain.
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL:
From cfergeau at redhat.com Thu Jun 2 16:59:09 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 18:59:09 +0200
Subject: [Libosinfo] [PATCH 1/2] ubuntu: Fix initrd/kernel paths
Message-ID: <1464886750-14348-1-git-send-email-cfergeau@redhat.com>
The initrd extensions are either .lz or .gz depending on the version
(server/desktop), and the base directory is either casper or install.
---
data/os/ubuntu.com/ubuntu-10.04.xml.in | 4 ++--
data/os/ubuntu.com/ubuntu-10.10.xml.in | 12 ++++++------
data/os/ubuntu.com/ubuntu-11.04.xml.in | 10 +++++-----
data/os/ubuntu.com/ubuntu-11.10.xml.in | 12 ++++++------
data/os/ubuntu.com/ubuntu-12.04.xml.in | 12 ++++++------
data/os/ubuntu.com/ubuntu-12.10.xml.in | 12 ++++++------
data/os/ubuntu.com/ubuntu-13.04.xml.in | 12 ++++++------
data/os/ubuntu.com/ubuntu-13.10.xml.in | 12 ++++++------
data/os/ubuntu.com/ubuntu-14.04.xml.in | 12 ++++++------
data/os/ubuntu.com/ubuntu-14.10.xml.in | 12 ++++++------
data/os/ubuntu.com/ubuntu-15.04.xml.in | 12 ++++++------
data/os/ubuntu.com/ubuntu-15.10.xml.in | 12 ++++++------
12 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/data/os/ubuntu.com/ubuntu-10.04.xml.in b/data/os/ubuntu.com/ubuntu-10.04.xml.in
index 1b69a53..0de35d0 100644
--- a/data/os/ubuntu.com/ubuntu-10.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-10.04.xml.in
@@ -34,7 +34,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso
@@ -43,7 +43,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-10.10.xml.in b/data/os/ubuntu.com/ubuntu-10.10.xml.in
index 0bd9270..b1d04c7 100644
--- a/data/os/ubuntu.com/ubuntu-10.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-10.10.xml.in
@@ -34,8 +34,8 @@
Ubuntu-Server 10.10 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso
@@ -43,8 +43,8 @@
Ubuntu-Server 10.10 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -54,7 +54,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso
@@ -63,7 +63,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-11.04.xml.in b/data/os/ubuntu.com/ubuntu-11.04.xml.in
index ab7e0a1..31a821b 100644
--- a/data/os/ubuntu.com/ubuntu-11.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-11.04.xml.in
@@ -34,8 +34,8 @@
Ubuntu-Server 11.04 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso
@@ -43,8 +43,8 @@
Ubuntu-Server 11.04 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -54,7 +54,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso
diff --git a/data/os/ubuntu.com/ubuntu-11.10.xml.in b/data/os/ubuntu.com/ubuntu-11.10.xml.in
index 0ca88cf..81ecfb7 100644
--- a/data/os/ubuntu.com/ubuntu-11.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-11.10.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 11.10 i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso
Ubuntu-Server 11.10 amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -51,7 +51,7 @@
Ubuntu 11.10 i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso
@@ -59,7 +59,7 @@
Ubuntu 11.10 amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in
index 83a4501..0a84f88 100644
--- a/data/os/ubuntu.com/ubuntu-12.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in
@@ -32,16 +32,16 @@
Ubuntu-Server 12.04(.\d)? LTS i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso
Ubuntu-Server 12.04(.\d)? LTS amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso
@@ -49,7 +49,7 @@
Ubuntu 12.04(.\d)? LTS i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso
@@ -57,7 +57,7 @@
Ubuntu 12.04(.\d)? LTS amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-12.10.xml.in b/data/os/ubuntu.com/ubuntu-12.10.xml.in
index 87d3a54..a6ec456 100644
--- a/data/os/ubuntu.com/ubuntu-12.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-12.10.xml.in
@@ -32,16 +32,16 @@
Ubuntu-Server 12.10 i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso
Ubuntu-Server 12.10 amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso
@@ -49,7 +49,7 @@
Ubuntu 12.10 i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso
@@ -57,7 +57,7 @@
Ubuntu 12.10 amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in
index de364c7..605fe4b 100644
--- a/data/os/ubuntu.com/ubuntu-13.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in
@@ -32,16 +32,16 @@
Ubuntu-Server 13.04 i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso
Ubuntu-Server 13.04 amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso
@@ -49,7 +49,7 @@
Ubuntu 13.04 i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso
@@ -57,7 +57,7 @@
Ubuntu 13.04 amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-13.10.xml.in b/data/os/ubuntu.com/ubuntu-13.10.xml.in
index 39f02ec..8d90530 100644
--- a/data/os/ubuntu.com/ubuntu-13.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-13.10.xml.in
@@ -32,16 +32,16 @@
Ubuntu-Server 13.10 i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso
Ubuntu-Server 13.10 amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso
@@ -49,7 +49,7 @@
Ubuntu 13.10 i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso
@@ -57,7 +57,7 @@
Ubuntu 13.10 amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
index d1fa114..a70990f 100644
--- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 14.04(.\d)? LTS i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso
Ubuntu-Server 14.04(.\d)? LTS amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso
@@ -50,7 +50,7 @@
Ubuntu 14.04(.\d)? LTS i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso
@@ -58,7 +58,7 @@
Ubuntu 14.04(.\d)? LTS amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in
index 8a72618..437994d 100644
--- a/data/os/ubuntu.com/ubuntu-14.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 14.10(.\d)? i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso
Ubuntu-Server 14.10(.\d)? amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso
@@ -50,7 +50,7 @@
Ubuntu 14.10(.\d)? i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso
@@ -58,7 +58,7 @@
Ubuntu 14.10(.\d)? amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
index 47c944e..f318052 100644
--- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 15.04(.\d)? i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso
Ubuntu-Server 15.04(.\d)? amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso
@@ -50,7 +50,7 @@
Ubuntu 15.04(.\d)? i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso
@@ -58,7 +58,7 @@
Ubuntu 15.04(.\d)? amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in
index 32dee03..5fb7711 100644
--- a/data/os/ubuntu.com/ubuntu-15.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 15.10(.\d)? i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso
Ubuntu-Server 15.10(.\d)? amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso
@@ -50,7 +50,7 @@
Ubuntu 15.10(.\d)? i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-amd64.iso
@@ -58,7 +58,7 @@
Ubuntu 15.10(.\d)? amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
--
2.7.4
From cfergeau at redhat.com Thu Jun 2 16:59:10 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 2 Jun 2016 18:59:10 +0200
Subject: [Libosinfo] [PATCHv2 2/2] ubuntu: Add Ubuntu 16.04 data
In-Reply-To: <1464886750-14348-1-git-send-email-cfergeau@redhat.com>
References: <1464886750-14348-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464886750-14348-2-git-send-email-cfergeau@redhat.com>
---
Changes since v1:
- fixed initrd/kernel paths
data/os/ubuntu.com/ubuntu-16.04.xml.in | 86 ++++++++++++++++++++++
po/POTFILES.in | 1 +
.../ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt | 29 ++++++++
.../ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt | 29 ++++++++
.../ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt | 29 ++++++++
.../ubuntu16.04/ubuntu-16.04-server-i386.iso.txt | 29 ++++++++
.../ubuntu-16.04-server-powerpc.iso.txt | 17 +++++
.../ubuntu-16.04-server-ppc64el.iso.txt | 17 +++++
.../ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt | 29 ++++++++
9 files changed, 266 insertions(+)
create mode 100644 data/os/ubuntu.com/ubuntu-16.04.xml.in
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
new file mode 100644
index 0000000..43e8071
--- /dev/null
+++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
@@ -0,0 +1,86 @@
+
+
+ ubuntu16.04
+ ubuntutxenial
+ <_name>Ubuntu 16.04
+ 16.04
+ <_vendor>Canonical Ltd
+ linux
+ ubuntu
+ Xenial Xerus
+
+
+
+ 2016-04-21
+ 2021-04-22
+
+
+
+ 1000000000
+ 1
+ 1073741824
+ 5368709120
+
+
+ 1000000000
+ 1073741824
+ 16106127360
+
+
+
+
+ http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-i386.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS i386
+
+ install/vmlinuz
+ install/initrd.gz
+
+
+ http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-amd64.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS amd64
+
+ install/vmlinuz
+ install/initrd.gz
+
+
+ http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-i386.iso
+
+ Ubuntu 16.04(.\d)? LTS i386
+
+ casper/vmlinuz
+ casper/initrd.lz
+
+
+ http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-amd64.iso
+
+ Ubuntu 16.04(.\d)? LTS amd64
+
+ casper/vmlinuz
+ casper/initrd.lz
+
+
+ http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-powerpc.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS ppc
+
+
+
+ http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-ppc64el.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS ppc64
+
+
+
+ http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-s390x.iso
+
+ Ubuntu-Server 16.04(.\d)? LTS s390x
+
+
+
+
+
+
+
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c0e3746..446432a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -344,6 +344,7 @@ data/os/ubuntu.com/ubuntu-14.04.xml.in
data/os/ubuntu.com/ubuntu-14.10.xml.in
data/os/ubuntu.com/ubuntu-15.04.xml.in
data/os/ubuntu.com/ubuntu-15.10.xml.in
+data/os/ubuntu.com/ubuntu-16.04.xml.in
data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
new file mode 100644
index 0000000..aa2b24a
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu 16.04 LTS amd64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+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: 725528
+El Torito VD version 1 found, boot catalog is in sector 166
+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 AF6CA 718538
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
new file mode 100644
index 0000000..cd34bb8
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu 16.04 LTS i386
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
+Application id:
+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: 734400
+El Torito VD version 1 found, boot catalog is in sector 252
+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 B26BE 730814
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
new file mode 100644
index 0000000..102d6f1
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 16.04 LTS amd64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+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: 335360
+El Torito VD version 1 found, boot catalog is in sector 1938
+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 343C0 213952
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
new file mode 100644
index 0000000..2fdef8e
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 16.04 LTS i386
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
+Application id:
+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: 331264
+El Torito VD version 1 found, boot catalog is in sector 3788
+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 34DF5 216565
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
new file mode 100644
index 0000000..4a0f992
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
@@ -0,0 +1,17 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 16.04 LTS ppc
+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: 364644
+CD-ROM uses ISO 9660:1999 relaxed format
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
new file mode 100644
index 0000000..c430fa9
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
@@ -0,0 +1,17 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 16.04 LTS ppc64
+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: 319480
+CD-ROM uses ISO 9660:1999 relaxed format
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
new file mode 100644
index 0000000..6ab2887
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 16.04 LTS s390x
+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: 281237
+El Torito VD version 1 found, boot catalog is in sector 1845
+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 FFFFD8D0
+ Bootoff 736 1846
--
2.7.4
From fidencio at redhat.com Thu Jun 2 17:02:08 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 2 Jun 2016 19:02:08 +0200
Subject: [Libosinfo] [PATCH 5/6] opensuse: Rename autoinst files
according to their id
In-Reply-To: <20160602165719.GC9290@edamame.cdg.redhat.com>
References: <1464868880-29375-1-git-send-email-cfergeau@redhat.com>
<1464868880-29375-5-git-send-email-cfergeau@redhat.com>
<20160602165719.GC9290@edamame.cdg.redhat.com>
Message-ID:
On Thu, Jun 2, 2016 at 6:57 PM, Christophe Fergeau wrote:
> On Thu, Jun 02, 2016 at 05:55:42PM +0200, Fabiano Fid?ncio wrote:
>> On Thu, Jun 2, 2016 at 2:01 PM, Christophe Fergeau wrote:
>> > This causes warnings when running ./test/test-isodetect if they are not
>> > named as expected:
>> >
>> > ** (process:28952): WARNING **: Entity http://opensuse.org/opensuse/autoyast/desktop
>> > should be in file install-script/opensuse.org/opensuse-autoyast-desktop.xml not
>> > install-script/opensuse.org/autoinst-desktop.xml
>>
>> Hmmm. I don't remember seeing these warnings before pushing these patches. :-\
>> Wouldn't be the case to, somehow, make the test fail in case of these warnings?
>
> The test could set warnings to be fatal through g_log_set_fatal_mask().
> However, iirc there were somewhat valid warnings when the database
> layout changed. We can try to make warnings fatals for a while, and
> disable it if it proves to be too much of a pain.
I like the idea and I'd go for it.
>
> Christophe
From fidencio at redhat.com Thu Jun 2 17:05:03 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 2 Jun 2016 19:05:03 +0200
Subject: [Libosinfo] [PATCH 1/2] ubuntu: Fix initrd/kernel paths
In-Reply-To: <1464886750-14348-1-git-send-email-cfergeau@redhat.com>
References: <1464886750-14348-1-git-send-email-cfergeau@redhat.com>
Message-ID:
On Thu, Jun 2, 2016 at 6:59 PM, Christophe Fergeau wrote:
> The initrd extensions are either .lz or .gz depending on the version
> (server/desktop), and the base directory is either casper or install.
It's clear when looking the files that the changes are for Ubuntu
10.04 and newers, but I'd like to see a comment in the commit messge
saying whether old versions where not checked or they are using the
proper initrd/kernel path.
Please, feel free to add this before pushing.
> ---
> data/os/ubuntu.com/ubuntu-10.04.xml.in | 4 ++--
> data/os/ubuntu.com/ubuntu-10.10.xml.in | 12 ++++++------
> data/os/ubuntu.com/ubuntu-11.04.xml.in | 10 +++++-----
> data/os/ubuntu.com/ubuntu-11.10.xml.in | 12 ++++++------
> data/os/ubuntu.com/ubuntu-12.04.xml.in | 12 ++++++------
> data/os/ubuntu.com/ubuntu-12.10.xml.in | 12 ++++++------
> data/os/ubuntu.com/ubuntu-13.04.xml.in | 12 ++++++------
> data/os/ubuntu.com/ubuntu-13.10.xml.in | 12 ++++++------
> data/os/ubuntu.com/ubuntu-14.04.xml.in | 12 ++++++------
> data/os/ubuntu.com/ubuntu-14.10.xml.in | 12 ++++++------
> data/os/ubuntu.com/ubuntu-15.04.xml.in | 12 ++++++------
> data/os/ubuntu.com/ubuntu-15.10.xml.in | 12 ++++++------
> 12 files changed, 67 insertions(+), 67 deletions(-)
>
> diff --git a/data/os/ubuntu.com/ubuntu-10.04.xml.in b/data/os/ubuntu.com/ubuntu-10.04.xml.in
> index 1b69a53..0de35d0 100644
> --- a/data/os/ubuntu.com/ubuntu-10.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-10.04.xml.in
> @@ -34,7 +34,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso
> @@ -43,7 +43,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-10.10.xml.in b/data/os/ubuntu.com/ubuntu-10.10.xml.in
> index 0bd9270..b1d04c7 100644
> --- a/data/os/ubuntu.com/ubuntu-10.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-10.10.xml.in
> @@ -34,8 +34,8 @@
> Ubuntu-Server 10.10 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso
> @@ -43,8 +43,8 @@
> Ubuntu-Server 10.10 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -54,7 +54,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso
> @@ -63,7 +63,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-11.04.xml.in b/data/os/ubuntu.com/ubuntu-11.04.xml.in
> index ab7e0a1..31a821b 100644
> --- a/data/os/ubuntu.com/ubuntu-11.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-11.04.xml.in
> @@ -34,8 +34,8 @@
> Ubuntu-Server 11.04 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso
> @@ -43,8 +43,8 @@
> Ubuntu-Server 11.04 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -54,7 +54,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso
> diff --git a/data/os/ubuntu.com/ubuntu-11.10.xml.in b/data/os/ubuntu.com/ubuntu-11.10.xml.in
> index 0ca88cf..81ecfb7 100644
> --- a/data/os/ubuntu.com/ubuntu-11.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-11.10.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 11.10 i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso
>
> Ubuntu-Server 11.10 amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -51,7 +51,7 @@
> Ubuntu 11.10 i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso
> @@ -59,7 +59,7 @@
> Ubuntu 11.10 amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in
> index 83a4501..0a84f88 100644
> --- a/data/os/ubuntu.com/ubuntu-12.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in
> @@ -32,16 +32,16 @@
>
> Ubuntu-Server 12.04(.\d)? LTS i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso
>
> Ubuntu-Server 12.04(.\d)? LTS amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso
> @@ -49,7 +49,7 @@
> Ubuntu 12.04(.\d)? LTS i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso
> @@ -57,7 +57,7 @@
> Ubuntu 12.04(.\d)? LTS amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-12.10.xml.in b/data/os/ubuntu.com/ubuntu-12.10.xml.in
> index 87d3a54..a6ec456 100644
> --- a/data/os/ubuntu.com/ubuntu-12.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-12.10.xml.in
> @@ -32,16 +32,16 @@
>
> Ubuntu-Server 12.10 i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso
>
> Ubuntu-Server 12.10 amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso
> @@ -49,7 +49,7 @@
> Ubuntu 12.10 i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso
> @@ -57,7 +57,7 @@
> Ubuntu 12.10 amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in
> index de364c7..605fe4b 100644
> --- a/data/os/ubuntu.com/ubuntu-13.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in
> @@ -32,16 +32,16 @@
>
> Ubuntu-Server 13.04 i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso
>
> Ubuntu-Server 13.04 amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso
> @@ -49,7 +49,7 @@
> Ubuntu 13.04 i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso
> @@ -57,7 +57,7 @@
> Ubuntu 13.04 amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-13.10.xml.in b/data/os/ubuntu.com/ubuntu-13.10.xml.in
> index 39f02ec..8d90530 100644
> --- a/data/os/ubuntu.com/ubuntu-13.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-13.10.xml.in
> @@ -32,16 +32,16 @@
>
> Ubuntu-Server 13.10 i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso
>
> Ubuntu-Server 13.10 amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso
> @@ -49,7 +49,7 @@
> Ubuntu 13.10 i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso
> @@ -57,7 +57,7 @@
> Ubuntu 13.10 amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> index d1fa114..a70990f 100644
> --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 14.04(.\d)? LTS i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso
>
> Ubuntu-Server 14.04(.\d)? LTS amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso
> @@ -50,7 +50,7 @@
> Ubuntu 14.04(.\d)? LTS i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> Ubuntu 14.04(.\d)? LTS amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in
> index 8a72618..437994d 100644
> --- a/data/os/ubuntu.com/ubuntu-14.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 14.10(.\d)? i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso
>
> Ubuntu-Server 14.10(.\d)? amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso
> @@ -50,7 +50,7 @@
> Ubuntu 14.10(.\d)? i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> Ubuntu 14.10(.\d)? amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
> index 47c944e..f318052 100644
> --- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 15.04(.\d)? i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso
>
> Ubuntu-Server 15.04(.\d)? amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso
> @@ -50,7 +50,7 @@
> Ubuntu 15.04(.\d)? i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> Ubuntu 15.04(.\d)? amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in
> index 32dee03..5fb7711 100644
> --- a/data/os/ubuntu.com/ubuntu-15.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 15.10(.\d)? i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso
>
> Ubuntu-Server 15.10(.\d)? amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso
> @@ -50,7 +50,7 @@
> Ubuntu 15.10(.\d)? i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> Ubuntu 15.10(.\d)? amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From fidencio at redhat.com Thu Jun 2 17:05:29 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 2 Jun 2016 19:05:29 +0200
Subject: [Libosinfo] [PATCHv2 2/2] ubuntu: Add Ubuntu 16.04 data
In-Reply-To: <1464886750-14348-2-git-send-email-cfergeau@redhat.com>
References: <1464886750-14348-1-git-send-email-cfergeau@redhat.com>
<1464886750-14348-2-git-send-email-cfergeau@redhat.com>
Message-ID:
On Thu, Jun 2, 2016 at 6:59 PM, Christophe Fergeau wrote:
> ---
> Changes since v1:
> - fixed initrd/kernel paths
>
>
> data/os/ubuntu.com/ubuntu-16.04.xml.in | 86 ++++++++++++++++++++++
> po/POTFILES.in | 1 +
> .../ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt | 29 ++++++++
> .../ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt | 29 ++++++++
> .../ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt | 29 ++++++++
> .../ubuntu16.04/ubuntu-16.04-server-i386.iso.txt | 29 ++++++++
> .../ubuntu-16.04-server-powerpc.iso.txt | 17 +++++
> .../ubuntu-16.04-server-ppc64el.iso.txt | 17 +++++
> .../ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt | 29 ++++++++
> 9 files changed, 266 insertions(+)
> create mode 100644 data/os/ubuntu.com/ubuntu-16.04.xml.in
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
> create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
>
> diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
> new file mode 100644
> index 0000000..43e8071
> --- /dev/null
> +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
> @@ -0,0 +1,86 @@
> +
> +
> + ubuntu16.04
> + ubuntutxenial
> + <_name>Ubuntu 16.04
> + 16.04
> + <_vendor>Canonical Ltd
> + linux
> + ubuntu
> + Xenial Xerus
> +
> +
> +
> + 2016-04-21
> + 2021-04-22
> +
> +
> +
> + 1000000000
> + 1
> + 1073741824
> + 5368709120
> +
> +
> + 1000000000
> + 1073741824
> + 16106127360
> +
> +
> +
> +
> + http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-i386.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS i386
> +
> + install/vmlinuz
> + install/initrd.gz
> +
> +
> + http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-amd64.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS amd64
> +
> + install/vmlinuz
> + install/initrd.gz
> +
> +
> + http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-i386.iso
> +
> + Ubuntu 16.04(.\d)? LTS i386
> +
> + casper/vmlinuz
> + casper/initrd.lz
> +
> +
> + http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-amd64.iso
> +
> + Ubuntu 16.04(.\d)? LTS amd64
> +
> + casper/vmlinuz
> + casper/initrd.lz
> +
> +
> + http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-powerpc.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS ppc
> +
> +
> +
> + http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-ppc64el.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS ppc64
> +
> +
> +
> + http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-s390x.iso
> +
> + Ubuntu-Server 16.04(.\d)? LTS s390x
> +
> +
> +
> +
> +
> +
> +
> +
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index c0e3746..446432a 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -344,6 +344,7 @@ data/os/ubuntu.com/ubuntu-14.04.xml.in
> data/os/ubuntu.com/ubuntu-14.10.xml.in
> data/os/ubuntu.com/ubuntu-15.04.xml.in
> data/os/ubuntu.com/ubuntu-15.10.xml.in
> +data/os/ubuntu.com/ubuntu-16.04.xml.in
> data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
> data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
> data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
> new file mode 100644
> index 0000000..aa2b24a
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu 16.04 LTS amd64
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
> +Application id:
> +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: 725528
> +El Torito VD version 1 found, boot catalog is in sector 166
> +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 AF6CA 718538
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
> new file mode 100644
> index 0000000..cd34bb8
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu 16.04 LTS i386
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
> +Application id:
> +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: 734400
> +El Torito VD version 1 found, boot catalog is in sector 252
> +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 B26BE 730814
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
> new file mode 100644
> index 0000000..102d6f1
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu-Server 16.04 LTS amd64
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
> +Application id:
> +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: 335360
> +El Torito VD version 1 found, boot catalog is in sector 1938
> +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 343C0 213952
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
> new file mode 100644
> index 0000000..2fdef8e
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: Ubuntu-Server 16.04 LTS i386
> +Volume set id:
> +Publisher id:
> +Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
> +Application id:
> +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: 331264
> +El Torito VD version 1 found, boot catalog is in sector 3788
> +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 34DF5 216565
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
> new file mode 100644
> index 0000000..4a0f992
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt
> @@ -0,0 +1,17 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Ubuntu-Server 16.04 LTS ppc
> +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: 364644
> +CD-ROM uses ISO 9660:1999 relaxed format
> +NO Joliet present
> +Rock Ridge signatures version 1 found
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
> new file mode 100644
> index 0000000..c430fa9
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt
> @@ -0,0 +1,17 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Ubuntu-Server 16.04 LTS ppc64
> +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: 319480
> +CD-ROM uses ISO 9660:1999 relaxed format
> +NO Joliet present
> +Rock Ridge signatures version 1 found
> diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
> new file mode 100644
> index 0000000..6ab2887
> --- /dev/null
> +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Ubuntu-Server 16.04 LTS s390x
> +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: 281237
> +El Torito VD version 1 found, boot catalog is in sector 1845
> +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 FFFFD8D0
> + Bootoff 736 1846
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From cfergeau at redhat.com Fri Jun 3 08:03:30 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 3 Jun 2016 10:03:30 +0200
Subject: [Libosinfo] [PATCH 1/2] ubuntu: Fix initrd/kernel paths
In-Reply-To:
References: <1464886750-14348-1-git-send-email-cfergeau@redhat.com>
Message-ID: <20160603080330.GF9290@edamame.cdg.redhat.com>
On Thu, Jun 02, 2016 at 07:05:03PM +0200, Fabiano Fid?ncio wrote:
> On Thu, Jun 2, 2016 at 6:59 PM, Christophe Fergeau wrote:
> > The initrd extensions are either .lz or .gz depending on the version
> > (server/desktop), and the base directory is either casper or install.
>
> It's clear when looking the files that the changes are for Ubuntu
> 10.04 and newers, but I'd like to see a comment in the commit messge
> saying whether old versions where not checked or they are using the
> proper initrd/kernel path.
Ah thanks for mentioning this, I actually had totally missed the older
ubuntus ;) I'll send a v2
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL:
From cfergeau at redhat.com Fri Jun 3 09:23:17 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 3 Jun 2016 11:23:17 +0200
Subject: [Libosinfo] [PATCH 1/2] ubuntu: Mark the sparc ISOs as sparc64
Message-ID: <1464945798-17485-1-git-send-email-cfergeau@redhat.com>
These ISOs only contain a 64 bit kernel.
---
data/os/ubuntu.com/ubuntu-6.06.xml.in | 2 +-
data/os/ubuntu.com/ubuntu-6.10.xml.in | 2 +-
data/os/ubuntu.com/ubuntu-7.04.xml.in | 2 +-
data/os/ubuntu.com/ubuntu-7.10.xml.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/os/ubuntu.com/ubuntu-6.06.xml.in b/data/os/ubuntu.com/ubuntu-6.06.xml.in
index d4cdb1d..6269f5c 100644
--- a/data/os/ubuntu.com/ubuntu-6.06.xml.in
+++ b/data/os/ubuntu.com/ubuntu-6.06.xml.in
@@ -59,7 +59,7 @@
casper/vmlinuz
casper/initrd.img
-
+
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso
Ubuntu-Server 6.06(.\d)? sparc
diff --git a/data/os/ubuntu.com/ubuntu-6.10.xml.in b/data/os/ubuntu.com/ubuntu-6.10.xml.in
index da6160b..2dcdf63 100644
--- a/data/os/ubuntu.com/ubuntu-6.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-6.10.xml.in
@@ -41,7 +41,7 @@
casper/vmlinuz
casper/initrd.img
-
+
http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-sparc.iso
Ubuntu-Server 6.10 sparc
diff --git a/data/os/ubuntu.com/ubuntu-7.04.xml.in b/data/os/ubuntu.com/ubuntu-7.04.xml.in
index c41ba0d..49101e8 100644
--- a/data/os/ubuntu.com/ubuntu-7.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-7.04.xml.in
@@ -32,7 +32,7 @@
casper/vmlinuz
casper/initrd.img
-
+
http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-sparc.iso
Ubuntu-Server 7.04 sparc
diff --git a/data/os/ubuntu.com/ubuntu-7.10.xml.in b/data/os/ubuntu.com/ubuntu-7.10.xml.in
index cf3fbf4..5fb9f17 100644
--- a/data/os/ubuntu.com/ubuntu-7.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-7.10.xml.in
@@ -32,7 +32,7 @@
casper/vmlinuz
casper/initrd.img
-
+
http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-sparc.iso
Ubuntu-Server 7.10 sparc
--
2.7.4
From cfergeau at redhat.com Fri Jun 3 09:23:18 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 3 Jun 2016 11:23:18 +0200
Subject: [Libosinfo] [PATCHv2 2/2] ubuntu: Fix initrd/kernel paths
In-Reply-To: <1464945798-17485-1-git-send-email-cfergeau@redhat.com>
References: <1464945798-17485-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464945798-17485-2-git-send-email-cfergeau@redhat.com>
The initrd extensions are either .lz or .gz depending on the version
(server/desktop), and the base directory is either casper or install.
---
Changes since v1:
- fixed older ubuntu releases as well
data/os/ubuntu.com/ubuntu-10.04.xml.in | 4 +--
data/os/ubuntu.com/ubuntu-10.10.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-11.04.xml.in | 10 +++----
data/os/ubuntu.com/ubuntu-11.10.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-12.04.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-12.10.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-13.04.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-13.10.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-14.04.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-14.10.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-15.04.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-15.10.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-5.04.xml.in | 24 ++++++++--------
data/os/ubuntu.com/ubuntu-5.10.xml.in | 36 +++++++++++------------
data/os/ubuntu.com/ubuntu-6.06.xml.in | 52 ++++++++++++++++------------------
data/os/ubuntu.com/ubuntu-6.10.xml.in | 24 ++++++++--------
data/os/ubuntu.com/ubuntu-7.04.xml.in | 16 +++++------
data/os/ubuntu.com/ubuntu-7.10.xml.in | 16 +++++------
data/os/ubuntu.com/ubuntu-8.04.xml.in | 16 +++++------
data/os/ubuntu.com/ubuntu-8.10.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-9.04.xml.in | 12 ++++----
data/os/ubuntu.com/ubuntu-9.10.xml.in | 12 ++++----
22 files changed, 175 insertions(+), 179 deletions(-)
diff --git a/data/os/ubuntu.com/ubuntu-10.04.xml.in b/data/os/ubuntu.com/ubuntu-10.04.xml.in
index 1b69a53..0de35d0 100644
--- a/data/os/ubuntu.com/ubuntu-10.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-10.04.xml.in
@@ -34,7 +34,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso
@@ -43,7 +43,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-10.10.xml.in b/data/os/ubuntu.com/ubuntu-10.10.xml.in
index 0bd9270..b1d04c7 100644
--- a/data/os/ubuntu.com/ubuntu-10.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-10.10.xml.in
@@ -34,8 +34,8 @@
Ubuntu-Server 10.10 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso
@@ -43,8 +43,8 @@
Ubuntu-Server 10.10 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -54,7 +54,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso
@@ -63,7 +63,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-11.04.xml.in b/data/os/ubuntu.com/ubuntu-11.04.xml.in
index ab7e0a1..31a821b 100644
--- a/data/os/ubuntu.com/ubuntu-11.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-11.04.xml.in
@@ -34,8 +34,8 @@
Ubuntu-Server 11.04 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso
@@ -43,8 +43,8 @@
Ubuntu-Server 11.04 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -54,7 +54,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso
diff --git a/data/os/ubuntu.com/ubuntu-11.10.xml.in b/data/os/ubuntu.com/ubuntu-11.10.xml.in
index 0ca88cf..81ecfb7 100644
--- a/data/os/ubuntu.com/ubuntu-11.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-11.10.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 11.10 i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso
Ubuntu-Server 11.10 amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -51,7 +51,7 @@
Ubuntu 11.10 i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso
@@ -59,7 +59,7 @@
Ubuntu 11.10 amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in
index 83a4501..0a84f88 100644
--- a/data/os/ubuntu.com/ubuntu-12.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in
@@ -32,16 +32,16 @@
Ubuntu-Server 12.04(.\d)? LTS i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso
Ubuntu-Server 12.04(.\d)? LTS amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso
@@ -49,7 +49,7 @@
Ubuntu 12.04(.\d)? LTS i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso
@@ -57,7 +57,7 @@
Ubuntu 12.04(.\d)? LTS amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-12.10.xml.in b/data/os/ubuntu.com/ubuntu-12.10.xml.in
index 87d3a54..a6ec456 100644
--- a/data/os/ubuntu.com/ubuntu-12.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-12.10.xml.in
@@ -32,16 +32,16 @@
Ubuntu-Server 12.10 i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso
Ubuntu-Server 12.10 amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso
@@ -49,7 +49,7 @@
Ubuntu 12.10 i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso
@@ -57,7 +57,7 @@
Ubuntu 12.10 amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in
index de364c7..605fe4b 100644
--- a/data/os/ubuntu.com/ubuntu-13.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in
@@ -32,16 +32,16 @@
Ubuntu-Server 13.04 i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso
Ubuntu-Server 13.04 amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso
@@ -49,7 +49,7 @@
Ubuntu 13.04 i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso
@@ -57,7 +57,7 @@
Ubuntu 13.04 amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-13.10.xml.in b/data/os/ubuntu.com/ubuntu-13.10.xml.in
index 39f02ec..8d90530 100644
--- a/data/os/ubuntu.com/ubuntu-13.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-13.10.xml.in
@@ -32,16 +32,16 @@
Ubuntu-Server 13.10 i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso
Ubuntu-Server 13.10 amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso
@@ -49,7 +49,7 @@
Ubuntu 13.10 i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso
@@ -57,7 +57,7 @@
Ubuntu 13.10 amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
index d1fa114..a70990f 100644
--- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 14.04(.\d)? LTS i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso
Ubuntu-Server 14.04(.\d)? LTS amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso
@@ -50,7 +50,7 @@
Ubuntu 14.04(.\d)? LTS i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso
@@ -58,7 +58,7 @@
Ubuntu 14.04(.\d)? LTS amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in
index 8a72618..437994d 100644
--- a/data/os/ubuntu.com/ubuntu-14.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 14.10(.\d)? i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso
Ubuntu-Server 14.10(.\d)? amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso
@@ -50,7 +50,7 @@
Ubuntu 14.10(.\d)? i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso
@@ -58,7 +58,7 @@
Ubuntu 14.10(.\d)? amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
index 47c944e..f318052 100644
--- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 15.04(.\d)? i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso
Ubuntu-Server 15.04(.\d)? amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso
@@ -50,7 +50,7 @@
Ubuntu 15.04(.\d)? i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso
@@ -58,7 +58,7 @@
Ubuntu 15.04(.\d)? amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in
index 32dee03..5fb7711 100644
--- a/data/os/ubuntu.com/ubuntu-15.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in
@@ -33,16 +33,16 @@
Ubuntu-Server 15.10(.\d)? i386
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso
Ubuntu-Server 15.10(.\d)? amd64
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso
@@ -50,7 +50,7 @@
Ubuntu 15.10(.\d)? i386
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-amd64.iso
@@ -58,7 +58,7 @@
Ubuntu 15.10(.\d)? amd64
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
diff --git a/data/os/ubuntu.com/ubuntu-5.04.xml.in b/data/os/ubuntu.com/ubuntu-5.04.xml.in
index d83bb0b..773600a 100644
--- a/data/os/ubuntu.com/ubuntu-5.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-5.04.xml.in
@@ -20,8 +20,8 @@
Ubuntu 5.04 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-amd64.iso
@@ -29,8 +29,8 @@
Ubuntu 5.04 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-powerpc.iso
@@ -38,8 +38,8 @@
Ubuntu 5.04 ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/powerpc/vmlinux
+ install/powerpc/initrd.gz
@@ -48,8 +48,8 @@
Ubuntu 5.04 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-amd64.iso
@@ -57,8 +57,8 @@
Ubuntu 5.04 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-powerpc.iso
@@ -66,8 +66,8 @@
Ubuntu 5.04 ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
diff --git a/data/os/ubuntu.com/ubuntu-5.10.xml.in b/data/os/ubuntu.com/ubuntu-5.10.xml.in
index ec7f2dc..79505a7 100644
--- a/data/os/ubuntu.com/ubuntu-5.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-5.10.xml.in
@@ -20,8 +20,8 @@
Ubuntu 5.10 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-amd64.iso
@@ -29,8 +29,8 @@
Ubuntu 5.10 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-powerpc.iso
@@ -38,8 +38,8 @@
Ubuntu 5.10 ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/powerpc/vmlinux
+ install/powerpc/initrd.gz
@@ -48,8 +48,8 @@
Ubuntu 5.10 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-amd64.iso
@@ -57,8 +57,8 @@
Ubuntu 5.10 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-powerpc.iso
@@ -66,8 +66,8 @@
Ubuntu 5.10 ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/powerpc/vmlinux
+ install/powerpc/initrd.gz
@@ -76,8 +76,8 @@
Ubuntu 5.10 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-amd64.iso
@@ -85,8 +85,8 @@
Ubuntu 5.10 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-powerpc.iso
@@ -94,8 +94,8 @@
Ubuntu 5.10 ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/powerpc/vmlinux
+ install/powerpc/initrd.gz
diff --git a/data/os/ubuntu.com/ubuntu-6.06.xml.in b/data/os/ubuntu.com/ubuntu-6.06.xml.in
index 6269f5c..23aa19c 100644
--- a/data/os/ubuntu.com/ubuntu-6.06.xml.in
+++ b/data/os/ubuntu.com/ubuntu-6.06.xml.in
@@ -20,8 +20,8 @@
Ubuntu-Server 6.06(.\d)? i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-amd64.iso
@@ -29,8 +29,8 @@
Ubuntu-Server 6.06(.\d)? amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-powerpc.iso
@@ -38,8 +38,8 @@
Ubuntu-Server 6.06(.\d)? ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/powerpc/vmlinux
+ install/powerpc/initrd.gz
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-hppa.iso
@@ -47,8 +47,8 @@
Ubuntu-Server 6.06(.\d)? hppa
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz-hppa32
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-ia64.iso
@@ -56,8 +56,6 @@
Ubuntu-Server 6.06(.\d)? ia64
LINUX
- casper/vmlinuz
- casper/initrd.img
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso
@@ -65,8 +63,8 @@
Ubuntu-Server 6.06(.\d)? sparc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ boot/sparc64
+ boot/initrd.gz
@@ -75,8 +73,8 @@
Ubuntu 6.06(.\d)? i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-amd64.iso
@@ -84,8 +82,8 @@
Ubuntu 6.06(.\d)? amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-powerpc.iso
@@ -93,8 +91,8 @@
Ubuntu 6.06(.\d)? ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/powerpc/vmlinux
+ install/powerpc/initrd.gz
@@ -103,8 +101,8 @@
Ubuntu 6.06(.\d)? i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-amd64.iso
@@ -112,8 +110,8 @@
Ubuntu 6.06(.\d)? amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-powerpc.iso
@@ -121,8 +119,8 @@
Ubuntu 6.06(.\d)? ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/powerpc/vmlinux
+ install/powerpc/initrd.gz
@@ -131,8 +129,8 @@
Ubuntu 6.06(.\d)? hppa
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinux-hppa32
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-ia64.iso
@@ -140,8 +138,6 @@
Ubuntu 6.06(.\d)? ia64
LINUX
- casper/vmlinuz
- casper/initrd.img
diff --git a/data/os/ubuntu.com/ubuntu-6.10.xml.in b/data/os/ubuntu.com/ubuntu-6.10.xml.in
index 2dcdf63..ad3b75b 100644
--- a/data/os/ubuntu.com/ubuntu-6.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-6.10.xml.in
@@ -20,8 +20,8 @@
Ubuntu-Server 6.10 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-amd64.iso
@@ -29,8 +29,8 @@
Ubuntu-Server 6.10 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-powerpc.iso
@@ -38,8 +38,8 @@
Ubuntu-Server 6.10 ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/powerpc/vmlinux
+ install/powerpc/initrd.gz
http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-sparc.iso
@@ -47,8 +47,8 @@
Ubuntu-Server 6.10 sparc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ boot/sparc64
+ boot/initrd.gz
@@ -58,7 +58,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-amd64.iso
@@ -67,7 +67,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-powerpc.iso
@@ -75,8 +75,8 @@
Ubuntu 6.10 ppc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ casper/powerpc/vmlinux
+ casper/powerpc/initrd.gz
diff --git a/data/os/ubuntu.com/ubuntu-7.04.xml.in b/data/os/ubuntu.com/ubuntu-7.04.xml.in
index 49101e8..e1947f3 100644
--- a/data/os/ubuntu.com/ubuntu-7.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-7.04.xml.in
@@ -20,8 +20,8 @@
Ubuntu-Server 7.04 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-amd64.iso
@@ -29,8 +29,8 @@
Ubuntu-Server 7.04 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-sparc.iso
@@ -38,8 +38,8 @@
Ubuntu-Server 7.04 sparc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ boot/sparc64
+ boot/initrd.gz
@@ -49,7 +49,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-desktop-amd64.iso
@@ -58,7 +58,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
diff --git a/data/os/ubuntu.com/ubuntu-7.10.xml.in b/data/os/ubuntu.com/ubuntu-7.10.xml.in
index 5fb9f17..d9d433e 100644
--- a/data/os/ubuntu.com/ubuntu-7.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-7.10.xml.in
@@ -20,8 +20,8 @@
Ubuntu-Server 7.10 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-amd64.iso
@@ -29,8 +29,8 @@
Ubuntu-Server 7.10 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-sparc.iso
@@ -38,8 +38,8 @@
Ubuntu-Server 7.10 sparc
LINUX
- casper/vmlinuz
- casper/initrd.img
+ boot/sparc64
+ boot/initrd.gz
@@ -49,7 +49,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-desktop-amd64.iso
@@ -58,7 +58,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
diff --git a/data/os/ubuntu.com/ubuntu-8.04.xml.in b/data/os/ubuntu.com/ubuntu-8.04.xml.in
index a990564..927e1d8 100644
--- a/data/os/ubuntu.com/ubuntu-8.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-8.04.xml.in
@@ -24,8 +24,8 @@
Ubuntu-Server 8.04(.\d)? i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-amd64.iso
@@ -33,8 +33,8 @@
Ubuntu-Server 8.04(.\d)? amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -44,7 +44,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-amd64.iso
@@ -53,7 +53,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
@@ -63,7 +63,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-amd64.iso
@@ -72,7 +72,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
diff --git a/data/os/ubuntu.com/ubuntu-8.10.xml.in b/data/os/ubuntu.com/ubuntu-8.10.xml.in
index 37399f0..a01b31a 100644
--- a/data/os/ubuntu.com/ubuntu-8.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-8.10.xml.in
@@ -20,8 +20,8 @@
Ubuntu-Server 8.10 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-amd64.iso
@@ -29,8 +29,8 @@
Ubuntu-Server 8.10 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -40,7 +40,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-desktop-amd64.iso
@@ -49,7 +49,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
diff --git a/data/os/ubuntu.com/ubuntu-9.04.xml.in b/data/os/ubuntu.com/ubuntu-9.04.xml.in
index 8bf461a..fd4d832 100644
--- a/data/os/ubuntu.com/ubuntu-9.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-9.04.xml.in
@@ -24,8 +24,8 @@
Ubuntu-Server 9.04(.\d)? i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-amd64.iso
@@ -33,8 +33,8 @@
Ubuntu-Server 9.04(.\d)? amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -44,7 +44,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-amd64.iso
@@ -53,7 +53,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.gz
diff --git a/data/os/ubuntu.com/ubuntu-9.10.xml.in b/data/os/ubuntu.com/ubuntu-9.10.xml.in
index 6ea48b2..aef7f02 100644
--- a/data/os/ubuntu.com/ubuntu-9.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-9.10.xml.in
@@ -20,8 +20,8 @@
Ubuntu-Server 9.10 i386
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-amd64.iso
@@ -29,8 +29,8 @@
Ubuntu-Server 9.10 amd64
LINUX
- casper/vmlinuz
- casper/initrd.img
+ install/vmlinuz
+ install/initrd.gz
@@ -40,7 +40,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-desktop-amd64.iso
@@ -49,7 +49,7 @@
LINUX
casper/vmlinuz
- casper/initrd.img
+ casper/initrd.lz
--
2.7.4
From cfergeau at redhat.com Fri Jun 3 09:23:31 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 3 Jun 2016 11:23:31 +0200
Subject: [Libosinfo] [PATCH 3/4] test: Silence expected warning in test-os
In-Reply-To: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
References: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464945812-17897-3-git-send-email-cfergeau@redhat.com>
---
test/test-os.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/test/test-os.c b/test/test-os.c
index 604b289..ad926cb 100644
--- a/test/test-os.c
+++ b/test/test-os.c
@@ -124,6 +124,9 @@ START_TEST(test_loader)
fail_unless(os != NULL, "could not find OS 'test5'");
str = osinfo_product_get_short_id(OSINFO_PRODUCT(os));
fail_unless(g_strcmp0(str, "test5") == 0, "wrong OS short-id");
+ /* 'test5' OS intentionnally contains an invalid release status */
+ g_test_expect_message(NULL, G_LOG_LEVEL_CRITICAL,
+ "*(osinfo_entity_get_param_value_enum): should not be reached*");
fail_unless(osinfo_os_get_release_status(os) == OSINFO_RELEASE_STATUS_RELEASED,
"OS should be a released one");
--
2.7.4
From cfergeau at redhat.com Fri Jun 3 09:23:29 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 3 Jun 2016 11:23:29 +0200
Subject: [Libosinfo] [PATCH 1/4] test: Adjust test database directory layout
Message-ID: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
Since the database reorganization, the files must follow a directory
layout matching their id, otherwise a warning is emitted.
---
.../example.com/libosinfo-test-datamap.xml} | 9 -------
.../example.com/libosinfo-test-datamap2.xml | 10 ++++++++
.../example.com/libosinfo-test-install-script.xml} | 0
.../fedoraproject.org/fedora-16.xml} | 28 ----------------------
test/dbdata/os/libosinfo.org/test-os-test1.xml | 11 +++++++++
test/dbdata/os/libosinfo.org/test-os-test2.xml | 7 ++++++
test/dbdata/os/libosinfo.org/test-os-test3.xml | 7 ++++++
test/dbdata/os/libosinfo.org/test-os-test4.xml | 7 ++++++
test/dbdata/os/libosinfo.org/test-os-test5.xml | 7 ++++++
9 files changed, 49 insertions(+), 37 deletions(-)
rename test/dbdata/{datamaps/test-datamap.xml => datamap/example.com/libosinfo-test-datamap.xml} (56%)
create mode 100644 test/dbdata/datamap/example.com/libosinfo-test-datamap2.xml
rename test/dbdata/{install-scripts/test-install-script.xml => install-script/example.com/libosinfo-test-install-script.xml} (100%)
rename test/dbdata/{oses/test-os-data.xml => os/fedoraproject.org/fedora-16.xml} (50%)
create mode 100644 test/dbdata/os/libosinfo.org/test-os-test1.xml
create mode 100644 test/dbdata/os/libosinfo.org/test-os-test2.xml
create mode 100644 test/dbdata/os/libosinfo.org/test-os-test3.xml
create mode 100644 test/dbdata/os/libosinfo.org/test-os-test4.xml
create mode 100644 test/dbdata/os/libosinfo.org/test-os-test5.xml
diff --git a/test/dbdata/datamaps/test-datamap.xml b/test/dbdata/datamap/example.com/libosinfo-test-datamap.xml
similarity index 56%
rename from test/dbdata/datamaps/test-datamap.xml
rename to test/dbdata/datamap/example.com/libosinfo-test-datamap.xml
index 16c5116..234bc46 100644
--- a/test/dbdata/datamaps/test-datamap.xml
+++ b/test/dbdata/datamap/example.com/libosinfo-test-datamap.xml
@@ -1,6 +1,5 @@
-
@@ -9,12 +8,4 @@
-
-
-
-
-
-
-
-
diff --git a/test/dbdata/datamap/example.com/libosinfo-test-datamap2.xml b/test/dbdata/datamap/example.com/libosinfo-test-datamap2.xml
new file mode 100644
index 0000000..e6d5f92
--- /dev/null
+++ b/test/dbdata/datamap/example.com/libosinfo-test-datamap2.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/test/dbdata/install-scripts/test-install-script.xml b/test/dbdata/install-script/example.com/libosinfo-test-install-script.xml
similarity index 100%
rename from test/dbdata/install-scripts/test-install-script.xml
rename to test/dbdata/install-script/example.com/libosinfo-test-install-script.xml
diff --git a/test/dbdata/oses/test-os-data.xml b/test/dbdata/os/fedoraproject.org/fedora-16.xml
similarity index 50%
rename from test/dbdata/oses/test-os-data.xml
rename to test/dbdata/os/fedoraproject.org/fedora-16.xml
index 1e6494e..88ef431 100644
--- a/test/dbdata/oses/test-os-data.xml
+++ b/test/dbdata/os/fedoraproject.org/fedora-16.xml
@@ -20,32 +20,4 @@
isolinux/initrd.img
-
-
- test1
- Test 1
- unknown
- libosinfo.org
- test
- prerelease
-
-
-
- test2
- released
-
-
-
- test3
-
-
-
- test4
- snapshot
-
-
-
- test5
- invalid-value
-
diff --git a/test/dbdata/os/libosinfo.org/test-os-test1.xml b/test/dbdata/os/libosinfo.org/test-os-test1.xml
new file mode 100644
index 0000000..8253459
--- /dev/null
+++ b/test/dbdata/os/libosinfo.org/test-os-test1.xml
@@ -0,0 +1,11 @@
+
+
+
+ test1
+ Test 1
+ unknown
+ libosinfo.org
+ test
+ prerelease
+
+
diff --git a/test/dbdata/os/libosinfo.org/test-os-test2.xml b/test/dbdata/os/libosinfo.org/test-os-test2.xml
new file mode 100644
index 0000000..5db0f84
--- /dev/null
+++ b/test/dbdata/os/libosinfo.org/test-os-test2.xml
@@ -0,0 +1,7 @@
+
+
+
+ test2
+ released
+
+
diff --git a/test/dbdata/os/libosinfo.org/test-os-test3.xml b/test/dbdata/os/libosinfo.org/test-os-test3.xml
new file mode 100644
index 0000000..8edad24
--- /dev/null
+++ b/test/dbdata/os/libosinfo.org/test-os-test3.xml
@@ -0,0 +1,7 @@
+
+
+
+ test3
+
+
+
diff --git a/test/dbdata/os/libosinfo.org/test-os-test4.xml b/test/dbdata/os/libosinfo.org/test-os-test4.xml
new file mode 100644
index 0000000..bac7365
--- /dev/null
+++ b/test/dbdata/os/libosinfo.org/test-os-test4.xml
@@ -0,0 +1,7 @@
+
+
+
+ test4
+ snapshot
+
+
diff --git a/test/dbdata/os/libosinfo.org/test-os-test5.xml b/test/dbdata/os/libosinfo.org/test-os-test5.xml
new file mode 100644
index 0000000..65dc54a
--- /dev/null
+++ b/test/dbdata/os/libosinfo.org/test-os-test5.xml
@@ -0,0 +1,7 @@
+
+
+
+ test5
+ invalid-value
+
+
--
2.7.4
From cfergeau at redhat.com Fri Jun 3 09:23:30 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 3 Jun 2016 11:23:30 +0200
Subject: [Libosinfo] [PATCH 2/4] os: Fix invalid URLs
In-Reply-To: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
References: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464945812-17897-2-git-send-email-cfergeau@redhat.com>
Some URLs have become obsolete since the last time
test-treeuris/test-mediauris were run, this fixes these 2 tests.
---
data/os/centos.org/centos-6.7.xml.in | 4 ++--
data/os/debian.org/debian-8.xml.in | 4 ++--
data/os/fedoraproject.org/fedora-20.xml.in | 2 +-
data/os/fedoraproject.org/fedora-21.xml.in | 24 ++++++++++++------------
data/os/ubuntu.com/ubuntu-15.04.xml.in | 8 ++++----
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
index 3dfd207..e38a2bb 100644
--- a/data/os/centos.org/centos-6.7.xml.in
+++ b/data/os/centos.org/centos-6.7.xml.in
@@ -116,7 +116,7 @@
- http://mirror.centos.org/centos-6/6.7/os/i386
+ http://vault.centos.org/6.7/os/i386
CentOS
6.7
@@ -124,7 +124,7 @@
- http://mirror.centos.org/centos-6/6.7/os/x86_64
+ http://vault.centos.org/6.7/os/x86_64
CentOS
6.7
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index e143dd3..bc63369 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -29,7 +29,7 @@
- http://cdimage.debian.org/debian-cd/8.3.0/i386/iso-dvd/debian-8.3.0-i386-DVD-1.iso
+ http://cdimage.debian.org/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso
Debian 8.\d.\d i386 1
@@ -37,7 +37,7 @@
install.386/initrd.gz
- http://cdimage.debian.org/debian-cd/8.3.0/amd64/iso-dvd/debian-8.3.0-amd64-DVD-1.iso
+ http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso
Debian 8.\d.\d amd64 1
diff --git a/data/os/fedoraproject.org/fedora-20.xml.in b/data/os/fedoraproject.org/fedora-20.xml.in
index 4e931f4..9917e5d 100644
--- a/data/os/fedoraproject.org/fedora-20.xml.in
+++ b/data/os/fedoraproject.org/fedora-20.xml.in
@@ -54,7 +54,7 @@
isolinux/initrd.img
- http://download.fedoraproject.org/pub/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedora-20-ppc64-DVD.iso
+ http://archive.fedoraproject.org/pub/archive/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedora-20-ppc64-DVD.iso
Fedora_20_ppc64
diff --git a/data/os/fedoraproject.org/fedora-21.xml.in b/data/os/fedoraproject.org/fedora-21.xml.in
index 9a83f3f..19fb9bb 100644
--- a/data/os/fedoraproject.org/fedora-21.xml.in
+++ b/data/os/fedoraproject.org/fedora-21.xml.in
@@ -37,7 +37,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso
Fedora-Live-WS-i686-21.*
LINUX
@@ -48,7 +48,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso
Fedora-Live-WS-x86_64-21.*
LINUX
@@ -63,7 +63,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso
Fedora-S.*21.*-i386
LINUX
@@ -74,7 +74,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso
Fedora-S.*-21.*-x86_64
LINUX
@@ -92,7 +92,7 @@
!-->
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-netinst-i386-21.iso
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-netinst-i386-21.iso
Fedora-S.*21.*-i386
LINUX
@@ -103,7 +103,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-netinst-x86_64-21.iso
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-netinst-x86_64-21.iso
Fedora-S.*-21.*-x86_64
LINUX
@@ -115,7 +115,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/os/
Fedora
21
@@ -123,7 +123,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/os/
Fedora
@@ -136,7 +136,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso
Fedora-C.*21.*-i386
LINUX
@@ -147,7 +147,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso
Fedora-C.*-21.*-x86_64
LINUX
@@ -158,7 +158,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/os/
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/i386/os/
Fedora
@@ -167,7 +167,7 @@
- http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/os/
+ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/x86_64/os/
Fedora
diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
index f318052..34111d7 100644
--- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
@@ -29,7 +29,7 @@
- http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso
+ http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso
Ubuntu-Server 15.04(.\d)? i386
@@ -37,7 +37,7 @@
install/initrd.gz
- http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso
+ http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso
Ubuntu-Server 15.04(.\d)? amd64
@@ -45,7 +45,7 @@
install/initrd.gz
- http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso
+ http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso
Ubuntu 15.04(.\d)? i386
@@ -53,7 +53,7 @@
casper/initrd.lz
- http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso
+ http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso
Ubuntu 15.04(.\d)? amd64
--
2.7.4
From cfergeau at redhat.com Fri Jun 3 09:23:32 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 3 Jun 2016 11:23:32 +0200
Subject: [Libosinfo] [PATCH 4/4] test: Make warnings fatal
In-Reply-To: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
References: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1464945812-17897-4-git-send-email-cfergeau@redhat.com>
Since standard output is hidden by default while we run make check, it's
very easy to miss test cases emitting new warnings. This commit uses
g_log_set_fatal_mask() to ensure that the test cases will abort if a
warning is emitted while they run. This matches the behaviour of the
GTest framework.
---
test/test-db.c | 3 +++
test/test-device.c | 3 +++
test/test-devicelist.c | 3 +++
test/test-entity.c | 3 +++
test/test-filter.c | 3 +++
test/test-install-script.c | 3 +++
test/test-isodetect.c | 3 +++
test/test-list.c | 3 +++
test/test-loader.c | 3 +++
test/test-mediauris.c | 3 +++
test/test-os.c | 3 +++
test/test-oslist.c | 3 +++
test/test-platform.c | 3 +++
test/test-platformlist.c | 3 +++
test/test-product.c | 3 +++
test/test-productfilter.c | 3 +++
test/test-treeuris.c | 3 +++
17 files changed, 51 insertions(+)
diff --git a/test/test-db.c b/test/test-db.c
index efb9fd4..31e80d1 100644
--- a/test/test-db.c
+++ b/test/test-db.c
@@ -422,6 +422,9 @@ int main(void)
Suite *s = list_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_entity_get_type();
osinfo_db_get_type();
diff --git a/test/test-device.c b/test/test-device.c
index a410e37..c7b2a82 100644
--- a/test/test-device.c
+++ b/test/test-device.c
@@ -55,6 +55,9 @@ int main(void)
Suite *s = device_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_device_get_type();
diff --git a/test/test-devicelist.c b/test/test-devicelist.c
index f06efcd..b83d6ca 100644
--- a/test/test-devicelist.c
+++ b/test/test-devicelist.c
@@ -224,6 +224,9 @@ int main(void)
Suite *s = list_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_device_get_type();
osinfo_devicelist_get_type();
diff --git a/test/test-entity.c b/test/test-entity.c
index 3629e5b..68ecd95 100644
--- a/test/test-entity.c
+++ b/test/test-entity.c
@@ -335,6 +335,9 @@ int main(void)
Suite *s = entity_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_dummy_get_type();
diff --git a/test/test-filter.c b/test/test-filter.c
index fc50357..7813325 100644
--- a/test/test-filter.c
+++ b/test/test-filter.c
@@ -172,6 +172,9 @@ int main(void)
Suite *s = filter_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_device_get_type();
osinfo_filter_get_type();
diff --git a/test/test-install-script.c b/test/test-install-script.c
index 08d7f76..338fc3b 100644
--- a/test/test-install-script.c
+++ b/test/test-install-script.c
@@ -327,6 +327,9 @@ int main(void)
Suite *s = list_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_entity_get_type();
osinfo_db_get_type();
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 0ca00f9..a1d3ccc 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -481,6 +481,9 @@ int main(void)
Suite *s = list_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_entity_get_type();
osinfo_db_get_type();
diff --git a/test/test-list.c b/test/test-list.c
index 007c362..5480482 100644
--- a/test/test-list.c
+++ b/test/test-list.c
@@ -414,6 +414,9 @@ int main(void)
Suite *s = list_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_dummy_get_type();
osinfo_dummy_list_get_type();
diff --git a/test/test-loader.c b/test/test-loader.c
index 8f796d8..0b2a7da 100644
--- a/test/test-loader.c
+++ b/test/test-loader.c
@@ -55,6 +55,9 @@ int main(void)
Suite *s = loader_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_entity_get_type();
osinfo_db_get_type();
diff --git a/test/test-mediauris.c b/test/test-mediauris.c
index b73dcbc..ce7841c 100644
--- a/test/test-mediauris.c
+++ b/test/test-mediauris.c
@@ -125,6 +125,9 @@ int main(void)
Suite *s = list_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
if (!g_getenv("LIBOSINFO_NETWORK_TESTS"))
return 77; /* Skip */
diff --git a/test/test-os.c b/test/test-os.c
index ad926cb..bae7f7e 100644
--- a/test/test-os.c
+++ b/test/test-os.c
@@ -216,6 +216,9 @@ int main(void)
Suite *s = os_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_platform_get_type();
osinfo_device_get_type();
diff --git a/test/test-oslist.c b/test/test-oslist.c
index 71d55a4..22ff83b 100644
--- a/test/test-oslist.c
+++ b/test/test-oslist.c
@@ -224,6 +224,9 @@ int main(void)
Suite *s = list_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_os_get_type();
osinfo_oslist_get_type();
diff --git a/test/test-platform.c b/test/test-platform.c
index 80b28db..8a49983 100644
--- a/test/test-platform.c
+++ b/test/test-platform.c
@@ -131,6 +131,9 @@ int main(void)
Suite *s = platform_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_platform_get_type();
osinfo_device_get_type();
diff --git a/test/test-platformlist.c b/test/test-platformlist.c
index ec53549..0310050 100644
--- a/test/test-platformlist.c
+++ b/test/test-platformlist.c
@@ -224,6 +224,9 @@ int main(void)
Suite *s = list_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_platform_get_type();
osinfo_platformlist_get_type();
diff --git a/test/test-product.c b/test/test-product.c
index 1e4e2d6..b03eac2 100644
--- a/test/test-product.c
+++ b/test/test-product.c
@@ -205,6 +205,9 @@ int main(void)
Suite *s = product_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_platform_get_type();
osinfo_device_get_type();
diff --git a/test/test-productfilter.c b/test/test-productfilter.c
index 8e1fed8..239e1a4 100644
--- a/test/test-productfilter.c
+++ b/test/test-productfilter.c
@@ -243,6 +243,9 @@ int main(void)
Suite *s = productfilter_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
/* Upfront so we don't confuse valgrind */
osinfo_entity_get_type();
osinfo_filter_get_type();
diff --git a/test/test-treeuris.c b/test/test-treeuris.c
index 0ddfe4f..3fe8b77 100644
--- a/test/test-treeuris.c
+++ b/test/test-treeuris.c
@@ -125,6 +125,9 @@ int main(void)
Suite *s = list_suite();
SRunner *sr = srunner_create(s);
+ /* Make sure we catch unexpected g_warning() */
+ g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
if (!g_getenv("LIBOSINFO_NETWORK_TESTS"))
return 77; /* Skip */
--
2.7.4
From fidencio at redhat.com Fri Jun 3 10:47:00 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 3 Jun 2016 12:47:00 +0200
Subject: [Libosinfo] [PATCHv2 2/2] ubuntu: Fix initrd/kernel paths
In-Reply-To: <1464945798-17485-2-git-send-email-cfergeau@redhat.com>
References: <1464945798-17485-1-git-send-email-cfergeau@redhat.com>
<1464945798-17485-2-git-send-email-cfergeau@redhat.com>
Message-ID:
On Fri, Jun 3, 2016 at 11:23 AM, Christophe Fergeau wrote:
> The initrd extensions are either .lz or .gz depending on the version
> (server/desktop), and the base directory is either casper or install.
> ---
> Changes since v1:
> - fixed older ubuntu releases as well
Thanks for taking a look in the older versions as well.
Acked-by: Fabiano Fid?ncio
>
> data/os/ubuntu.com/ubuntu-10.04.xml.in | 4 +--
> data/os/ubuntu.com/ubuntu-10.10.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-11.04.xml.in | 10 +++----
> data/os/ubuntu.com/ubuntu-11.10.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-12.04.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-12.10.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-13.04.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-13.10.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-14.04.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-14.10.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-15.04.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-15.10.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-5.04.xml.in | 24 ++++++++--------
> data/os/ubuntu.com/ubuntu-5.10.xml.in | 36 +++++++++++------------
> data/os/ubuntu.com/ubuntu-6.06.xml.in | 52 ++++++++++++++++------------------
> data/os/ubuntu.com/ubuntu-6.10.xml.in | 24 ++++++++--------
> data/os/ubuntu.com/ubuntu-7.04.xml.in | 16 +++++------
> data/os/ubuntu.com/ubuntu-7.10.xml.in | 16 +++++------
> data/os/ubuntu.com/ubuntu-8.04.xml.in | 16 +++++------
> data/os/ubuntu.com/ubuntu-8.10.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-9.04.xml.in | 12 ++++----
> data/os/ubuntu.com/ubuntu-9.10.xml.in | 12 ++++----
> 22 files changed, 175 insertions(+), 179 deletions(-)
>
> diff --git a/data/os/ubuntu.com/ubuntu-10.04.xml.in b/data/os/ubuntu.com/ubuntu-10.04.xml.in
> index 1b69a53..0de35d0 100644
> --- a/data/os/ubuntu.com/ubuntu-10.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-10.04.xml.in
> @@ -34,7 +34,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso
> @@ -43,7 +43,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-10.10.xml.in b/data/os/ubuntu.com/ubuntu-10.10.xml.in
> index 0bd9270..b1d04c7 100644
> --- a/data/os/ubuntu.com/ubuntu-10.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-10.10.xml.in
> @@ -34,8 +34,8 @@
> Ubuntu-Server 10.10 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso
> @@ -43,8 +43,8 @@
> Ubuntu-Server 10.10 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -54,7 +54,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso
> @@ -63,7 +63,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-11.04.xml.in b/data/os/ubuntu.com/ubuntu-11.04.xml.in
> index ab7e0a1..31a821b 100644
> --- a/data/os/ubuntu.com/ubuntu-11.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-11.04.xml.in
> @@ -34,8 +34,8 @@
> Ubuntu-Server 11.04 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso
> @@ -43,8 +43,8 @@
> Ubuntu-Server 11.04 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -54,7 +54,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso
> diff --git a/data/os/ubuntu.com/ubuntu-11.10.xml.in b/data/os/ubuntu.com/ubuntu-11.10.xml.in
> index 0ca88cf..81ecfb7 100644
> --- a/data/os/ubuntu.com/ubuntu-11.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-11.10.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 11.10 i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso
>
> Ubuntu-Server 11.10 amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -51,7 +51,7 @@
> Ubuntu 11.10 i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso
> @@ -59,7 +59,7 @@
> Ubuntu 11.10 amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in
> index 83a4501..0a84f88 100644
> --- a/data/os/ubuntu.com/ubuntu-12.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in
> @@ -32,16 +32,16 @@
>
> Ubuntu-Server 12.04(.\d)? LTS i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso
>
> Ubuntu-Server 12.04(.\d)? LTS amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso
> @@ -49,7 +49,7 @@
> Ubuntu 12.04(.\d)? LTS i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso
> @@ -57,7 +57,7 @@
> Ubuntu 12.04(.\d)? LTS amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-12.10.xml.in b/data/os/ubuntu.com/ubuntu-12.10.xml.in
> index 87d3a54..a6ec456 100644
> --- a/data/os/ubuntu.com/ubuntu-12.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-12.10.xml.in
> @@ -32,16 +32,16 @@
>
> Ubuntu-Server 12.10 i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso
>
> Ubuntu-Server 12.10 amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso
> @@ -49,7 +49,7 @@
> Ubuntu 12.10 i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso
> @@ -57,7 +57,7 @@
> Ubuntu 12.10 amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in
> index de364c7..605fe4b 100644
> --- a/data/os/ubuntu.com/ubuntu-13.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in
> @@ -32,16 +32,16 @@
>
> Ubuntu-Server 13.04 i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso
>
> Ubuntu-Server 13.04 amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso
> @@ -49,7 +49,7 @@
> Ubuntu 13.04 i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso
> @@ -57,7 +57,7 @@
> Ubuntu 13.04 amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-13.10.xml.in b/data/os/ubuntu.com/ubuntu-13.10.xml.in
> index 39f02ec..8d90530 100644
> --- a/data/os/ubuntu.com/ubuntu-13.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-13.10.xml.in
> @@ -32,16 +32,16 @@
>
> Ubuntu-Server 13.10 i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso
>
> Ubuntu-Server 13.10 amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso
> @@ -49,7 +49,7 @@
> Ubuntu 13.10 i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso
> @@ -57,7 +57,7 @@
> Ubuntu 13.10 amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> index d1fa114..a70990f 100644
> --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 14.04(.\d)? LTS i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso
>
> Ubuntu-Server 14.04(.\d)? LTS amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso
> @@ -50,7 +50,7 @@
> Ubuntu 14.04(.\d)? LTS i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> Ubuntu 14.04(.\d)? LTS amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in
> index 8a72618..437994d 100644
> --- a/data/os/ubuntu.com/ubuntu-14.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 14.10(.\d)? i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso
>
> Ubuntu-Server 14.10(.\d)? amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso
> @@ -50,7 +50,7 @@
> Ubuntu 14.10(.\d)? i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> Ubuntu 14.10(.\d)? amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
> index 47c944e..f318052 100644
> --- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 15.04(.\d)? i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso
>
> Ubuntu-Server 15.04(.\d)? amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso
> @@ -50,7 +50,7 @@
> Ubuntu 15.04(.\d)? i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> Ubuntu 15.04(.\d)? amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in
> index 32dee03..5fb7711 100644
> --- a/data/os/ubuntu.com/ubuntu-15.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in
> @@ -33,16 +33,16 @@
>
> Ubuntu-Server 15.10(.\d)? i386
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso
>
> Ubuntu-Server 15.10(.\d)? amd64
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso
> @@ -50,7 +50,7 @@
> Ubuntu 15.10(.\d)? i386
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> Ubuntu 15.10(.\d)? amd64
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-5.04.xml.in b/data/os/ubuntu.com/ubuntu-5.04.xml.in
> index d83bb0b..773600a 100644
> --- a/data/os/ubuntu.com/ubuntu-5.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-5.04.xml.in
> @@ -20,8 +20,8 @@
> Ubuntu 5.04 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-amd64.iso
> @@ -29,8 +29,8 @@
> Ubuntu 5.04 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-powerpc.iso
> @@ -38,8 +38,8 @@
> Ubuntu 5.04 ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/powerpc/vmlinux
> + install/powerpc/initrd.gz
>
>
>
> @@ -48,8 +48,8 @@
> Ubuntu 5.04 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-amd64.iso
> @@ -57,8 +57,8 @@
> Ubuntu 5.04 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-powerpc.iso
> @@ -66,8 +66,8 @@
> Ubuntu 5.04 ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-5.10.xml.in b/data/os/ubuntu.com/ubuntu-5.10.xml.in
> index ec7f2dc..79505a7 100644
> --- a/data/os/ubuntu.com/ubuntu-5.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-5.10.xml.in
> @@ -20,8 +20,8 @@
> Ubuntu 5.10 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-amd64.iso
> @@ -29,8 +29,8 @@
> Ubuntu 5.10 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-powerpc.iso
> @@ -38,8 +38,8 @@
> Ubuntu 5.10 ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/powerpc/vmlinux
> + install/powerpc/initrd.gz
>
>
>
> @@ -48,8 +48,8 @@
> Ubuntu 5.10 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-amd64.iso
> @@ -57,8 +57,8 @@
> Ubuntu 5.10 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-powerpc.iso
> @@ -66,8 +66,8 @@
> Ubuntu 5.10 ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/powerpc/vmlinux
> + install/powerpc/initrd.gz
>
>
>
> @@ -76,8 +76,8 @@
> Ubuntu 5.10 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-amd64.iso
> @@ -85,8 +85,8 @@
> Ubuntu 5.10 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-powerpc.iso
> @@ -94,8 +94,8 @@
> Ubuntu 5.10 ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/powerpc/vmlinux
> + install/powerpc/initrd.gz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-6.06.xml.in b/data/os/ubuntu.com/ubuntu-6.06.xml.in
> index 6269f5c..23aa19c 100644
> --- a/data/os/ubuntu.com/ubuntu-6.06.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-6.06.xml.in
> @@ -20,8 +20,8 @@
> Ubuntu-Server 6.06(.\d)? i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-amd64.iso
> @@ -29,8 +29,8 @@
> Ubuntu-Server 6.06(.\d)? amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-powerpc.iso
> @@ -38,8 +38,8 @@
> Ubuntu-Server 6.06(.\d)? ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/powerpc/vmlinux
> + install/powerpc/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-hppa.iso
> @@ -47,8 +47,8 @@
> Ubuntu-Server 6.06(.\d)? hppa
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz-hppa32
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-ia64.iso
> @@ -56,8 +56,6 @@
> Ubuntu-Server 6.06(.\d)? ia64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso
> @@ -65,8 +63,8 @@
> Ubuntu-Server 6.06(.\d)? sparc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + boot/sparc64
> + boot/initrd.gz
>
>
>
> @@ -75,8 +73,8 @@
> Ubuntu 6.06(.\d)? i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-amd64.iso
> @@ -84,8 +82,8 @@
> Ubuntu 6.06(.\d)? amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-powerpc.iso
> @@ -93,8 +91,8 @@
> Ubuntu 6.06(.\d)? ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/powerpc/vmlinux
> + install/powerpc/initrd.gz
>
>
>
> @@ -103,8 +101,8 @@
> Ubuntu 6.06(.\d)? i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-amd64.iso
> @@ -112,8 +110,8 @@
> Ubuntu 6.06(.\d)? amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-powerpc.iso
> @@ -121,8 +119,8 @@
> Ubuntu 6.06(.\d)? ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/powerpc/vmlinux
> + install/powerpc/initrd.gz
>
>
>
> @@ -131,8 +129,8 @@
> Ubuntu 6.06(.\d)? hppa
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinux-hppa32
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-ia64.iso
> @@ -140,8 +138,6 @@
> Ubuntu 6.06(.\d)? ia64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-6.10.xml.in b/data/os/ubuntu.com/ubuntu-6.10.xml.in
> index 2dcdf63..ad3b75b 100644
> --- a/data/os/ubuntu.com/ubuntu-6.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-6.10.xml.in
> @@ -20,8 +20,8 @@
> Ubuntu-Server 6.10 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-amd64.iso
> @@ -29,8 +29,8 @@
> Ubuntu-Server 6.10 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-powerpc.iso
> @@ -38,8 +38,8 @@
> Ubuntu-Server 6.10 ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/powerpc/vmlinux
> + install/powerpc/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-sparc.iso
> @@ -47,8 +47,8 @@
> Ubuntu-Server 6.10 sparc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + boot/sparc64
> + boot/initrd.gz
>
>
>
> @@ -58,7 +58,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-amd64.iso
> @@ -67,7 +67,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-powerpc.iso
> @@ -75,8 +75,8 @@
> Ubuntu 6.10 ppc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + casper/powerpc/vmlinux
> + casper/powerpc/initrd.gz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-7.04.xml.in b/data/os/ubuntu.com/ubuntu-7.04.xml.in
> index 49101e8..e1947f3 100644
> --- a/data/os/ubuntu.com/ubuntu-7.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-7.04.xml.in
> @@ -20,8 +20,8 @@
> Ubuntu-Server 7.04 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-amd64.iso
> @@ -29,8 +29,8 @@
> Ubuntu-Server 7.04 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-sparc.iso
> @@ -38,8 +38,8 @@
> Ubuntu-Server 7.04 sparc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + boot/sparc64
> + boot/initrd.gz
>
>
>
> @@ -49,7 +49,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-7.10.xml.in b/data/os/ubuntu.com/ubuntu-7.10.xml.in
> index 5fb9f17..d9d433e 100644
> --- a/data/os/ubuntu.com/ubuntu-7.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-7.10.xml.in
> @@ -20,8 +20,8 @@
> Ubuntu-Server 7.10 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-amd64.iso
> @@ -29,8 +29,8 @@
> Ubuntu-Server 7.10 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-sparc.iso
> @@ -38,8 +38,8 @@
> Ubuntu-Server 7.10 sparc
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + boot/sparc64
> + boot/initrd.gz
>
>
>
> @@ -49,7 +49,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-desktop-amd64.iso
> @@ -58,7 +58,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-8.04.xml.in b/data/os/ubuntu.com/ubuntu-8.04.xml.in
> index a990564..927e1d8 100644
> --- a/data/os/ubuntu.com/ubuntu-8.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-8.04.xml.in
> @@ -24,8 +24,8 @@
> Ubuntu-Server 8.04(.\d)? i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-amd64.iso
> @@ -33,8 +33,8 @@
> Ubuntu-Server 8.04(.\d)? amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -44,7 +44,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-amd64.iso
> @@ -53,7 +53,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
>
> @@ -63,7 +63,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-amd64.iso
> @@ -72,7 +72,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-8.10.xml.in b/data/os/ubuntu.com/ubuntu-8.10.xml.in
> index 37399f0..a01b31a 100644
> --- a/data/os/ubuntu.com/ubuntu-8.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-8.10.xml.in
> @@ -20,8 +20,8 @@
> Ubuntu-Server 8.10 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-amd64.iso
> @@ -29,8 +29,8 @@
> Ubuntu-Server 8.10 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -40,7 +40,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-desktop-amd64.iso
> @@ -49,7 +49,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-9.04.xml.in b/data/os/ubuntu.com/ubuntu-9.04.xml.in
> index 8bf461a..fd4d832 100644
> --- a/data/os/ubuntu.com/ubuntu-9.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-9.04.xml.in
> @@ -24,8 +24,8 @@
> Ubuntu-Server 9.04(.\d)? i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-amd64.iso
> @@ -33,8 +33,8 @@
> Ubuntu-Server 9.04(.\d)? amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -44,7 +44,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-amd64.iso
> @@ -53,7 +53,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.gz
>
>
>
> diff --git a/data/os/ubuntu.com/ubuntu-9.10.xml.in b/data/os/ubuntu.com/ubuntu-9.10.xml.in
> index 6ea48b2..aef7f02 100644
> --- a/data/os/ubuntu.com/ubuntu-9.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-9.10.xml.in
> @@ -20,8 +20,8 @@
> Ubuntu-Server 9.10 i386
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
> http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-amd64.iso
> @@ -29,8 +29,8 @@
> Ubuntu-Server 9.10 amd64
> LINUX
>
> - casper/vmlinuz
> - casper/initrd.img
> + install/vmlinuz
> + install/initrd.gz
>
>
>
> @@ -40,7 +40,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
> http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-desktop-amd64.iso
> @@ -49,7 +49,7 @@
> LINUX
>
> casper/vmlinuz
> - casper/initrd.img
> + casper/initrd.lz
>
>
>
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
From fidencio at redhat.com Fri Jun 3 10:47:33 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 3 Jun 2016 12:47:33 +0200
Subject: [Libosinfo] [PATCH 1/2] ubuntu: Mark the sparc ISOs as sparc64
In-Reply-To: <1464945798-17485-1-git-send-email-cfergeau@redhat.com>
References: <1464945798-17485-1-git-send-email-cfergeau@redhat.com>
Message-ID:
On Fri, Jun 3, 2016 at 11:23 AM, Christophe Fergeau wrote:
> These ISOs only contain a 64 bit kernel.
> ---
> data/os/ubuntu.com/ubuntu-6.06.xml.in | 2 +-
> data/os/ubuntu.com/ubuntu-6.10.xml.in | 2 +-
> data/os/ubuntu.com/ubuntu-7.04.xml.in | 2 +-
> data/os/ubuntu.com/ubuntu-7.10.xml.in | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/data/os/ubuntu.com/ubuntu-6.06.xml.in b/data/os/ubuntu.com/ubuntu-6.06.xml.in
> index d4cdb1d..6269f5c 100644
> --- a/data/os/ubuntu.com/ubuntu-6.06.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-6.06.xml.in
> @@ -59,7 +59,7 @@
> casper/vmlinuz
> casper/initrd.img
>
> -
> +
> http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso
>
> Ubuntu-Server 6.06(.\d)? sparc
> diff --git a/data/os/ubuntu.com/ubuntu-6.10.xml.in b/data/os/ubuntu.com/ubuntu-6.10.xml.in
> index da6160b..2dcdf63 100644
> --- a/data/os/ubuntu.com/ubuntu-6.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-6.10.xml.in
> @@ -41,7 +41,7 @@
> casper/vmlinuz
> casper/initrd.img
>
> -
> +
> http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-sparc.iso
>
> Ubuntu-Server 6.10 sparc
> diff --git a/data/os/ubuntu.com/ubuntu-7.04.xml.in b/data/os/ubuntu.com/ubuntu-7.04.xml.in
> index c41ba0d..49101e8 100644
> --- a/data/os/ubuntu.com/ubuntu-7.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-7.04.xml.in
> @@ -32,7 +32,7 @@
> casper/vmlinuz
> casper/initrd.img
>
> -
> +
> http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-sparc.iso
>
> Ubuntu-Server 7.04 sparc
> diff --git a/data/os/ubuntu.com/ubuntu-7.10.xml.in b/data/os/ubuntu.com/ubuntu-7.10.xml.in
> index cf3fbf4..5fb9f17 100644
> --- a/data/os/ubuntu.com/ubuntu-7.10.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-7.10.xml.in
> @@ -32,7 +32,7 @@
> casper/vmlinuz
> casper/initrd.img
>
> -
> +
> http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-sparc.iso
>
> Ubuntu-Server 7.10 sparc
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From fidencio at redhat.com Fri Jun 3 10:48:40 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 3 Jun 2016 12:48:40 +0200
Subject: [Libosinfo] [PATCH 1/4] test: Adjust test database directory
layout
In-Reply-To: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
References: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
Message-ID:
On Fri, Jun 3, 2016 at 11:23 AM, Christophe Fergeau wrote:
> Since the database reorganization, the files must follow a directory
> layout matching their id, otherwise a warning is emitted.
> ---
> .../example.com/libosinfo-test-datamap.xml} | 9 -------
> .../example.com/libosinfo-test-datamap2.xml | 10 ++++++++
> .../example.com/libosinfo-test-install-script.xml} | 0
> .../fedoraproject.org/fedora-16.xml} | 28 ----------------------
> test/dbdata/os/libosinfo.org/test-os-test1.xml | 11 +++++++++
> test/dbdata/os/libosinfo.org/test-os-test2.xml | 7 ++++++
> test/dbdata/os/libosinfo.org/test-os-test3.xml | 7 ++++++
> test/dbdata/os/libosinfo.org/test-os-test4.xml | 7 ++++++
> test/dbdata/os/libosinfo.org/test-os-test5.xml | 7 ++++++
> 9 files changed, 49 insertions(+), 37 deletions(-)
> rename test/dbdata/{datamaps/test-datamap.xml => datamap/example.com/libosinfo-test-datamap.xml} (56%)
> create mode 100644 test/dbdata/datamap/example.com/libosinfo-test-datamap2.xml
> rename test/dbdata/{install-scripts/test-install-script.xml => install-script/example.com/libosinfo-test-install-script.xml} (100%)
> rename test/dbdata/{oses/test-os-data.xml => os/fedoraproject.org/fedora-16.xml} (50%)
> create mode 100644 test/dbdata/os/libosinfo.org/test-os-test1.xml
> create mode 100644 test/dbdata/os/libosinfo.org/test-os-test2.xml
> create mode 100644 test/dbdata/os/libosinfo.org/test-os-test3.xml
> create mode 100644 test/dbdata/os/libosinfo.org/test-os-test4.xml
> create mode 100644 test/dbdata/os/libosinfo.org/test-os-test5.xml
>
> diff --git a/test/dbdata/datamaps/test-datamap.xml b/test/dbdata/datamap/example.com/libosinfo-test-datamap.xml
> similarity index 56%
> rename from test/dbdata/datamaps/test-datamap.xml
> rename to test/dbdata/datamap/example.com/libosinfo-test-datamap.xml
> index 16c5116..234bc46 100644
> --- a/test/dbdata/datamaps/test-datamap.xml
> +++ b/test/dbdata/datamap/example.com/libosinfo-test-datamap.xml
> @@ -1,6 +1,5 @@
>
>
> -
>
>
>
> @@ -9,12 +8,4 @@
>
>
>
> -
> -
> -
> -
> -
> -
> -
> -
>
> diff --git a/test/dbdata/datamap/example.com/libosinfo-test-datamap2.xml b/test/dbdata/datamap/example.com/libosinfo-test-datamap2.xml
> new file mode 100644
> index 0000000..e6d5f92
> --- /dev/null
> +++ b/test/dbdata/datamap/example.com/libosinfo-test-datamap2.xml
> @@ -0,0 +1,10 @@
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> diff --git a/test/dbdata/install-scripts/test-install-script.xml b/test/dbdata/install-script/example.com/libosinfo-test-install-script.xml
> similarity index 100%
> rename from test/dbdata/install-scripts/test-install-script.xml
> rename to test/dbdata/install-script/example.com/libosinfo-test-install-script.xml
> diff --git a/test/dbdata/oses/test-os-data.xml b/test/dbdata/os/fedoraproject.org/fedora-16.xml
> similarity index 50%
> rename from test/dbdata/oses/test-os-data.xml
> rename to test/dbdata/os/fedoraproject.org/fedora-16.xml
> index 1e6494e..88ef431 100644
> --- a/test/dbdata/oses/test-os-data.xml
> +++ b/test/dbdata/os/fedoraproject.org/fedora-16.xml
> @@ -20,32 +20,4 @@
> isolinux/initrd.img
>
>
> -
> -
> - test1
> - Test 1
> - unknown
> - libosinfo.org
> - test
> - prerelease
> -
> -
> -
> - test2
> - released
> -
> -
> -
> - test3
> -
> -
> -
> - test4
> - snapshot
> -
> -
> -
> - test5
> - invalid-value
> -
>
> diff --git a/test/dbdata/os/libosinfo.org/test-os-test1.xml b/test/dbdata/os/libosinfo.org/test-os-test1.xml
> new file mode 100644
> index 0000000..8253459
> --- /dev/null
> +++ b/test/dbdata/os/libosinfo.org/test-os-test1.xml
> @@ -0,0 +1,11 @@
> +
> +
> +
> + test1
> + Test 1
> + unknown
> + libosinfo.org
> + test
> + prerelease
> +
> +
> diff --git a/test/dbdata/os/libosinfo.org/test-os-test2.xml b/test/dbdata/os/libosinfo.org/test-os-test2.xml
> new file mode 100644
> index 0000000..5db0f84
> --- /dev/null
> +++ b/test/dbdata/os/libosinfo.org/test-os-test2.xml
> @@ -0,0 +1,7 @@
> +
> +
> +
> + test2
> + released
> +
> +
> diff --git a/test/dbdata/os/libosinfo.org/test-os-test3.xml b/test/dbdata/os/libosinfo.org/test-os-test3.xml
> new file mode 100644
> index 0000000..8edad24
> --- /dev/null
> +++ b/test/dbdata/os/libosinfo.org/test-os-test3.xml
> @@ -0,0 +1,7 @@
> +
> +
> +
> + test3
> +
> +
> +
> diff --git a/test/dbdata/os/libosinfo.org/test-os-test4.xml b/test/dbdata/os/libosinfo.org/test-os-test4.xml
> new file mode 100644
> index 0000000..bac7365
> --- /dev/null
> +++ b/test/dbdata/os/libosinfo.org/test-os-test4.xml
> @@ -0,0 +1,7 @@
> +
> +
> +
> + test4
> + snapshot
> +
> +
> diff --git a/test/dbdata/os/libosinfo.org/test-os-test5.xml b/test/dbdata/os/libosinfo.org/test-os-test5.xml
> new file mode 100644
> index 0000000..65dc54a
> --- /dev/null
> +++ b/test/dbdata/os/libosinfo.org/test-os-test5.xml
> @@ -0,0 +1,7 @@
> +
> +
> +
> + test5
> + invalid-value
> +
> +
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From fidencio at redhat.com Fri Jun 3 10:51:54 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 3 Jun 2016 12:51:54 +0200
Subject: [Libosinfo] [PATCH 2/4] os: Fix invalid URLs
In-Reply-To: <1464945812-17897-2-git-send-email-cfergeau@redhat.com>
References: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
<1464945812-17897-2-git-send-email-cfergeau@redhat.com>
Message-ID:
On Fri, Jun 3, 2016 at 11:23 AM, Christophe Fergeau wrote:
> Some URLs have become obsolete since the last time
> test-treeuris/test-mediauris were run, this fixes these 2 tests.
> ---
> data/os/centos.org/centos-6.7.xml.in | 4 ++--
> data/os/debian.org/debian-8.xml.in | 4 ++--
> data/os/fedoraproject.org/fedora-20.xml.in | 2 +-
> data/os/fedoraproject.org/fedora-21.xml.in | 24 ++++++++++++------------
> data/os/ubuntu.com/ubuntu-15.04.xml.in | 8 ++++----
> 5 files changed, 21 insertions(+), 21 deletions(-)
>
> diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
> index 3dfd207..e38a2bb 100644
> --- a/data/os/centos.org/centos-6.7.xml.in
> +++ b/data/os/centos.org/centos-6.7.xml.in
> @@ -116,7 +116,7 @@
>
>
>
> - http://mirror.centos.org/centos-6/6.7/os/i386
> + http://vault.centos.org/6.7/os/i386
>
> CentOS
> 6.7
> @@ -124,7 +124,7 @@
>
>
>
> - http://mirror.centos.org/centos-6/6.7/os/x86_64
> + http://vault.centos.org/6.7/os/x86_64
>
> CentOS
> 6.7
> diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
> index e143dd3..bc63369 100644
> --- a/data/os/debian.org/debian-8.xml.in
> +++ b/data/os/debian.org/debian-8.xml.in
> @@ -29,7 +29,7 @@
>
>
>
> - http://cdimage.debian.org/debian-cd/8.3.0/i386/iso-dvd/debian-8.3.0-i386-DVD-1.iso
> + http://cdimage.debian.org/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso
>
> Debian 8.\d.\d i386 1
>
> @@ -37,7 +37,7 @@
> install.386/initrd.gz
>
>
> - http://cdimage.debian.org/debian-cd/8.3.0/amd64/iso-dvd/debian-8.3.0-amd64-DVD-1.iso
> + http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso
>
> Debian 8.\d.\d amd64 1
>
> diff --git a/data/os/fedoraproject.org/fedora-20.xml.in b/data/os/fedoraproject.org/fedora-20.xml.in
> index 4e931f4..9917e5d 100644
> --- a/data/os/fedoraproject.org/fedora-20.xml.in
> +++ b/data/os/fedoraproject.org/fedora-20.xml.in
> @@ -54,7 +54,7 @@
> isolinux/initrd.img
>
>
> - http://download.fedoraproject.org/pub/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedora-20-ppc64-DVD.iso
> + http://archive.fedoraproject.org/pub/archive/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedora-20-ppc64-DVD.iso
>
>
> Fedora_20_ppc64
> diff --git a/data/os/fedoraproject.org/fedora-21.xml.in b/data/os/fedoraproject.org/fedora-21.xml.in
> index 9a83f3f..19fb9bb 100644
> --- a/data/os/fedoraproject.org/fedora-21.xml.in
> +++ b/data/os/fedoraproject.org/fedora-21.xml.in
> @@ -37,7 +37,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso
>
> Fedora-Live-WS-i686-21.*
> LINUX
> @@ -48,7 +48,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso
>
> Fedora-Live-WS-x86_64-21.*
> LINUX
> @@ -63,7 +63,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso
>
> Fedora-S.*21.*-i386
> LINUX
> @@ -74,7 +74,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso
>
> Fedora-S.*-21.*-x86_64
> LINUX
> @@ -92,7 +92,7 @@
> !-->
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-netinst-i386-21.iso
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-netinst-i386-21.iso
>
> Fedora-S.*21.*-i386
> LINUX
> @@ -103,7 +103,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-netinst-x86_64-21.iso
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-netinst-x86_64-21.iso
>
> Fedora-S.*-21.*-x86_64
> LINUX
> @@ -115,7 +115,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/os/
>
> Fedora
> 21
> @@ -123,7 +123,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/os/
>
>
> Fedora
> @@ -136,7 +136,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso
>
> Fedora-C.*21.*-i386
> LINUX
> @@ -147,7 +147,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso
>
> Fedora-C.*-21.*-x86_64
> LINUX
> @@ -158,7 +158,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/os/
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/i386/os/
>
>
> Fedora
> @@ -167,7 +167,7 @@
>
>
>
> - http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/os/
> + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/x86_64/os/
>
>
> Fedora
> diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
> index f318052..34111d7 100644
> --- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
> @@ -29,7 +29,7 @@
>
>
>
> - http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso
> + http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso
>
> Ubuntu-Server 15.04(.\d)? i386
>
> @@ -37,7 +37,7 @@
> install/initrd.gz
>
>
> - http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso
> + http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso
>
> Ubuntu-Server 15.04(.\d)? amd64
>
> @@ -45,7 +45,7 @@
> install/initrd.gz
>
>
> - http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso
> + http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso
>
> Ubuntu 15.04(.\d)? i386
>
> @@ -53,7 +53,7 @@
> casper/initrd.lz
>
>
> - http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso
> + http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso
>
> Ubuntu 15.04(.\d)? amd64
>
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From fidencio at redhat.com Fri Jun 3 10:53:14 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 3 Jun 2016 12:53:14 +0200
Subject: [Libosinfo] [PATCH 3/4] test: Silence expected warning in
test-os
In-Reply-To: <1464945812-17897-3-git-send-email-cfergeau@redhat.com>
References: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
<1464945812-17897-3-git-send-email-cfergeau@redhat.com>
Message-ID:
On Fri, Jun 3, 2016 at 11:23 AM, Christophe Fergeau wrote:
> ---
> test/test-os.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/test/test-os.c b/test/test-os.c
> index 604b289..ad926cb 100644
> --- a/test/test-os.c
> +++ b/test/test-os.c
> @@ -124,6 +124,9 @@ START_TEST(test_loader)
> fail_unless(os != NULL, "could not find OS 'test5'");
> str = osinfo_product_get_short_id(OSINFO_PRODUCT(os));
> fail_unless(g_strcmp0(str, "test5") == 0, "wrong OS short-id");
> + /* 'test5' OS intentionnally contains an invalid release status */
> + g_test_expect_message(NULL, G_LOG_LEVEL_CRITICAL,
> + "*(osinfo_entity_get_param_value_enum): should not be reached*");
> fail_unless(osinfo_os_get_release_status(os) == OSINFO_RELEASE_STATUS_RELEASED,
> "OS should be a released one");
>
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From cfergeau at redhat.com Fri Jun 3 10:53:27 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 3 Jun 2016 12:53:27 +0200
Subject: [Libosinfo] [PATCHv2 2/2] ubuntu: Fix initrd/kernel paths
In-Reply-To:
References: <1464945798-17485-1-git-send-email-cfergeau@redhat.com>
<1464945798-17485-2-git-send-email-cfergeau@redhat.com>
Message-ID: <20160603105327.GG9290@edamame.cdg.redhat.com>
On Fri, Jun 03, 2016 at 12:47:00PM +0200, Fabiano Fid?ncio wrote:
> On Fri, Jun 3, 2016 at 11:23 AM, Christophe Fergeau wrote:
> > The initrd extensions are either .lz or .gz depending on the version
> > (server/desktop), and the base directory is either casper or install.
> > ---
> > Changes since v1:
> > - fixed older ubuntu releases as well
>
> Thanks for taking a look in the older versions as well.
By the way, forgot to mention this, but the ppc/parisc entries could
help a bit more love as they usually have different kernels/initrd for
32/64 bit for example (on a single ISO).
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL:
From fidencio at redhat.com Fri Jun 3 10:55:39 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 3 Jun 2016 12:55:39 +0200
Subject: [Libosinfo] [PATCHv2 2/2] ubuntu: Fix initrd/kernel paths
In-Reply-To: <20160603105327.GG9290@edamame.cdg.redhat.com>
References: <1464945798-17485-1-git-send-email-cfergeau@redhat.com>
<1464945798-17485-2-git-send-email-cfergeau@redhat.com>
<20160603105327.GG9290@edamame.cdg.redhat.com>
Message-ID:
On Fri, Jun 3, 2016 at 12:53 PM, Christophe Fergeau wrote:
> On Fri, Jun 03, 2016 at 12:47:00PM +0200, Fabiano Fid?ncio wrote:
>> On Fri, Jun 3, 2016 at 11:23 AM, Christophe Fergeau wrote:
>> > The initrd extensions are either .lz or .gz depending on the version
>> > (server/desktop), and the base directory is either casper or install.
>> > ---
>> > Changes since v1:
>> > - fixed older ubuntu releases as well
>>
>> Thanks for taking a look in the older versions as well.
>
> By the way, forgot to mention this, but the ppc/parisc entries could
> help a bit more love as they usually have different kernels/initrd for
> 32/64 bit for example (on a single ISO).
Can you please add this info to the commit log as well?
>
> Christophe
From fidencio at redhat.com Fri Jun 3 10:56:07 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 3 Jun 2016 12:56:07 +0200
Subject: [Libosinfo] [PATCH 4/4] test: Make warnings fatal
In-Reply-To: <1464945812-17897-4-git-send-email-cfergeau@redhat.com>
References: <1464945812-17897-1-git-send-email-cfergeau@redhat.com>
<1464945812-17897-4-git-send-email-cfergeau@redhat.com>
Message-ID:
On Fri, Jun 3, 2016 at 11:23 AM, Christophe Fergeau wrote:
> Since standard output is hidden by default while we run make check, it's
> very easy to miss test cases emitting new warnings. This commit uses
> g_log_set_fatal_mask() to ensure that the test cases will abort if a
> warning is emitted while they run. This matches the behaviour of the
> GTest framework.
> ---
> test/test-db.c | 3 +++
> test/test-device.c | 3 +++
> test/test-devicelist.c | 3 +++
> test/test-entity.c | 3 +++
> test/test-filter.c | 3 +++
> test/test-install-script.c | 3 +++
> test/test-isodetect.c | 3 +++
> test/test-list.c | 3 +++
> test/test-loader.c | 3 +++
> test/test-mediauris.c | 3 +++
> test/test-os.c | 3 +++
> test/test-oslist.c | 3 +++
> test/test-platform.c | 3 +++
> test/test-platformlist.c | 3 +++
> test/test-product.c | 3 +++
> test/test-productfilter.c | 3 +++
> test/test-treeuris.c | 3 +++
> 17 files changed, 51 insertions(+)
>
> diff --git a/test/test-db.c b/test/test-db.c
> index efb9fd4..31e80d1 100644
> --- a/test/test-db.c
> +++ b/test/test-db.c
> @@ -422,6 +422,9 @@ int main(void)
> Suite *s = list_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_db_get_type();
> diff --git a/test/test-device.c b/test/test-device.c
> index a410e37..c7b2a82 100644
> --- a/test/test-device.c
> +++ b/test/test-device.c
> @@ -55,6 +55,9 @@ int main(void)
> Suite *s = device_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_device_get_type();
>
> diff --git a/test/test-devicelist.c b/test/test-devicelist.c
> index f06efcd..b83d6ca 100644
> --- a/test/test-devicelist.c
> +++ b/test/test-devicelist.c
> @@ -224,6 +224,9 @@ int main(void)
> Suite *s = list_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_device_get_type();
> osinfo_devicelist_get_type();
> diff --git a/test/test-entity.c b/test/test-entity.c
> index 3629e5b..68ecd95 100644
> --- a/test/test-entity.c
> +++ b/test/test-entity.c
> @@ -335,6 +335,9 @@ int main(void)
> Suite *s = entity_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_dummy_get_type();
>
> diff --git a/test/test-filter.c b/test/test-filter.c
> index fc50357..7813325 100644
> --- a/test/test-filter.c
> +++ b/test/test-filter.c
> @@ -172,6 +172,9 @@ int main(void)
> Suite *s = filter_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_device_get_type();
> osinfo_filter_get_type();
> diff --git a/test/test-install-script.c b/test/test-install-script.c
> index 08d7f76..338fc3b 100644
> --- a/test/test-install-script.c
> +++ b/test/test-install-script.c
> @@ -327,6 +327,9 @@ int main(void)
> Suite *s = list_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_db_get_type();
> diff --git a/test/test-isodetect.c b/test/test-isodetect.c
> index 0ca00f9..a1d3ccc 100644
> --- a/test/test-isodetect.c
> +++ b/test/test-isodetect.c
> @@ -481,6 +481,9 @@ int main(void)
> Suite *s = list_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_db_get_type();
> diff --git a/test/test-list.c b/test/test-list.c
> index 007c362..5480482 100644
> --- a/test/test-list.c
> +++ b/test/test-list.c
> @@ -414,6 +414,9 @@ int main(void)
> Suite *s = list_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_dummy_get_type();
> osinfo_dummy_list_get_type();
> diff --git a/test/test-loader.c b/test/test-loader.c
> index 8f796d8..0b2a7da 100644
> --- a/test/test-loader.c
> +++ b/test/test-loader.c
> @@ -55,6 +55,9 @@ int main(void)
> Suite *s = loader_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_db_get_type();
> diff --git a/test/test-mediauris.c b/test/test-mediauris.c
> index b73dcbc..ce7841c 100644
> --- a/test/test-mediauris.c
> +++ b/test/test-mediauris.c
> @@ -125,6 +125,9 @@ int main(void)
> Suite *s = list_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> if (!g_getenv("LIBOSINFO_NETWORK_TESTS"))
> return 77; /* Skip */
>
> diff --git a/test/test-os.c b/test/test-os.c
> index ad926cb..bae7f7e 100644
> --- a/test/test-os.c
> +++ b/test/test-os.c
> @@ -216,6 +216,9 @@ int main(void)
> Suite *s = os_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_platform_get_type();
> osinfo_device_get_type();
> diff --git a/test/test-oslist.c b/test/test-oslist.c
> index 71d55a4..22ff83b 100644
> --- a/test/test-oslist.c
> +++ b/test/test-oslist.c
> @@ -224,6 +224,9 @@ int main(void)
> Suite *s = list_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_os_get_type();
> osinfo_oslist_get_type();
> diff --git a/test/test-platform.c b/test/test-platform.c
> index 80b28db..8a49983 100644
> --- a/test/test-platform.c
> +++ b/test/test-platform.c
> @@ -131,6 +131,9 @@ int main(void)
> Suite *s = platform_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_platform_get_type();
> osinfo_device_get_type();
> diff --git a/test/test-platformlist.c b/test/test-platformlist.c
> index ec53549..0310050 100644
> --- a/test/test-platformlist.c
> +++ b/test/test-platformlist.c
> @@ -224,6 +224,9 @@ int main(void)
> Suite *s = list_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_platform_get_type();
> osinfo_platformlist_get_type();
> diff --git a/test/test-product.c b/test/test-product.c
> index 1e4e2d6..b03eac2 100644
> --- a/test/test-product.c
> +++ b/test/test-product.c
> @@ -205,6 +205,9 @@ int main(void)
> Suite *s = product_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_platform_get_type();
> osinfo_device_get_type();
> diff --git a/test/test-productfilter.c b/test/test-productfilter.c
> index 8e1fed8..239e1a4 100644
> --- a/test/test-productfilter.c
> +++ b/test/test-productfilter.c
> @@ -243,6 +243,9 @@ int main(void)
> Suite *s = productfilter_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_filter_get_type();
> diff --git a/test/test-treeuris.c b/test/test-treeuris.c
> index 0ddfe4f..3fe8b77 100644
> --- a/test/test-treeuris.c
> +++ b/test/test-treeuris.c
> @@ -125,6 +125,9 @@ int main(void)
> Suite *s = list_suite();
> SRunner *sr = srunner_create(s);
>
> + /* Make sure we catch unexpected g_warning() */
> + g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> +
> if (!g_getenv("LIBOSINFO_NETWORK_TESTS"))
> return 77; /* Skip */
>
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fid?ncio
From cfergeau at redhat.com Wed Jun 8 10:01:06 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:06 +0200
Subject: [Libosinfo] [PATCH 02/14] entity: Fix
osinfo_entity_get_param_keys() leak
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-3-git-send-email-cfergeau@redhat.com>
The content of the GList returned by osinfo_entity_get_param_key() is
not owned by the caller, but by OsinfoEntity. However, the "id" field
added to the list was owned by the caller, and could not be freed
properly. This commit adds a const char * to the GList rather than
adding a g_strdup'ed string in order to fix this leak.
==12129== 3 bytes in 1 blocks are definitely lost in loss record 7 of 269
==12129== at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
==12129== by 0x684FE58: g_malloc (gmem.c:94)
==12129== by 0x686889E: g_strdup (gstrfuncs.c:363)
==12129== by 0x532BB81: osinfo_entity_get_param_keys (osinfo_entity.c:300)
==12129== by 0x401AFF: test_multi_props_clear (test-entity.c:266)
==12129== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12129== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==12129== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==12129== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==12129== by 0x51178EB: srunner_run (check_run.c:782)
==12129== by 0x401369: main (test-entity.c:344)
---
osinfo/osinfo_entity.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osinfo/osinfo_entity.c b/osinfo/osinfo_entity.c
index 7e27930..20b9115 100644
--- a/osinfo/osinfo_entity.c
+++ b/osinfo/osinfo_entity.c
@@ -297,7 +297,7 @@ GList *osinfo_entity_get_param_keys(OsinfoEntity *entity)
{
g_return_val_if_fail(OSINFO_IS_ENTITY(entity), NULL);
GList *keys = g_hash_table_get_keys(entity->priv->params);
- keys = g_list_append(keys, g_strdup("id"));
+ keys = g_list_append(keys, (char *)"id");
return keys;
}
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:05 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:05 +0200
Subject: [Libosinfo] [PATCH 01/14] test-entity: Fix
osinfo_entity_get_param_keys() leak
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-2-git-send-email-cfergeau@redhat.com>
The list returned by osinfo_entity_get_param_keys() must be freed.
==20812== 24 bytes in 1 blocks are definitely lost in loss record 109 of 262
==20812== at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
==20812== by 0x684FE58: g_malloc (gmem.c:94)
==20812== by 0x6866D42: g_slice_alloc (gslice.c:1025)
==20812== by 0x6846A13: g_list_append (glist.c:261)
==20812== by 0x532BB88: osinfo_entity_get_param_keys (osinfo_entity.c:300)
==20812== by 0x40160F: test_empty_props (test-entity.c:71)
==20812== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==20812== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==20812== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==20812== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==20812== by 0x51178EB: srunner_run (check_run.c:782)
==20812== by 0x40314A: main (test-entity.c:344)
---
test/test-entity.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/test-entity.c b/test/test-entity.c
index 68ecd95..15da5ff 100644
--- a/test/test-entity.c
+++ b/test/test-entity.c
@@ -71,6 +71,7 @@ START_TEST(test_empty_props)
GList *keys = osinfo_entity_get_param_keys(ent);
fail_unless(keys != NULL, "Entity param key list was not empty");
fail_unless(keys->next == NULL, "Entity param key list was not empty");
+ g_list_free(keys);
const gchar *value = osinfo_entity_get_param_value(ent, "wibble");
fail_unless(value == NULL, "Entity param value was not NULL");
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:07 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:07 +0200
Subject: [Libosinfo] [PATCH 03/14] test: Fix osinfo_list_get_elements() leak
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-4-git-send-email-cfergeau@redhat.com>
The returned list must be freed after use.
This fixes:
==13583== at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
==13583== by 0x684FE58: g_malloc (gmem.c:94)
==13583== by 0x6866D42: g_slice_alloc (gslice.c:1025)
==13583== by 0x68462B5: g_list_prepend (glist.c:311)
==13583== by 0x683A06B: g_hash_table_get_values (ghash.c:1814)
==13583== by 0x532D2CC: osinfo_list_get_elements (osinfo_list.c:212)
==13583== by 0x401961: test_uris (test-mediauris.c:87)
==13583== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==13583== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==13583== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==13583== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==13583== by 0x51178EB: srunner_run (check_run.c:782)
==13583== by 0x4016A4: main (test-mediauris.c:146)
---
test/test-mediauris.c | 2 +-
test/test-treeuris.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/test-mediauris.c b/test/test-mediauris.c
index ce7841c..46a68f0 100644
--- a/test/test-mediauris.c
+++ b/test/test-mediauris.c
@@ -97,7 +97,7 @@ START_TEST(test_uris)
tmp = tmp->next;
}
- g_list_free(tmp);
+ g_list_free(osel);
if (oslist)
g_object_unref(oslist);
diff --git a/test/test-treeuris.c b/test/test-treeuris.c
index 3fe8b77..b5c50c6 100644
--- a/test/test-treeuris.c
+++ b/test/test-treeuris.c
@@ -97,7 +97,7 @@ START_TEST(test_uris)
tmp = tmp->next;
}
- g_list_free(tmp);
+ g_list_free(osel);
if (oslist)
g_object_unref(oslist);
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:04 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:04 +0200
Subject: [Libosinfo] [PATCH 00/14]
Message-ID: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Hey,
Here are fixes for all the leaks I could find when running our test suite
through valgrind. The last patch does not fix a leak, and is probably not
strictly required.
Christophe
From cfergeau at redhat.com Wed Jun 8 10:01:08 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:08 +0200
Subject: [Libosinfo] [PATCH 04/14] test-product: Fix two small leaks
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-5-git-send-email-cfergeau@redhat.com>
This fixes:
==14496== 456 (48 direct, 408 indirect) bytes in 1 blocks are definitely lost in loss record 373 of 382
==14496== at 0x65E1964: g_type_create_instance (gtype.c:1854)
==14496== by 0x65C36AA: g_object_new_internal (gobject.c:1781)
==14496== by 0x65C50CC: g_object_newv (gobject.c:1928)
==14496== by 0x65C58B3: g_object_new (gobject.c:1621)
==14496== by 0x53375FD: osinfo_productfilter_new (osinfo_productfilter.c:93)
==14496== by 0x401982: test_supportdate (test-product.c:121)
==14496== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==14496== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==14496== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==14496== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==14496== by 0x51178EB: srunner_run (check_run.c:782)
==14496== by 0x40166E: main (test-product.c:219)
==14496==-
==14496== 1,964 (48 direct, 1,916 indirect) bytes in 1 blocks are definitely lost in loss record 379 of 382
==14496== at 0x65E1964: g_type_create_instance (gtype.c:1854)
==14496== by 0x65C36AA: g_object_new_internal (gobject.c:1781)
==14496== by 0x65C55ED: g_object_new_valist (gobject.c:2040)
==14496== by 0x65C58A0: g_object_new (gobject.c:1624)
==14496== by 0x5338257: osinfo_productlist_new (osinfo_productlist.c:81)
==14496== by 0x401946: test_supportdate (test-product.c:116)
==14496== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==14496== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==14496== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==14496== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==14496== by 0x51178EB: srunner_run (check_run.c:782)
==14496== by 0x40166E: main (test-product.c:219)
---
test/test-product.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/test-product.c b/test/test-product.c
index b03eac2..f9ddb12 100644
--- a/test/test-product.c
+++ b/test/test-product.c
@@ -182,6 +182,8 @@ START_TEST(test_supportdate)
g_object_unref(product2);
g_object_unref(product3);
g_object_unref(product4);
+ g_object_unref(filter);
+ g_object_unref(products);
}
END_TEST
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:11 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:11 +0200
Subject: [Libosinfo] [PATCH 07/14] test-install-script: Fix various small
leaks
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-8-git-send-email-cfergeau@redhat.com>
The value returned by osinfo_install_script_generate_for_media_finish()
was not freed in several codepaths, and the mainloop was not destroyed when
no longer needed. Data read with g_file_load_contents was also not freed
when no longer used.
This fixes:
==12193== 528 bytes in 1 blocks are definitely lost in loss record 2,279 of 2,310
==12193== at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
==12193== by 0x5F6D459: xmlStrndup (xmlstring.c:45)
==12193== by 0x556EF95: xsltSaveResultToString (xsltutils.c:1780)
==12193== by 0x53345C2: osinfo_install_script_apply_xslt (osinfo_install_script.c:824)
==12193== by 0x53346EC: osinfo_install_script_apply_template (osinfo_install_script.c:853)
==12193== by 0x5334A7A: osinfo_install_script_generate_async_common (osinfo_install_script.c:942)
==12193== by 0x5335170: osinfo_install_script_generate_for_media_async (osinfo_install_script.c:1216)
==12193== by 0x40298A: test_script_data (test-install-script.c:212)
==12193== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12193== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==12193== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==12193== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==12193== by 0x51178EB: srunner_run (check_run.c:782)
==12193== by 0x401F82: main (test-install-script.c:345)
==12193== 16 bytes in 1 blocks are definitely lost in loss record 772 of 2,310
==12193== at 0x4C2DA60: calloc (vg_replace_malloc.c:711)
==12193== by 0x684FEB0: g_malloc0 (gmem.c:124)
==12193== by 0x684ABF1: g_main_loop_new (gmain.c:3929)
==12193== by 0x402373: test_script_datamap (test-install-script.c:284)
==12193== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12193== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==12193== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==12193== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==12193== by 0x51178EB: srunner_run (check_run.c:782)
==12193== by 0x401F82: main (test-install-script.c:345)
==29859== 16,384 bytes in 1 blocks are definitely lost in loss record 2,295 of 2,295
==29859== at 0x4C2BAEE: malloc (vg_replace_malloc.c:298)
==29859== by 0x4C2DCA1: realloc (vg_replace_malloc.c:785)
==29859== by 0x684FF1F: g_realloc (gmem.c:159)
==29859== by 0x681DE68: g_array_maybe_expand (garray.c:779)
==29859== by 0x681E783: g_array_set_size (garray.c:555)
==29859== by 0x681F328: g_byte_array_set_size (garray.c:1752)
==29859== by 0x62775AE: g_file_load_contents (gfile.c:6748)
==29859== by 0x4025E9: test_script_data (test-install-script.c:195)
==29859== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==29859== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==29859== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==29859== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==29859== by 0x51178EB: srunner_run (check_run.c:782)
==29859== by 0x40303D: main (test-install-script.c:349)
---
test/test-install-script.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/test/test-install-script.c b/test/test-install-script.c
index 338fc3b..d62e36d 100644
--- a/test/test-install-script.c
+++ b/test/test-install-script.c
@@ -170,6 +170,7 @@ START_TEST(test_script_file)
fail_unless(strcmp(actualData, expectData) == 0, "Actual '%s' match expect '%s'",
actualData, expectData);
+ g_free(actualData);
g_object_unref(media);
g_object_unref(db);
g_object_unref(config);
@@ -222,10 +223,13 @@ START_TEST(test_script_data)
unlink(BUILDDIR "/test/install-script-actual.txt");
fail_unless(error == NULL, error ? error->message : "none");
+ g_free(data);
+ g_free(actualData);
g_object_unref(media);
g_object_unref(db);
g_object_unref(config);
g_object_unref(script);
+ g_main_loop_unref(loop);
}
END_TEST
@@ -300,9 +304,11 @@ START_TEST(test_script_datamap)
fail_unless(strcmp(actualData, expectData2) == 0, "Actual '%s' match expect '%s'",
actualData, expectData2);
+ g_free(actualData);
g_object_unref(db);
g_object_unref(os);
g_object_unref(config);
+ g_main_loop_unref(loop);
}
END_TEST
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:14 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:14 +0200
Subject: [Libosinfo] [PATCH 10/14] install-script: Fix leak in
_template_loaded()
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-11-git-send-email-cfergeau@redhat.com>
The file content obtained through g_file_load_contents_finish() was
never freed.
This fixes:
==29859== 16,384 bytes in 1 blocks are definitely lost in loss record 2,294 of 2,295
==29859== at 0x4C2DC57: realloc (vg_replace_malloc.c:785)
==29859== by 0x684FF1F: g_realloc (gmem.c:159)
==29859== by 0x681DE68: g_array_maybe_expand (garray.c:779)
==29859== by 0x681E783: g_array_set_size (garray.c:555)
==29859== by 0x681F328: g_byte_array_set_size (garray.c:1752)
==29859== by 0x626F143: load_contents_read_callback (gfile.c:6885)
==29859== by 0x6289129: async_ready_callback_wrapper (ginputstream.c:532)
==29859== by 0x62B0342: g_task_return_now (gtask.c:1107)
==29859== by 0x62B0378: complete_in_idle_cb (gtask.c:1121)
==29859== by 0x684A702: g_main_dispatch (gmain.c:3154)
==29859== by 0x684A702: g_main_context_dispatch (gmain.c:3769)
==29859== by 0x684AAAF: g_main_context_iterate.isra.29 (gmain.c:3840)
==29859== by 0x684ADD1: g_main_loop_run (gmain.c:4034)
==29859== by 0x402442: test_script_file (test-install-script.c:165)
==29859== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==29859== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==29859== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==29859== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==29859== by 0x51178EB: srunner_run (check_run.c:782)
==29859== by 0x40303D: main (test-install-script.c:349)
---
osinfo/osinfo_install_script.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 23831c5..23db364 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -904,6 +904,7 @@ static void osinfo_install_script_template_loaded(GObject *src,
g_task_return_pointer(data->res, output, NULL);
cleanup:
+ g_free(input);
osinfo_install_script_generate_data_free(data);
g_free(uri);
}
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:15 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:15 +0200
Subject: [Libosinfo] [PATCH 11/14] install-script: Fix OsinfoOs leaks
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-12-git-send-email-cfergeau@redhat.com>
The OsinfoOs instance returned by osinfo_media_get_os must be unref'ed
when no longer needed.
This fixes:
==29859== 3,926 (96 direct, 3,830 indirect) bytes in 1 blocks are definitely lost in loss record 2,286 of 2,295
==29859== at 0x65E19D0: g_type_create_instance (gtype.c:1854
==29859== by 0x65C36AA: g_object_new_internal (gobject.c:1781)
==29859== by 0x65C55ED: g_object_new_valist (gobject.c:2040)
==29859== by 0x65C58A0: g_object_new (gobject.c:1624)
==29859== by 0x5339F69: osinfo_os_new (osinfo_os.c:201)
==29859== by 0x5347FFD: osinfo_loader_get_os (osinfo_loader.c:464)
==29859== by 0x534B439: osinfo_loader_os (osinfo_loader.c:1410)
==29859== by 0x534BFB1: osinfo_loader_root (osinfo_loader.c:1599)
==29859== by 0x534C399: osinfo_loader_process_xml (osinfo_loader.c:1680)
==29859== by 0x534CFEE: osinfo_loader_process_file_reg_xml (osinfo_loader.c:1877)
==29859== by 0x534DA1F: osinfo_loader_process_list (osinfo_loader.c:2160)
==29859== by 0x534DCEA: osinfo_loader_process_path (osinfo_loader.c:2232)
==29859== by 0x402310: test_script_file (test-install-script.c:146)
==29859== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==29859== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==29859== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==29859== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==29859== by 0x51178EB: srunner_run (check_run.c:782)
==29859== by 0x40303D: main (test-install-script.c:349)
==29859==-
==29859== 3,926 (96 direct, 3,830 indirect) bytes in 1 blocks are definitely lost in loss record 2,287 of 2,295
==29859== at 0x65E19D0: g_type_create_instance (gtype.c:1854)
==29859== by 0x65C36AA: g_object_new_internal (gobject.c:1781)
==29859== by 0x65C55ED: g_object_new_valist (gobject.c:2040)
==29859== by 0x65C58A0: g_object_new (gobject.c:1624)
==29859== by 0x5339F69: osinfo_os_new (osinfo_os.c:201)
==29859== by 0x5347FFD: osinfo_loader_get_os (osinfo_loader.c:464)
==29859== by 0x534B439: osinfo_loader_os (osinfo_loader.c:1410)
==29859== by 0x534BFB1: osinfo_loader_root (osinfo_loader.c:1599)
==29859== by 0x534C399: osinfo_loader_process_xml (osinfo_loader.c:1680)
==29859== by 0x534CFEE: osinfo_loader_process_file_reg_xml (osinfo_loader.c:1877)
==29859== by 0x534DA1F: osinfo_loader_process_list (osinfo_loader.c:2160)
==29859== by 0x534DCEA: osinfo_loader_process_path (osinfo_loader.c:2232)
==29859== by 0x402626: test_script_data (test-install-script.c:199)
==29859== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==29859== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==29859== by 0x51178EB: srunner_run_tcase (check_run.c:373)
---
osinfo/osinfo_install_script.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 23db364..2465771 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1223,6 +1223,8 @@ void osinfo_install_script_generate_for_media_async(OsinfoInstallScript *script,
cancellable,
callback,
user_data);
+
+ g_object_unref(os);
}
static void osinfo_install_script_generate_for_media_done(GObject *src,
@@ -1644,6 +1646,7 @@ gchar *osinfo_install_script_generate_command_line_for_media(OsinfoInstallScript
g_prefix_error(&error, "%s", _("Failed to apply script template: "));
}
}
+ g_object_unref(os);
return output;
}
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:16 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:16 +0200
Subject: [Libosinfo] [PATCH 12/14] tools: Fix OsinfoOs leak in
osinfo-install-script
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-13-git-send-email-cfergeau@redhat.com>
The OsinfoOs instance returned by osinfo_media_get_os() must be unref'ed
when no longer needed.
osinfo-install-script has code doing:
if (media == NULL) {
os = find_os();
} else {
os = osinfo_media_get_os();
}
find_os() does not return a ref'ed OsinfoOs to the caller, while
osinfo_media_get_os() does. In order to make it possible to release the
ref returned by osinfo_media_get_os(), this commit changes find_os() to
always ref the OsinfoOs instance it returns.
Moreover, one of the codepaths in find_os() looks like it was
potentially returning an invalid pointer:
os = OSINFO_OS(osinfo_list_get_nth(OSINFO_LIST(filteredList), 0));
g_object_unref(filteredList);
The OsinfoOs instance was probably kept alive by references held outside
of the filtered list, but it's safer to keep a reference to ourselves,
which this commit is doing anyway in order to fix find_os() memory
handling.
---
tools/osinfo-install-script.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/osinfo-install-script.c b/tools/osinfo-install-script.c
index 915d07e..75bfda1 100644
--- a/tools/osinfo-install-script.c
+++ b/tools/osinfo-install-script.c
@@ -99,7 +99,7 @@ static OsinfoOs *find_os(OsinfoDb *db,
os = osinfo_db_get_os(db, idoruri);
if (os)
- return os;
+ return g_object_ref(os);
oslist = osinfo_db_get_os_list(db);
filter = osinfo_filter_new();
@@ -110,8 +110,10 @@ static OsinfoOs *find_os(OsinfoDb *db,
filteredList = OSINFO_OSLIST(osinfo_list_new_filtered(OSINFO_LIST(oslist),
filter));
- if (osinfo_list_get_length(OSINFO_LIST(filteredList)) > 0)
+ if (osinfo_list_get_length(OSINFO_LIST(filteredList)) > 0) {
os = OSINFO_OS(osinfo_list_get_nth(OSINFO_LIST(filteredList), 0));
+ g_object_ref(os);
+ }
g_object_unref(oslist);
g_object_unref(filteredList);
@@ -392,6 +394,7 @@ EXIT:
if (media != NULL)
g_object_unref(media);
g_clear_error(&error);
+ g_clear_object(&os);
g_clear_object(&loader);
g_option_context_free(context);
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:12 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:12 +0200
Subject: [Libosinfo] [PATCH 08/14] install-script: Fix GFile leaks
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-9-git-send-email-cfergeau@redhat.com>
This fixes:
==12193== 89 (32 direct, 57 indirect) bytes in 1 blocks are definitely lost in loss record 1,826 of 2,310
==12193== at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
==12193== by 0x684FE58: g_malloc (gmem.c:94)
==12193== by 0x6866D42: g_slice_alloc (gslice.c:1025)
==12193== by 0x686736D: g_slice_alloc0 (gslice.c:1051)
==12193== by 0x65E1821: g_type_create_instance (gtype.c:1857)
==12193== by 0x65C36AA: g_object_new_internal (gobject.c:1781)
==12193== by 0x65C50CC: g_object_newv (gobject.c:1928)
==12193== by 0x65C58B3: g_object_new (gobject.c:1621)
==12193== by 0x6320EF9: _g_local_file_new (glocalfile.c:301)
==12193== by 0x98512F7: g_daemon_vfs_get_file_for_path (gdaemonvfs.c:383)
==12193== by 0x98513A1: g_daemon_vfs_get_file_for_uri (gdaemonvfs.c:407)
==12193== by 0x5334B09: osinfo_install_script_generate_async_common (osinfo_install_script.c:959)
==12193== by 0x5335170: osinfo_install_script_generate_for_media_async (osinfo_install_script.c:1216)
==12193== by 0x402B8A: test_script_file (test-install-script.c:157)
==12193== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12193== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==12193== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==12193== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==12193== by 0x51178EB: srunner_run (check_run.c:782)
==12193== by 0x401F82: main (test-install-script.c:345)
==12193== 89 (32 direct, 57 indirect) bytes in 1 blocks are definitely lost in loss record 1,827 of 2,310
==12193== at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
==12193== by 0x684FE58: g_malloc (gmem.c:94)
==12193== by 0x6866D42: g_slice_alloc (gslice.c:1025)
==12193== by 0x686736D: g_slice_alloc0 (gslice.c:1051)
==12193== by 0x65E1821: g_type_create_instance (gtype.c:1857)
==12193== by 0x65C36AA: g_object_new_internal (gobject.c:1781)
==12193== by 0x65C50CC: g_object_newv (gobject.c:1928)
==12193== by 0x65C58B3: g_object_new (gobject.c:1621)
==12193== by 0x6320EF9: _g_local_file_new (glocalfile.c:301)
==12193== by 0x98512F7: g_daemon_vfs_get_file_for_path (gdaemonvfs.c:383)
==12193== by 0x98513A1: g_daemon_vfs_get_file_for_uri (gdaemonvfs.c:407)
==12193== by 0x402899: test_script_data (test-install-script.c:191)
==12193== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==12193== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==12193== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==12193== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==12193== by 0x51178EB: srunner_run (check_run.c:782)
==12193== by 0x401F82: main (test-install-script.c:345)
=
---
osinfo/osinfo_install_script.c | 1 +
test/test-install-script.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 7f0d863..a290d2a 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -962,6 +962,7 @@ static void osinfo_install_script_generate_async_common(OsinfoInstallScript *scr
cancellable,
osinfo_install_script_template_loaded,
data);
+ g_object_unref(file);
}
}
diff --git a/test/test-install-script.c b/test/test-install-script.c
index d62e36d..7b16552 100644
--- a/test/test-install-script.c
+++ b/test/test-install-script.c
@@ -194,6 +194,7 @@ START_TEST(test_script_data)
g_file_load_contents(file, NULL, &data, NULL, NULL, &error);
fail_unless(error == NULL, error ? error->message : "none");
+ g_object_unref(file);
osinfo_loader_process_path(loader, SRCDIR "/test/dbdata", &error);
fail_unless(error == NULL, error ? error->message : "none");
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:10 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:10 +0200
Subject: [Libosinfo] [PATCH 06/14] productfilter: Free 'supportDate' in
::finalize()
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-7-git-send-email-cfergeau@redhat.com>
This fixes:
==4878== 8 bytes in 1 blocks are definitely lost in loss record 8 of 319
==4878== at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
==4878== by 0x6849E58: g_malloc (gmem.c:94)
==4878== by 0x682A114: g_date_new_dmy (gdate.c:289)
==4878== by 0x5335C6D: osinfo_productfilter_add_support_date_constraint (osinfo_productfilter.c:210)
==4878== by 0x401E8B: test_supportdate (test-product.c:171)
==4878== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==4878== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==4878== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==4878== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==4878== by 0x51178EB: srunner_run (check_run.c:782)
==4878== by 0x40165E: main (test-product.c:221)
---
osinfo/osinfo_productfilter.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/osinfo/osinfo_productfilter.c b/osinfo/osinfo_productfilter.c
index 70f4a91..16976c2 100644
--- a/osinfo/osinfo_productfilter.c
+++ b/osinfo/osinfo_productfilter.c
@@ -62,6 +62,9 @@ osinfo_productfilter_finalize(GObject *object)
g_hash_table_unref(productfilter->priv->productConstraints);
+ if (productfilter->priv->supportDate)
+ g_date_free(productfilter->priv->supportDate);
+
/* Chain up to the parent class */
G_OBJECT_CLASS(osinfo_productfilter_parent_class)->finalize(object);
}
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:13 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:13 +0200
Subject: [Libosinfo] [PATCH 09/14] install-script: Fix leak in error case in
generate_entity_xml()
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-10-git-send-email-cfergeau@redhat.com>
The key list returned by osinfo_entity_get_param_keys() was freed in the
nominal case, but not in the error case.
---
osinfo/osinfo_install_script.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index a290d2a..23831c5 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -662,7 +662,7 @@ static xmlNodePtr osinfo_install_script_generate_entity_xml(OsinfoInstallScript
{
xmlNodePtr node = NULL;
xmlNodePtr data = NULL;
- GList *keys;
+ GList *keys = NULL;
GList *tmp1;
if (!(node = xmlNewDocNode(NULL, NULL, (xmlChar*)name, NULL))) {
@@ -725,6 +725,7 @@ static xmlNodePtr osinfo_install_script_generate_entity_xml(OsinfoInstallScript
return node;
error:
+ g_list_free(keys);
xmlFreeNode(data);
xmlFreeNode(node);
return NULL;
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:09 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:09 +0200
Subject: [Libosinfo] [PATCH 05/14] productfilter: Fix GDate leak
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-6-git-send-email-cfergeau@redhat.com>
osinfo_productfilter_matches_default() was not freeing the GDate
instances returned by osinfo_product_get_{release,eol}_date().
This fixes:
==14496== 16 bytes in 2 blocks are definitely lost in loss record 141 of 382
==14496== at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
==14496== by 0x684FE58: g_malloc (gmem.c:94)
==14496== by 0x6830114: g_date_new_dmy (gdate.c:289)
==14496== by 0x5337012: date_from_string (osinfo_product.c:345)
==14496== by 0x533706D: osinfo_product_get_release_date (osinfo_product.c:354)
==14496== by 0x5337F6F: osinfo_productfilter_matches_default (osinfo_productfilter.c:279)
==14496== by 0x532CC8D: osinfo_filter_matches (osinfo_filter.c:288)
==14496== by 0x532D51B: osinfo_list_add_filtered (osinfo_list.c:272)
==14496== by 0x532DD52: osinfo_list_new_filtered (osinfo_list.c:443)
==14496== by 0x401B35: test_supportdate (test-product.c:140)
==14496== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==14496== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==14496== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==14496== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==14496== by 0x51178EB: srunner_run (check_run.c:782)
==14496== by 0x40166E: main (test-product.c:219)
==14496==-
==14496== 16 bytes in 2 blocks are definitely lost in loss record 142 of 382
==14496== at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
==14496== by 0x684FE58: g_malloc (gmem.c:94)
==14496== by 0x6830114: g_date_new_dmy (gdate.c:289)
==14496== by 0x5337012: date_from_string (osinfo_product.c:345)
==14496== by 0x53370C8: osinfo_product_get_eol_date (osinfo_product.c:364)
==14496== by 0x5337F92: osinfo_productfilter_matches_default (osinfo_productfilter.c:280)
==14496== by 0x532CC8D: osinfo_filter_matches (osinfo_filter.c:288)
==14496== by 0x532D51B: osinfo_list_add_filtered (osinfo_list.c:272)
==14496== by 0x532DD52: osinfo_list_new_filtered (osinfo_list.c:443)
==14496== by 0x401B35: test_supportdate (test-product.c:140)
==14496== by 0x5117535: tcase_run_tfun_nofork.isra.9 (check_run.c:390)
==14496== by 0x51178EB: srunner_iterate_tcase_tfuns (check_run.c:231)
==14496== by 0x51178EB: srunner_run_tcase (check_run.c:373)
==14496== by 0x51178EB: srunner_iterate_suites (check_run.c:195)
==14496== by 0x51178EB: srunner_run (check_run.c:782)
==14496== by 0x40166E: main (test-product.c:219)
---
osinfo/osinfo_productfilter.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/osinfo/osinfo_productfilter.c b/osinfo/osinfo_productfilter.c
index 9dbffa2..70f4a91 100644
--- a/osinfo/osinfo_productfilter.c
+++ b/osinfo/osinfo_productfilter.c
@@ -276,16 +276,26 @@ static gboolean osinfo_productfilter_matches_default(OsinfoFilter *filter, Osinf
if (productfilter->priv->supportDate) {
GDate *when = productfilter->priv->supportDate;
- GDate *release = osinfo_product_get_release_date(OSINFO_PRODUCT(entity));
- GDate *eol = osinfo_product_get_eol_date(OSINFO_PRODUCT(entity));
+ GDate *release;
+ GDate *eol;
- if (release &&
- (g_date_compare(release, when) > 0))
- return FALSE;
+ release = osinfo_product_get_release_date(OSINFO_PRODUCT(entity));
+ if (release != NULL) {
+ gboolean newer;
+ newer = (g_date_compare(release, when) > 0);
+ g_date_free(release);
+ if (newer)
+ return FALSE;
+ }
- if (eol &&
- (g_date_compare(eol, when) < 0))
- return FALSE;
+ eol = osinfo_product_get_eol_date(OSINFO_PRODUCT(entity));
+ if (eol != NULL) {
+ gboolean older;
+ older = (g_date_compare(eol, when) < 0);
+ g_date_free(eol);
+ if (older)
+ return FALSE;
+ }
}
return args.matched;
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:17 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:17 +0200
Subject: [Libosinfo] [PATCH 13/14] osinfo: Add GDestroyNotify callback to
g_task_return_pointer calls
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-14-git-send-email-cfergeau@redhat.com>
The GDestroyNotify callback passed to g_task_return_pointer() is used to
free the associated pointer in case g_task_propagate_pointer() is not
called (error cases, _finish() never called, ...).
When the GTask owns the pointer it's passed through
g_task_return_pointer() (for example the _finish() function is (transfer
full) and only calls g_task_propagate_pointer()), we need to set a
GDestroyNotify when calling g_task_return_pointer() or we may have leaks
in corner cases.
---
osinfo/osinfo_install_script.c | 4 ++--
osinfo/osinfo_media.c | 2 +-
osinfo/osinfo_tree.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 2465771..ebe1887 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -901,7 +901,7 @@ static void osinfo_install_script_template_loaded(GObject *src,
goto cleanup;
}
- g_task_return_pointer(data->res, output, NULL);
+ g_task_return_pointer(data->res, output, g_free);
cleanup:
g_free(input);
@@ -955,7 +955,7 @@ static void osinfo_install_script_generate_async_common(OsinfoInstallScript *scr
osinfo_install_script_generate_data_free(data);
return;
}
- g_task_return_pointer(data->res, output, NULL);
+ g_task_return_pointer(data->res, output, g_free);
osinfo_install_script_generate_data_free(data);
} else {
GFile *file = g_file_new_for_uri(templateUri);
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index f7bf120..b45f4f4 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -758,7 +758,7 @@ EXIT:
if (error != NULL)
g_task_return_error(data->res, error);
else
- g_task_return_pointer(data->res, media, NULL);
+ g_task_return_pointer(data->res, media, g_object_unref);
g_object_unref(stream);
create_from_location_async_data_free(data);
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 6fc62f7..565ccfe 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -614,7 +614,7 @@ static void on_location_read(GObject *source,
goto cleanup;
}
- g_task_return_pointer(data->res, ret, NULL);
+ g_task_return_pointer(data->res, ret, g_object_unref);
cleanup:
create_from_location_async_data_free(data);
--
2.7.4
From cfergeau at redhat.com Wed Jun 8 10:01:18 2016
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 8 Jun 2016 12:01:18 +0200
Subject: [Libosinfo] [PATCH 14/14] install-script: Return glib-allocated
string from ::apply_xslt()
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1465380078-30866-15-git-send-email-cfergeau@redhat.com>
Strings created by libxml2 should be freed with xmlFree while glib ones
should be freed with g_free, so it's cleaner to allocate the string
returned from ::apply_xslt() with the glib allocator as it's meant to be
g_free'ed later on.
---
osinfo/osinfo_install_script.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index ebe1887..9206101 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -808,6 +808,7 @@ static gchar *osinfo_install_script_apply_xslt(xsltStylesheetPtr ss,
GError **error)
{
xsltTransformContextPtr ctxt;
+ xmlChar *xsltResult;
gchar *ret = NULL;
xmlDocPtr docOut = NULL;
int len;
@@ -822,10 +823,12 @@ static gchar *osinfo_install_script_apply_xslt(xsltStylesheetPtr ss,
goto cleanup;
}
- if (xsltSaveResultToString((xmlChar **)&ret, &len, docOut, ss) < 0) {
+ if (xsltSaveResultToString(&xsltResult, &len, docOut, ss) < 0) {
g_set_error(error, 0, 0, "%s", _("Unable to convert XSL output to string"));
goto cleanup;
}
+ ret = g_strdup((gchar *)xsltResult);
+ xmlFree(xsltResult);
cleanup:
xmlFreeDoc(docOut);
--
2.7.4
From fidencio at redhat.com Thu Jun 16 08:14:47 2016
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Thu, 16 Jun 2016 10:14:47 +0200
Subject: [Libosinfo] [PATCH 00/14]
In-Reply-To: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
References: <1465380078-30866-1-git-send-email-cfergeau@redhat.com>
Message-ID:
Christophe,
On Wed, Jun 8, 2016 at 12:01 PM, Christophe Fergeau wrote:
> Hey,
>
> Here are fixes for all the leaks I could find when running our test suite
> through valgrind. The last patch does not fix a leak, and is probably not
> strictly required.
ACK all the series, including the last one, considering you have
tested them beforehand.
Best Regards,
--
Fabiano Fid?ncio
From berrange at redhat.com Thu Jun 16 08:20:43 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 16 Jun 2016 09:20:43 +0100
Subject: [Libosinfo] [PATCH db-tools 0/2] Add tools for database
import/export
Message-ID: <1466065245-13312-1-git-send-email-berrange@redhat.com>
Since we're soon going to start distributing the database as a
standalone archive, it'll be useful if we had tools which can
import/export between the local database filesystem tree and a
database archive file. While users/apps could just use 'tar'
directly, providing these tools makes life simpler as users
don't need to remember where the correct database locations
are.
For these tools I'm using libarchive since it is available on
all platforms (BSD, Linux, MinGW and OS-X). For the format it
is using the tar "pax" format (the latest POSIX tar format)
since it has unlimited filename/path lengths support, and the
'xz' compression scheme since it is by far the best at compressing
these XML files.
Daniel P. Berrange (2):
Add osinfo-db-import tool for unpacking an osinfo database archive
Add osinfo-db-export tool for packing an osinfo database archive
.gitignore | 6 +
configure.ac | 1 +
mingw-osinfo-db-tools.spec.in | 8 +-
osinfo-db-tools.spec.in | 5 +
po/POTFILES.in | 2 +
tools/Makefile.am | 18 +-
tools/osinfo-db-export.c | 621 ++++++++++++++++++++++++++++++++++++++++++
tools/osinfo-db-import.c | 468 +++++++++++++++++++++++++++++++
8 files changed, 1125 insertions(+), 4 deletions(-)
create mode 100644 tools/osinfo-db-export.c
create mode 100644 tools/osinfo-db-import.c
--
2.5.5
From berrange at redhat.com Thu Jun 16 08:20:44 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 16 Jun 2016 09:20:44 +0100
Subject: [Libosinfo] [PATCH db-tools 1/2] Add osinfo-db-import tool for
unpacking an osinfo database archive
In-Reply-To: <1466065245-13312-1-git-send-email-berrange@redhat.com>
References: <1466065245-13312-1-git-send-email-berrange@redhat.com>
Message-ID: <1466065245-13312-2-git-send-email-berrange@redhat.com>
Add a new osinfo-db-import tool which takes an archive in the
tar (pax) format, with XZ compression and can extract its contents
into one of the standard libosinfo database locations.
This makes it easy for users to download new copies of the
database and unpack them in the right place.
eg
$ osinfo-db-import -v osinfo-db-2016-06-15.tar.xz
osinfo-db-import: d osinfo-db-2016-06-15/
osinfo-db-import: r osinfo-db-2016-06-15/pci.ids
osinfo-db-import: r osinfo-db-2016-06-15/usb.ids
osinfo-db-import: d osinfo-db-2016-06-15/datamaps/
osinfo-db-import: r osinfo-db-2016-06-15/datamaps/windows-lang.xml
osinfo-db-import: r osinfo-db-2016-06-15/datamaps/x11-keyboard.xml
osinfo-db-import: d osinfo-db-2016-06-15/devices/
osinfo-db-import: r osinfo-db-2016-06-15/devices/qemu-pci.xml
osinfo-db-import: r osinfo-db-2016-06-15/devices/qemu-ps2.xml
osinfo-db-import: r osinfo-db-2016-06-15/devices/qemu-usb.xml
osinfo-db-import: r osinfo-db-2016-06-15/devices/virtio-pci.xml
osinfo-db-import: r osinfo-db-2016-06-15/devices/xen.xml
...snip...
Signed-off-by: Daniel P. Berrange
---
.gitignore | 3 +
configure.ac | 1 +
mingw-osinfo-db-tools.spec.in | 6 +-
osinfo-db-tools.spec.in | 3 +
po/POTFILES.in | 1 +
tools/Makefile.am | 12 +-
tools/osinfo-db-import.c | 468 ++++++++++++++++++++++++++++++++++++++++++
7 files changed, 490 insertions(+), 4 deletions(-)
create mode 100644 tools/osinfo-db-import.c
diff --git a/.gitignore b/.gitignore
index 03c5264..297976f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,9 @@ build/
tools/osinfo-db-validate
tools/osinfo-db-validate.exe
tools/osinfo-db-validate.1
+tools/osinfo-db-import
+tools/osinfo-db-import.exe
+tools/osinfo-db-import.1
po/.intltool-merge-cache
po/Makefile.in.in
po/POTFILES
diff --git a/configure.ac b/configure.ac
index 28e0fc6..49fae1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ GLIB_ENCODED_VERSION="GLIB_VERSION_2_36"
PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0])
PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0])
+PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.0.0])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $GLIB_MINIMUM_VERSION gobject-2.0 gio-2.0])
GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_ENCODED_VERSION"
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 750b060..f3035f9 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -26,8 +26,8 @@ BuildRequires: mingw32-libxml2
BuildRequires: mingw64-libxml2
BuildRequires: mingw32-libxslt
BuildRequires: mingw64-libxslt
-BuildRequires: mingw32-libsoup
-BuildRequires: mingw64-libsoup
+BuildRequires: mingw32-libarchive
+BuildRequires: mingw64-libarchive
BuildRequires: pkgconfig
@@ -74,11 +74,13 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
%files -n mingw32-osinfo-db-tools
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{mingw32_bindir}/osinfo-db-import.exe
%{mingw32_bindir}/osinfo-db-validate.exe
%{mingw32_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
%files -n mingw64-osinfo-db-tools
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{mingw64_bindir}/osinfo-db-import.exe
%{mingw64_bindir}/osinfo-db-validate.exe
%{mingw64_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index 6285ff1..1295f6e 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -12,6 +12,7 @@ BuildRequires: intltool
BuildRequires: glib2-devel
BuildRequires: libxml2-devel >= 2.6.0
BuildRequires: libxslt-devel >= 1.0.0
+BuildRequires: libarchive-devel
BuildRequires: /usr/bin/pod2man
%description
@@ -33,7 +34,9 @@ information about operating systems for use with virtualization
%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{_bindir}/osinfo-db-import
%{_bindir}/osinfo-db-validate
+%{_mandir}/man1/osinfo-db-import.1*
%{_mandir}/man1/osinfo-db-validate.1*
%changelog
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 31b35e2..c1e69ef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1 +1,2 @@
+tools/osinfo-db-import.c
tools/osinfo-db-validate.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 97a9cb6..5ade53a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,14 +3,16 @@ AM_CFLAGS = $(GOBJECT_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBXML_CFLAGS) \
-DPKGDATADIR="\"$(pkgdatadir)\"" \
+ -DDATA_DIR="\"$(datadir)\"" \
+ -DSYSCONFDIR="\"$(sysconfdir)\"" \
-DLOCALEDIR="\"$(datadir)/locale\"" \
$(WARN_CFLAGS) \
-I$(top_srcdir) \
$(NULL)
-bin_PROGRAMS = osinfo-db-validate
+bin_PROGRAMS = osinfo-db-validate osinfo-db-import
-man1_MANS = osinfo-db-validate.1
+man1_MANS = osinfo-db-validate.1 osinfo-db-import.1
CLEANFILES = $(man1_MANS)
@@ -24,3 +26,9 @@ osinfo_db_validate_LDADD = $(GOBJECT_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(LIBXML_LIBS)
+
+osinfo_db_import_SOURCES = osinfo-db-import.c
+osinfo_db_import_LDADD = $(GOBJECT_LIBS) \
+ $(GIO_LIBS) \
+ $(GLIB_LIBS) \
+ $(LIBARCHIVE_LIBS)
diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
new file mode 100644
index 0000000..327562a
--- /dev/null
+++ b/tools/osinfo-db-import.c
@@ -0,0 +1,468 @@
+/*
+ * Copyright (C) 2016 Red Hat, Inc
+ *
+ * osinfo-db-import: import a database archive
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Daniel P. Berrange
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+const char *argv0;
+
+static GFile *osinfo_db_import_get_system_path(const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+ const gchar *path = g_getenv("OSINFO_DATA_DIR");
+ if (!path)
+ path = DATA_DIR "/libosinfo";
+
+ dbdir = g_strdup_printf("%s%s/db", root, path);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+static GFile *osinfo_db_import_get_local_path(const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+
+ dbdir = g_strdup_printf("%s" SYSCONFDIR "/libosinfo/db", root);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+static GFile *osinfo_db_import_get_user_path(const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+ const gchar *configdir = g_get_user_config_dir();
+
+ dbdir = g_strdup_printf("%s%s/libosinfo/db", root, configdir);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+static GFile *osinfo_db_import_get_custom_path(const gchar *dir,
+ const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+
+ dbdir = g_strdup_printf("%s%s", root, dir);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+
+static GFile *osinfo_db_import_get_path(const char *root,
+ gboolean user,
+ gboolean local,
+ gboolean system,
+ const char *custom)
+{
+ if (custom) {
+ return osinfo_db_import_get_custom_path(custom, root);
+ } else if (user) {
+ return osinfo_db_import_get_user_path(root);
+ } else if (local) {
+ return osinfo_db_import_get_local_path(root);
+ } else if (system) {
+ return osinfo_db_import_get_system_path(root);
+#ifndef WIN32
+ } else if (geteuid() == 0) {
+ return osinfo_db_import_get_local_path(root);
+#endif
+ } else {
+ return osinfo_db_import_get_user_path(root);
+ }
+}
+
+
+static int osinfo_db_import_create_reg(GFile *file,
+ struct archive *arc,
+ struct archive_entry *entry)
+{
+ GFileOutputStream *os = NULL;
+ GError *err = NULL;
+ int ret;
+ int r;
+ const void *buf;
+ size_t size;
+ gint64 offset;
+
+ os = g_file_replace(file, NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION,
+ NULL, &err);
+ if (!os) {
+ g_printerr("%s: %s\n",
+ argv0, err->message);
+ return -1;
+ }
+
+ for (;;) {
+ r = archive_read_data_block(arc, &buf, &size, &offset);
+ if (r == ARCHIVE_EOF)
+ break;
+ if (r != ARCHIVE_OK) {
+ g_printerr("%s: cannot write to %s\n",
+ argv0, g_file_get_path(file));
+ goto cleanup;
+ }
+
+ if (!g_seekable_seek(G_SEEKABLE(os), offset, G_SEEK_SET, NULL, NULL)) {
+ g_printerr("%s: cannot seek to %" PRId64 " in %s\n",
+ argv0, (uint64_t)offset, g_file_get_path(file));
+ goto cleanup;
+ }
+ if (!g_output_stream_write_all(G_OUTPUT_STREAM(os), buf, size, NULL, NULL, NULL)) {
+ g_printerr("%s: cannot write to %s\n",
+ argv0, g_file_get_path(file));
+ goto cleanup;
+ }
+ }
+ ret = 0;
+ cleanup:
+ g_object_unref(os);
+ return ret;
+}
+
+static int osinfo_db_import_create_dir(GFile *file,
+ struct archive_entry *entry)
+{
+ GError *err = NULL;
+ if (!g_file_make_directory_with_parents(file, NULL, &err) &&
+ err->code != G_IO_ERROR_EXISTS) {
+ g_printerr("%s: %s\n", argv0, err->message);
+ return -1;
+ }
+ if (err)
+ g_error_free(err);
+ return 0;
+}
+
+
+static int osinfo_db_import_create(GFile *file,
+ struct archive *arc,
+ struct archive_entry *entry,
+ gboolean verbose)
+{
+ int type = archive_entry_filetype(entry) & AE_IFMT;
+
+ switch (type) {
+ case AE_IFREG:
+ if (verbose) {
+ g_print("%s: r %s\n", argv0, archive_entry_pathname(entry));
+ }
+ return osinfo_db_import_create_reg(file, arc, entry);
+
+ case AE_IFDIR:
+ if (verbose) {
+ g_print("%s: d %s\n", argv0, archive_entry_pathname(entry));
+ }
+ return osinfo_db_import_create_dir(file, entry);
+
+ default:
+ g_printerr("%s: unsupported file type for %s\n",
+ argv0, archive_entry_pathname(entry));
+ return -1;
+ }
+}
+
+static GFile *osinfo_db_import_get_file(GFile *target,
+ struct archive_entry *entry)
+{
+ const gchar *entpath = archive_entry_pathname(entry);
+ const gchar *tmp = strchr(entpath, '/');
+ if (!tmp) {
+ tmp = "";
+ } else {
+ tmp++;
+ }
+ return g_file_resolve_relative_path(target, tmp);
+}
+
+static int osinfo_db_import_extract(GFile *target,
+ const char *source,
+ gboolean verbose)
+{
+ struct archive *arc;
+ struct archive_entry *entry;
+ int ret = -1;
+ int r;
+ GFile *file = NULL;
+ GError *err = NULL;
+
+ arc = archive_read_new();
+
+ archive_read_support_format_tar(arc);
+ archive_read_support_filter_xz(arc);
+
+ if (source != NULL && g_str_equal(source, "-"))
+ source = NULL;
+
+ if ((r = archive_read_open_filename(arc, source, 10240)) != ARCHIVE_OK) {
+ g_printerr("%s: cannot open archive %s: %s\n",
+ argv0, source, archive_error_string(arc));
+ goto cleanup;
+ }
+
+ for (;;) {
+ r = archive_read_next_header(arc, &entry);
+ if (r == ARCHIVE_EOF)
+ break;
+ if (r != ARCHIVE_OK) {
+ g_printerr("%s: cannot read next archive entry in %s: %s\n",
+ argv0, source, archive_error_string(arc));
+ goto cleanup;
+ }
+
+ file = osinfo_db_import_get_file(target, entry);
+ if (osinfo_db_import_create(file, arc, entry, verbose) < 0) {
+ goto cleanup;
+ }
+ g_object_unref(file);
+ file = NULL;
+ }
+
+ if (archive_read_close(arc) != ARCHIVE_OK) {
+ g_printerr("%s: cannot finish reading archive %s: %s\n",
+ argv0, source, archive_error_string(arc));
+ goto cleanup;
+ }
+
+ ret = 0;
+ cleanup:
+ archive_read_free(arc);
+ if (err)
+ g_error_free(err);
+ if (file)
+ g_object_unref(file);
+ return ret;
+}
+
+gint main(gint argc, gchar **argv)
+{
+ GOptionContext *context;
+ GError *error = NULL;
+ gint ret = EXIT_FAILURE;
+ gboolean verbose = FALSE;
+ gboolean user = FALSE;
+ gboolean local = FALSE;
+ gboolean system = FALSE;
+ const gchar *root = "";
+ const gchar *archive = NULL;
+ const gchar *custom = NULL;
+ int locs = 0;
+ GFile *dir = NULL;
+ const GOptionEntry entries[] = {
+ { "verbose", 'v', 0, G_OPTION_ARG_NONE, (void*)&verbose,
+ N_("Verbose progress information"), NULL, },
+ { "user", 0, 0, G_OPTION_ARG_NONE, (void *)&user,
+ N_("Import into user directory"), NULL, },
+ { "local", 0, 0, G_OPTION_ARG_NONE, (void *)&local,
+ N_("Import into local directory"), NULL, },
+ { "system", 0, 0, G_OPTION_ARG_NONE, (void *)&system,
+ N_("Import into system directory"), NULL, },
+ { "dir", 0, 0, G_OPTION_ARG_STRING, (void *)&custom,
+ N_("Import into custom directory"), NULL, },
+ { "root", 0, 0, G_OPTION_ARG_STRING, &root,
+ N_("Installation root directory"), NULL, },
+ { NULL, 0, 0, 0, NULL, NULL, NULL },
+ };
+ argv0 = argv[0];
+
+ setlocale(LC_ALL, "");
+ textdomain(GETTEXT_PACKAGE);
+ bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+
+ context = g_option_context_new(_("- Validate XML documents "));
+
+ g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
+
+ if (!g_option_context_parse(context, &argc, &argv, &error)) {
+ g_printerr(_("%s: error while parsing commandline options: %s\n\n"),
+ argv0, error->message);
+ g_printerr("%s\n", g_option_context_get_help(context, FALSE, NULL));
+ goto error;
+ }
+
+ if (argc > 2) {
+ g_printerr(_("%s: expected path to one archive file to import\n"),
+ argv0);
+ goto error;
+ }
+
+ if (local)
+ locs++;
+ if (system)
+ locs++;
+ if (user)
+ locs++;
+ if (custom)
+ locs++;
+ if (locs > 1) {
+ g_printerr(_("Only one of --user, --local, --system & --dir can be used"));
+ goto error;
+ }
+
+ archive = argc == 2 ? argv[1] : NULL;
+ dir = osinfo_db_import_get_path(root, user, local, system, custom);
+ if (osinfo_db_import_extract(dir, archive, verbose) < 0)
+ goto error;
+
+ ret = EXIT_SUCCESS;
+
+ error:
+ if (dir) {
+ g_object_unref(dir);
+ }
+ g_clear_error(&error);
+ g_option_context_free(context);
+
+ return ret;
+}
+
+
+/*
+=pod
+
+=head1 NAME
+
+osinfo-db-import - Import an osinfo database archive
+
+=head1 SYNOPSIS
+
+osinfo-db-import [OPTIONS...] ARCHIVE-FILE
+
+=head1 DESCRIPTION
+
+The B tool will take an osinfo database
+archive and extract its contents into one of the standard
+database locations on the current host:
+
+=over 1
+
+=item B
+
+This is the primary system-wide database location, intended
+for use by operating system vendors distributing database
+files in the native package format.
+
+=item B
+
+This is the secondary system-wide database location, intended
+for use by system administrators wishing to provide an updated
+database for all users.
+
+=item B
+
+This is the user private database location, intended for use
+by unprivileged local users wishing to provide applications
+they use with an updated database.
+
+=back
+
+If run by a privileged account (ie root), the B database
+location will be used by default, otherwise the B location
+will be used.
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--user>
+
+Override the default behaviour to force installation into the
+B database location.
+
+=item B<--local>
+
+Override the default behaviour to force installation into the
+B database location.
+
+=item B<--system>
+
+Override the default behaviour to force installation into the
+B database location.
+
+=item B<--dir=PATH>
+
+Override the default behaviour to force installation into the
+custom directory B.
+
+=item B<--root=PATH>
+
+Prefix the installation location with the root directory
+given by C. This is useful when wishing to install
+into a chroot environment or equivalent.
+
+=item B<-v>, B<--verbose>
+
+Display verbose progress information when installing files
+
+=back
+
+=head1 EXIT STATUS
+
+The exit status will be 0 if all files were installed
+successfully, or 1 if at least one file could not be
+installed.
+
+=head1 SEE ALSO
+
+C
+
+=head1 AUTHORS
+
+Daniel P. Berrange
+
+=head1 COPYRIGHT
+
+Copyright (C) 2016 Red Hat, Inc.
+
+=head1 LICENSE
+
+C is distributed under the termsof the GNU LGPL v2+
+license. This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE
+
+=cut
+*/
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * End:
+ */
--
2.5.5
From berrange at redhat.com Thu Jun 16 08:20:45 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 16 Jun 2016 09:20:45 +0100
Subject: [Libosinfo] [PATCH db-tools 2/2] Add osinfo-db-export tool for
packing an osinfo database archive
In-Reply-To: <1466065245-13312-1-git-send-email-berrange@redhat.com>
References: <1466065245-13312-1-git-send-email-berrange@redhat.com>
Message-ID: <1466065245-13312-3-git-send-email-berrange@redhat.com>
Add a new osinfo-db-export tool which creates an archive in the
tar (pax) format, with XZ compression and can filling it with the
database files from one of the standard libosinfo database locations,
or a custom directory.
This makes it easy for users to create their own local custom database
content and then distribute and import it on many machines. It will
also be used for creating official release archives of the libosinfo
database from upstream.
$ osinfo-db-export --verbose osinfo-db-2016-06-15.tar.xz
osinfo-db-export: d osinfo-db-2016-06-15/
osinfo-db-export: d osinfo-db-2016-06-15/datamaps
osinfo-db-export: r osinfo-db-2016-06-15/datamaps/windows-lang.xml
osinfo-db-export: r osinfo-db-2016-06-15/datamaps/x11-keyboard.xml
osinfo-db-export: d osinfo-db-2016-06-15/devices
osinfo-db-export: r osinfo-db-2016-06-15/devices/qemu-pci.xml
osinfo-db-export: r osinfo-db-2016-06-15/devices/qemu-ps2.xml
osinfo-db-export: r osinfo-db-2016-06-15/devices/qemu-usb.xml
osinfo-db-export: r osinfo-db-2016-06-15/devices/virtio-pci.xml
osinfo-db-export: r osinfo-db-2016-06-15/devices/xen.xml
osinfo-db-export: d osinfo-db-2016-06-15/hypervisors
osinfo-db-export: r osinfo-db-2016-06-15/hypervisors/kvm.xml
...snip...
Signed-off-by: Daniel P. Berrange
---
.gitignore | 3 +
mingw-osinfo-db-tools.spec.in | 2 +
osinfo-db-tools.spec.in | 2 +
po/POTFILES.in | 1 +
tools/Makefile.am | 10 +-
tools/osinfo-db-export.c | 621 ++++++++++++++++++++++++++++++++++++++++++
6 files changed, 637 insertions(+), 2 deletions(-)
create mode 100644 tools/osinfo-db-export.c
diff --git a/.gitignore b/.gitignore
index 297976f..bda3aea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,9 @@ tools/osinfo-db-validate.1
tools/osinfo-db-import
tools/osinfo-db-import.exe
tools/osinfo-db-import.1
+tools/osinfo-db-export
+tools/osinfo-db-export.exe
+tools/osinfo-db-export.1
po/.intltool-merge-cache
po/Makefile.in.in
po/POTFILES
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index f3035f9..870b2e4 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -74,12 +74,14 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
%files -n mingw32-osinfo-db-tools
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{mingw32_bindir}/osinfo-db-export.exe
%{mingw32_bindir}/osinfo-db-import.exe
%{mingw32_bindir}/osinfo-db-validate.exe
%{mingw32_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
%files -n mingw64-osinfo-db-tools
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{mingw64_bindir}/osinfo-db-export.exe
%{mingw64_bindir}/osinfo-db-import.exe
%{mingw64_bindir}/osinfo-db-validate.exe
%{mingw64_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index 1295f6e..d125751 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -34,8 +34,10 @@ information about operating systems for use with virtualization
%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{_bindir}/osinfo-db-export
%{_bindir}/osinfo-db-import
%{_bindir}/osinfo-db-validate
+%{_mandir}/man1/osinfo-db-export.1*
%{_mandir}/man1/osinfo-db-import.1*
%{_mandir}/man1/osinfo-db-validate.1*
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c1e69ef..6688a2d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,3 @@
+tools/osinfo-db-export.c
tools/osinfo-db-import.c
tools/osinfo-db-validate.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5ade53a..701fbe4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,9 +10,9 @@ AM_CFLAGS = $(GOBJECT_CFLAGS) \
-I$(top_srcdir) \
$(NULL)
-bin_PROGRAMS = osinfo-db-validate osinfo-db-import
+bin_PROGRAMS = osinfo-db-validate osinfo-db-import osinfo-db-export
-man1_MANS = osinfo-db-validate.1 osinfo-db-import.1
+man1_MANS = osinfo-db-validate.1 osinfo-db-import.1 osinfo-db-export.1
CLEANFILES = $(man1_MANS)
@@ -32,3 +32,9 @@ osinfo_db_import_LDADD = $(GOBJECT_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(LIBARCHIVE_LIBS)
+
+osinfo_db_export_SOURCES = osinfo-db-export.c
+osinfo_db_export_LDADD = $(GOBJECT_LIBS) \
+ $(GIO_LIBS) \
+ $(GLIB_LIBS) \
+ $(LIBARCHIVE_LIBS)
diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
new file mode 100644
index 0000000..ea68645
--- /dev/null
+++ b/tools/osinfo-db-export.c
@@ -0,0 +1,621 @@
+/*
+ * Copyright (C) 2016 Red Hat, Inc
+ *
+ * osinfo-db-export: export a database archive
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Daniel P. Berrange
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+const char *argv0;
+
+static GFile *osinfo_db_export_get_system_path(const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+ const gchar *path = g_getenv("OSINFO_DATA_DIR");
+ if (!path)
+ path = DATA_DIR "/libosinfo";
+
+ dbdir = g_strdup_printf("%s%s/db", root, path);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+static GFile *osinfo_db_export_get_local_path(const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+
+ dbdir = g_strdup_printf("%s" SYSCONFDIR "/libosinfo/db", root);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+static GFile *osinfo_db_export_get_user_path(const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+ const gchar *configdir = g_get_user_config_dir();
+
+ dbdir = g_strdup_printf("%s%s/libosinfo/db", root, configdir);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+
+static GFile *osinfo_db_export_get_custom_path(const gchar *dir,
+ const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+
+ dbdir = g_strdup_printf("%s%s", root, dir);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+
+static GFile *osinfo_db_export_get_path(const char *root,
+ gboolean user,
+ gboolean local,
+ gboolean system,
+ const char *custom)
+{
+ if (custom) {
+ return osinfo_db_export_get_custom_path(custom, root);
+ } else if (user) {
+ return osinfo_db_export_get_user_path(root);
+ } else if (local) {
+ return osinfo_db_export_get_local_path(root);
+ } else if (system) {
+ return osinfo_db_export_get_system_path(root);
+#ifndef WIN32
+ } else if (geteuid() == 0) {
+ return osinfo_db_export_get_local_path(root);
+#endif
+ } else {
+ return osinfo_db_export_get_user_path(root);
+ }
+}
+
+
+static int osinfo_db_export_create_file(const gchar *prefix,
+ GFile *file,
+ GFileInfo *info,
+ GFile *base,
+ const gchar *target,
+ struct archive *arc,
+ gboolean verbose);
+
+
+static int osinfo_db_export_create_reg(GFile *file,
+ const gchar *abspath,
+ const gchar *target,
+ struct archive *arc)
+{
+ GFileInputStream *is = NULL;
+ GError *err = NULL;
+ gchar *buf = NULL;
+ gsize size;
+ int ret = -1;
+ gsize rv;
+
+ is = g_file_read(file, NULL, &err);
+ if (!is) {
+ g_printerr("%s: cannot read file %s: %s\n",
+ argv0, abspath, err->message);
+ goto cleanup;
+ }
+
+ size = 64 * 1024;
+ buf = g_new0(char, size);
+ while (1) {
+ rv = g_input_stream_read(G_INPUT_STREAM(is),
+ buf,
+ size,
+ NULL,
+ &err);
+ if (rv == -1) {
+ g_printerr("%s: cannot read data %s: %s\n",
+ argv0, abspath, err->message);
+ goto cleanup;
+ }
+
+ if (rv == 0)
+ break;
+
+ if (archive_write_data(arc, buf, rv) < 0) {
+ g_printerr("%s: cannot write archive data for %s to %s: %s\n",
+ argv0, abspath, target, archive_error_string(arc));
+ goto cleanup;
+ }
+ }
+
+ ret = 0;
+ cleanup:
+ if (err)
+ g_error_free(err);
+ g_object_unref(is);
+ g_free(buf);
+ return ret;
+}
+
+static int osinfo_db_export_create_dir(const gchar *prefix,
+ GFile *file,
+ GFile *base,
+ const gchar *abspath,
+ const gchar *target,
+ struct archive *arc,
+ gboolean verbose)
+{
+ GFileEnumerator *children;
+ GError *err = NULL;
+ int ret = -1;
+
+ children = g_file_enumerate_children(file,
+ G_FILE_ATTRIBUTE_STANDARD_NAME
+ ","
+ G_FILE_ATTRIBUTE_STANDARD_SIZE,
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
+ &err);
+ if (!children) {
+ g_printerr("%s: cannot read directory %s: %s\n",
+ argv0, abspath, err->message);
+ goto cleanup;
+ }
+
+ while (1) {
+ GFileInfo *childinfo = NULL;
+ GFile *child = NULL;
+
+ childinfo = g_file_enumerator_next_file(children, NULL, &err);
+ if (!childinfo) {
+ if (err) {
+ g_printerr("%s: cannot read directory entry %s: %s\n",
+ argv0, abspath, err->message);
+ goto cleanup;
+ } else {
+ break;
+ }
+ }
+
+ child = g_file_enumerator_get_child(children, childinfo);
+
+ if (osinfo_db_export_create_file(prefix, child, childinfo, base, target, arc, verbose) < 0) {
+ g_object_unref(child);
+ g_object_unref(childinfo);
+ goto cleanup;
+ }
+
+ g_object_unref(child);
+ g_object_unref(childinfo);
+ }
+
+ ret = 0;
+ cleanup:
+ if (err)
+ g_error_free(err);
+ return ret;
+}
+
+
+static int osinfo_db_export_create_file(const gchar *prefix,
+ GFile *file,
+ GFileInfo *info,
+ GFile *base,
+ const gchar *target,
+ struct archive *arc,
+ gboolean verbose)
+{
+ GFileType type = g_file_query_file_type(file,
+ G_FILE_QUERY_INFO_NONE,
+ NULL);
+ gchar *abspath, *relpath;
+ int ret = -1;
+ GError *err = NULL;
+ gchar *entpath = NULL;
+ struct archive_entry *entry = NULL;
+
+ abspath = g_file_get_path(file);
+ relpath = g_file_get_relative_path(base, file);
+
+ if (!info) {
+ info = g_file_query_info(file,
+ G_FILE_ATTRIBUTE_STANDARD_NAME
+ ","
+ G_FILE_ATTRIBUTE_STANDARD_SIZE,
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
+ &err);
+ } else {
+ g_object_ref(info);
+ }
+ if (!info) {
+ g_printerr("%s: cannot get file info %s: %s\n",
+ argv0, abspath, err->message);
+ goto cleanup;
+ }
+
+ entpath = g_strdup_printf("%s/%s", prefix, relpath ? relpath : "");
+
+ entry = archive_entry_new();
+ archive_entry_set_pathname(entry, entpath);
+
+ switch (type) {
+ case G_FILE_TYPE_REGULAR:
+ case G_FILE_TYPE_SYMBOLIC_LINK:
+ if (verbose) {
+ g_print("%s: r %s\n", argv0, entpath);
+ }
+ archive_entry_set_filetype(entry, AE_IFREG);
+ archive_entry_set_perm(entry, 0755);
+ archive_entry_set_size(entry, g_file_info_get_size(info));
+ break;
+
+ case G_FILE_TYPE_DIRECTORY:
+ if (verbose) {
+ g_print("%s: d %s\n", argv0, entpath);
+ }
+ archive_entry_set_filetype(entry, AE_IFDIR);
+ archive_entry_set_perm(entry, 0644);
+ archive_entry_set_size(entry, 0);
+ break;
+
+ case G_FILE_TYPE_SPECIAL:
+ g_printerr("%s: cannot archive special file type %s\n",
+ argv0, abspath);
+ goto cleanup;
+
+ case G_FILE_TYPE_SHORTCUT:
+ g_printerr("%s: cannot archive shortcut file type %s\n",
+ argv0, abspath);
+ goto cleanup;
+
+ case G_FILE_TYPE_MOUNTABLE:
+ g_printerr("%s: cannot archive mount file type %s\n",
+ argv0, abspath);
+ goto cleanup;
+
+ case G_FILE_TYPE_UNKNOWN:
+ default:
+ g_printerr("%s: cannot archive unknown file type %s\n",
+ argv0, abspath);
+ goto cleanup;
+ }
+
+ if (archive_write_header(arc, entry) != ARCHIVE_OK) {
+ g_printerr("%s: cannot write archive header %s: %s\n",
+ argv0, target, archive_error_string(arc));
+ goto cleanup;
+ }
+
+ switch (type) {
+ case G_FILE_TYPE_REGULAR:
+ case G_FILE_TYPE_SYMBOLIC_LINK:
+ if (osinfo_db_export_create_reg(file, abspath, target, arc) < 0)
+ goto cleanup;
+ break;
+
+ case G_FILE_TYPE_DIRECTORY:
+ if (osinfo_db_export_create_dir(prefix, file, base, abspath, target, arc, verbose) < 0)
+ goto cleanup;
+ break;
+
+ default:
+ g_assert_not_reached();
+ }
+
+ ret = 0;
+ cleanup:
+ archive_entry_free(entry);
+ g_free(abspath);
+ g_free(relpath);
+ g_free(entpath);
+ g_object_unref(info);
+ if (err)
+ g_error_free(err);
+ return ret;
+}
+
+static int osinfo_db_export_create(const gchar *prefix,
+ GFile *source,
+ const gchar *target,
+ gboolean verbose)
+{
+ struct archive *arc;
+ int ret = -1;
+ int r;
+ GError *err = NULL;
+
+ arc = archive_write_new();
+
+ archive_write_add_filter_xz(arc);
+ archive_write_set_format_pax(arc);
+
+ if (target != NULL && g_str_equal(target, "-"))
+ target = NULL;
+
+ if ((r = archive_write_open_filename(arc, target)) != ARCHIVE_OK) {
+ g_printerr("%s: cannot open archive %s: %s\n",
+ argv0, target, archive_error_string(arc));
+ goto cleanup;
+ }
+
+ if (osinfo_db_export_create_file(prefix, source, NULL, source, target, arc, verbose) < 0) {
+ goto cleanup;
+ }
+
+ if (archive_write_close(arc) != ARCHIVE_OK) {
+ g_printerr("%s: cannot finish writing archive %s: %s\n",
+ argv0, target, archive_error_string(arc));
+ goto cleanup;
+ }
+
+ ret = 0;
+ cleanup:
+ archive_write_free(arc);
+ if (err)
+ g_error_free(err);
+ return ret;
+}
+
+static gchar *osinfo_db_export_prefix(const gchar *version)
+{
+ if (version == NULL) {
+ GTimeZone *tz = g_time_zone_new_utc();
+ GDateTime *now = g_date_time_new_now(tz);
+ gchar *ret;
+
+ ret = g_strdup_printf("osinfo-db-%04d-%02d-%02d",
+ g_date_time_get_year(now),
+ g_date_time_get_month(now),
+ g_date_time_get_day_of_month(now));
+ g_date_time_unref(now);
+ g_time_zone_unref(tz);
+ return ret;
+ } else {
+ return g_strdup_printf("osinfo-db-%s", version);
+ }
+}
+
+
+gint main(gint argc, gchar **argv)
+{
+ GOptionContext *context;
+ GError *error = NULL;
+ gint ret = EXIT_FAILURE;
+ gboolean verbose = FALSE;
+ gboolean user = FALSE;
+ gboolean local = FALSE;
+ gboolean system = FALSE;
+ const gchar *root = "";
+ const gchar *archive = NULL;
+ const gchar *custom = NULL;
+ const gchar *version = NULL;
+ gchar *prefix = NULL;
+ int locs = 0;
+ GFile *dir = NULL;
+ const GOptionEntry entries[] = {
+ { "verbose", 'v', 0, G_OPTION_ARG_NONE, (void*)&verbose,
+ N_("Verbose progress information"), NULL, },
+ { "user", 0, 0, G_OPTION_ARG_NONE, (void *)&user,
+ N_("Install into user directory"), NULL, },
+ { "local", 0, 0, G_OPTION_ARG_NONE, (void *)&local,
+ N_("Install into local directory"), NULL, },
+ { "system", 0, 0, G_OPTION_ARG_NONE, (void *)&system,
+ N_("Install into system directory"), NULL, },
+ { "dir", 0, 0, G_OPTION_ARG_STRING, (void *)&custom,
+ N_("Import into custom directory"), NULL, },
+ { "version", 0, 0, G_OPTION_ARG_STRING, (void *)&version,
+ N_("Set version number of archive"), NULL, },
+ { "root", 0, 0, G_OPTION_ARG_STRING, &root,
+ N_("Installation root directory"), NULL, },
+ { NULL, 0, 0, 0, NULL, NULL, NULL },
+ };
+ argv0 = argv[0];
+
+ setlocale(LC_ALL, "");
+ textdomain(GETTEXT_PACKAGE);
+ bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+
+ context = g_option_context_new(_("- Validate XML documents "));
+
+ g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
+
+ if (!g_option_context_parse(context, &argc, &argv, &error)) {
+ g_printerr(_("%s: error while parsing commandline options: %s\n\n"),
+ argv0, error->message);
+ g_printerr("%s\n", g_option_context_get_help(context, FALSE, NULL));
+ goto error;
+ }
+
+ if (argc > 2) {
+ g_printerr(_("%s: expected path to one archive file to export\n"),
+ argv0);
+ goto error;
+ }
+
+ if (local)
+ locs++;
+ if (system)
+ locs++;
+ if (user)
+ locs++;
+ if (custom)
+ locs++;
+ if (locs > 1) {
+ g_printerr(_("Only one of --user, --local, --system & --dir can be used"));
+ goto error;
+ }
+
+ prefix = osinfo_db_export_prefix(version);
+ archive = argc == 2 ? argv[1] : NULL;
+ dir = osinfo_db_export_get_path(root, user, local, system, custom);
+ if (osinfo_db_export_create(prefix, dir, archive, verbose) < 0)
+ goto error;
+
+ ret = EXIT_SUCCESS;
+
+ error:
+ g_free(prefix);
+ if (dir) {
+ g_object_unref(dir);
+ }
+ g_clear_error(&error);
+ g_option_context_free(context);
+
+ return ret;
+}
+
+
+/*
+=pod
+
+=head1 NAME
+
+osinfo-db-export - Export to a osinfo database archive
+
+=head1 SYNOPSIS
+
+osinfo-db-export [OPTIONS...] ARCHIVE-FILE
+
+=head1 DESCRIPTION
+
+The B tool will create an osinfo database
+archive file containing the content from one of the standard
+local database locations:
+
+=over 1
+
+=item B
+
+This is the primary system-wide database location, intended
+for use by operating system vendors distributing database
+files in the native package format.
+
+=item B
+
+This is the secondary system-wide database location, intended
+for use by system administrators wishing to provide an updated
+database for all users.
+
+=item B
+
+This is the user private database location, intended for use
+by unprivileged local users wishing to provide applications
+they use with an updated database.
+
+=back
+
+If run by a privileged account (ie root), the B database
+location will be used by default, otherwise the B location
+will be used.
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--user>
+
+Override the default behaviour to force archiving files from the
+B database location.
+
+=item B<--local>
+
+Override the default behaviour to force archiving files from the
+B database location.
+
+=item B<--system>
+
+Override the default behaviour to force archiving files from the
+B database location.
+
+=item B<--dir=PATH>
+
+Override the default behaviour to force archiving files from the
+custom directory B.
+
+=item B<--root=PATH>
+
+Prefix the database location with the root directory given by
+C. This is useful when wishing to archive files that are
+in a chroot environment or equivalent.
+
+=item B<--version=VERSION>
+
+Set the version string for the files in the archive to
+B. If this argument is not given, the version
+will be set to the current date in the format B.
+
+=item B<-v>, B<--verbose>
+
+Display verbose progress information when archiving files
+
+=back
+
+=head1 EXIT STATUS
+
+The exit status will be 0 if all files were packed
+successfully, or 1 if at least one file could not be
+packed into the archive.
+
+=head1 SEE ALSO
+
+C
+
+=head1 AUTHORS
+
+Daniel P. Berrange
+
+=head1 COPYRIGHT
+
+Copyright (C) 2016 Red Hat, Inc.
+
+=head1 LICENSE
+
+C is distributed under the termsof the GNU LGPL v2+
+license. This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE
+
+=cut
+*/
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * End:
+ */
--
2.5.5
From zeeshanak at gnome.org Thu Jun 23 21:01:14 2016
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 23 Jun 2016 22:01:14 +0100
Subject: [Libosinfo] [PATCH db-tools 0/2] Add tools for database
import/export
In-Reply-To: <1466065245-13312-1-git-send-email-berrange@redhat.com>
References: <1466065245-13312-1-git-send-email-berrange@redhat.com>
Message-ID:
Hi Daniel,
On Thu, Jun 16, 2016 at 9:20 AM, Daniel P. Berrange wrote:
> Since we're soon going to start distributing the database as a
> standalone archive, it'll be useful if we had tools which can
> import/export between the local database filesystem tree and a
> database archive file. While users/apps could just use 'tar'
> directly, providing these tools makes life simpler as users
> don't need to remember where the correct database locations
> are.
>
> For these tools I'm using libarchive since it is available on
> all platforms (BSD, Linux, MinGW and OS-X). For the format it
> is using the tar "pax" format (the latest POSIX tar format)
> since it has unlimited filename/path lengths support, and the
> 'xz' compression scheme since it is by far the best at compressing
> these XML files.
Cool stuff. Ack both patches.
--
Regards,
Zeeshan Ali (Khattak)
From berrange at redhat.com Tue Jun 28 15:52:26 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:26 +0100
Subject: [Libosinfo] [PATCH db-tools 00/11] Misc changes for split DB
toolchain
Message-ID: <1467129157-19313-1-git-send-email-berrange@redhat.com>
This series contains a bunch of small-ish patches doing
random fixes and enhancements to the osinfo-db-tools
package
Notable things
- Fix osinfo-db-validate to look for RNG schema in the
database tree location
- Add a new osinfo-db-path tool
- Improve the way we create tar.xz packages
Daniel P. Berrange (11):
Share code for getting database path locations
Fix description of import/export commands
Add a new osinfo-db-path tool for reporting db locations
Find RNG schema in default database locations
Change osinfo-db-validate to default to a standard location
Set a valid error domain for GError
Remove print of filenames when --verbose is not used
Fix swapped file/directory permissions in tar file
Explicitly set timestamps on entries in created tar file
Filter list of files included in created tar
Fix source link in the RPM spec
.gitignore | 3 +
mingw-osinfo-db-tools.spec.in | 2 +
osinfo-db-tools.spec.in | 4 +-
po/POTFILES.in | 2 +
tools/Makefile.am | 20 +++-
tools/osinfo-db-export.c | 107 +++++---------------
tools/osinfo-db-import.c | 84 +---------------
tools/osinfo-db-path.c | 223 ++++++++++++++++++++++++++++++++++++++++++
tools/osinfo-db-util.c | 164 +++++++++++++++++++++++++++++++
tools/osinfo-db-util.h | 58 +++++++++++
tools/osinfo-db-validate.c | 189 ++++++++++++++++++++++++++++-------
11 files changed, 653 insertions(+), 203 deletions(-)
create mode 100644 tools/osinfo-db-path.c
create mode 100644 tools/osinfo-db-util.c
create mode 100644 tools/osinfo-db-util.h
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:27 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:27 +0100
Subject: [Libosinfo] [PATCH db-tools 01/11] Share code for getting database
path locations
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-2-git-send-email-berrange@redhat.com>
Both the osinfo-db-import and osinfo-db-export tools have
the same code for getting the database path locations. Pull
it out into a osinfo-db-util.c file for sharing.
Signed-off-by: Daniel P. Berrange
---
tools/Makefile.am | 9 +++-
tools/osinfo-db-export.c | 80 ++--------------------------------
tools/osinfo-db-import.c | 80 ++--------------------------------
tools/osinfo-db-util.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++
tools/osinfo-db-util.h | 48 +++++++++++++++++++++
5 files changed, 171 insertions(+), 156 deletions(-)
create mode 100644 tools/osinfo-db-util.c
create mode 100644 tools/osinfo-db-util.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 701fbe4..37f9abb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -21,19 +21,24 @@ POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)"
%.1: %.c Makefile
$(AM_V_GEN)$(POD2MAN) $< $@
+COMMON_SOURCES = \
+ osinfo-db-util.c \
+ osinfo-db-util.h \
+ $(NULL)
+
osinfo_db_validate_SOURCES = osinfo-db-validate.c
osinfo_db_validate_LDADD = $(GOBJECT_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(LIBXML_LIBS)
-osinfo_db_import_SOURCES = osinfo-db-import.c
+osinfo_db_import_SOURCES = osinfo-db-import.c $(COMMON_SOURCES)
osinfo_db_import_LDADD = $(GOBJECT_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(LIBARCHIVE_LIBS)
-osinfo_db_export_SOURCES = osinfo-db-export.c
+osinfo_db_export_SOURCES = osinfo-db-export.c $(COMMON_SOURCES)
osinfo_db_export_LDADD = $(GOBJECT_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
index ea68645..256c793 100644
--- a/tools/osinfo-db-export.c
+++ b/tools/osinfo-db-export.c
@@ -23,89 +23,15 @@
#include
-#include
-#include
#include
#include
#include
#include
#include
-const char *argv0;
-
-static GFile *osinfo_db_export_get_system_path(const gchar *root)
-{
- GFile *file;
- gchar *dbdir;
- const gchar *path = g_getenv("OSINFO_DATA_DIR");
- if (!path)
- path = DATA_DIR "/libosinfo";
-
- dbdir = g_strdup_printf("%s%s/db", root, path);
- file = g_file_new_for_path(dbdir);
- g_free(dbdir);
- return file;
-}
-
-static GFile *osinfo_db_export_get_local_path(const gchar *root)
-{
- GFile *file;
- gchar *dbdir;
-
- dbdir = g_strdup_printf("%s" SYSCONFDIR "/libosinfo/db", root);
- file = g_file_new_for_path(dbdir);
- g_free(dbdir);
- return file;
-}
-
-static GFile *osinfo_db_export_get_user_path(const gchar *root)
-{
- GFile *file;
- gchar *dbdir;
- const gchar *configdir = g_get_user_config_dir();
-
- dbdir = g_strdup_printf("%s%s/libosinfo/db", root, configdir);
- file = g_file_new_for_path(dbdir);
- g_free(dbdir);
- return file;
-}
+#include "osinfo-db-util.h"
-
-static GFile *osinfo_db_export_get_custom_path(const gchar *dir,
- const gchar *root)
-{
- GFile *file;
- gchar *dbdir;
-
- dbdir = g_strdup_printf("%s%s", root, dir);
- file = g_file_new_for_path(dbdir);
- g_free(dbdir);
- return file;
-}
-
-
-static GFile *osinfo_db_export_get_path(const char *root,
- gboolean user,
- gboolean local,
- gboolean system,
- const char *custom)
-{
- if (custom) {
- return osinfo_db_export_get_custom_path(custom, root);
- } else if (user) {
- return osinfo_db_export_get_user_path(root);
- } else if (local) {
- return osinfo_db_export_get_local_path(root);
- } else if (system) {
- return osinfo_db_export_get_system_path(root);
-#ifndef WIN32
- } else if (geteuid() == 0) {
- return osinfo_db_export_get_local_path(root);
-#endif
- } else {
- return osinfo_db_export_get_user_path(root);
- }
-}
+const char *argv0;
static int osinfo_db_export_create_file(const gchar *prefix,
@@ -481,7 +407,7 @@ gint main(gint argc, gchar **argv)
prefix = osinfo_db_export_prefix(version);
archive = argc == 2 ? argv[1] : NULL;
- dir = osinfo_db_export_get_path(root, user, local, system, custom);
+ dir = osinfo_db_get_path(root, user, local, system, custom);
if (osinfo_db_export_create(prefix, dir, archive, verbose) < 0)
goto error;
diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
index 327562a..b621d2b 100644
--- a/tools/osinfo-db-import.c
+++ b/tools/osinfo-db-import.c
@@ -23,89 +23,15 @@
#include
-#include
-#include
#include
#include
#include
#include
#include
-const char *argv0;
-
-static GFile *osinfo_db_import_get_system_path(const gchar *root)
-{
- GFile *file;
- gchar *dbdir;
- const gchar *path = g_getenv("OSINFO_DATA_DIR");
- if (!path)
- path = DATA_DIR "/libosinfo";
-
- dbdir = g_strdup_printf("%s%s/db", root, path);
- file = g_file_new_for_path(dbdir);
- g_free(dbdir);
- return file;
-}
-
-static GFile *osinfo_db_import_get_local_path(const gchar *root)
-{
- GFile *file;
- gchar *dbdir;
-
- dbdir = g_strdup_printf("%s" SYSCONFDIR "/libosinfo/db", root);
- file = g_file_new_for_path(dbdir);
- g_free(dbdir);
- return file;
-}
-
-static GFile *osinfo_db_import_get_user_path(const gchar *root)
-{
- GFile *file;
- gchar *dbdir;
- const gchar *configdir = g_get_user_config_dir();
-
- dbdir = g_strdup_printf("%s%s/libosinfo/db", root, configdir);
- file = g_file_new_for_path(dbdir);
- g_free(dbdir);
- return file;
-}
-
-static GFile *osinfo_db_import_get_custom_path(const gchar *dir,
- const gchar *root)
-{
- GFile *file;
- gchar *dbdir;
-
- dbdir = g_strdup_printf("%s%s", root, dir);
- file = g_file_new_for_path(dbdir);
- g_free(dbdir);
- return file;
-}
-
-
-static GFile *osinfo_db_import_get_path(const char *root,
- gboolean user,
- gboolean local,
- gboolean system,
- const char *custom)
-{
- if (custom) {
- return osinfo_db_import_get_custom_path(custom, root);
- } else if (user) {
- return osinfo_db_import_get_user_path(root);
- } else if (local) {
- return osinfo_db_import_get_local_path(root);
- } else if (system) {
- return osinfo_db_import_get_system_path(root);
-#ifndef WIN32
- } else if (geteuid() == 0) {
- return osinfo_db_import_get_local_path(root);
-#endif
- } else {
- return osinfo_db_import_get_user_path(root);
- }
-}
+#include "osinfo-db-util.h"
+const char *argv0;
static int osinfo_db_import_create_reg(GFile *file,
struct archive *arc,
@@ -335,7 +261,7 @@ gint main(gint argc, gchar **argv)
}
archive = argc == 2 ? argv[1] : NULL;
- dir = osinfo_db_import_get_path(root, user, local, system, custom);
+ dir = osinfo_db_get_path(root, user, local, system, custom);
if (osinfo_db_import_extract(dir, archive, verbose) < 0)
goto error;
diff --git a/tools/osinfo-db-util.c b/tools/osinfo-db-util.c
new file mode 100644
index 0000000..1d81d0c
--- /dev/null
+++ b/tools/osinfo-db-util.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2016 Red Hat, Inc.
+ *
+ * osinfo-db-util: misc helper APIs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Daniel P. Berrange
+ */
+
+#include
+
+#include "osinfo-db-util.h"
+
+GFile *osinfo_db_get_system_path(const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+ const gchar *path = g_getenv("OSINFO_DATA_DIR");
+ if (!path)
+ path = DATA_DIR "/libosinfo";
+
+ dbdir = g_strdup_printf("%s%s/db", root, path);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+
+GFile *osinfo_db_get_local_path(const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+
+ dbdir = g_strdup_printf("%s" SYSCONFDIR "/libosinfo/db", root);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+
+GFile *osinfo_db_get_user_path(const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+ const gchar *configdir = g_get_user_config_dir();
+
+ dbdir = g_strdup_printf("%s%s/libosinfo/db", root, configdir);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+
+GFile *osinfo_db_get_custom_path(const gchar *dir,
+ const gchar *root)
+{
+ GFile *file;
+ gchar *dbdir;
+
+ dbdir = g_strdup_printf("%s%s", root, dir);
+ file = g_file_new_for_path(dbdir);
+ g_free(dbdir);
+ return file;
+}
+
+
+GFile *osinfo_db_get_path(const char *root,
+ gboolean user,
+ gboolean local,
+ gboolean system,
+ const char *custom)
+{
+ if (custom) {
+ return osinfo_db_get_custom_path(custom, root);
+ } else if (user) {
+ return osinfo_db_get_user_path(root);
+ } else if (local) {
+ return osinfo_db_get_local_path(root);
+ } else if (system) {
+ return osinfo_db_get_system_path(root);
+#ifndef WIN32
+ } else if (geteuid() == 0) {
+ return osinfo_db_get_local_path(root);
+#endif
+ } else {
+ return osinfo_db_get_user_path(root);
+ }
+}
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/tools/osinfo-db-util.h b/tools/osinfo-db-util.h
new file mode 100644
index 0000000..acfcde6
--- /dev/null
+++ b/tools/osinfo-db-util.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 Red Hat, Inc.
+ *
+ * osinfo-db-util: misc helper APIs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Daniel P. Berrange
+ */
+
+#ifndef OSINFO_DB_UTIL_H__
+#define OSINFO_DB_UTIL_H__
+
+#include
+
+GFile *osinfo_db_get_system_path(const gchar *root);
+GFile *osinfo_db_get_local_path(const gchar *root);
+GFile *osinfo_db_get_user_path(const gchar *root);
+GFile *osinfo_db_get_custom_path(const gchar *dir,
+ const gchar *root);
+GFile *osinfo_db_get_path(const char *root,
+ gboolean user,
+ gboolean local,
+ gboolean system,
+ const char *custom);
+
+#endif /* OSINFO_DB_UTIL_H__ */
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * End:
+ */
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:28 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:28 +0100
Subject: [Libosinfo] [PATCH db-tools 02/11] Fix description of import/export
commands
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-3-git-send-email-berrange@redhat.com>
The command line option help was reporting the wrong description
for the import/export commands due to cut+paste mistake.
Signed-off-by: Daniel P. Berrange
---
tools/osinfo-db-export.c | 2 +-
tools/osinfo-db-import.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
index 256c793..553b797 100644
--- a/tools/osinfo-db-export.c
+++ b/tools/osinfo-db-export.c
@@ -375,7 +375,7 @@ gint main(gint argc, gchar **argv)
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
- context = g_option_context_new(_("- Validate XML documents "));
+ context = g_option_context_new(_("- Export database archive "));
g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
index b621d2b..17d9e23 100644
--- a/tools/osinfo-db-import.c
+++ b/tools/osinfo-db-import.c
@@ -230,7 +230,7 @@ gint main(gint argc, gchar **argv)
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
- context = g_option_context_new(_("- Validate XML documents "));
+ context = g_option_context_new(_("- Import database archive "));
g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:29 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:29 +0100
Subject: [Libosinfo] [PATCH db-tools 03/11] Add a new osinfo-db-path tool
for reporting db locations
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-4-git-send-email-berrange@redhat.com>
Applications or system administrators accessing the osinfo
database directly (instead of via the libosinfo API) will
need a well defined means of getting the standard database
locations. The osinfo-db-tool is a trivial command that
can serve this purpose. eg
$ osinfo-db-path --system
/usr/local/share/libosinfo/db
$ osinfo-db-path --user
/home/berrange/.config/libosinfo/db
Signed-off-by: Daniel P. Berrange
---
.gitignore | 3 +
mingw-osinfo-db-tools.spec.in | 2 +
osinfo-db-tools.spec.in | 2 +
po/POTFILES.in | 1 +
tools/Makefile.am | 9 +-
tools/osinfo-db-export.c | 2 +-
tools/osinfo-db-import.c | 2 +-
tools/osinfo-db-path.c | 223 ++++++++++++++++++++++++++++++++++++++++++
8 files changed, 240 insertions(+), 4 deletions(-)
create mode 100644 tools/osinfo-db-path.c
diff --git a/.gitignore b/.gitignore
index bda3aea..437d9bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,9 @@ tools/osinfo-db-import.1
tools/osinfo-db-export
tools/osinfo-db-export.exe
tools/osinfo-db-export.1
+tools/osinfo-db-path
+tools/osinfo-db-path.exe
+tools/osinfo-db-path.1
po/.intltool-merge-cache
po/Makefile.in.in
po/POTFILES
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 870b2e4..0fe1890 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -76,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
%{mingw32_bindir}/osinfo-db-export.exe
%{mingw32_bindir}/osinfo-db-import.exe
+%{mingw32_bindir}/osinfo-db-path.exe
%{mingw32_bindir}/osinfo-db-validate.exe
%{mingw32_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
@@ -83,6 +84,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
%{mingw64_bindir}/osinfo-db-export.exe
%{mingw64_bindir}/osinfo-db-import.exe
+%{mingw64_bindir}/osinfo-db-path.exe
%{mingw64_bindir}/osinfo-db-validate.exe
%{mingw64_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index d125751..155ede9 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -36,9 +36,11 @@ information about operating systems for use with virtualization
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
%{_bindir}/osinfo-db-export
%{_bindir}/osinfo-db-import
+%{_bindir}/osinfo-db-path
%{_bindir}/osinfo-db-validate
%{_mandir}/man1/osinfo-db-export.1*
%{_mandir}/man1/osinfo-db-import.1*
+%{_mandir}/man1/osinfo-db-path.1*
%{_mandir}/man1/osinfo-db-validate.1*
%changelog
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6688a2d..279b26f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
tools/osinfo-db-export.c
tools/osinfo-db-import.c
+tools/osinfo-db-path.c
tools/osinfo-db-validate.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 37f9abb..af069a5 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,9 +10,9 @@ AM_CFLAGS = $(GOBJECT_CFLAGS) \
-I$(top_srcdir) \
$(NULL)
-bin_PROGRAMS = osinfo-db-validate osinfo-db-import osinfo-db-export
+bin_PROGRAMS = osinfo-db-validate osinfo-db-import osinfo-db-export osinfo-db-path
-man1_MANS = osinfo-db-validate.1 osinfo-db-import.1 osinfo-db-export.1
+man1_MANS = osinfo-db-validate.1 osinfo-db-import.1 osinfo-db-export.1 osinfo-db-path.1
CLEANFILES = $(man1_MANS)
@@ -43,3 +43,8 @@ osinfo_db_export_LDADD = $(GOBJECT_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(LIBARCHIVE_LIBS)
+
+osinfo_db_path_SOURCES = osinfo-db-path.c $(COMMON_SOURCES)
+osinfo_db_path_LDADD = $(GOBJECT_LIBS) \
+ $(GIO_LIBS) \
+ $(GLIB_LIBS)
diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
index 553b797..1973a33 100644
--- a/tools/osinfo-db-export.c
+++ b/tools/osinfo-db-export.c
@@ -518,7 +518,7 @@ packed into the archive.
=head1 SEE ALSO
-C
+C, C
=head1 AUTHORS
diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
index 17d9e23..a75745b 100644
--- a/tools/osinfo-db-import.c
+++ b/tools/osinfo-db-import.c
@@ -365,7 +365,7 @@ installed.
=head1 SEE ALSO
-C
+C, C
=head1 AUTHORS
diff --git a/tools/osinfo-db-path.c b/tools/osinfo-db-path.c
new file mode 100644
index 0000000..08cefa4
--- /dev/null
+++ b/tools/osinfo-db-path.c
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2016 Red Hat, Inc
+ *
+ * osinfo-db-path: report the path to the osinfo database
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Daniel P. Berrange
+ */
+
+#include
+
+#include
+#include
+#include
+
+#include "osinfo-db-util.h"
+
+const char *argv0;
+
+gint main(gint argc, gchar **argv)
+{
+ GOptionContext *context;
+ GError *error = NULL;
+ gint ret = EXIT_FAILURE;
+ gboolean user = FALSE;
+ gboolean local = FALSE;
+ gboolean system = FALSE;
+ const gchar *root = "";
+ const gchar *custom = NULL;
+ int locs = 0;
+ char *path;
+ GFile *dir = NULL;
+ const GOptionEntry entries[] = {
+ { "user", 0, 0, G_OPTION_ARG_NONE, (void *)&user,
+ N_("Report the user directory"), NULL, },
+ { "local", 0, 0, G_OPTION_ARG_NONE, (void *)&local,
+ N_("Report the local directory"), NULL, },
+ { "system", 0, 0, G_OPTION_ARG_NONE, (void *)&system,
+ N_("Report the system directory"), NULL, },
+ { "dir", 0, 0, G_OPTION_ARG_STRING, (void *)&custom,
+ N_("Report the custom directory"), NULL, },
+ { "root", 0, 0, G_OPTION_ARG_STRING, &root,
+ N_("Report against root directory"), NULL, },
+ { NULL, 0, 0, 0, NULL, NULL, NULL },
+ };
+ argv0 = argv[0];
+
+ setlocale(LC_ALL, "");
+ textdomain(GETTEXT_PACKAGE);
+ bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+
+ context = g_option_context_new(_("- Report database locations "));
+
+ g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
+
+ if (!g_option_context_parse(context, &argc, &argv, &error)) {
+ g_printerr(_("%s: error while parsing commandline options: %s\n\n"),
+ argv0, error->message);
+ g_printerr("%s\n", g_option_context_get_help(context, FALSE, NULL));
+ goto error;
+ }
+
+ if (argc > 1) {
+ g_printerr(_("%s: unexpected extra arguments\n"),
+ argv0);
+ goto error;
+ }
+
+ if (local)
+ locs++;
+ if (system)
+ locs++;
+ if (user)
+ locs++;
+ if (custom)
+ locs++;
+ if (locs > 1) {
+ g_printerr(_("Only one of --user, --local, --system & --dir can be used"));
+ goto error;
+ }
+
+ dir = osinfo_db_get_path(root, user, local, system, custom);
+
+ path = g_file_get_path(dir);
+ g_print("%s\n", path);
+ g_free(path);
+
+ ret = EXIT_SUCCESS;
+
+ error:
+ if (dir) {
+ g_object_unref(dir);
+ }
+ g_clear_error(&error);
+ g_option_context_free(context);
+
+ return ret;
+}
+
+
+/*
+=pod
+
+=head1 NAME
+
+osinfo-db-path - Report database locations
+
+=head1 SYNOPSIS
+
+osinfo-db-path [OPTIONS...]
+
+=head1 DESCRIPTION
+
+The B tool will report the paths associated
+with the standard osinfo database locations:
+
+=over 1
+
+=item B
+
+This is the primary system-wide database location, intended
+for use by operating system vendors distributing database
+files in the native package format.
+
+=item B
+
+This is the secondary system-wide database location, intended
+for use by system administrators wishing to provide an updated
+database for all users.
+
+=item B
+
+This is the user private database location, intended for use
+by unprivileged local users wishing to provide applications
+they use with an updated database.
+
+=back
+
+If run by a privileged account (ie root), the B database
+location will be reported by default, otherwise the B location
+will be reported.
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--user>
+
+Override the default behaviour to force reporting of the
+B database location.
+
+=item B<--local>
+
+Override the default behaviour to force reporting of the
+B database location.
+
+=item B<--system>
+
+Override the default behaviour to force reporting of the
+B database location.
+
+=item B<--dir=PATH>
+
+Override the default behaviour to force reporting of the
+custom directory B.
+
+=item B<--root=PATH>
+
+Prefix the database location with the root directory given
+by C. This is useful when wishing to report paths
+relative to a chroot environment or equivalent.
+
+=back
+
+=head1 EXIT STATUS
+
+The exit status will be 0 if the requested path was reported,
+or 1 if the arguments were invalid.
+
+=head1 SEE ALSO
+
+C, C
+
+=head1 AUTHORS
+
+Daniel P. Berrange
+
+=head1 COPYRIGHT
+
+Copyright (C) 2016 Red Hat, Inc.
+
+=head1 LICENSE
+
+C is distributed under the termsof the GNU LGPL v2+
+license. This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE
+
+=cut
+*/
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * End:
+ */
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:30 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:30 +0100
Subject: [Libosinfo] [PATCH db-tools 04/11] Find RNG schema in default
database locations
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-5-git-send-email-berrange@redhat.com>
With the split out database, the RNG schema will no longer
be installed by the code, instead it will be distributed
as part of the database. Thus we should look in the database
locations to find the schema.
Signed-off-by: Daniel P. Berrange
---
po/POTFILES.in | 1 +
tools/Makefile.am | 2 +-
tools/osinfo-db-util.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++
tools/osinfo-db-util.h | 7 +++++++
tools/osinfo-db-validate.c | 29 ++++++++++++++++++---------
5 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 279b26f..a2cfe55 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,5 @@
tools/osinfo-db-export.c
tools/osinfo-db-import.c
tools/osinfo-db-path.c
+tools/osinfo-db-util.c
tools/osinfo-db-validate.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index af069a5..f415297 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -26,7 +26,7 @@ COMMON_SOURCES = \
osinfo-db-util.h \
$(NULL)
-osinfo_db_validate_SOURCES = osinfo-db-validate.c
+osinfo_db_validate_SOURCES = osinfo-db-validate.c $(COMMON_SOURCES)
osinfo_db_validate_LDADD = $(GOBJECT_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
diff --git a/tools/osinfo-db-util.c b/tools/osinfo-db-util.c
index 1d81d0c..bd4a813 100644
--- a/tools/osinfo-db-util.c
+++ b/tools/osinfo-db-util.c
@@ -23,6 +23,8 @@
#include
+#include
+
#include "osinfo-db-util.h"
GFile *osinfo_db_get_system_path(const gchar *root)
@@ -101,6 +103,53 @@ GFile *osinfo_db_get_path(const char *root,
}
}
+GFile *osinfo_db_get_file(const char *root,
+ gboolean user,
+ gboolean local,
+ gboolean system,
+ const char *custom,
+ const gchar *file,
+ GError **err)
+{
+ GFile *ret = NULL;
+ gboolean tryAll = TRUE;
+ GFile *paths[4];
+ gsize npaths = 0;
+ gsize i;
+
+ if (user || local || system || custom)
+ tryAll = FALSE;
+
+ if (custom)
+ paths[npaths++] = osinfo_db_get_custom_path(custom, root);
+
+ if (tryAll || user)
+ paths[npaths++] = osinfo_db_get_user_path(root);
+
+ if (tryAll || local)
+ paths[npaths++] = osinfo_db_get_local_path(root);
+
+ if (tryAll || system)
+ paths[npaths++] = osinfo_db_get_system_path(root);
+
+ for (i = 0; i < npaths; i++) {
+ ret = g_file_resolve_relative_path(paths[i], file);
+ if (g_file_query_exists(ret, NULL))
+ break;
+ g_object_unref(ret);
+ ret = NULL;
+ }
+
+ if (!ret) {
+ g_set_error(err, 0, 0,
+ _("Unable to locate '%s' in any database location"),
+ file);
+ return NULL;
+ }
+
+ return ret;
+}
+
/*
* Local variables:
* indent-tabs-mode: nil
diff --git a/tools/osinfo-db-util.h b/tools/osinfo-db-util.h
index acfcde6..d56c098 100644
--- a/tools/osinfo-db-util.h
+++ b/tools/osinfo-db-util.h
@@ -36,6 +36,13 @@ GFile *osinfo_db_get_path(const char *root,
gboolean local,
gboolean system,
const char *custom);
+GFile *osinfo_db_get_file(const char *root,
+ gboolean user,
+ gboolean local,
+ gboolean system,
+ const char *custom,
+ const gchar *file,
+ GError **err);
#endif /* OSINFO_DB_UTIL_H__ */
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
index 965ed0e..6826a54 100644
--- a/tools/osinfo-db-validate.c
+++ b/tools/osinfo-db-validate.c
@@ -23,13 +23,11 @@
#include
-#include
-#include
#include
#include
#include
-#define SCHEMA PKGDATADIR "/schemas/libosinfo.rng"
+#include "osinfo-db-util.h"
static gboolean verbose = FALSE;
@@ -192,22 +190,24 @@ static gboolean validate_file(xmlRelaxNGValidCtxtPtr rngValid, GFile *file, GFil
}
-static gboolean validate_files(gint argc, gchar **argv, GError **error)
+static gboolean validate_files(GFile *schema, gint argc, gchar **argv, GError **error)
{
xmlRelaxNGParserCtxtPtr rngParser = NULL;
xmlRelaxNGPtr rng = NULL;
xmlRelaxNGValidCtxtPtr rngValid = NULL;
gboolean ret = FALSE;
gsize i;
+ gchar *schemapath = NULL;
xmlSetGenericErrorFunc(NULL, validate_generic_error_nop);
xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop);
- rngParser = xmlRelaxNGNewParserCtxt(SCHEMA);
+ schemapath = g_file_get_path(schema);
+ rngParser = xmlRelaxNGNewParserCtxt(schemapath);
if (!rngParser) {
g_set_error(error, 0, 0,
_("Unable to create RNG parser for %s"),
- SCHEMA);
+ schemapath);
goto cleanup;
}
@@ -215,7 +215,7 @@ static gboolean validate_files(gint argc, gchar **argv, GError **error)
if (!rng) {
g_set_error(error, 0, 0,
_("Unable to parse RNG %s"),
- SCHEMA);
+ schemapath);
goto cleanup;
}
@@ -223,7 +223,7 @@ static gboolean validate_files(gint argc, gchar **argv, GError **error)
if (!rngValid) {
g_set_error(error, 0, 0,
_("Unable to create RNG validation context %s"),
- SCHEMA);
+ schemapath);
goto cleanup;
}
@@ -239,6 +239,7 @@ static gboolean validate_files(gint argc, gchar **argv, GError **error)
ret = TRUE;
cleanup:
+ g_free(schemapath);
xmlRelaxNGFreeValidCtxt(rngValid);
xmlRelaxNGFreeParserCtxt(rngParser);
xmlRelaxNGFree(rng);
@@ -250,6 +251,7 @@ gint main(gint argc, gchar **argv)
GOptionContext *context;
GError *error = NULL;
gint ret = EXIT_FAILURE;
+ GFile *schema = NULL;
setlocale(LC_ALL, "");
textdomain(GETTEXT_PACKAGE);
@@ -267,7 +269,14 @@ gint main(gint argc, gchar **argv)
goto error;
}
- if (!validate_files(argc - 1, argv + 1, &error)) {
+ schema = osinfo_db_get_file(NULL, FALSE, FALSE, FALSE, NULL,
+ "schema/osinfo.rng", &error);
+ if (!schema) {
+ g_printerr("%s\n", error->message);
+ goto error;
+ }
+
+ if (!validate_files(schema, argc - 1, argv + 1, &error)) {
g_printerr("%s\n", error->message);
goto error;
}
@@ -275,6 +284,8 @@ gint main(gint argc, gchar **argv)
ret = EXIT_SUCCESS;
error:
+ if (schema)
+ g_object_unref(schema);
g_clear_error(&error);
g_option_context_free(context);
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:31 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:31 +0100
Subject: [Libosinfo] [PATCH db-tools 05/11] Change osinfo-db-validate to
default to a standard location
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-6-git-send-email-berrange@redhat.com>
Instead of requiring a list of paths to be passed in, default
to validating files from the standard database locations.
Signed-off-by: Daniel P. Berrange
---
tools/osinfo-db-validate.c | 151 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 128 insertions(+), 23 deletions(-)
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
index 6826a54..2989f2e 100644
--- a/tools/osinfo-db-validate.c
+++ b/tools/osinfo-db-validate.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Red Hat, Inc
+ * Copyright (C) 2012-2016 Red Hat, Inc
*
* osinfo-validate: validate that XML file(s) follows the published schema
*
@@ -31,13 +31,6 @@
static gboolean verbose = FALSE;
-static const GOptionEntry entries[] = {
- { "verbose", 'v', 0, G_OPTION_ARG_NONE, (void*)&verbose,
- N_("Verbose progress information"), NULL, },
- { NULL, 0, 0, 0, NULL, NULL, NULL }
-};
-
-
static void validate_generic_error_nop(void *userData G_GNUC_UNUSED,
const char *msg G_GNUC_UNUSED,
...)
@@ -190,7 +183,7 @@ static gboolean validate_file(xmlRelaxNGValidCtxtPtr rngValid, GFile *file, GFil
}
-static gboolean validate_files(GFile *schema, gint argc, gchar **argv, GError **error)
+static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GError **error)
{
xmlRelaxNGParserCtxtPtr rngParser = NULL;
xmlRelaxNGPtr rng = NULL;
@@ -227,13 +220,9 @@ static gboolean validate_files(GFile *schema, gint argc, gchar **argv, GError **
goto cleanup;
}
- for (i = 0; i < argc; i++) {
- GFile *file = g_file_new_for_commandline_arg(argv[i]);
- if (!validate_file(rngValid, file, NULL, error)) {
- g_object_unref(file);
+ for (i = 0; i < nfiles; i++) {
+ if (!validate_file(rngValid, files[i], NULL, error))
goto cleanup;
- }
- g_object_unref(file);
}
ret = TRUE;
@@ -252,6 +241,30 @@ gint main(gint argc, gchar **argv)
GError *error = NULL;
gint ret = EXIT_FAILURE;
GFile *schema = NULL;
+ gboolean user = FALSE;
+ gboolean local = FALSE;
+ gboolean system = FALSE;
+ const gchar *root = "";
+ const gchar *custom = NULL;
+ int locs = 0;
+ GFile *dir = NULL;
+ GFile **files = NULL;
+ gsize nfiles = 0, i;
+ const GOptionEntry entries[] = {
+ { "verbose", 'v', 0, G_OPTION_ARG_NONE, (void*)&verbose,
+ N_("Verbose progress information"), NULL, },
+ { "user", 0, 0, G_OPTION_ARG_NONE, (void *)&user,
+ N_("Install into user directory"), NULL, },
+ { "local", 0, 0, G_OPTION_ARG_NONE, (void *)&local,
+ N_("Install into local directory"), NULL, },
+ { "system", 0, 0, G_OPTION_ARG_NONE, (void *)&system,
+ N_("Install into system directory"), NULL, },
+ { "dir", 0, 0, G_OPTION_ARG_STRING, (void *)&custom,
+ N_("Import into custom directory"), NULL, },
+ { "root", 0, 0, G_OPTION_ARG_STRING, &root,
+ N_("Installation root directory"), NULL, },
+ { NULL, 0, 0, 0, NULL, NULL, NULL },
+ };
setlocale(LC_ALL, "");
textdomain(GETTEXT_PACKAGE);
@@ -269,14 +282,42 @@ gint main(gint argc, gchar **argv)
goto error;
}
- schema = osinfo_db_get_file(NULL, FALSE, FALSE, FALSE, NULL,
+ if (local)
+ locs++;
+ if (system)
+ locs++;
+ if (user)
+ locs++;
+ if (custom)
+ locs++;
+ if (locs > 1 || (locs && argc > 1)) {
+ g_printerr(_("Only one of --user, --local, --system, --dir or positional filenames can be used"));
+ goto error;
+ }
+
+ schema = osinfo_db_get_file(root,
+ user || custom,
+ local || user || custom,
+ system || local || user || custom,
+ custom,
"schema/osinfo.rng", &error);
if (!schema) {
g_printerr("%s\n", error->message);
goto error;
}
- if (!validate_files(schema, argc - 1, argv + 1, &error)) {
+ dir = osinfo_db_get_path(root, user, local, system, custom);
+
+ if (dir) {
+ files = g_new0(GFile *, 1);
+ files[nfiles++] = dir;
+ } else {
+ files = g_new0(GFile *, argc - 1);
+ for (i = 1; i < argc; i++) {
+ files[nfiles++] = g_file_new_for_commandline_arg(argv[i]);
+ }
+ }
+ if (!validate_files(schema, nfiles, files, &error)) {
g_printerr("%s\n", error->message);
goto error;
}
@@ -286,6 +327,8 @@ gint main(gint argc, gchar **argv)
error:
if (schema)
g_object_unref(schema);
+ if (dir)
+ g_object_unref(dir);
g_clear_error(&error);
g_option_context_free(context);
@@ -301,16 +344,52 @@ osinfo-db-validate - Validate libosinfo XML data files
=head1 SYNOPSIS
+osinfo-db-validate [OPTIONS...]
+
osinfo-db-validate [OPTIONS...] LOCAL-PATH1 [LOCAL-PATH2...]
osinfo-db-validate [OPTIONS...] URI1 [URI2...]
=head1 DESCRIPTION
-Check that all files (C or C) comply with the
-libosinfo XML schema. The local path may point to a directory
-containing XML files, or directly to an XML file. The uris must
-point directly to remote XML files
+The B tool is able to validate XML files
+in one of the osinfo database locations for compliance with
+the RNG schema.
+
+=over 1
+
+=item B
+
+This is the primary system-wide database location, intended
+for use by operating system vendors distributing database
+files in the native package format. The RNG schema is
+expected to be present in this location.
+
+=item B
+
+This is the secondary system-wide database location, intended
+for use by system administrators wishing to provide an updated
+database for all users. This location may provide an RNG schema
+override, otherwise the RNG schema from the system location
+will be used.
+
+=item B
+
+This is the user private database location, intended for use
+by unprivileged local users wishing to provide applications
+they use with an updated database. This location may provide
+an RNG schema override, otherwise the RNG schema from the
+local location will be used, or failing that the system
+location.
+
+=back
+
+If run by a privileged account (ie root), the B database
+location will be validate by default, otherwise the B location
+will be validated.
+
+Alternatively it is possible to directly provide a list of files
+to be validated using the (C or C) arguments.
Any validation errors will be displayed on the console when
detected.
@@ -319,6 +398,32 @@ detected.
=over 8
+=item B<--user>
+
+Override the default behaviour to force validating files from the
+B database location.
+
+=item B<--local>
+
+Override the default behaviour to force validating files from the
+B database location.
+
+=item B<--system>
+
+Override the default behaviour to force validating files from the
+B database location.
+
+=item B<--dir=PATH>
+
+Override the default behaviour to force validating files from the
+custom directory B.
+
+=item B<--root=PATH>
+
+Prefix the database location with the root directory given by
+C. This is useful when wishing to validate files that are
+in a chroot environment or equivalent.
+
=item B<-v>, B<--verbose>
Display verbose progress information when validating files
@@ -332,7 +437,7 @@ or 1 if a validation error was hit.
=head1 SEE ALSO
-C
+C
=head1 AUTHORS
@@ -340,7 +445,7 @@ Daniel P. Berrange
=head1 COPYRIGHT
-Copyright (C) 2012, 2014 Red Hat, Inc.
+Copyright (C) 2012-2016 Red Hat, Inc.
=head1 LICENSE
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:32 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:32 +0100
Subject: [Libosinfo] [PATCH db-tools 06/11] Set a valid error domain for
GError
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-7-git-send-email-berrange@redhat.com>
GLib will print a warning if 0 is passed for the GQuark
error domain when setting a GError. Define a valid error
domain quark and use it.
Signed-off-by: Daniel P. Berrange
---
tools/osinfo-db-util.c | 7 ++++++-
tools/osinfo-db-util.h | 3 +++
tools/osinfo-db-validate.c | 14 +++++++-------
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/tools/osinfo-db-util.c b/tools/osinfo-db-util.c
index bd4a813..34abe88 100644
--- a/tools/osinfo-db-util.c
+++ b/tools/osinfo-db-util.c
@@ -27,6 +27,11 @@
#include "osinfo-db-util.h"
+GQuark osinfo_db_error_quark(void)
+{
+ return g_quark_from_static_string("osinfo-db-error");
+}
+
GFile *osinfo_db_get_system_path(const gchar *root)
{
GFile *file;
@@ -141,7 +146,7 @@ GFile *osinfo_db_get_file(const char *root,
}
if (!ret) {
- g_set_error(err, 0, 0,
+ g_set_error(err, OSINFO_DB_ERROR, 0,
_("Unable to locate '%s' in any database location"),
file);
return NULL;
diff --git a/tools/osinfo-db-util.h b/tools/osinfo-db-util.h
index d56c098..59ceadc 100644
--- a/tools/osinfo-db-util.h
+++ b/tools/osinfo-db-util.h
@@ -26,6 +26,9 @@
#include
+#define OSINFO_DB_ERROR osinfo_db_error_quark()
+
+GQuark osinfo_db_error_quark(void);
GFile *osinfo_db_get_system_path(const gchar *root);
GFile *osinfo_db_get_local_path(const gchar *root);
GFile *osinfo_db_get_user_path(const gchar *root);
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
index 2989f2e..ce3366a 100644
--- a/tools/osinfo-db-validate.c
+++ b/tools/osinfo-db-validate.c
@@ -58,7 +58,7 @@ static xmlDocPtr parse_file(GFile *file, GError **error)
goto cleanup;
if (!(pctxt = xmlNewParserCtxt())) {
- g_set_error(error, 0, 0, "%s",
+ g_set_error(error, OSINFO_DB_ERROR, 0, "%s",
_("Unable to create libxml parser"));
goto cleanup;
}
@@ -66,7 +66,7 @@ static xmlDocPtr parse_file(GFile *file, GError **error)
if (!(doc = xmlCtxtReadDoc(pctxt, (const xmlChar*)data, uri, NULL,
XML_PARSE_NOENT | XML_PARSE_NONET |
XML_PARSE_NOWARNING))) {
- g_set_error(error, 0, 0,
+ g_set_error(error, OSINFO_DB_ERROR, 0,
_("Unable to parse XML document '%s'"),
uri);
goto cleanup;
@@ -98,7 +98,7 @@ static gboolean validate_file_regular(xmlRelaxNGValidCtxtPtr rngValid,
goto cleanup;
if (xmlRelaxNGValidateDoc(rngValid, doc) != 0) {
- g_set_error(error, 0, 0,
+ g_set_error(error, OSINFO_DB_ERROR, 0,
_("Unable to validate XML document '%s'"),
uri);
goto cleanup;
@@ -166,7 +166,7 @@ static gboolean validate_file(xmlRelaxNGValidCtxtPtr rngValid, GFile *file, GFil
if (!validate_file_regular(rngValid, file, error))
goto cleanup;
} else {
- g_set_error(error, 0, 0,
+ g_set_error(error, OSINFO_DB_ERROR, 0,
"Unable to handle file type for %s",
uri);
goto cleanup;
@@ -198,7 +198,7 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro
schemapath = g_file_get_path(schema);
rngParser = xmlRelaxNGNewParserCtxt(schemapath);
if (!rngParser) {
- g_set_error(error, 0, 0,
+ g_set_error(error, OSINFO_DB_ERROR, 0,
_("Unable to create RNG parser for %s"),
schemapath);
goto cleanup;
@@ -206,7 +206,7 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro
rng = xmlRelaxNGParse(rngParser);
if (!rng) {
- g_set_error(error, 0, 0,
+ g_set_error(error, OSINFO_DB_ERROR, 0,
_("Unable to parse RNG %s"),
schemapath);
goto cleanup;
@@ -214,7 +214,7 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro
rngValid = xmlRelaxNGNewValidCtxt(rng);
if (!rngValid) {
- g_set_error(error, 0, 0,
+ g_set_error(error, OSINFO_DB_ERROR, 0,
_("Unable to create RNG validation context %s"),
schemapath);
goto cleanup;
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:33 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:33 +0100
Subject: [Libosinfo] [PATCH db-tools 07/11] Remove print of filenames when
--verbose is not used
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-8-git-send-email-berrange@redhat.com>
The osinfo-db-validate command has a --verbose arg to request
printing of filenames as they are validated. Remove the stray
g_print() that duplicated this
Signed-off-by: Daniel P. Berrange
---
tools/osinfo-db-validate.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
index ce3366a..70c1ac3 100644
--- a/tools/osinfo-db-validate.c
+++ b/tools/osinfo-db-validate.c
@@ -172,7 +172,6 @@ static gboolean validate_file(xmlRelaxNGValidCtxtPtr rngValid, GFile *file, GFil
goto cleanup;
}
- g_print(_("Processed '%s'.\n"), uri);
ret = TRUE;
cleanup:
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:34 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:34 +0100
Subject: [Libosinfo] [PATCH db-tools 08/11] Fix swapped file/directory
permissions in tar file
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-9-git-send-email-berrange@redhat.com>
Plain files were given mode 0755 while dirs got 0644, the exact
opposite of what they should have.
Signed-off-by: Daniel P. Berrange
---
tools/osinfo-db-export.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
index 1973a33..c79778a 100644
--- a/tools/osinfo-db-export.c
+++ b/tools/osinfo-db-export.c
@@ -204,7 +204,7 @@ static int osinfo_db_export_create_file(const gchar *prefix,
g_print("%s: r %s\n", argv0, entpath);
}
archive_entry_set_filetype(entry, AE_IFREG);
- archive_entry_set_perm(entry, 0755);
+ archive_entry_set_perm(entry, 0644);
archive_entry_set_size(entry, g_file_info_get_size(info));
break;
@@ -213,7 +213,7 @@ static int osinfo_db_export_create_file(const gchar *prefix,
g_print("%s: d %s\n", argv0, entpath);
}
archive_entry_set_filetype(entry, AE_IFDIR);
- archive_entry_set_perm(entry, 0644);
+ archive_entry_set_perm(entry, 0755);
archive_entry_set_size(entry, 0);
break;
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:35 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:35 +0100
Subject: [Libosinfo] [PATCH db-tools 09/11] Explicitly set timestamps on
entries in created tar file
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-10-git-send-email-berrange@redhat.com>
Always set a timestamp on entries in the created tar file
to reflect the time at which the tar was created. This
ensures when people import new versions of the database,
the files get newer timestamps.
Signed-off-by: Daniel P. Berrange
---
tools/osinfo-db-export.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
index c79778a..52792a7 100644
--- a/tools/osinfo-db-export.c
+++ b/tools/osinfo-db-export.c
@@ -33,6 +33,7 @@
const char *argv0;
+time_t entryts;
static int osinfo_db_export_create_file(const gchar *prefix,
GFile *file,
@@ -197,6 +198,11 @@ static int osinfo_db_export_create_file(const gchar *prefix,
entry = archive_entry_new();
archive_entry_set_pathname(entry, entpath);
+ archive_entry_set_atime(entry, entryts, 0);
+ archive_entry_set_ctime(entry, entryts, 0);
+ archive_entry_set_mtime(entry, entryts, 0);
+ archive_entry_set_birthtime(entry, entryts, 0);
+
switch (type) {
case G_FILE_TYPE_REGULAR:
case G_FILE_TYPE_SYMBOLIC_LINK:
@@ -212,6 +218,7 @@ static int osinfo_db_export_create_file(const gchar *prefix,
if (verbose) {
g_print("%s: d %s\n", argv0, entpath);
}
+
archive_entry_set_filetype(entry, AE_IFDIR);
archive_entry_set_perm(entry, 0755);
archive_entry_set_size(entry, 0);
@@ -405,6 +412,7 @@ gint main(gint argc, gchar **argv)
goto error;
}
+ entryts = time(NULL);
prefix = osinfo_db_export_prefix(version);
archive = argc == 2 ? argv[1] : NULL;
dir = osinfo_db_get_path(root, user, local, system, custom);
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:36 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:36 +0100
Subject: [Libosinfo] [PATCH db-tools 10/11] Filter list of files included in
created tar
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-11-git-send-email-berrange@redhat.com>
Don't include hidden files or editor backup files in the
exported tar. Also whitelist to only include files with
a .xml or .rng suffix. This facilitates running against
a local git repo which may have other files such as the
automake/autoconf .in and .am files.
Signed-off-by: Daniel P. Berrange
---
tools/osinfo-db-export.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
index 52792a7..4321ae4 100644
--- a/tools/osinfo-db-export.c
+++ b/tools/osinfo-db-export.c
@@ -206,6 +206,17 @@ static int osinfo_db_export_create_file(const gchar *prefix,
switch (type) {
case G_FILE_TYPE_REGULAR:
case G_FILE_TYPE_SYMBOLIC_LINK:
+ if (g_file_info_get_is_backup(info) ||
+ g_file_info_get_is_hidden(info)) {
+ ret = 0;
+ goto cleanup;
+ }
+ if (!g_str_has_suffix(entpath, ".rng") &&
+ !g_str_has_suffix(entpath, ".xml")) {
+ ret = 0;
+ goto cleanup;
+ }
+
if (verbose) {
g_print("%s: r %s\n", argv0, entpath);
}
--
2.7.4
From berrange at redhat.com Tue Jun 28 15:52:37 2016
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 28 Jun 2016 16:52:37 +0100
Subject: [Libosinfo] [PATCH db-tools 11/11] Fix source link in the RPM spec
In-Reply-To: <1467129157-19313-1-git-send-email-berrange@redhat.com>
References: <1467129157-19313-1-git-send-email-berrange@redhat.com>
Message-ID: <1467129157-19313-12-git-send-email-berrange@redhat.com>
Signed-off-by: Daniel P. Berrange
---
osinfo-db-tools.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index 155ede9..afe0336 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -6,7 +6,7 @@ Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
-Source: https://fedorahosted.org/releases/l/i/%{name}/%{name}-%{version}.tar.gz
+Source: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.gz
URL: http://libosinfo.org/
BuildRequires: intltool
BuildRequires: glib2-devel
--
2.7.4
From fidencio at redhat.com Thu Jun 30 17:04:10 2016
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 30 Jun 2016 19:04:10 +0200
Subject: [Libosinfo] [libosinfo] osinfo-query: return failure when no
matches are found
Message-ID: <1467306250-6229-1-git-send-email-fidencio@redhat.com>
According to `man osinfo-query`: "The exit status will be 0 if matching
entries were found, or 1 if not matches were found". So, let's adapt the
program in order to match the manual.
Also, this patch was written keeping the current behavior about printing
the Short ID, Name, Version, ID table.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1351718
Signed-off-by: Fabiano Fid?ncio
---
tools/osinfo-query.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/tools/osinfo-query.c b/tools/osinfo-query.c
index 66f49e2..48e792f 100644
--- a/tools/osinfo-query.c
+++ b/tools/osinfo-query.c
@@ -331,6 +331,9 @@ static gboolean print_results_text(OsinfoList *list,
}
g_print("\n");
+ if (tmp == NULL)
+ goto end;
+
while (tmp) {
OsinfoEntity *entity = OSINFO_ENTITY(tmp->data);
@@ -338,9 +341,10 @@ static gboolean print_results_text(OsinfoList *list,
tmp = tmp->next;
}
+ ret = TRUE;
+end:
g_list_free(entities);
- ret = TRUE;
// cleanup:
return ret;
}
@@ -458,7 +462,13 @@ gint main(gint argc, gchar **argv)
osinfo_list_add_filtered(results, entities, filter);
- print_results_text(results, labels, sortKey);
+ if (!print_results_text(results, labels, sortKey)) {
+ /*
+ * The os wasn't found, no need to print an error,
+ * just be sure to return EXIT_FAILURE.
+ */
+ goto error;
+ }
ret = EXIT_SUCCESS;
--
2.7.4