On Sun, Mar 15, 2015 at 04:04:54PM +0000, Zeeshan Ali (Khattak) wrote: > Both F19 and F21 has been released. Not only its better to keep test it's > data against released ISOs rather than Alpha ISOs, the volume-size is > obviously different between released and Alpha ISO so if we want to add > volume-size for these ISOs to our database, we need this change to avoid > breaking the tests. If I understand correctly, this means that after this series, some media entries which were detected by libosinfo (Fedora Alphas) will no longer be recognized? Do we want a 'catch-all' entry without specifying a size? Or provide a way to do 'fuzzy' identification where the size would be ignored for ISO detection? "This looks like a Fedora 19 ISO" when the byte size is off by one is much better than "I don't know what ISO this is". Christophe > --- > .../Fedora-19-i386-netinst.iso.txt} | 8 +++--- > ...etinst.iso.txt => Fedora-19-x86_64-DVD.iso.txt} | 8 +++--- > ...o.txt => Fedora-Live-Desktop-i686-19-1.iso.txt} | 4 +-- > ...txt => Fedora-Live-Desktop-x86_64-19-1.iso.txt} | 6 ++--- > .../fedora19/Fedora-Live-KDE-i686-19-1.iso.txt | 29 ++++++++++++++++++++++ > ...iso.txt => Fedora-Live-KDE-x86_64-19-1.iso.txt} | 6 ++--- > ...so.txt => Fedora-Live-LXDE-x86_64-19-1.iso.txt} | 6 ++--- > ...so.txt => Fedora-Live-XFCE-x86_64-19-1.iso.txt} | 6 ++--- > .../Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt | 29 ---------------------- > .../fedora21/Fedora-Server-DVD-i386-21.iso.txt | 29 ++++++++++++++++++++++ > 10 files changed, 80 insertions(+), 51 deletions(-) > rename test/isodata/fedora/{fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt => fedora19/Fedora-19-i386-netinst.iso.txt} (82%) > rename test/isodata/fedora/fedora19/{Fedora-19-Alpha-x86_64-netinst.iso.txt => Fedora-19-x86_64-DVD.iso.txt} (82%) > rename test/isodata/fedora/fedora19/{Fedora-Live-Desktop-i686-19-Alpha-1.iso.txt => Fedora-Live-Desktop-i686-19-1.iso.txt} (92%) > rename test/isodata/fedora/fedora19/{Fedora-Live-LXDE-x86_64-19-Alpha-1.iso.txt => Fedora-Live-Desktop-x86_64-19-1.iso.txt} (89%) > create mode 100644 test/isodata/fedora/fedora19/Fedora-Live-KDE-i686-19-1.iso.txt > rename test/isodata/fedora/fedora19/{Fedora-Live-SoaS-x86_64-19-Alpha-1.iso.txt => Fedora-Live-KDE-x86_64-19-1.iso.txt} (89%) > rename test/isodata/fedora/fedora19/{Fedora-Live-Desktop-x86_64-19-Alpha-1.iso.txt => Fedora-Live-LXDE-x86_64-19-1.iso.txt} (89%) > rename test/isodata/fedora/fedora19/{Fedora-Live-KDE-x86_64-19-Alpha-1.iso.txt => Fedora-Live-XFCE-x86_64-19-1.iso.txt} (89%) > delete mode 100644 test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt > create mode 100644 test/isodata/fedora/fedora21/Fedora-Server-DVD-i386-21.iso.txt > > diff --git a/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt b/test/isodata/fedora/fedora19/Fedora-19-i386-netinst.iso.txt > similarity index 82% > rename from test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt > rename to test/isodata/fedora/fedora19/Fedora-19-i386-netinst.iso.txt > index f4e9436..dab2a8d 100644 > --- a/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt > +++ b/test/isodata/fedora/fedora19/Fedora-19-i386-netinst.iso.txt > @@ -1,6 +1,6 @@ > CD-ROM is in ISO 9660 format > System id: LINUX > -Volume id: Fedora-S-21_A_T7-x86_64 > +Volume id: Fedora 19 i386 > Volume set id: > Publisher id: > Data preparer id: > @@ -11,8 +11,8 @@ Bibliographic File id: > 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 > +Volume size is: 180667 > +El Torito VD version 1 found, boot catalog is in sector 40 > Joliet with UCS level 3 found > Rock Ridge signatures version 1 found > Eltorito validation header: > @@ -26,4 +26,4 @@ Eltorito validation header: > Load segment 0 > Sys type 0 > Nsect 4 > - Bootoff 1B8 440 > + Bootoff 3D14 15636 > diff --git a/test/isodata/fedora/fedora19/Fedora-19-Alpha-x86_64-netinst.iso.txt b/test/isodata/fedora/fedora19/Fedora-19-x86_64-DVD.iso.txt > similarity index 82% > rename from test/isodata/fedora/fedora19/Fedora-19-Alpha-x86_64-netinst.iso.txt > rename to test/isodata/fedora/fedora19/Fedora-19-x86_64-DVD.iso.txt > index f425cf5..3ad2f70 100644 > --- a/test/isodata/fedora/fedora19/Fedora-19-Alpha-x86_64-netinst.iso.txt > +++ b/test/isodata/fedora/fedora19/Fedora-19-x86_64-DVD.iso.txt > @@ -1,6 +1,6 @@ > CD-ROM is in ISO 9660 format > System id: LINUX > -Volume id: Fedora 19-Alpha x86_64 > +Volume id: Fedora 19 x86_64 > Volume set id: > Publisher id: > Data preparer id: > @@ -11,8 +11,8 @@ Bibliographic File id: > Volume set size is: 1 > Volume set sequence number is: 1 > Logical block size is: 2048 > -Volume size is: 159569 > -El Torito VD version 1 found, boot catalog is in sector 46 > +Volume size is: 2170157 > +El Torito VD version 1 found, boot catalog is in sector 659 > Joliet with UCS level 3 found > Rock Ridge signatures version 1 found > Eltorito validation header: > @@ -26,4 +26,4 @@ Eltorito validation header: > Load segment 0 > Sys type 0 > Nsect 4 > - Bootoff 3B86 15238 > + Bootoff 294 660 > diff --git a/test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-1.iso.txt > similarity index 92% > rename from test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-Alpha-1.iso.txt > rename to test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-1.iso.txt > index 8dd33f4..7cf764a 100644 > --- a/test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-Alpha-1.iso.txt > +++ b/test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-1.iso.txt > @@ -1,6 +1,6 @@ > CD-ROM is in ISO 9660 format > System id: LINUX > -Volume id: Fedora-Live-Desktop-i686-19-Alph > +Volume id: Fedora-Live-Desktop-i686-19-1 > Volume set id: > Publisher id: > Data preparer id: > @@ -11,7 +11,7 @@ Bibliographic File id: > Volume set size is: 1 > Volume set sequence number is: 1 > Logical block size is: 2048 > -Volume size is: 492490 > +Volume size is: 470060 > El Torito VD version 1 found, boot catalog is in sector 36 > Joliet with UCS level 3 found > Rock Ridge signatures version 1 found > diff --git a/test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-1.iso.txt > similarity index 89% > rename from test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-Alpha-1.iso.txt > rename to test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-1.iso.txt > index 0f94172..44cb133 100644 > --- a/test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-Alpha-1.iso.txt > +++ b/test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-1.iso.txt > @@ -1,6 +1,6 @@ > CD-ROM is in ISO 9660 format > System id: LINUX > -Volume id: Fedora-Live-LXDE-x86_64-19-Alpha > +Volume id: Fedora-Live-Desktop-x86_64-19-1 > Volume set id: > Publisher id: > Data preparer id: > @@ -11,7 +11,7 @@ Bibliographic File id: > Volume set size is: 1 > Volume set sequence number is: 1 > Logical block size is: 2048 > -Volume size is: 379826 > +Volume size is: 486873 > El Torito VD version 1 found, boot catalog is in sector 42 > Joliet with UCS level 3 found > Rock Ridge signatures version 1 found > @@ -26,4 +26,4 @@ Eltorito validation header: > Load segment 0 > Sys type 0 > Nsect 4 > - Bootoff 9CA 2506 > + Bootoff 9F6 2550 > diff --git a/test/isodata/fedora/fedora19/Fedora-Live-KDE-i686-19-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-KDE-i686-19-1.iso.txt > new file mode 100644 > index 0000000..a24aae1 > --- /dev/null > +++ b/test/isodata/fedora/fedora19/Fedora-Live-KDE-i686-19-1.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: Fedora-Live-KDE-i686-19-1 > +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: 431436 > +El Torito VD version 1 found, boot catalog is in sector 36 > +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 25 37 > diff --git a/test/isodata/fedora/fedora19/Fedora-Live-SoaS-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-1.iso.txt > similarity index 89% > rename from test/isodata/fedora/fedora19/Fedora-Live-SoaS-x86_64-19-Alpha-1.iso.txt > rename to test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-1.iso.txt > index 4d5635d..c1df730 100644 > --- a/test/isodata/fedora/fedora19/Fedora-Live-SoaS-x86_64-19-Alpha-1.iso.txt > +++ b/test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-1.iso.txt > @@ -1,6 +1,6 @@ > CD-ROM is in ISO 9660 format > System id: LINUX > -Volume id: Fedora-Live-SoaS-x86_64-19-Alpha > +Volume id: Fedora-Live-KDE-x86_64-19-1 > Volume set id: > Publisher id: > Data preparer id: > @@ -11,7 +11,7 @@ Bibliographic File id: > Volume set size is: 1 > Volume set sequence number is: 1 > Logical block size is: 2048 > -Volume size is: 333903 > +Volume size is: 449225 > El Torito VD version 1 found, boot catalog is in sector 42 > Joliet with UCS level 3 found > Rock Ridge signatures version 1 found > @@ -26,4 +26,4 @@ Eltorito validation header: > Load segment 0 > Sys type 0 > Nsect 4 > - Bootoff 9CA 2506 > + Bootoff 9F6 2550 > diff --git a/test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-1.iso.txt > similarity index 89% > rename from test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-Alpha-1.iso.txt > rename to test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-1.iso.txt > index 6af34bb..4634ecc 100644 > --- a/test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-Alpha-1.iso.txt > +++ b/test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-1.iso.txt > @@ -1,6 +1,6 @@ > CD-ROM is in ISO 9660 format > System id: LINUX > -Volume id: Fedora-Live-Desktop-x86_64-19-Al > +Volume id: Fedora-Live-LXDE-x86_64-19-1 > Volume set id: > Publisher id: > Data preparer id: > @@ -11,7 +11,7 @@ Bibliographic File id: > Volume set size is: 1 > Volume set sequence number is: 1 > Logical block size is: 2048 > -Volume size is: 510034 > +Volume size is: 353701 > El Torito VD version 1 found, boot catalog is in sector 42 > Joliet with UCS level 3 found > Rock Ridge signatures version 1 found > @@ -26,4 +26,4 @@ Eltorito validation header: > Load segment 0 > Sys type 0 > Nsect 4 > - Bootoff 9CA 2506 > + Bootoff 9F6 2550 > diff --git a/test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-1.iso.txt > similarity index 89% > rename from test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-Alpha-1.iso.txt > rename to test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-1.iso.txt > index 61e9c6b..6874d0d 100644 > --- a/test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-Alpha-1.iso.txt > +++ b/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-1.iso.txt > @@ -1,6 +1,6 @@ > CD-ROM is in ISO 9660 format > System id: LINUX > -Volume id: Fedora-Live-KDE-x86_64-19-Alpha- > +Volume id: Fedora-Live-XFCE-x86_64-19-1 > Volume set id: > Publisher id: > Data preparer id: > @@ -11,7 +11,7 @@ Bibliographic File id: > Volume set size is: 1 > Volume set sequence number is: 1 > Logical block size is: 2048 > -Volume size is: 454492 > +Volume size is: 317471 > El Torito VD version 1 found, boot catalog is in sector 42 > Joliet with UCS level 3 found > Rock Ridge signatures version 1 found > @@ -26,4 +26,4 @@ Eltorito validation header: > Load segment 0 > Sys type 0 > Nsect 4 > - Bootoff 9CA 2506 > + Bootoff 9F6 2550 > diff --git a/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt > deleted file mode 100644 > index 7425d02..0000000 > --- a/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt > +++ /dev/null > @@ -1,29 +0,0 @@ > -CD-ROM is in ISO 9660 format > -System id: LINUX > -Volume id: Fedora-Live-XFCE-x86_64-19-Alpha > -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: 386506 > -El Torito VD version 1 found, boot catalog is in sector 42 > -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 9CA 2506 > diff --git a/test/isodata/fedora/fedora21/Fedora-Server-DVD-i386-21.iso.txt b/test/isodata/fedora/fedora21/Fedora-Server-DVD-i386-21.iso.txt > new file mode 100644 > index 0000000..f1717cc > --- /dev/null > +++ b/test/isodata/fedora/fedora21/Fedora-Server-DVD-i386-21.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: Fedora-S-21-i386 > +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: 1051499 > +El Torito VD version 1 found, boot catalog is in sector 435 > +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 1B4 436 > -- > 2.1.0 > > _______________________________________________ > Libosinfo mailing list > Libosinfo@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/libosinfo
Attachment:
pgpkPTfKp8zlx.pgp
Description: PGP signature
_______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo