On 06/09/2012 12:21 AM, Christophe Fergeau wrote: > This patch hasn't been reviewed after I've reviewed and modified the > initial patch. > I have the same interrogations as the libosinfo build patch > about attribution. > This patch is based on a patch by Wanlong, which I have modified to fix a few > bugs, and I've added the test cases. I reckon it would be more accurate if > I am the author and say in the log it's based on a patch from Wanlong? Yeah, that's fine, thank you. Wanlong Gao > > Christophe > > > On Fri, Jun 01, 2012 at 11:14:10AM +0200, Christophe Fergeau wrote: >> From: Wanlong Gao <gaowanlong@xxxxxxxxxxxxxx> >> >> Add information about Ubuntu 12.04 >> >> Signed-off-by: Wanlong Gao <gaowanlong@xxxxxxxxxxxxxx> >> --- >> data/oses/ubuntu.xml | 61 ++++++++++++++++++++ >> .../ubuntu-12.04-alternate-amd64.iso.txt | 29 ++++++++++ >> .../ubuntu-12.04-alternate-i386.iso.txt | 29 ++++++++++ >> .../ubuntu12.04/ubuntu-12.04-desktop-amd64.iso.txt | 29 ++++++++++ >> .../ubuntu12.04/ubuntu-12.04-desktop-i386.iso.txt | 29 ++++++++++ >> .../ubuntu12.04/ubuntu-12.04-server-amd64.iso.txt | 29 ++++++++++ >> .../ubuntu12.04/ubuntu-12.04-server-i386.iso.txt | 29 ++++++++++ >> 7 files changed, 235 insertions(+) >> create mode 100644 test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-amd64.iso.txt >> create mode 100644 test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-i386.iso.txt >> create mode 100644 test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-amd64.iso.txt >> create mode 100644 test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-i386.iso.txt >> create mode 100644 test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-amd64.iso.txt >> create mode 100644 test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-i386.iso.txt >> >> diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml >> index e4f2e1c..13fea2e 100644 >> --- a/data/oses/ubuntu.xml >> +++ b/data/oses/ubuntu.xml >> @@ -1042,4 +1042,65 @@ >> </media> >> </os> >> >> + <os id="http://ubuntu.com/ubuntu/12.04";> >> + <short-id>ubuntu12.04</short-id> >> + <short-id>ubuntuprecise</short-id> >> + <name>Ubuntu Precise Pangolin LTS</name> >> + <version>12.04</version> >> + <vendor>Canonical Ltd</vendor> >> + <family>linux</family> >> + <distro>ubuntu</distro> >> + <codename>Precise Pangolin</codename> >> + <upgrades id="http://ubuntu.com/ubuntu/11.10"/> >> + <derives-from id="http://ubuntu.com/ubuntu/11.10"/> >> + >> + <release-date>2012-04-26</release-date> >> + >> + <resources arch="all"> >> + <minimum> >> + <cpu>1000000000</cpu> >> + <n-cpus>1</n-cpus> >> + <ram>67108864</ram> >> + <storage>5368709120</storage> >> + </minimum> >> + <recommended> >> + <cpu>1000000000</cpu> >> + <ram>536870912</ram> >> + <storage>5368709120</storage> >> + </recommended> >> + </resources> >> + <media arch="i386"> >> + <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso</url> >> + <iso> >> + <volume-id>Ubuntu-Server 12.04(.\d)? LTS i386</volume-id> >> + </iso> >> + <kernel>casper/vmlinuz</kernel> >> + <initrd>casper/initrd.img</initrd> >> + </media> >> + <media arch="x86_64"> >> + <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url> >> + <iso> >> + <volume-id>Ubuntu-Server 12.04(.\d)? LTS amd64</volume-id> >> + </iso> >> + <kernel>casper/vmlinuz</kernel> >> + <initrd>casper/initrd.img</initrd> >> + </media> >> + <media arch="i386" live="true"> >> + <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url> >> + <iso> >> + <volume-id>Ubuntu 12.04(.\d)? LTS i386</volume-id> >> + </iso> >> + <kernel>casper/vmlinuz</kernel> >> + <initrd>casper/initrd.img</initrd> >> + </media> >> + <media arch="x86_64" live="true"> >> + <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url> >> + <iso> >> + <volume-id>Ubuntu 12.04(.\d)? LTS amd64</volume-id> >> + </iso> >> + <kernel>casper/vmlinuz</kernel> >> + <initrd>casper/initrd.img</initrd> >> + </media> >> + </os> >> + >> </libosinfo> >> diff --git a/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-amd64.iso.txt b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-amd64.iso.txt >> new file mode 100644 >> index 0000000..874f057 >> --- /dev/null >> +++ b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-amd64.iso.txt >> @@ -0,0 +1,29 @@ >> +CD-ROM is in ISO 9660 format >> +System id: >> +Volume id: Ubuntu 12.04 LTS amd64 >> +Volume set id: >> +Publisher id: >> +Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 355990 >> +El Torito VD version 1 found, boot catalog is in sector 4534 >> +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 534B5 341173 >> diff --git a/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-i386.iso.txt b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-i386.iso.txt >> new file mode 100644 >> index 0000000..473dab6 >> --- /dev/null >> +++ b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-alternate-i386.iso.txt >> @@ -0,0 +1,29 @@ >> +CD-ROM is in ISO 9660 format >> +System id: >> +Volume id: Ubuntu 12.04 LTS i386 >> +Volume set id: >> +Publisher id: >> +Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 351894 >> +El Torito VD version 1 found, boot catalog is in sector 4494 >> +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 52B8D 338829 >> diff --git a/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-amd64.iso.txt >> new file mode 100644 >> index 0000000..ec73fbb >> --- /dev/null >> +++ b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-amd64.iso.txt >> @@ -0,0 +1,29 @@ >> +CD-ROM is in ISO 9660 format >> +System id: >> +Volume id: Ubuntu 12.04 LTS amd64 >> +Volume set id: >> +Publisher id: >> +Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 357526 >> +El Torito VD version 1 found, boot catalog is in sector 348 >> +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 56C7A 355450 >> diff --git a/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-i386.iso.txt >> new file mode 100644 >> index 0000000..59c0e2f >> --- /dev/null >> +++ b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-desktop-i386.iso.txt >> @@ -0,0 +1,29 @@ >> +CD-ROM is in ISO 9660 format >> +System id: >> +Volume id: Ubuntu 12.04 LTS i386 >> +Volume set id: >> +Publisher id: >> +Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 359062 >> +El Torito VD version 1 found, boot catalog is in sector 272 >> +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 573B0 357296 >> diff --git a/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-amd64.iso.txt >> new file mode 100644 >> index 0000000..dae81cb >> --- /dev/null >> +++ b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-amd64.iso.txt >> @@ -0,0 +1,29 @@ >> +CD-ROM is in ISO 9660 format >> +System id: >> +Volume id: Ubuntu-Server 12.04 LTS amd64 >> +Volume set id: >> +Publisher id: >> +Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 350358 >> +El Torito VD version 1 found, boot catalog is in sector 3728 >> +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 518B1 334001 >> diff --git a/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-i386.iso.txt b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-i386.iso.txt >> new file mode 100644 >> index 0000000..28b2304 >> --- /dev/null >> +++ b/test/isodata/ubuntu/ubuntu12.04/ubuntu-12.04-server-i386.iso.txt >> @@ -0,0 +1,29 @@ >> +CD-ROM is in ISO 9660 format >> +System id: >> +Volume id: Ubuntu-Server 12.04 LTS i386 >> +Volume set id: >> +Publisher id: >> +Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 344726 >> +El Torito VD version 1 found, boot catalog is in sector 3676 >> +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 50A7B 330363 >> -- >> 1.7.10.2 >> >> _______________________________________________ >> virt-tools-list mailing list >> virt-tools-list@xxxxxxxxxx >> https://www.redhat.com/mailman/listinfo/virt-tools-list >> >> >> _______________________________________________ >> virt-tools-list mailing list >> virt-tools-list@xxxxxxxxxx >> https://www.redhat.com/mailman/listinfo/virt-tools-list
