From matteo.bernardini at gmail.com Thu Sep 11 15:58:25 2014 From: matteo.bernardini at gmail.com (ponce) Date: Thu, 11 Sep 2014 17:58:25 +0200 Subject: [Libosinfo] [PATCH] Add Slackware metadata Message-ID: <1410451105-2285-1-git-send-email-matteo.bernardini@gmail.com> From: Matteo Bernardini Signed-off-by: Matteo Bernardini Reviewed-by: Robby Workman --- data/oses/Makefile.am | 1 + data/oses/slackware.xml.in | 166 +++++++++++++++++++++ po/POTFILES.in | 1 + .../slackware-13.0-install-dvd.iso.txt | 33 ++++ .../slackware64-13.0-install-dvd.iso.txt | 33 ++++ .../slackware-13.1-install-dvd.iso.txt | 33 ++++ .../slackware64-13.1-install-dvd.iso.txt | 33 ++++ .../slackware-13.37-install-dvd.iso.txt | 33 ++++ .../slackware64-13.37-install-dvd.iso.txt | 33 ++++ .../slackware-14.0-install-dvd.iso.txt | 33 ++++ .../slackware64-14.0-install-dvd.iso.txt | 33 ++++ .../slackware-14.1-install-dvd.iso.txt | 33 ++++ .../slackware64-14.1-install-dvd.iso.txt | 33 ++++ test/test-isodetect.c | 7 + 14 files changed, 505 insertions(+) create mode 100644 data/oses/slackware.xml.in create mode 100644 test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt create mode 100644 test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt create mode 100644 test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt create mode 100644 test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt create mode 100644 test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt create mode 100644 test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt create mode 100644 test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt create mode 100644 test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt create mode 100644 test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt create mode 100644 test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am index e1fb6fb..35769e2 100644 --- a/data/oses/Makefile.am +++ b/data/oses/Makefile.am @@ -18,6 +18,7 @@ database_in_files = \ opensuse.xml.in \ rhl.xml.in \ rhel.xml.in \ + slackware.xml.in \ solaris.xml.in \ suse.xml.in \ ubuntu.xml.in \ diff --git a/data/oses/slackware.xml.in b/data/oses/slackware.xml.in new file mode 100644 index 0000000..645d390 --- /dev/null +++ b/data/oses/slackware.xml.in @@ -0,0 +1,166 @@ + + + + slackware13.0 + <_name>Slackware 13.0 + 13.0 + <_vendor>Slackware + linux + slackware + 2009-08-26 + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.0-iso/slackware-13.0-install-dvd.iso + + SlackDVD + Slackware 13.0 DVD + + + kernels/hugesmp.s/bzImage + isolinux/initrd.img + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.0-iso/slackware64-13.0-install-dvd.iso + + SlackDVD + Slackware 13.0 DVD + + + kernels/huge.s/bzImage + isolinux/initrd.img + + + + + slackware13.1 + <_name>Slackware 13.1 + 13.1 + <_vendor>Slackware + linux + slackware + + + 2010-05-19 + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.1-iso/slackware-13.1-install-dvd.iso + + SlackDVD + Slackware 13.1 DVD + + + kernels/hugesmp.s/bzImage + isolinux/initrd.img + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.1-iso/slackware64-13.1-install-dvd.iso + + SlackDVD + Slackware 13.1 DVD + + + kernels/huge.s/bzImage + isolinux/initrd.img + + + + + slackware13.37 + <_name>Slackware 13.37 + 13.37 + <_vendor>Slackware + linux + slackware + + + 2011-04-25 + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.37-iso/slackware-13.37-install-dvd.iso + + SlackDVD + Slackware 13.37 DVD + + + kernels/hugesmp.s/bzImage + isolinux/initrd.img + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.37-iso/slackware64-13.37-install-dvd.iso + + SlackDVD + Slackware 13.37 DVD + + + kernels/huge.s/bzImage + isolinux/initrd.img + + + + + slackware14.0 + <_name>Slackware 14.0 + 14.0 + <_vendor>Slackware + linux + slackware + + + 2012-09-26 + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.0-iso/slackware-14.0-install-dvd.iso + + SlackDVD + Slackware 14.0 DVD + + + kernels/hugesmp.s/bzImage + isolinux/initrd.img + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.0-iso/slackware64-14.0-install-dvd.iso + + SlackDVD + Slackware 14.0 DVD + + + kernels/huge.s/bzImage + isolinux/initrd.img + + + + + slackware14.1 + <_name>Slackware 14.1 + 14.1 + <_vendor>Slackware + linux + slackware + + + 2013-11-04 + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.1-iso/slackware-14.1-install-dvd.iso + + SlackDVD + Slackware 14.1 DVD + + + kernels/hugesmp.s/bzImage + isolinux/initrd.img + + + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.1-iso/slackware64-14.1-install-dvd.iso + + SlackDVD + Slackware 14.1 DVD + + + kernels/huge.s/bzImage + isolinux/initrd.img + + + + diff --git a/po/POTFILES.in b/po/POTFILES.in index a1a551f..7fb4aa2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,7 @@ data/oses/netware.xml.in data/oses/solaris.xml.in data/oses/dos.xml.in +data/oses/slackware.xml.in data/oses/mageia.xml.in data/oses/mandrake.xml.in data/oses/mandriva.xml.in diff --git a/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt b/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt new file mode 100644 index 0000000..0402219 --- /dev/null +++ b/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware 13.0 DVD +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: 1914167 +El Torito VD version 1 found, boot catalog is in sector 2351 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 930 2352 diff --git a/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt b/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt new file mode 100644 index 0000000..ad1a4ec --- /dev/null +++ b/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware 13.0 DVD +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: 1926212 +El Torito VD version 1 found, boot catalog is in sector 2251 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 8CC 2252 diff --git a/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt b/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt new file mode 100644 index 0000000..ca1eca9 --- /dev/null +++ b/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware 13.1 DVD +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: 2108672 +El Torito VD version 1 found, boot catalog is in sector 2380 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 94D 2381 diff --git a/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt b/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt new file mode 100644 index 0000000..9126fdd --- /dev/null +++ b/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware64 13.1 DVD +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: 2134723 +El Torito VD version 1 found, boot catalog is in sector 2333 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 91E 2334 diff --git a/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt b/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt new file mode 100644 index 0000000..316b1c3 --- /dev/null +++ b/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware 13.37 DVD +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: 2218788 +El Torito VD version 1 found, boot catalog is in sector 2471 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 9A8 2472 diff --git a/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt b/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt new file mode 100644 index 0000000..e1fbdd6 --- /dev/null +++ b/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware64 13.37 DVD +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: 2254040 +El Torito VD version 1 found, boot catalog is in sector 2424 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 979 2425 diff --git a/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt b/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt new file mode 100644 index 0000000..249b665 --- /dev/null +++ b/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware 14.0 DVD +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: 1200676 +El Torito VD version 1 found, boot catalog is in sector 681 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 2AA 682 diff --git a/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt b/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt new file mode 100644 index 0000000..6fd67cf --- /dev/null +++ b/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware64 14.0 DVD +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: 1177016 +El Torito VD version 1 found, boot catalog is in sector 664 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 299 665 diff --git a/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt b/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt new file mode 100644 index 0000000..0636efc --- /dev/null +++ b/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware 14.1 DVD +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: 1213132 +El Torito VD version 1 found, boot catalog is in sector 709 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 2C6 710 diff --git a/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt b/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt new file mode 100644 index 0000000..3b8df93 --- /dev/null +++ b/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt @@ -0,0 +1,33 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: SlackDVD +Volume set id: +Publisher id: +Data preparer id: +Application id: Slackware64 14.1 DVD +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: 1190715 +El Torito VD version 1 found, boot catalog is in sector 698 + +Joliet with UCS level 3 found. +SUSP signatures version 1 found +Rock Ridge signatures version 1 found +Rock Ridge id 'RRIP_1991A' +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Cksum AA 55 OK + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 58B 1419 diff --git a/test/test-isodetect.c b/test/test-isodetect.c index 5bd211a..4288cf0 100644 --- a/test/test-isodetect.c +++ b/test/test-isodetect.c @@ -408,6 +408,12 @@ START_TEST(test_mageia) } END_TEST +START_TEST(test_slackware) +{ + test_one("slackware"); +} +END_TEST + static Suite * list_suite(void) { @@ -424,6 +430,7 @@ list_suite(void) tcase_add_test(tc, test_opensuse); tcase_add_test(tc, test_centos); tcase_add_test(tc, test_gnome); + tcase_add_test(tc, test_slackware); tcase_add_test(tc, test_altlinux); tcase_add_test(tc, test_mageia); suite_add_tcase(s, tc); -- 2.1.0 From cfergeau at redhat.com Thu Sep 11 17:19:09 2014 From: cfergeau at redhat.com (Christophe Fergeau) Date: Thu, 11 Sep 2014 19:19:09 +0200 Subject: [Libosinfo] [PATCH] Add Slackware metadata In-Reply-To: <1410451105-2285-1-git-send-email-matteo.bernardini@gmail.com> References: <1410451105-2285-1-git-send-email-matteo.bernardini@gmail.com> Message-ID: <20140911171909.GC9223@edamame.cdg.redhat.com> Hey, Thanks a lot for all this data! A few comments below On Thu, Sep 11, 2014 at 05:58:25PM +0200, ponce wrote: > From: Matteo Bernardini > > Signed-off-by: Matteo Bernardini > Reviewed-by: Robby Workman > --- > data/oses/Makefile.am | 1 + > data/oses/slackware.xml.in | 166 +++++++++++++++++++++ > po/POTFILES.in | 1 + > .../slackware-13.0-install-dvd.iso.txt | 33 ++++ > .../slackware64-13.0-install-dvd.iso.txt | 33 ++++ > .../slackware-13.1-install-dvd.iso.txt | 33 ++++ > .../slackware64-13.1-install-dvd.iso.txt | 33 ++++ > .../slackware-13.37-install-dvd.iso.txt | 33 ++++ > .../slackware64-13.37-install-dvd.iso.txt | 33 ++++ > .../slackware-14.0-install-dvd.iso.txt | 33 ++++ > .../slackware64-14.0-install-dvd.iso.txt | 33 ++++ > .../slackware-14.1-install-dvd.iso.txt | 33 ++++ > .../slackware64-14.1-install-dvd.iso.txt | 33 ++++ > test/test-isodetect.c | 7 + > 14 files changed, 505 insertions(+) > create mode 100644 data/oses/slackware.xml.in > create mode 100644 test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt > create mode 100644 test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt > create mode 100644 test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt > create mode 100644 test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt > create mode 100644 test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt > create mode 100644 test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt > create mode 100644 test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt > create mode 100644 test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt > create mode 100644 test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt > create mode 100644 test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt > > diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am > index e1fb6fb..35769e2 100644 > --- a/data/oses/Makefile.am > +++ b/data/oses/Makefile.am > @@ -18,6 +18,7 @@ database_in_files = \ > opensuse.xml.in \ > rhl.xml.in \ > rhel.xml.in \ > + slackware.xml.in \ > solaris.xml.in \ > suse.xml.in \ > ubuntu.xml.in \ > diff --git a/data/oses/slackware.xml.in b/data/oses/slackware.xml.in > new file mode 100644 > index 0000000..645d390 > --- /dev/null > +++ b/data/oses/slackware.xml.in > @@ -0,0 +1,166 @@ > + > + > + > + slackware13.0 > + <_name>Slackware 13.0 > + 13.0 > + <_vendor>Slackware > + linux > + slackware > + 2009-08-26 > + > + i486 does not exist in data/schemas/libosinfo.rng which causes test-xml-validate to fail (when running make check). You could add the new value there, but I'm not sure how much existing code hardcodes the known values already. Slackware binaries are exactly i486 binaries ? They won't work on an i386 but an i686 is not required? > + http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.0-iso/slackware-13.0-install-dvd.iso > + > + SlackDVD > + Slackware 13.0 DVD > + > + > + kernels/hugesmp.s/bzImage > + isolinux/initrd.img > + > + > + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.0-iso/slackware64-13.0-install-dvd.iso > + > + SlackDVD > + Slackware 13.0 DVD > + > + > + kernels/huge.s/bzImage > + isolinux/initrd.img > + > + > + > + > + slackware13.1 > + <_name>Slackware 13.1 > + 13.1 > + <_vendor>Slackware > + linux > + slackware > + > + > + 2010-05-19 > + > + > + http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.1-iso/slackware-13.1-install-dvd.iso > + > + SlackDVD > + Slackware 13.1 DVD > + > + > + kernels/hugesmp.s/bzImage > + isolinux/initrd.img > + > + > + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.1-iso/slackware64-13.1-install-dvd.iso > + > + SlackDVD > + Slackware 13.1 DVD All the 64 bit images starting with 13.1 seem to be using Slackware64 here. This is good as otherwise libosinfo would not be able to tell the difference between a 32 or 64 bit image. I would also add some information about the supported virtio devices, but this can be added later. The patches should be good to go once make check passes :) Christophe > + > + > + kernels/huge.s/bzImage > + isolinux/initrd.img > + > + > + > + > + slackware13.37 > + <_name>Slackware 13.37 > + 13.37 > + <_vendor>Slackware > + linux > + slackware > + > + > + 2011-04-25 > + > + > + http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.37-iso/slackware-13.37-install-dvd.iso > + > + SlackDVD > + Slackware 13.37 DVD > + > + > + kernels/hugesmp.s/bzImage > + isolinux/initrd.img > + > + > + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.37-iso/slackware64-13.37-install-dvd.iso > + > + SlackDVD > + Slackware 13.37 DVD > + > + > + kernels/huge.s/bzImage > + isolinux/initrd.img > + > + > + > + > + slackware14.0 > + <_name>Slackware 14.0 > + 14.0 > + <_vendor>Slackware > + linux > + slackware > + > + > + 2012-09-26 > + > + > + http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.0-iso/slackware-14.0-install-dvd.iso > + > + SlackDVD > + Slackware 14.0 DVD > + > + > + kernels/hugesmp.s/bzImage > + isolinux/initrd.img > + > + > + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.0-iso/slackware64-14.0-install-dvd.iso > + > + SlackDVD > + Slackware 14.0 DVD > + > + > + kernels/huge.s/bzImage > + isolinux/initrd.img > + > + > + > + > + slackware14.1 > + <_name>Slackware 14.1 > + 14.1 > + <_vendor>Slackware > + linux > + slackware > + > + > + 2013-11-04 > + > + > + http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.1-iso/slackware-14.1-install-dvd.iso > + > + SlackDVD > + Slackware 14.1 DVD > + > + > + kernels/hugesmp.s/bzImage > + isolinux/initrd.img > + > + > + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.1-iso/slackware64-14.1-install-dvd.iso > + > + SlackDVD > + Slackware 14.1 DVD > + > + > + kernels/huge.s/bzImage > + isolinux/initrd.img > + > + > + > + > diff --git a/po/POTFILES.in b/po/POTFILES.in > index a1a551f..7fb4aa2 100644 > --- a/po/POTFILES.in > +++ b/po/POTFILES.in > @@ -1,6 +1,7 @@ > data/oses/netware.xml.in > data/oses/solaris.xml.in > data/oses/dos.xml.in > +data/oses/slackware.xml.in > data/oses/mageia.xml.in > data/oses/mandrake.xml.in > data/oses/mandriva.xml.in > diff --git a/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt b/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt > new file mode 100644 > index 0000000..0402219 > --- /dev/null > +++ b/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware 13.0 DVD > +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: 1914167 > +El Torito VD version 1 found, boot catalog is in sector 2351 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 930 2352 > diff --git a/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt b/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt > new file mode 100644 > index 0000000..ad1a4ec > --- /dev/null > +++ b/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware 13.0 DVD > +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: 1926212 > +El Torito VD version 1 found, boot catalog is in sector 2251 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 8CC 2252 > diff --git a/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt b/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt > new file mode 100644 > index 0000000..ca1eca9 > --- /dev/null > +++ b/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware 13.1 DVD > +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: 2108672 > +El Torito VD version 1 found, boot catalog is in sector 2380 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 94D 2381 > diff --git a/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt b/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt > new file mode 100644 > index 0000000..9126fdd > --- /dev/null > +++ b/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware64 13.1 DVD > +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: 2134723 > +El Torito VD version 1 found, boot catalog is in sector 2333 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 91E 2334 > diff --git a/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt b/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt > new file mode 100644 > index 0000000..316b1c3 > --- /dev/null > +++ b/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware 13.37 DVD > +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: 2218788 > +El Torito VD version 1 found, boot catalog is in sector 2471 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 9A8 2472 > diff --git a/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt b/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt > new file mode 100644 > index 0000000..e1fbdd6 > --- /dev/null > +++ b/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware64 13.37 DVD > +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: 2254040 > +El Torito VD version 1 found, boot catalog is in sector 2424 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 979 2425 > diff --git a/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt b/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt > new file mode 100644 > index 0000000..249b665 > --- /dev/null > +++ b/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware 14.0 DVD > +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: 1200676 > +El Torito VD version 1 found, boot catalog is in sector 681 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 2AA 682 > diff --git a/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt b/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt > new file mode 100644 > index 0000000..6fd67cf > --- /dev/null > +++ b/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware64 14.0 DVD > +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: 1177016 > +El Torito VD version 1 found, boot catalog is in sector 664 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 299 665 > diff --git a/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt b/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt > new file mode 100644 > index 0000000..0636efc > --- /dev/null > +++ b/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware 14.1 DVD > +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: 1213132 > +El Torito VD version 1 found, boot catalog is in sector 709 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 2C6 710 > diff --git a/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt b/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt > new file mode 100644 > index 0000000..3b8df93 > --- /dev/null > +++ b/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt > @@ -0,0 +1,33 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: SlackDVD > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: Slackware64 14.1 DVD > +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: 1190715 > +El Torito VD version 1 found, boot catalog is in sector 698 > + > +Joliet with UCS level 3 found. > +SUSP signatures version 1 found > +Rock Ridge signatures version 1 found > +Rock Ridge id 'RRIP_1991A' > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID '' > + Cksum AA 55 OK > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 4 > + Bootoff 58B 1419 > diff --git a/test/test-isodetect.c b/test/test-isodetect.c > index 5bd211a..4288cf0 100644 > --- a/test/test-isodetect.c > +++ b/test/test-isodetect.c > @@ -408,6 +408,12 @@ START_TEST(test_mageia) > } > END_TEST > > +START_TEST(test_slackware) > +{ > + test_one("slackware"); > +} > +END_TEST > + > static Suite * > list_suite(void) > { > @@ -424,6 +430,7 @@ list_suite(void) > tcase_add_test(tc, test_opensuse); > tcase_add_test(tc, test_centos); > tcase_add_test(tc, test_gnome); > + tcase_add_test(tc, test_slackware); > tcase_add_test(tc, test_altlinux); > tcase_add_test(tc, test_mageia); > suite_add_tcase(s, tc); > -- > 2.1.0 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: not available URL: From matteo.bernardini at gmail.com Thu Sep 11 18:10:15 2014 From: matteo.bernardini at gmail.com (Matteo Bernardini) Date: Thu, 11 Sep 2014 20:10:15 +0200 Subject: [Libosinfo] [PATCH] Add Slackware metadata In-Reply-To: <20140911171909.GC9223@edamame.cdg.redhat.com> References: <1410451105-2285-1-git-send-email-matteo.bernardini@gmail.com> <20140911171909.GC9223@edamame.cdg.redhat.com> Message-ID: 2014-09-11 19:19 GMT+02:00 Christophe Fergeau : > Hey, > > Thanks a lot for all this data! A few comments below thanks to you for reviewing it! > > On Thu, Sep 11, 2014 at 05:58:25PM +0200, ponce wrote: >> From: Matteo Bernardini >> >> Signed-off-by: Matteo Bernardini >> Reviewed-by: Robby Workman >> --- >> data/oses/Makefile.am | 1 + >> data/oses/slackware.xml.in | 166 +++++++++++++++++++++ >> po/POTFILES.in | 1 + >> .../slackware-13.0-install-dvd.iso.txt | 33 ++++ >> .../slackware64-13.0-install-dvd.iso.txt | 33 ++++ >> .../slackware-13.1-install-dvd.iso.txt | 33 ++++ >> .../slackware64-13.1-install-dvd.iso.txt | 33 ++++ >> .../slackware-13.37-install-dvd.iso.txt | 33 ++++ >> .../slackware64-13.37-install-dvd.iso.txt | 33 ++++ >> .../slackware-14.0-install-dvd.iso.txt | 33 ++++ >> .../slackware64-14.0-install-dvd.iso.txt | 33 ++++ >> .../slackware-14.1-install-dvd.iso.txt | 33 ++++ >> .../slackware64-14.1-install-dvd.iso.txt | 33 ++++ >> test/test-isodetect.c | 7 + >> 14 files changed, 505 insertions(+) >> create mode 100644 data/oses/slackware.xml.in >> create mode 100644 test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt >> create mode 100644 test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt >> create mode 100644 test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt >> create mode 100644 test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt >> create mode 100644 test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt >> create mode 100644 test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt >> create mode 100644 test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt >> create mode 100644 test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt >> create mode 100644 test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt >> create mode 100644 test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt >> >> diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am >> index e1fb6fb..35769e2 100644 >> --- a/data/oses/Makefile.am >> +++ b/data/oses/Makefile.am >> @@ -18,6 +18,7 @@ database_in_files = \ >> opensuse.xml.in \ >> rhl.xml.in \ >> rhel.xml.in \ >> + slackware.xml.in \ >> solaris.xml.in \ >> suse.xml.in \ >> ubuntu.xml.in \ >> diff --git a/data/oses/slackware.xml.in b/data/oses/slackware.xml.in >> new file mode 100644 >> index 0000000..645d390 >> --- /dev/null >> +++ b/data/oses/slackware.xml.in >> @@ -0,0 +1,166 @@ >> + >> + >> + >> + slackware13.0 >> + <_name>Slackware 13.0 >> + 13.0 >> + <_vendor>Slackware >> + linux >> + slackware >> + 2009-08-26 >> + >> + > > i486 does not exist in data/schemas/libosinfo.rng which causes > test-xml-validate to fail (when running make check). > You could add the new value there, but I'm not sure how much existing > code hardcodes the known values already. Slackware binaries are exactly > i486 binaries ? They won't work on an i386 but an i686 is not required? Yes, they are built with "-O2 -march=i486 -mtune=i686", so binaries actually run fine on i486. I think there should be no probs either in switching arch to i686 if it's safer, also because the use cases for virtualizing i486 that I can think of are very few... if someone complains it also can be changed again later... let me know the way you prefer. > >> + http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.0-iso/slackware-13.0-install-dvd.iso >> + >> + SlackDVD >> + Slackware 13.0 DVD >> + >> + >> + kernels/hugesmp.s/bzImage >> + isolinux/initrd.img >> + >> + >> + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.0-iso/slackware64-13.0-install-dvd.iso >> + >> + SlackDVD >> + Slackware 13.0 DVD >> + >> + >> + kernels/huge.s/bzImage >> + isolinux/initrd.img >> + >> + >> + >> + >> + slackware13.1 >> + <_name>Slackware 13.1 >> + 13.1 >> + <_vendor>Slackware >> + linux >> + slackware >> + >> + >> + 2010-05-19 >> + >> + >> + http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.1-iso/slackware-13.1-install-dvd.iso >> + >> + SlackDVD >> + Slackware 13.1 DVD >> + >> + >> + kernels/hugesmp.s/bzImage >> + isolinux/initrd.img >> + >> + >> + http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.1-iso/slackware64-13.1-install-dvd.iso >> + >> + SlackDVD >> + Slackware 13.1 DVD > > All the 64 bit images starting with 13.1 seem to be using Slackware64 > here. This is good as otherwise libosinfo would not be able to tell the > difference between a 32 or 64 bit image. Yes, my bad: I'll change the xml accordingly... Just to let you know the logic behind the patch, I added versions from 13.0-onward as they are the ones still supported (there's no defined eol_date): what do you think it's better, to start from 13.1 or to add another field to the xml to let it recognize the arch (a suggestion of the field to use would be appreciated ;) )? > > I would also add some information about the supported virtio devices, > but this can be added later. Ok, I'll have a look. To explain, it's just that I was adding libosinfo to slackbuilds.org (Slackware's third party repository of build scripts) as a dependency of the newer virt-manager and I tried to do something to let it support also Slackware itself (with some debugging help from Robby Workman and Willy Sudiarto Raharjo)... Then I thought that maybe this stuff could have been useful also upstream... Any hint to enhance slackware support is obviously welcome! :) > The patches should be good to go once make check passes :) fine! Matteo Bernardini From cfergeau at redhat.com Fri Sep 12 12:27:08 2014 From: cfergeau at redhat.com (Christophe Fergeau) Date: Fri, 12 Sep 2014 14:27:08 +0200 Subject: [Libosinfo] [PATCH] Add Slackware metadata In-Reply-To: References: <1410451105-2285-1-git-send-email-matteo.bernardini@gmail.com> <20140911171909.GC9223@edamame.cdg.redhat.com> Message-ID: <20140912122708.GB2475@edamame.cdg.redhat.com> Hi, On Thu, Sep 11, 2014 at 08:10:15PM +0200, Matteo Bernardini wrote: > > i486 does not exist in data/schemas/libosinfo.rng which causes > > test-xml-validate to fail (when running make check). > > You could add the new value there, but I'm not sure how much existing > > code hardcodes the known values already. Slackware binaries are exactly > > i486 binaries ? They won't work on an i386 but an i686 is not required? > > Yes, they are built with "-O2 -march=i486 -mtune=i686", so binaries > actually run fine on i486. > I think there should be no probs either in switching arch to i686 if > it's safer, also because the use cases for virtualizing i486 that I > can think of are very few... if someone complains it also can be > changed again later... > let me know the way you prefer. I'd go with i686 as some client code is already explicitly testing for i386/i686/x86_64. > > All the 64 bit images starting with 13.1 seem to be using Slackware64 > > here. This is good as otherwise libosinfo would not be able to tell the > > difference between a 32 or 64 bit image. > > Yes, my bad: I'll change the xml accordingly... > Just to let you know the logic behind the patch, I added versions from > 13.0-onward as they are the ones still supported (there's no defined > eol_date): what do you think it's better, to start from 13.1 or to add > another field to the xml to let it recognize the arch (a suggestion of > the field to use would be appreciated ;) )? I can't see a field which libosinfo can parse already and which would be different between the 32 and 64 bit images, so I don't think we can make the difference between the 2 images unfortunately :( (maybe we could add support for parsing 'Volume size is: 1914167' which is different). For now I guess you can keep the data as it is, or remove the volume ids for one of the 2 arches. > > > > > I would also add some information about the supported virtio devices, > > but this can be added later. > > Ok, I'll have a look. > To explain, it's just that I was adding libosinfo to slackbuilds.org > (Slackware's third party repository of build scripts) as a dependency > of the newer virt-manager and I tried to do something to let it > support also Slackware itself (with some debugging help from Robby > Workman and Willy Sudiarto Raharjo)... > Then I thought that maybe this stuff could have been useful also upstream... > > Any hint to enhance slackware support is obviously welcome! :) I'd look at the fedora.xml.in file and reuse some of the entries which are in there depending on how recent the kernel in the slackware releases are. But this should work fine even without these devices, adding them may improve performance of the VM, or integration with the client OS. Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: not available URL: From fidencio at redhat.com Wed Sep 17 11:39:14 2014 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 17 Sep 2014 13:39:14 +0200 Subject: [Libosinfo] [PATCH] Add more win8.1 data to DB Message-ID: <1410953954-20983-1-git-send-email-fidencio@redhat.com> Also, replicating an X64 entry to the X86 volume-ids --- data/oses/windows.xml.in | 4 +-- ...n_windows_8_1_n_with_update_x64_dvd_4065114.iso | 29 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in index 285fb28..1ac533d 100644 --- a/data/oses/windows.xml.in +++ b/data/oses/windows.xml.in @@ -989,14 +989,14 @@ - (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE)_ + (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IR1_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE)_ MICROSOFT CORPORATION [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) - (IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE)_ + (IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE|IR3_CCSNA_X64FRE)_ MICROSOFT CORPORATION [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) diff --git a/test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso b/test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso new file mode 100644 index 0000000..2a9baa3 --- /dev/null +++ b/test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: IR3_CCSNA_X64FRE_EN-US_DV9 +Volume set id: IR3_CCSNA_X64FRE_EN-US_DV9 +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.53 (01/01/2005 TM) +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: 1899257 +El Torito VD version 1 found, boot catalog is in sector 22 +NO Joliet present +NO Rock Ridge present +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'Microsoft Corporation' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 8 + Bootoff 86A 2154 -- 1.9.3 From cfergeau at redhat.com Wed Sep 17 11:51:27 2014 From: cfergeau at redhat.com (Christophe Fergeau) Date: Wed, 17 Sep 2014 13:51:27 +0200 Subject: [Libosinfo] [PATCH] Add more win8.1 data to DB In-Reply-To: <1410953954-20983-1-git-send-email-fidencio@redhat.com> References: <1410953954-20983-1-git-send-email-fidencio@redhat.com> Message-ID: <20140917115127.GH29139@edamame.cdg.redhat.com> On Wed, Sep 17, 2014 at 01:39:14PM +0200, Fabiano Fid?ncio wrote: > Also, replicating an X64 entry to the X86 volume-ids This patch adds one X64 entry, but the X86 changes seem to be more than that? You can add the X86 entry similar to the X64 entry you add with this patch, but the other X86 changes would belong in a different one. Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: not available URL: From fidencio at redhat.com Wed Sep 17 12:26:49 2014 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 17 Sep 2014 14:26:49 +0200 Subject: [Libosinfo] [v2: PATCH 1/2] Add more win8.1 data to DB Message-ID: <1410956810-23552-1-git-send-email-fidencio@redhat.com> And replicating the x86_64 entry to the i686 volume-ids --- data/oses/windows.xml.in | 4 +-- ...n_windows_8_1_n_with_update_x64_dvd_4065114.iso | 29 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in index 285fb28..866dacd 100644 --- a/data/oses/windows.xml.in +++ b/data/oses/windows.xml.in @@ -989,14 +989,14 @@ - (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE)_ + (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE)_ MICROSOFT CORPORATION [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) - (IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE)_ + (IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE|IR3_CCSNA_X64FRE)_ MICROSOFT CORPORATION [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) diff --git a/test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso b/test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso new file mode 100644 index 0000000..2a9baa3 --- /dev/null +++ b/test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: IR3_CCSNA_X64FRE_EN-US_DV9 +Volume set id: IR3_CCSNA_X64FRE_EN-US_DV9 +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.53 (01/01/2005 TM) +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: 1899257 +El Torito VD version 1 found, boot catalog is in sector 22 +NO Joliet present +NO Rock Ridge present +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'Microsoft Corporation' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 8 + Bootoff 86A 2154 -- 1.9.3 From fidencio at redhat.com Wed Sep 17 12:26:50 2014 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 17 Sep 2014 14:26:50 +0200 Subject: [Libosinfo] [PATCH 2/2] Add a missing win8.1 i686 entry In-Reply-To: <1410956810-23552-1-git-send-email-fidencio@redhat.com> References: <1410956810-23552-1-git-send-email-fidencio@redhat.com> Message-ID: <1410956810-23552-2-git-send-email-fidencio@redhat.com> Just replicating an x86_64 entry to the i686 volume-ids --- data/oses/windows.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in index 866dacd..1ac533d 100644 --- a/data/oses/windows.xml.in +++ b/data/oses/windows.xml.in @@ -989,7 +989,7 @@ - (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE)_ + (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IR1_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE)_ MICROSOFT CORPORATION [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) -- 1.9.3 From cfergeau at redhat.com Wed Sep 17 12:40:09 2014 From: cfergeau at redhat.com (Christophe Fergeau) Date: Wed, 17 Sep 2014 14:40:09 +0200 Subject: [Libosinfo] [PATCH 2/2] Add a missing win8.1 i686 entry In-Reply-To: <1410956810-23552-2-git-send-email-fidencio@redhat.com> References: <1410956810-23552-1-git-send-email-fidencio@redhat.com> <1410956810-23552-2-git-send-email-fidencio@redhat.com> Message-ID: <20140917124009.GI29139@edamame.cdg.redhat.com> ACK (hopefully there is an ISO for real with this ID ;) On Wed, Sep 17, 2014 at 02:26:50PM +0200, Fabiano Fid?ncio wrote: > Just replicating an x86_64 entry to the i686 volume-ids > --- > data/oses/windows.xml.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in > index 866dacd..1ac533d 100644 > --- a/data/oses/windows.xml.in > +++ b/data/oses/windows.xml.in > @@ -989,7 +989,7 @@ > > > > - (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE)_ > + (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IR1_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE)_ > MICROSOFT CORPORATION > [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) > > -- > 1.9.3 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: not available URL: From cfergeau at redhat.com Wed Sep 17 12:40:14 2014 From: cfergeau at redhat.com (Christophe Fergeau) Date: Wed, 17 Sep 2014 14:40:14 +0200 Subject: [Libosinfo] [v2: PATCH 1/2] Add more win8.1 data to DB In-Reply-To: <1410956810-23552-1-git-send-email-fidencio@redhat.com> References: <1410956810-23552-1-git-send-email-fidencio@redhat.com> Message-ID: <20140917124014.GJ29139@edamame.cdg.redhat.com> ACK On Wed, Sep 17, 2014 at 02:26:49PM +0200, Fabiano Fid?ncio wrote: > And replicating the x86_64 entry to the i686 volume-ids > --- > data/oses/windows.xml.in | 4 +-- > ...n_windows_8_1_n_with_update_x64_dvd_4065114.iso | 29 ++++++++++++++++++++++ > 2 files changed, 31 insertions(+), 2 deletions(-) > create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso > > diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in > index 285fb28..866dacd 100644 > --- a/data/oses/windows.xml.in > +++ b/data/oses/windows.xml.in > @@ -989,14 +989,14 @@ > > > > - (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE)_ > + (IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE)_ > MICROSOFT CORPORATION > [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) > > > > > - (IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE)_ > + (IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE|IR3_CCSNA_X64FRE)_ > MICROSOFT CORPORATION > [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*) > > diff --git a/test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso b/test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso > new file mode 100644 > index 0000000..2a9baa3 > --- /dev/null > +++ b/test/isodata/windows/win8.1/en_windows_8_1_n_with_update_x64_dvd_4065114.iso > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: > +Volume id: IR3_CCSNA_X64FRE_EN-US_DV9 > +Volume set id: IR3_CCSNA_X64FRE_EN-US_DV9 > +Publisher id: MICROSOFT CORPORATION > +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 > +Application id: CDIMAGE 2.53 (01/01/2005 TM) > +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: 1899257 > +El Torito VD version 1 found, boot catalog is in sector 22 > +NO Joliet present > +NO Rock Ridge present > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID 'Microsoft Corporation' > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 8 > + Bootoff 86A 2154 > -- > 1.9.3 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: not available URL: From crobinso at redhat.com Sun Sep 21 22:37:10 2014 From: crobinso at redhat.com (Cole Robinson) Date: Sun, 21 Sep 2014 18:37:10 -0400 Subject: [Libosinfo] [PATCH libosinfo] m4: Update manywarnings from gnulib Message-ID: Fixes these noisy errors on Fedora 21: gcc: warning: switch '-Wmudflap' is no longer supported Signed-off-by: Cole Robinson --- (FYI pushed as trivial, just a simple import) m4/manywarnings.m4 | 213 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 137 insertions(+), 76 deletions(-) diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 index fd0e372..3e6dd21 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -1,5 +1,5 @@ -# manywarnings.m4 serial 3 -dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +# manywarnings.m4 serial 7 +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -35,14 +35,12 @@ AC_DEFUN([gl_MANYWARN_COMPLEMENT], # make sure your gcc understands it. AC_DEFUN([gl_MANYWARN_ALL_GCC], [ - dnl First, check if -Wno-missing-field-initializers is needed. - dnl -Wmissing-field-initializers is implied by -W, but that issues - dnl warnings with GCC version before 4.7, for the common idiom - dnl of initializing types on the stack to zero, using { 0, } + dnl First, check for some issues that only occur when combining multiple + dnl gcc warning categories. AC_REQUIRE([AC_PROG_CC]) if test -n "$GCC"; then - dnl First, check -W -Werror -Wno-missing-field-initializers is supported + dnl Check if -W -Werror -Wno-missing-field-initializers is supported dnl with the current $CC $CFLAGS $CPPFLAGS. AC_MSG_CHECKING([whether -Wno-missing-field-initializers is supported]) AC_CACHE_VAL([gl_cv_cc_nomfi_supported], [ @@ -77,108 +75,171 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], ]) AC_MSG_RESULT([$gl_cv_cc_nomfi_needed]) fi + + dnl Next, check if -Werror -Wuninitialized is useful with the + dnl user's choice of $CFLAGS; some versions of gcc warn that it + dnl has no effect if -O is not also used + AC_MSG_CHECKING([whether -Wuninitialized is supported]) + AC_CACHE_VAL([gl_cv_cc_uninitialized_supported], [ + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -Wuninitialized" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[]], [[]])], + [gl_cv_cc_uninitialized_supported=yes], + [gl_cv_cc_uninitialized_supported=no]) + CFLAGS="$gl_save_CFLAGS"]) + AC_MSG_RESULT([$gl_cv_cc_uninitialized_supported]) + fi + # List all gcc warning categories. + # To compare this list to your installed GCC's, run this Bash command: + # + # comm -3 \ + # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \ + # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort | + # grep -v -x -f <( + # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec)) + gl_manywarn_set= for gl_manywarn_item in \ - -Wall \ -W \ - -Wformat-y2k \ - -Wformat-nonliteral \ - -Wformat-security \ - -Winit-self \ - -Wmissing-include-dirs \ - -Wswitch-default \ - -Wswitch-enum \ - -Wunused \ - -Wunknown-pragmas \ - -Wstrict-aliasing \ - -Wstrict-overflow \ - -Wsystem-headers \ - -Wfloat-equal \ - -Wtraditional \ - -Wtraditional-conversion \ - -Wdeclaration-after-statement \ - -Wundef \ - -Wshadow \ - -Wunsafe-loop-optimizations \ - -Wpointer-arith \ + -Wabi \ + -Waddress \ + -Waggressive-loop-optimizations \ + -Wall \ + -Warray-bounds \ + -Wattributes \ -Wbad-function-cast \ - -Wc++-compat \ - -Wcast-qual \ - -Wcast-align \ - -Wwrite-strings \ - -Wconversion \ - -Wsign-conversion \ - -Wlogical-op \ - -Waggregate-return \ - -Wstrict-prototypes \ - -Wold-style-definition \ - -Wmissing-prototypes \ - -Wmissing-declarations \ - -Wmissing-noreturn \ - -Wmissing-format-attribute \ - -Wpacked \ - -Wpadded \ - -Wredundant-decls \ - -Wnested-externs \ - -Wunreachable-code \ - -Winline \ - -Winvalid-pch \ - -Wlong-long \ - -Wvla \ - -Wvolatile-register-var \ - -Wdisabled-optimization \ - -Wstack-protector \ - -Woverlength-strings \ -Wbuiltin-macro-redefined \ - -Wmudflap \ - -Wpacked-bitfield-compat \ - -Wsync-nand \ - ; do - gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" - done - # The following are not documented in the manual but are included in - # output from gcc --help=warnings. - for gl_manywarn_item in \ - -Wattributes \ + -Wcast-align \ + -Wchar-subscripts \ + -Wclobbered \ + -Wcomment \ + -Wcomments \ -Wcoverage-mismatch \ - -Wmultichar \ - -Wunused-macros \ - ; do - gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" - done - # More warnings from gcc 4.6.2 --help=warnings. - for gl_manywarn_item in \ - -Wabi \ -Wcpp \ + -Wdate-time \ -Wdeprecated \ -Wdeprecated-declarations \ + -Wdisabled-optimization \ -Wdiv-by-zero \ -Wdouble-promotion \ + -Wempty-body \ -Wendif-labels \ + -Wenum-compare \ -Wextra \ -Wformat-contains-nul \ -Wformat-extra-args \ + -Wformat-nonliteral \ + -Wformat-security \ + -Wformat-y2k \ -Wformat-zero-length \ - -Wformat=2 \ + -Wfree-nonheap-object \ + -Wignored-qualifiers \ + -Wimplicit \ + -Wimplicit-function-declaration \ + -Wimplicit-int \ + -Winit-self \ + -Winline \ + -Wint-to-pointer-cast \ + -Winvalid-memory-model \ + -Winvalid-pch \ + -Wjump-misses-init \ + -Wlogical-op \ + -Wmain \ + -Wmaybe-uninitialized \ + -Wmissing-braces \ + -Wmissing-declarations \ + -Wmissing-field-initializers \ + -Wmissing-include-dirs \ + -Wmissing-parameter-type \ + -Wmissing-prototypes \ -Wmultichar \ - -Wnormalized=nfc \ + -Wnarrowing \ + -Wnested-externs \ + -Wnonnull \ + -Wold-style-declaration \ + -Wold-style-definition \ + -Wopenmp-simd \ -Woverflow \ + -Woverlength-strings \ + -Woverride-init \ + -Wpacked \ + -Wpacked-bitfield-compat \ + -Wparentheses \ + -Wpointer-arith \ + -Wpointer-sign \ -Wpointer-to-int-cast \ -Wpragmas \ + -Wreturn-local-addr \ + -Wreturn-type \ + -Wsequence-point \ + -Wshadow \ + -Wsizeof-pointer-memaccess \ + -Wstack-protector \ + -Wstrict-aliasing \ + -Wstrict-overflow \ + -Wstrict-prototypes \ -Wsuggest-attribute=const \ + -Wsuggest-attribute=format \ -Wsuggest-attribute=noreturn \ -Wsuggest-attribute=pure \ + -Wswitch \ + -Wswitch-default \ + -Wsync-nand \ + -Wsystem-headers \ -Wtrampolines \ + -Wtrigraphs \ + -Wtype-limits \ + -Wuninitialized \ + -Wunknown-pragmas \ + -Wunsafe-loop-optimizations \ + -Wunused \ + -Wunused-but-set-parameter \ + -Wunused-but-set-variable \ + -Wunused-function \ + -Wunused-label \ + -Wunused-local-typedefs \ + -Wunused-macros \ + -Wunused-parameter \ + -Wunused-result \ + -Wunused-value \ + -Wunused-variable \ + -Wvarargs \ + -Wvariadic-macros \ + -Wvector-operation-performance \ + -Wvla \ + -Wvolatile-register-var \ + -Wwrite-strings \ + \ ; do gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" done - # Disable the missing-field-initializers warning if needed + # gcc --help=warnings outputs an unusual form for this option; list + # it here so that the above 'comm' command doesn't report a false match. + gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc" + + # These are needed for older GCC versions. + if test -n "$GCC"; then + case `($CC --version) 2>/dev/null` in + 'gcc (GCC) '[[0-3]].* | \ + 'gcc (GCC) '4.[[0-7]].*) + gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option" + gl_manywarn_set="$gl_manywarn_set -funit-at-a-time" + ;; + esac + fi + + # Disable specific options as needed. if test "$gl_cv_cc_nomfi_needed" = yes; then gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers" fi + if test "$gl_cv_cc_uninitialized_supported" = no; then + gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized" + fi + $1=$gl_manywarn_set ]) -- 2.1.0 From crobinso at redhat.com Mon Sep 22 17:02:05 2014 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 22 Sep 2014 13:02:05 -0400 Subject: [Libosinfo] [PATCH libosinfo] gitignore: Ignore build-aux/compile Message-ID: <731fee0551ea88aa702d4383a97b9944fcc638c8.1411405311.git.crobinso@redhat.com> Which appears on f21 Signed-off-by: Cole Robinson --- Pushed as trivial .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4489f79..252b7ed 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ Makefile Makefile.in aclocal.m4 autom4te.cache +build-aux/compile build-aux/config.guess build-aux/config.sub build-aux/depcomp -- 2.1.0 From crobinso at redhat.com Mon Sep 22 17:03:18 2014 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 22 Sep 2014 13:03:18 -0400 Subject: [Libosinfo] [PATCH libosinfo] Add symlink to allow using OSINFO_DATA_DIR=$srcdir Message-ID: <60d2abe3c741be4b8df2ea7a78f787cbcc3c449e.1411405398.git.crobinso@redhat.com> Creates a symlink 'db' pointing to 'data'. Now If I want to test commits to ensure osinfo-detect works, I do: OSINFO_DATA_DIR=`pwd` ./tools/osinfo-detect Signed-off-by: Cole Robinson --- db | 1 + 1 file changed, 1 insertion(+) create mode 120000 db diff --git a/db b/db new file mode 120000 index 0000000..6320cd2 --- /dev/null +++ b/db @@ -0,0 +1 @@ +data \ No newline at end of file -- 2.1.0 From crobinso at redhat.com Mon Sep 22 17:50:51 2014 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 22 Sep 2014 13:50:51 -0400 Subject: [Libosinfo] [PATCH libosinfo] oses: Add Fedora21 Message-ID: <6c6d713927bfe19627fc22ec67a211d6a1a28fc9.1411408246.git.crobinso@redhat.com> This just adds a plain Fedora21 entry. F21 is going to have different versions like 'Workstation' and 'Server' but we don't seem to distinguish for other distros so I just stuck with the pattern here. This currently doesn't work for detecting Workstation media, since their volume IDs are truncated. Bug tracking that: https://bugzilla.redhat.com/show_bug.cgi?id=1145264 Signed-off-by: Cole Robinson --- data/oses/fedora.xml.in | 86 ++++++++++++++++++++++ .../Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt | 29 ++++++++ 2 files changed, 115 insertions(+) create mode 100644 test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in index 27cdd4a..1848a78 100644 --- a/data/oses/fedora.xml.in +++ b/data/oses/fedora.xml.in @@ -1584,4 +1584,90 @@ + + + fedora21 + <_name>Fedora 21 + 21 + <_vendor>Fedora Project + linux + fedora + + + + + + + Fedora.*21.*-i386 + LINUX + + isolinux/vmlinuz + isolinux/initrd.img + + + + + Fedora.*-21.*-x86_64 + LINUX + + isolinux/vmlinuz + isolinux/initrd.img + + + + + + + Fedora-Live-.*-i686-21 + LINUX + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + + + Fedora-Live-.*-x86_64-21 + LINUX + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + + + + Fedora + 21 + i386 + + + + + + Fedora + 21 + x86_64 + + + + + + 1 + 1000000000 + 1073741824 + 10737418240 + + + + + + diff --git a/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt b/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt new file mode 100644 index 0000000..f4e9436 --- /dev/null +++ b/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-S-21_A_T7-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: 979923 +El Torito VD version 1 found, boot catalog is in sector 439 +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 1B8 440 -- 2.1.0 From crobinso at redhat.com Mon Sep 22 17:52:03 2014 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 22 Sep 2014 13:52:03 -0400 Subject: [Libosinfo] [PATCH libosinfo] oses: Add Ubuntu 14.04 LTS Message-ID: <14a586d70e039efff02136354d14567c72c5f549.1411408233.git.crobinso@redhat.com> Signed-off-by: Cole Robinson --- I added the test data before making the volume ID lookup actually work, yet 'make check' still passed... Does the test suite not ensure isodata is mapped to a valid OS? data/oses/ubuntu.xml.in | 67 ++++++++++++++++++++++ .../ubuntu14.04/ubuntu-14.04.1-desktop-i386.iso | 29 ++++++++++ 2 files changed, 96 insertions(+) create mode 100644 test/isodata/ubuntu/ubuntu14.04/ubuntu-14.04.1-desktop-i386.iso diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in index 3a5d248..78e9b2e 100644 --- a/data/oses/ubuntu.xml.in +++ b/data/oses/ubuntu.xml.in @@ -1316,4 +1316,71 @@