And some other misc iso data I have lying around Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx> --- data/os/debian.org/debian-9.xml.in | 55 +++++++++++++++++-- .../debian9/debian-9.3.0-amd64-DVD-1.iso.txt | 29 ++++++++++ .../debian-9.7.0-arm64-netinst.iso.txt | 29 ++++++++++ .../debian9/debian-9.7.0-i386-netinst.iso.txt | 29 ++++++++++ .../debian-9.7.0-ppc64el-DVD-1.iso.txt | 16 ++++++ .../debian-9.7.0-ppc64el-netinst.iso.txt | 16 ++++++ .../debian9/debian-9.7.0-s390x-DVD-1.iso.txt | 16 ++++++ .../debian-9.7.0-s390x-netinst.iso.txt | 16 ++++++ 8 files changed, 202 insertions(+), 4 deletions(-) create mode 100644 tests/isodata/debian/debian9/debian-9.3.0-amd64-DVD-1.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-arm64-netinst.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-i386-netinst.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-ppc64el-DVD-1.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-ppc64el-netinst.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-s390x-DVD-1.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.7.0-s390x-netinst.iso.txt diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in index 7ff402b..9a844f8 100644 --- a/data/os/debian.org/debian-9.xml.in +++ b/data/os/debian.org/debian-9.xml.in @@ -86,13 +86,31 @@ <kernel>install.armhf/vmlinuz</kernel> <initrd>install.armhf/initrd.gz</initrd> </media> + <media arch="ppc64le"> + <variant id="universal-netinst"/> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/ppc64el/iso-cd/debian-9.8.0-ppc64el-netinst.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ ppc64el n</volume-id> + </iso> + <kernel>install/vmlinux</kernel> + <initrd>install/initrd.gz</initrd> + </media> + <media arch="s390x"> + <variant id="universal-netinst"/> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/s390x/iso-cd/debian-9.8.0-s390x-netinst.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ s390x n</volume-id> + </iso> + <kernel>boot/linux_vm</kernel> + <initrd>boot/root.bin</initrd> + </media> <!-- DVD --> <media arch="i686"> <variant id="universal"/> <url>http://cdimage.debian.org/cdimage/release/9.8.0/i386/iso-dvd/debian-9.8.0-i386-DVD-1.iso</url> <iso> - <volume-id>Debian 9.(\d)+.(\d)+ i386 1</volume-id> + <volume-id>Debian 9.(\d)+.(\d)+ i386 (\d)+</volume-id> </iso> <kernel>install.386/vmlinuz</kernel> <initrd>install.386/initrd.gz</initrd> @@ -101,7 +119,7 @@ <variant id="universal"/> <url>http://cdimage.debian.org/cdimage/release/9.8.0/amd64/iso-dvd/debian-9.8.0-amd64-DVD-1.iso</url> <iso> - <volume-id>Debian 9.(\d)+.(\d)+ amd64 1</volume-id> + <volume-id>Debian 9.(\d)+.(\d)+ amd64 (\d)+</volume-id> </iso> <kernel>install.amd/vmlinuz</kernel> <initrd>install.amd/initrd.gz</initrd> @@ -110,7 +128,7 @@ <variant id="universal"/> <url>http://cdimage.debian.org/cdimage/release/9.8.0/arm64/iso-dvd/debian-9.8.0-arm64-DVD-1.iso</url> <iso> - <volume-id>Debian 9.(\d)+.(\d)+ arm64 1</volume-id> + <volume-id>Debian 9.(\d)+.(\d)+ arm64 (\d)+</volume-id> </iso> <kernel>install.arm64/vmlinuz</kernel> <initrd>install.arm64/initrd.gz</initrd> @@ -119,11 +137,30 @@ <variant id="universal"/> <url>http://cdimage.debian.org/cdimage/release/9.8.0/armhf/iso-dvd/debian-9.8.0-armhf-DVD-1.iso</url> <iso> - <volume-id>Debian 9.(\d)+.(\d)+ armhf 1</volume-id> + <volume-id>Debian 9.(\d)+.(\d)+ armhf (\d)+</volume-id> </iso> <kernel>install.armhf/vmlinuz</kernel> <initrd>install.armhf/initrd.gz</initrd> </media> + <media arch="ppc64le"> + <variant id="universal"/> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/ppc64el/iso-dvd/debian-9.8.0-ppc64el-DVD-1.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ ppc64el (\d)+</volume-id> + </iso> + <kernel>install/vmlinux</kernel> + <initrd>install/initrd.gz</initrd> + </media> + <media arch="s390x"> + <variant id="universal"/> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/s390x/iso-dvd/debian-9.8.0-s390x-DVD-1.iso</url> + <iso> + <volume-id>Debian 9.(\d)+.(\d)+ s390x (\d)+</volume-id> + </iso> + <kernel>boot/linux_vm</kernel> + <initrd>boot/root.bin</initrd> + </media> + <tree arch="i686"> <url>http://deb.debian.org/debian/dists/stretch/main/installer-i386</url> @@ -145,6 +182,16 @@ <kernel>current/images/netboot/debian-installer/armhf/linux</kernel> <initrd>current/images/netboot/debian-installer/armhf/initrd.gz</initrd> </tree> + <tree arch="s390x"> + <url>http://deb.debian.org/debian/dists/stretch/main/installer-s390x</url> + <kernel>current/images/generic/kernel.debian</kernel> + <initrd>current/images/generic/initrd.debian</initrd> + </tree> + <tree arch="ppc64le"> + <url>http://deb.debian.org/debian/dists/stretch/main/installer-ppc64el</url> + <kernel>current/images/netboot/debian-installer/ppc64el/vmlinux</kernel> + <initrd>current/images/netboot/debian-installer/ppc64el/initrd.gz</initrd> + </tree> <installer> <script id='http://debian.org/debian/preseed/jeos'/> diff --git a/tests/isodata/debian/debian9/debian-9.3.0-amd64-DVD-1.iso.txt b/tests/isodata/debian/debian9/debian-9.3.0-amd64-DVD-1.iso.txt new file mode 100644 index 0000000..f156675 --- /dev/null +++ b/tests/isodata/debian/debian9/debian-9.3.0-amd64-DVD-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 9.3.0 amd64 1 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6 +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: 1935816 +El Torito VD version 1 found, boot catalog is in sector 5366 +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 15C7 5575 diff --git a/tests/isodata/debian/debian9/debian-9.7.0-arm64-netinst.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-arm64-netinst.iso.txt new file mode 100644 index 0000000..4ab9e77 --- /dev/null +++ b/tests/isodata/debian/debian9/debian-9.7.0-arm64-netinst.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 9.7.0 arm64 n +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6 +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: 103424 +El Torito VD version 1 found, boot catalog is in sector 910 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 239 (Unknown Arch) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 340 + Bootoff 38F 911 diff --git a/tests/isodata/debian/debian9/debian-9.7.0-i386-netinst.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-i386-netinst.iso.txt new file mode 100644 index 0000000..1ee1fe1 --- /dev/null +++ b/tests/isodata/debian/debian9/debian-9.7.0-i386-netinst.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 9.7.0 i386 n +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6 +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: 193536 +El Torito VD version 1 found, boot catalog is in sector 949 +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 44E 1102 diff --git a/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-DVD-1.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-DVD-1.iso.txt new file mode 100644 index 0000000..4bdf26e --- /dev/null +++ b/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-DVD-1.iso.txt @@ -0,0 +1,16 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 9.7.0 ppc64el 1 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6 +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: 2243683 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found diff --git a/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-netinst.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-netinst.iso.txt new file mode 100644 index 0000000..ee3b2dd --- /dev/null +++ b/tests/isodata/debian/debian9/debian-9.7.0-ppc64el-netinst.iso.txt @@ -0,0 +1,16 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 9.7.0 ppc64el n +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6 +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: 105886 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found diff --git a/tests/isodata/debian/debian9/debian-9.7.0-s390x-DVD-1.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-s390x-DVD-1.iso.txt new file mode 100644 index 0000000..c0c69ec --- /dev/null +++ b/tests/isodata/debian/debian9/debian-9.7.0-s390x-DVD-1.iso.txt @@ -0,0 +1,16 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 9.7.0 s390x 1 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6 +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: 2204396 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found diff --git a/tests/isodata/debian/debian9/debian-9.7.0-s390x-netinst.iso.txt b/tests/isodata/debian/debian9/debian-9.7.0-s390x-netinst.iso.txt new file mode 100644 index 0000000..3cbfb52 --- /dev/null +++ b/tests/isodata/debian/debian9/debian-9.7.0-s390x-netinst.iso.txt @@ -0,0 +1,16 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 9.7.0 s390x n +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6 +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: 83145 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found -- 2.21.0 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo