Attachment 909078 Details for Bug 1092627 – WIP patch grouping together the data in this bug, and adressing some of the issues which were mentioned

[patch] WIP patch grouping together the data in this bug, and adressing some of the issues which were mentioned

0001-Add-Haiku-OS-data.patch (text/plain), 8.36 KB, created by Christophe Fergeau on 2014-06-16 10:37:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christophe Fergeau

Created: 2014-06-16 10:37:37 UTC

Size: 8.36 KB

patch

obsolete

>From 762b5d4d7d0976e6de5749537e24bc5431c5b9ad Mon Sep 17 00:00:00 2001
>From: Christophe Fergeau <cfergeau@redhat.com>
>Date: Mon, 16 Jun 2014 12:14:05 +0200
>Subject: [PATCH] Add Haiku OS data
>
>All the data was provided by Alexander von Gluck IV
><kallisti5@unixzen.com>
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1092627
>---
> data/oses/Makefile.am                              |  1 +
> data/oses/haiku.xml.in                             | 66 ++++++++++++++++++++++
> .../isodata/haiku/Haiku-r1alpha1-x86-disc1.iso.txt | 29 ++++++++++
> .../isodata/haiku/Haiku-r1alpha2-x86-disc1.iso.txt | 29 ++++++++++
> .../isodata/haiku/Haiku-r1alpha3-x86-disc1.iso.txt | 29 ++++++++++
> .../haikur1a4/Haiku-r1alpha41-x86-disc1.iso.txt    | 29 ++++++++++
> test/test-isodetect.c                              |  7 +++
> 7 files changed, 190 insertions(+)
> create mode 100644 data/oses/haiku.xml.in
> create mode 100644 test/isodata/haiku/Haiku-r1alpha1-x86-disc1.iso.txt
> create mode 100644 test/isodata/haiku/Haiku-r1alpha2-x86-disc1.iso.txt
> create mode 100644 test/isodata/haiku/Haiku-r1alpha3-x86-disc1.iso.txt
> create mode 100644 test/isodata/haiku/haikur1a4/Haiku-r1alpha41-x86-disc1.iso.txt
>
>diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
>index 49c8bab..c4e22d7 100644
>--- a/data/oses/Makefile.am
>+++ b/data/oses/Makefile.am
>@@ -8,6 +8,7 @@ database_in_files = 	\
> 	fedora.xml.in   \
> 	freebsd.xml.in  \
> 	gnome.xml.in	\
>+	haiku.xml.in    \
> 	mageia.xml.in \
> 	mandriva.xml.in \
> 	mandrake.xml.in \
>diff --git a/data/oses/haiku.xml.in b/data/oses/haiku.xml.in
>new file mode 100644
>index 0000000..090ae0c
>--- /dev/null
>+++ b/data/oses/haiku.xml.in
>@@ -0,0 +1,66 @@
>+<libosinfo version="0.0.1">
>+  <os id="http://haiku-os.org/haiku/r1a4">
>+    <short-id>haikur1a4</short-id>
>+    <_name>Haiku R1A4.1</_name>
>+    <version>0.41</version>
>+    <_vendor>Haiku, Inc.</_vendor>
>+    <family>haiku</family>
>+    <distro>haiku</distro>
>+
>+    <devices>
>+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> 
>+    </devices>
>+
>+    <resources arch="all">
>+      <minimum>
>+        <cpu>1000000000</cpu>
>+        <n-cpus>1</n-cpus>
>+        <ram>536870912</ram>
>+        <storage>2147483648</storage>
>+      </minimum>
>+      <recommended>
>+        <cpu>1000000000</cpu>
>+        <ram>1073741824</ram>
>+        <storage>4294967296</storage>
>+      </recommended>
>+    </resources>
>+
>+    <media arch="i586" live="true">
>+      <url>http://sourceforge.net/projects/open-beos/files/releases/r1alpha4.1/haiku-r1alpha4.1-iso.tar.xz/download</url>
>+      <iso>
>+        <volume-id>Haiku R1A4.1 x86_gcc2</volume-id>
>+      </iso>
>+    </media>
>+  </os>
>+
>+  <os id="http://haiku-os.org/haiku/nightly">
>+    <short-id>haikur1</short-id>
>+    <_name>Haiku R1 Nightly</_name>
>+    <version>0.9</version>
>+    <_vendor>Haiku, Inc.</_vendor>
>+    <family>haiku</family>
>+    <distro>haiku</distro>
>+    <upgrades id="http://haiku-os.org/haiku/r1a4"/>
>+    <derives-from id="http://haiku-os.org/haiku/r1a4"/>
>+    <release-status>snapshot</release-status>
>+
>+    <devices>
>+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> 
>+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> 
>+    </devices>
>+
>+    <resources arch="all">
>+      <minimum>
>+        <cpu>1000000000</cpu>
>+        <n-cpus>1</n-cpus>
>+        <ram>536870912</ram>
>+        <storage>2147483648</storage>
>+      </minimum>
>+      <recommended>
>+        <cpu>1000000000</cpu>
>+        <ram>1073741824</ram>
>+        <storage>4294967296</storage>
>+      </recommended>
>+    </resources>
>+  </os>
>+</libosinfo>
>diff --git a/test/isodata/haiku/Haiku-r1alpha1-x86-disc1.iso.txt b/test/isodata/haiku/Haiku-r1alpha1-x86-disc1.iso.txt
>new file mode 100644
>index 0000000..805c497
>--- /dev/null
>+++ b/test/isodata/haiku/Haiku-r1alpha1-x86-disc1.iso.txt
>@@ -0,0 +1,29 @@
>+CD-ROM is in ISO 9660 format
>+System id: FreeBSD
>+Volume id: Haiku
>+Volume set id: 
>+Publisher id: 
>+Data preparer id: 
>+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
>+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: 194485
>+El Torito VD version 1 found, boot catalog is in sector 1607
>+NO Joliet present
>+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 3 (2.88MB Floppy)
>+        Load segment 0
>+        Sys type 0
>+        Nsect 1
>+        Bootoff 648 1608
>diff --git a/test/isodata/haiku/Haiku-r1alpha2-x86-disc1.iso.txt b/test/isodata/haiku/Haiku-r1alpha2-x86-disc1.iso.txt
>new file mode 100644
>index 0000000..853995d
>--- /dev/null
>+++ b/test/isodata/haiku/Haiku-r1alpha2-x86-disc1.iso.txt
>@@ -0,0 +1,29 @@
>+CD-ROM is in ISO 9660 format
>+System id: FreeBSD
>+Volume id: Haiku
>+Volume set id: 
>+Publisher id: 
>+Data preparer id: 
>+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
>+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: 238075
>+El Torito VD version 1 found, boot catalog is in sector 2098
>+NO Joliet present
>+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 3 (2.88MB Floppy)
>+        Load segment 0
>+        Sys type 0
>+        Nsect 1
>+        Bootoff 833 2099
>diff --git a/test/isodata/haiku/Haiku-r1alpha3-x86-disc1.iso.txt b/test/isodata/haiku/Haiku-r1alpha3-x86-disc1.iso.txt
>new file mode 100644
>index 0000000..d859591
>--- /dev/null
>+++ b/test/isodata/haiku/Haiku-r1alpha3-x86-disc1.iso.txt
>@@ -0,0 +1,29 @@
>+CD-ROM is in ISO 9660 format
>+System id: FreeBSD
>+Volume id: Haiku
>+Volume set id: 
>+Publisher id: 
>+Data preparer id: 
>+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
>+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: 287810
>+El Torito VD version 1 found, boot catalog is in sector 2682
>+NO Joliet present
>+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 3 (2.88MB Floppy)
>+        Load segment 0
>+        Sys type 0
>+        Nsect 1
>+        Bootoff A7B 2683
>diff --git a/test/isodata/haiku/haikur1a4/Haiku-r1alpha41-x86-disc1.iso.txt b/test/isodata/haiku/haikur1a4/Haiku-r1alpha41-x86-disc1.iso.txt
>new file mode 100644
>index 0000000..7b77e09
>--- /dev/null
>+++ b/test/isodata/haiku/haikur1a4/Haiku-r1alpha41-x86-disc1.iso.txt
>@@ -0,0 +1,29 @@
>+CD-ROM is in ISO 9660 format
>+System id: FreeBSD
>+Volume id: bootimg
>+Volume set id: 
>+Publisher id: 
>+Data preparer id: 
>+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
>+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: 1624
>+El Torito VD version 1 found, boot catalog is in sector 32
>+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 3 (2.88MB Floppy)
>+        Load segment 0
>+        Sys type 0
>+        Nsect 1
>+        Bootoff 21 33
>diff --git a/test/test-isodetect.c b/test/test-isodetect.c
>index 5bd211a..1dcd79a 100644
>--- a/test/test-isodetect.c
>+++ b/test/test-isodetect.c
>@@ -408,6 +408,12 @@ START_TEST(test_mageia)
> }
> END_TEST
> 
>+START_TEST(test_haiku)
>+{
>+    test_one("haiku");
>+}
>+END_TEST
>+
> static Suite *
> list_suite(void)
> {
>@@ -426,6 +432,7 @@ list_suite(void)
>     tcase_add_test(tc, test_gnome);
>     tcase_add_test(tc, test_altlinux);
>     tcase_add_test(tc, test_mageia);
>+    tcase_add_test(tc, test_haiku);
>     suite_add_tcase(s, tc);
>     return s;
> }
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1092627: 890847 | 909078