From b29c83584843a1e4081efa8369c66ded142869eb Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 21 Sep 2014 15:41:51 -0400 Subject: [PATCH] fedora: Add F21 info This is a squash of 4 patches from upstream: ----------- oses: Add Fedora21 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 ----------- fedora: Mark F21 as released F21 was release on Dec 3, 2014. Add release date for F21 and update release status. ----------- schema: Allow variants for install trees Allow install trees to be associated with specific variants of the OS. ----------- fedora: Add/update media & tree info for F21 Fedora now has variants and simply updating the ISO URLs is not a good way forward. This patch adds information about media/tree of each variant seperately. Unfortunately, there is no installer media for Workstation variant and even though Server netiso is actually generic enough to let user install Workstation as well, both netiso and full installer ISO have the exact same volume-id so we can't simply assign netiso a (fake) generic variant and be done with it. :( For more details: https://bugzilla.redhat.com/show_bug.cgi?id=1178787 ----------- Allow tree/media elements in any order Put all child elements for and inside an to allow them to appear in any order --- data/oses/fedora.xml.in | 168 ++++++++++++++++++++- data/schemas/libosinfo.rng | 50 +++--- .../Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt | 29 ++++ 3 files changed, 221 insertions(+), 26 deletions(-) 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..0c01ab9 100644 --- a/data/oses/fedora.xml.in +++ b/data/oses/fedora.xml.in @@ -1533,6 +1533,161 @@ + + fedora21 + <_name>Fedora 21 + 21 + <_vendor>Fedora Project + linux + fedora + + + + 2014-12-03 + + + <_name>Fedora 21 Workstation + + + <_name>Fedora 21 Server + + + <_name>Fedora 21 Cloud + + + + + + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso + + Fedora-Live-WS-i686-21.* + LINUX + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso + + Fedora-Live-WS-x86_64-21.* + LINUX + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso + + Fedora-S.*21.*-i386 + LINUX + + isolinux/vmlinuz + isolinux/initrd.img + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso + + Fedora-S.*-21.*-x86_64 + LINUX + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/ + + Fedora + 21 + i386 + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/ + + + Fedora + 21 + x86_64 + + + + + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso + + Fedora-C.*21.*-i386 + LINUX + + isolinux/vmlinuz + isolinux/initrd.img + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso + + Fedora-C.*-21.*-x86_64 + LINUX + + isolinux/vmlinuz + isolinux/initrd.img + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/os/ + + + Fedora + 21 + i386 + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/os/ + + + Fedora + 21 + x86_64 + + + + + + 1 + 1000000000 + 1073741824 + 10737418240 + + + + + + + + @@ -1543,19 +1698,19 @@ <_vendor>Fedora Project linux fedora - - + + prerelease - Fedora ([2-9][1-9]|[0-9]{3,}).* i386 + Fedora.*-([2-9][1-9]|[0-9]{3,}).*-i386 LINUX - Fedora ([2-9][1-9]|[0-9]{3,}).* x86_64 + Fedora.*-([2-9][1-9]|[0-9]{3,}).*-x86_64 LINUX isolinux/vmlinuz @@ -1584,4 +1739,9 @@ + + + diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng index e693674..1580d9a 100644 --- a/data/schemas/libosinfo.rng +++ b/data/schemas/libosinfo.rng @@ -337,22 +337,22 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -414,16 +414,22 @@ - - - - - - - - + + + + + + + + + + + + + + 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