From: Matteo Bernardini <ponce@xxxxxxxxxxxxxxx> Signed-off-by: Matteo Bernardini <ponce@xxxxxxxxxxxxxxx> Reviewed-by: Robby Workman <rworkman@xxxxxxxxxxxxx> --- 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 @@ +<libosinfo version="0.0.1"> + + <os id="http://mirrors.slackware.com/slackware/slackware-13.0";> + <short-id>slackware13.0</short-id> + <_name>Slackware 13.0</_name> + <version>13.0</version> + <_vendor>Slackware</_vendor> + <family>linux</family> + <distro>slackware</distro> + <release-date>2009-08-26</release-date> + + <media arch="i486"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.0-iso/slackware-13.0-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 13.0 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/hugesmp.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + <media arch="x86_64"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.0-iso/slackware64-13.0-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 13.0 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/huge.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + </os> + + <os id="http://mirrors.slackware.com/slackware/slackware-13.1";> + <short-id>slackware13.1</short-id> + <_name>Slackware 13.1</_name> + <version>13.1</version> + <_vendor>Slackware</_vendor> + <family>linux</family> + <distro>slackware</distro> + <upgrades id="http://mirrors.slackware.com/slackware/slackware-13.0"/> + <derives-from id="http://mirrors.slackware.com/slackware/slackware-13.0"/> + <release-date>2010-05-19</release-date> + + <media arch="i486"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.1-iso/slackware-13.1-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 13.1 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/hugesmp.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + <media arch="x86_64"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.1-iso/slackware64-13.1-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 13.1 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/huge.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + </os> + + <os id="http://mirrors.slackware.com/slackware/slackware-13.37";> + <short-id>slackware13.37</short-id> + <_name>Slackware 13.37</_name> + <version>13.37</version> + <_vendor>Slackware</_vendor> + <family>linux</family> + <distro>slackware</distro> + <upgrades id="http://mirrors.slackware.com/slackware/slackware-13.1"/> + <derives-from id="http://mirrors.slackware.com/slackware/slackware-13.1"/> + <release-date>2011-04-25</release-date> + + <media arch="i486"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.37-iso/slackware-13.37-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 13.37 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/hugesmp.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + <media arch="x86_64"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.37-iso/slackware64-13.37-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 13.37 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/huge.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + </os> + + <os id="http://mirrors.slackware.com/slackware/slackware-14.0";> + <short-id>slackware14.0</short-id> + <_name>Slackware 14.0</_name> + <version>14.0</version> + <_vendor>Slackware</_vendor> + <family>linux</family> + <distro>slackware</distro> + <upgrades id="http://mirrors.slackware.com/slackware/slackware-13.37"/> + <derives-from id="http://mirrors.slackware.com/slackware/slackware-13.37"/> + <release-date>2012-09-26</release-date> + + <media arch="i486"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.0-iso/slackware-14.0-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 14.0 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/hugesmp.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + <media arch="x86_64"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.0-iso/slackware64-14.0-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 14.0 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/huge.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + </os> + + <os id="http://mirrors.slackware.com/slackware/slackware-14.1";> + <short-id>slackware14.1</short-id> + <_name>Slackware 14.1</_name> + <version>14.1</version> + <_vendor>Slackware</_vendor> + <family>linux</family> + <distro>slackware</distro> + <upgrades id="http://mirrors.slackware.com/slackware/slackware-14.0"/> + <derives-from id="http://mirrors.slackware.com/slackware/slackware-14.0"/> + <release-date>2013-11-04</release-date> + + <media arch="i486"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.1-iso/slackware-14.1-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 14.1 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/hugesmp.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + <media arch="x86_64"> + <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.1-iso/slackware64-14.1-install-dvd.iso</url> + <iso> + <volume-id>SlackDVD</volume-id> + <application-id>Slackware 14.1 DVD</application-id> + <publisher-id></publisher-id> + </iso> + <kernel>kernels/huge.s/bzImage</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + </os> + +</libosinfo> 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@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
