From felipe10borges at gmail.com Fri Feb 2 11:24:43 2018
From: felipe10borges at gmail.com (Felipe Borges)
Date: Fri, 2 Feb 2018 12:24:43 +0100
Subject: [Libosinfo] [PATCH] win-2k16: add Windows Server 2016 data
Message-ID: <20180202112443.4482-1-feborges@redhat.com>
https://docs.microsoft.com/en-us/windows-server/get-started/server-basics
---
data/os/microsoft.com/win-2k16.xml.in | 60 +++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
create mode 100644 data/os/microsoft.com/win-2k16.xml.in
diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in
new file mode 100644
index 0000000..48bf5e3
--- /dev/null
+++ b/data/os/microsoft.com/win-2k16.xml.in
@@ -0,0 +1,60 @@
+
+
+
+ win2k16
+ <_name>Microsoft Windows Server 2016
+ 1709
+ <_vendor>Microsoft Corporation
+ winnt
+ win
+
+
+
+
+ <_name>Windows Server 2016 for HyperV
+
+
+ 2017-10-17
+
+
+
+ (SSS_X64CHK|SSS_X64FRE|SSS_X64FREE)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+
+
+
+
+ ()_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+
+
+
+
+ (SHV_X64CHK|SHV_X64FRE)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+
+
+
+
+ 1400000000
+ 1
+ 536870912
+ 10737418240
+
+
+
+ 2000000000
+ 2147483648
+ 42949672960
+
+
+
+
+
--
2.14.3
From felipeborges at gnome.org Fri Feb 2 11:27:23 2018
From: felipeborges at gnome.org (Felipe Borges)
Date: Fri, 2 Feb 2018 12:27:23 +0100
Subject: [Libosinfo] [PATCH] windows: add win2k16 test data
Message-ID: <20180202112723.4850-1-felipeborges@gnome.org>
---
.../en_windows_server_2016_x64_dvd_9718492.iso.txt | 29 ++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
diff --git a/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt b/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
new file mode 100644
index 0000000..a4e98ce
--- /dev/null
+++ b/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: SSS_X64FRE_EN-US_DV9
+Volume set id: SSS_X64FRE_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.56 (01/01/2005 TM)
+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: 2872706
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 8
+ Bootoff 233 563
--
2.14.3
From felipe10borges at gmail.com Fri Feb 2 15:26:31 2018
From: felipe10borges at gmail.com (Felipe Borges)
Date: Fri, 2 Feb 2018 16:26:31 +0100
Subject: [Libosinfo] [PATCH] freedos: add freedos-1.2
Message-ID: <20180202152631.27277-1-feborges@redhat.com>
http://www.freedos.org
---
data/os/freedos.org/freedos-1.2.xml.in | 53 ++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 data/os/freedos.org/freedos-1.2.xml.in
diff --git a/data/os/freedos.org/freedos-1.2.xml.in b/data/os/freedos.org/freedos-1.2.xml.in
new file mode 100644
index 0000000..c4dee6a
--- /dev/null
+++ b/data/os/freedos.org/freedos-1.2.xml.in
@@ -0,0 +1,53 @@
+
+
+
+ freedos1.2
+ <_name>FreeDOS 1.2
+ 1.2
+ <_vendor>FreeDOS
+ linux
+ freedos
+
+ 2016-12-25
+
+
+ <_name>FreeDOS 1.2 "Standard" Installer
+
+
+ <_name>FreeDOS 1.2 "Legacy" Installer
+
+
+
+
+ http://www.freedos.org/download/download/FD12CD.iso
+
+ FD-SETUP
+ LINUX
+
+
+
+
+
+ http://www.freedos.org/download/download/FD12LGCY.iso
+
+ FDI-CD
+ LINUX
+
+
+
+
+
+ 1
+ 1000000000
+ 33554432
+ 209715200
+
+
+
+ 67108864
+ 419430400
+
+
+
+
--
2.14.3
From felipeborges at gnome.org Fri Feb 2 15:30:41 2018
From: felipeborges at gnome.org (Felipe Borges)
Date: Fri, 2 Feb 2018 16:30:41 +0100
Subject: [Libosinfo] [PATCH] freedos: add freedos 1.2 test data
Message-ID: <20180202153041.27888-1-felipeborges@gnome.org>
---
tests/isodata/freedos/FD12CD.iso.txt | 29 +++++++++++++++++++++++++++++
tests/isodata/freedos/FD12LGCY.iso.txt | 29 +++++++++++++++++++++++++++++
2 files changed, 58 insertions(+)
create mode 100644 tests/isodata/freedos/FD12CD.iso.txt
create mode 100644 tests/isodata/freedos/FD12LGCY.iso.txt
diff --git a/tests/isodata/freedos/FD12CD.iso.txt b/tests/isodata/freedos/FD12CD.iso.txt
new file mode 100644
index 0000000..5205591
--- /dev/null
+++ b/tests/isodata/freedos/FD12CD.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: FD-SETUP
+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: 214247
+El Torito VD version 1 found, boot catalog is in sector 69
+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 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 46 70
diff --git a/tests/isodata/freedos/FD12LGCY.iso.txt b/tests/isodata/freedos/FD12LGCY.iso.txt
new file mode 100644
index 0000000..44ea185
--- /dev/null
+++ b/tests/isodata/freedos/FD12LGCY.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: FDI-CD
+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: 214188
+El Torito VD version 1 found, boot catalog is in sector 68
+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 2 (1.44MB Floppy)
+ Load segment 0
+ Sys type 0
+ Nsect 1
+ Bootoff 45 69
--
2.14.3
From feborges at redhat.com Fri Feb 2 15:30:11 2018
From: feborges at redhat.com (Felipe Borges)
Date: Fri, 2 Feb 2018 16:30:11 +0100
Subject: [Libosinfo] [PATCH] freedos: add freedos-1.2
In-Reply-To: <20180202152631.27277-1-feborges@redhat.com>
References: <20180202152631.27277-1-feborges@redhat.com>
Message-ID:
I'm not sure if projects such as FreeDOS (not-commercial) are in the
scope of libosinfo. If not, please ignore the patches.
On Fri, Feb 2, 2018 at 4:26 PM, Felipe Borges wrote:
> http://www.freedos.org
> ---
> data/os/freedos.org/freedos-1.2.xml.in | 53 ++++++++++++++++++++++++++++++++++
> 1 file changed, 53 insertions(+)
> create mode 100644 data/os/freedos.org/freedos-1.2.xml.in
>
> diff --git a/data/os/freedos.org/freedos-1.2.xml.in b/data/os/freedos.org/freedos-1.2.xml.in
> new file mode 100644
> index 0000000..c4dee6a
> --- /dev/null
> +++ b/data/os/freedos.org/freedos-1.2.xml.in
> @@ -0,0 +1,53 @@
> +
> +
> +
> + freedos1.2
> + <_name>FreeDOS 1.2
> + 1.2
> + <_vendor>FreeDOS
> + linux
> + freedos
> +
> + 2016-12-25
> +
> +
> + <_name>FreeDOS 1.2 "Standard" Installer
> +
> +
> + <_name>FreeDOS 1.2 "Legacy" Installer
> +
> +
> +
> +
> + http://www.freedos.org/download/download/FD12CD.iso
> +
> + FD-SETUP
> + LINUX
> +
> +
> +
> +
> +
> + http://www.freedos.org/download/download/FD12LGCY.iso
> +
> + FDI-CD
> + LINUX
> +
> +
> +
> +
> +
> + 1
> + 1000000000
> + 33554432
> + 209715200
> +
> +
> +
> + 67108864
> + 419430400
> +
> +
> +
> +
> --
> 2.14.3
>
From berrange at redhat.com Fri Feb 2 15:58:41 2018
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 2 Feb 2018 15:58:41 +0000
Subject: [Libosinfo] [PATCH] freedos: add freedos-1.2
In-Reply-To:
References: <20180202152631.27277-1-feborges@redhat.com>
Message-ID: <20180202155841.GO15403@redhat.com>
On Fri, Feb 02, 2018 at 04:30:11PM +0100, Felipe Borges wrote:
> I'm not sure if projects such as FreeDOS (not-commercial) are in the
> scope of libosinfo. If not, please ignore the patches.
If it is an operating system and it is available to a non-trivial
number of people, it is in scope.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From felipe10borges at gmail.com Fri Feb 2 17:31:06 2018
From: felipe10borges at gmail.com (Felipe Borges)
Date: Fri, 2 Feb 2018 18:31:06 +0100
Subject: [Libosinfo] [PATCH] pop_os: add Pop!_OS 17.10 data
Message-ID: <20180202173106.28165-1-feborges@redhat.com>
https://system76.com/pop
Pop!_OS is based on Ubuntu. It follows the Ubuntu version numbers
and release schedule. The first version, 17.10, shipped on October
19th, 2017. There will be a new release every six months.
---
data/os/system76.com/popos-17.10.xml.in | 55 +++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 data/os/system76.com/popos-17.10.xml.in
diff --git a/data/os/system76.com/popos-17.10.xml.in b/data/os/system76.com/popos-17.10.xml.in
new file mode 100644
index 0000000..23c1ade
--- /dev/null
+++ b/data/os/system76.com/popos-17.10.xml.in
@@ -0,0 +1,55 @@
+
+
+
+ popos17.10
+ popos17.10
+ <_name>Pop!_OS 17.10
+ 17.10
+ <_vendor>System76, Inc.
+ linux
+ popos
+
+ 2017-10-19
+
+
+ <_name>Pop!_OS 17.10 (NVIDIA)
+
+
+ <_name>Pop!_OS 17.10 (Intel/AMD)
+
+
+
+
+ 1000000000
+ 1
+ 1073741824
+ 5368709120
+
+
+ 1000000000
+ 1073741824
+ 16106127360
+
+
+
+
+
+ https://d1vhcvzji58n1j.cloudfront.net/pop-os/iso/nvidia/46/pop-os_amd64_nvidia_46.iso
+
+ Pop_OS 17.10 amd64
+
+ install/vmlinuz
+ install/initrd.gz
+
+
+
+ https://d1vhcvzji58n1j.cloudfront.net/pop-os/iso/intel/57/pop-os_amd64_intel_57.iso
+
+ Pop_OS 17.10 amd64
+
+ install/vmlinuz
+ install/initrd.gz
+
+
+
--
2.14.3
From felipeborges at gnome.org Fri Feb 2 17:33:35 2018
From: felipeborges at gnome.org (Felipe Borges)
Date: Fri, 2 Feb 2018 18:33:35 +0100
Subject: [Libosinfo] [PATCH] pop_os: add Pop!_OS test data
Message-ID: <20180202173335.28837-1-felipeborges@gnome.org>
---
tests/isodata/popos/pop-os_amd64_intel_57.iso.txt | 29 ++++++++++++++++++++++
tests/isodata/popos/pop-os_amd64_nvidia_46.iso.txt | 29 ++++++++++++++++++++++
2 files changed, 58 insertions(+)
create mode 100644 tests/isodata/popos/pop-os_amd64_intel_57.iso.txt
create mode 100644 tests/isodata/popos/pop-os_amd64_nvidia_46.iso.txt
diff --git a/tests/isodata/popos/pop-os_amd64_intel_57.iso.txt b/tests/isodata/popos/pop-os_amd64_intel_57.iso.txt
new file mode 100644
index 0000000..d6b434e
--- /dev/null
+++ b/tests/isodata/popos/pop-os_amd64_intel_57.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Pop_OS 17.10 amd64
+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: 922984
+El Torito VD version 1 found, boot catalog is in sector 83
+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 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 5F4 1524
diff --git a/tests/isodata/popos/pop-os_amd64_nvidia_46.iso.txt b/tests/isodata/popos/pop-os_amd64_nvidia_46.iso.txt
new file mode 100644
index 0000000..6a7d3d2
--- /dev/null
+++ b/tests/isodata/popos/pop-os_amd64_nvidia_46.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Pop_OS 17.10 amd64
+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: 1007616
+El Torito VD version 1 found, boot catalog is in sector 83
+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 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 5F4 1524
--
2.14.3
From vchaves at ymail.com Mon Feb 5 00:47:55 2018
From: vchaves at ymail.com (Vicente Chaves de Melo)
Date: Sun, 4 Feb 2018 22:47:55 -0200
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
Message-ID: <2e1d3de4-c91a-13a1-d3bc-321a68984887@ymail.com>
Hello list,
I would like to contribute with the addition of information about NetbSD
6.x and 7.x since the versions currently available are no longer in
support:
--- /dev/null?? 2018-02-02 10:38:42.362719082 -0200
+++ /usr/share/osinfo/os/netbsd.org/netbsd-6.0.xml????? 2018-01-31
13:55:17.624960628 -0200
@@ -0,0 +1,75 @@
+
+
+
+?
+??? netbsd6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? 6.0
+??? NetBSD Project
+??? Projecte NetBSD
+??? NetBSD-Projekt
+??? NetBSD Project
+??? NetBSD Project
+??? NetBSD ??????
+??? Projekt NetBSD
+??? Projeto NetBSD
+??? ?????? NetBSD
+??? netbsd
+??? netbsd
+???
+???
+
+??? 2012-10-13
+
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-amd64.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-i386.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+?
+
--- /dev/null?? 2018-02-02 10:38:42.362719082 -0200
+++ /usr/share/osinfo/os/netbsd.org/netbsd-6.1.xml????? 2018-01-31
13:55:17.628960628 -0200
@@ -0,0 +1,75 @@
+
+
+
+?
+??? netbsd6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? 6.1
+??? NetBSD Project
+??? Projecte NetBSD
+??? NetBSD-Projekt
+??? NetBSD Project
+??? NetBSD Project
+??? NetBSD ??????
+??? Projekt NetBSD
+??? Projeto NetBSD
+??? ?????? NetBSD
+??? netbsd
+??? netbsd
+???
+???
+
+??? 2013-05-13
+
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-amd64.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-i386.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+?
+
--- /dev/null?? 2018-02-02 10:38:42.362719082 -0200
+++ /usr/share/osinfo/os/netbsd.org/netbsd-7.0.xml????? 2018-01-31
13:55:17.628960628 -0200
@@ -0,0 +1,75 @@
+
+
+
+?
+??? netbsd7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? 7.0
+??? NetBSD Project
+??? Projecte NetBSD
+??? NetBSD-Projekt
+??? NetBSD Project
+??? NetBSD Project
+??? NetBSD ??????
+??? Projekt NetBSD
+??? Projeto NetBSD
+??? ?????? NetBSD
+??? netbsd
+??? netbsd
+???
+???
+
+??? 2015-09-25
+
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-amd64.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-i386.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+?
+
--- /dev/null?? 2018-02-02 10:38:42.362719082 -0200
+++ /usr/share/osinfo/os/netbsd.org/netbsd-7.1.xml????? 2018-01-31
13:55:17.628960628 -0200
@@ -0,0 +1,75 @@
+
+
+
+?
+??? netbsd7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? 7.1
+??? NetBSD Project
+??? Projecte NetBSD
+??? NetBSD-Projekt
+??? NetBSD Project
+??? NetBSD Project
+??? NetBSD ??????
+??? Projekt NetBSD
+??? Projeto NetBSD
+??? ?????? NetBSD
+??? netbsd
+??? netbsd
+???
+???
+
+??? 2017-03-11
+
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-amd64.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-i386.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+?
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
From vchaves at ymail.com Tue Feb 6 17:13:59 2018
From: vchaves at ymail.com (Vicente Chaves de Melo)
Date: Tue, 6 Feb 2018 15:13:59 -0200
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
Message-ID: <20180206171359.20019-1-vchaves@ymail.com>
---
data/os/netbsd.org/netbsd-6.0.xml.in | 75 ++++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-6.1.xml.in | 75 ++++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-7.0.xml.in | 75 ++++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-7.1.xml.in | 75 ++++++++++++++++++++++++++++++++++++
4 files changed, 300 insertions(+)
create mode 100644 data/os/netbsd.org/netbsd-6.0.xml.in
create mode 100644 data/os/netbsd.org/netbsd-6.1.xml.in
create mode 100644 data/os/netbsd.org/netbsd-7.0.xml.in
create mode 100644 data/os/netbsd.org/netbsd-7.1.xml.in
diff --git a/data/os/netbsd.org/netbsd-6.0.xml.in b/data/os/netbsd.org/netbsd-6.0.xml.in
new file mode 100644
index 0000000..9897d59
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-6.0.xml.in
@@ -0,0 +1,75 @@
+
+
+
+
+ netbsd6.0
+ NetBSD 6.0
+ NetBSD 6.0
+ NetBSD 6.0
+ NetBSD 6.0
+ NetBSD 6.0
+ NetBSD 6.0
+ NetBSD 6.0
+ NetBSD 6.0
+ NetBSD 6.0
+ 6.0
+ NetBSD Project
+ Projecte NetBSD
+ NetBSD-Projekt
+ NetBSD Project
+ NetBSD Project
+ NetBSD ??????
+ Projekt NetBSD
+ Projeto NetBSD
+ ?????? NetBSD
+ netbsd
+ netbsd
+
+
+
+ 2012-10-13
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-amd64.iso
+
+ NetBSD
+ NETBSD_60
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_60
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_60
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-i386.iso
+
+ NetBSD
+ NETBSD_60
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_60
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_60
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-6.1.xml.in b/data/os/netbsd.org/netbsd-6.1.xml.in
new file mode 100644
index 0000000..e81d12e
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-6.1.xml.in
@@ -0,0 +1,75 @@
+
+
+
+
+ netbsd6.1
+ NetBSD 6.1
+ NetBSD 6.1
+ NetBSD 6.1
+ NetBSD 6.1
+ NetBSD 6.1
+ NetBSD 6.1
+ NetBSD 6.1
+ NetBSD 6.1
+ NetBSD 6.1
+ 6.1
+ NetBSD Project
+ Projecte NetBSD
+ NetBSD-Projekt
+ NetBSD Project
+ NetBSD Project
+ NetBSD ??????
+ Projekt NetBSD
+ Projeto NetBSD
+ ?????? NetBSD
+ netbsd
+ netbsd
+
+
+
+ 2013-05-13
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-amd64.iso
+
+ NetBSD
+ NETBSD_61
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_61
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_61
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-i386.iso
+
+ NetBSD
+ NETBSD_61
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_61
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_61
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-7.0.xml.in b/data/os/netbsd.org/netbsd-7.0.xml.in
new file mode 100644
index 0000000..b4eb414
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.0.xml.in
@@ -0,0 +1,75 @@
+
+
+
+
+ netbsd7.0
+ NetBSD 7.0
+ NetBSD 7.0
+ NetBSD 7.0
+ NetBSD 7.0
+ NetBSD 7.0
+ NetBSD 7.0
+ NetBSD 7.0
+ NetBSD 7.0
+ NetBSD 7.0
+ 7.0
+ NetBSD Project
+ Projecte NetBSD
+ NetBSD-Projekt
+ NetBSD Project
+ NetBSD Project
+ NetBSD ??????
+ Projekt NetBSD
+ Projeto NetBSD
+ ?????? NetBSD
+ netbsd
+ netbsd
+
+
+
+ 2015-09-25
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-amd64.iso
+
+ NetBSD
+ NETBSD_70
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_70
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_70
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-i386.iso
+
+ NetBSD
+ NETBSD_70
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_70
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_70
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-7.1.xml.in b/data/os/netbsd.org/netbsd-7.1.xml.in
new file mode 100644
index 0000000..c03fcfd
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.1.xml.in
@@ -0,0 +1,75 @@
+
+
+
+
+ netbsd7.1
+ NetBSD 7.1
+ NetBSD 7.1
+ NetBSD 7.1
+ NetBSD 7.1
+ NetBSD 7.1
+ NetBSD 7.1
+ NetBSD 7.1
+ NetBSD 7.1
+ NetBSD 7.1
+ 7.1
+ NetBSD Project
+ Projecte NetBSD
+ NetBSD-Projekt
+ NetBSD Project
+ NetBSD Project
+ NetBSD ??????
+ Projekt NetBSD
+ Projeto NetBSD
+ ?????? NetBSD
+ netbsd
+ netbsd
+
+
+
+ 2017-03-11
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-amd64.iso
+
+ NetBSD
+ NETBSD_71
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_71
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_71
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-i386.iso
+
+ NetBSD
+ NETBSD_71
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_71
+
+
+
+ ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_71
+
+
+
+
--
2.13.6
From cfergeau at redhat.com Wed Feb 14 10:09:28 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 14 Feb 2018 11:09:28 +0100
Subject: [Libosinfo] [libosinfo] tests: Remove calls to
g_log_set_always_fatal()
In-Reply-To: <20180115120813.770-1-cfergeau@redhat.com>
References: <20180115120813.770-1-cfergeau@redhat.com>
Message-ID: <20180214100928.GA25895@natto.ory.fergeau.eu>
Ping?
Christophe
On Mon, Jan 15, 2018 at 01:08:13PM +0100, Christophe Fergeau wrote:
> All tests call that method because they want g_warning() to be fatal.
> Since the switch to GTest, this is no longer necessary as this is the
> default behaviour.
>
> Signed-off-by: Christophe Fergeau
> ---
> tests/test-db.c | 3 ---
> tests/test-device.c | 3 ---
> tests/test-devicelist.c | 3 ---
> tests/test-entity.c | 3 ---
> tests/test-filter.c | 3 ---
> tests/test-install-script.c | 3 ---
> tests/test-isodetect.c | 3 ---
> tests/test-list.c | 3 ---
> tests/test-loader.c | 3 ---
> tests/test-mediauris.c | 3 ---
> tests/test-os.c | 3 ---
> tests/test-oslist.c | 3 ---
> tests/test-platform.c | 3 ---
> tests/test-platformlist.c | 3 ---
> tests/test-product.c | 3 ---
> tests/test-productfilter.c | 3 ---
> tests/test-treeuris.c | 3 ---
> 17 files changed, 51 deletions(-)
>
> diff --git a/tests/test-db.c b/tests/test-db.c
> index ac0a529b..553cea2e 100644
> --- a/tests/test-db.c
> +++ b/tests/test-db.c
> @@ -411,9 +411,6 @@ main(int argc, char *argv[])
> g_test_add_func("/db/prop_os", test_prop_os);
> g_test_add_func("/db/rel_os", test_rel_os);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_db_get_type();
> diff --git a/tests/test-device.c b/tests/test-device.c
> index f14eebab..064ccc27 100644
> --- a/tests/test-device.c
> +++ b/tests/test-device.c
> @@ -44,9 +44,6 @@ main(int argc, char *argv[])
>
> g_test_add_func("/device/basic", test_basic);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_device_get_type();
>
> diff --git a/tests/test-devicelist.c b/tests/test-devicelist.c
> index cd697934..0c9e3e85 100644
> --- a/tests/test-devicelist.c
> +++ b/tests/test-devicelist.c
> @@ -213,9 +213,6 @@ main(int argc, char *argv[])
> g_test_add_func("/devicelist/intersect", test_intersect);
> g_test_add_func("/devicelist/filter", test_filter);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_device_get_type();
> osinfo_devicelist_get_type();
> diff --git a/tests/test-entity.c b/tests/test-entity.c
> index 5f7233b8..b89f0b5a 100644
> --- a/tests/test-entity.c
> +++ b/tests/test-entity.c
> @@ -323,9 +323,6 @@ main(int argc, char *argv[])
> g_test_add_func("/entity/multi_props_clear", test_multi_props_clear);
> g_test_add_func("/entity/int64_props", test_int64_props);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_dummy_get_type();
>
> diff --git a/tests/test-filter.c b/tests/test-filter.c
> index 3fbeb3e2..9afbc7fb 100644
> --- a/tests/test-filter.c
> +++ b/tests/test-filter.c
> @@ -161,9 +161,6 @@ main(int argc, char *argv[])
> g_test_add_func("/filter/filter_multi", test_filter_multi);
> g_test_add_func("/filter/filter_combine", test_filter_combine);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_device_get_type();
> osinfo_filter_get_type();
> diff --git a/tests/test-install-script.c b/tests/test-install-script.c
> index fa692a39..bb9e79a5 100644
> --- a/tests/test-install-script.c
> +++ b/tests/test-install-script.c
> @@ -309,9 +309,6 @@ main(int argc, char *argv[])
> g_test_add_func("/install-script/script_data", test_script_data);
> g_test_add_func("/install-script/script_datamap", test_script_datamap);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_db_get_type();
> diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
> index 51137284..1f6e5504 100644
> --- a/tests/test-isodetect.c
> +++ b/tests/test-isodetect.c
> @@ -480,9 +480,6 @@ main(int argc, char *argv[])
> g_test_add_func("/isodetect/sles", test_sles);
> g_test_add_func("/isodetect/sled", test_sled);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_db_get_type();
> diff --git a/tests/test-list.c b/tests/test-list.c
> index df1c9738..2d376198 100644
> --- a/tests/test-list.c
> +++ b/tests/test-list.c
> @@ -403,9 +403,6 @@ main(int argc, char *argv[])
> g_test_add_func("/list/filter", test_filter);
> g_test_add_func("/list/iterate", test_iterate);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_dummy_get_type();
> osinfo_dummy_list_get_type();
> diff --git a/tests/test-loader.c b/tests/test-loader.c
> index 680075d2..984219b7 100644
> --- a/tests/test-loader.c
> +++ b/tests/test-loader.c
> @@ -44,9 +44,6 @@ main(int argc, char *argv[])
>
> g_test_add_func("/loader/basic", test_basic);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_db_get_type();
> diff --git a/tests/test-mediauris.c b/tests/test-mediauris.c
> index a079f465..4bf8ead4 100644
> --- a/tests/test-mediauris.c
> +++ b/tests/test-mediauris.c
> @@ -119,9 +119,6 @@ main(int argc, char *argv[])
>
> g_test_add_func("/mediauris/uris", test_uris);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> if (!g_getenv("LIBOSINFO_NETWORK_TESTS"))
> return 77; /* Skip */
>
> diff --git a/tests/test-os.c b/tests/test-os.c
> index d62117c0..3c1016a0 100644
> --- a/tests/test-os.c
> +++ b/tests/test-os.c
> @@ -200,9 +200,6 @@ main(int argc, char *argv[])
> g_test_add_func("/os/devices_filter", test_devices_filter);
> g_test_add_func("/os/device_driver", test_device_driver);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_platform_get_type();
> osinfo_device_get_type();
> diff --git a/tests/test-oslist.c b/tests/test-oslist.c
> index c85f8225..6e056a6f 100644
> --- a/tests/test-oslist.c
> +++ b/tests/test-oslist.c
> @@ -213,9 +213,6 @@ main(int argc, char *argv[])
> g_test_add_func("/oslist/intersect", test_intersect);
> g_test_add_func("/oslist/filter", test_filter);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_os_get_type();
> osinfo_oslist_get_type();
> diff --git a/tests/test-platform.c b/tests/test-platform.c
> index a5185290..afcb9193 100644
> --- a/tests/test-platform.c
> +++ b/tests/test-platform.c
> @@ -120,9 +120,6 @@ main(int argc, char *argv[])
> g_test_add_func("/platform/devices", test_devices);
> g_test_add_func("/platform/devices_filter", test_devices_filter);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_platform_get_type();
> osinfo_device_get_type();
> diff --git a/tests/test-platformlist.c b/tests/test-platformlist.c
> index f5029111..852c6b78 100644
> --- a/tests/test-platformlist.c
> +++ b/tests/test-platformlist.c
> @@ -213,9 +213,6 @@ main(int argc, char *argv[])
> g_test_add_func("/platformlist/intersect", test_intersect);
> g_test_add_func("/platformlist/filter", test_filter);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_platform_get_type();
> osinfo_platformlist_get_type();
> diff --git a/tests/test-product.c b/tests/test-product.c
> index 8d58f1c3..3703a703 100644
> --- a/tests/test-product.c
> +++ b/tests/test-product.c
> @@ -195,9 +195,6 @@ main(int argc, char *argv[])
> g_test_add_func("/product/relproduct", test_relproduct);
> g_test_add_func("/product/supportdate", test_supportdate);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_platform_get_type();
> osinfo_device_get_type();
> diff --git a/tests/test-productfilter.c b/tests/test-productfilter.c
> index 021e45a6..125bb9ad 100644
> --- a/tests/test-productfilter.c
> +++ b/tests/test-productfilter.c
> @@ -232,9 +232,6 @@ main(int argc, char *argv[])
> g_test_add_func("/productfilter/productfilter_multi", test_productfilter_multi);
> g_test_add_func("/productfilter/productfilter_combine", test_productfilter_combine);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> /* Upfront so we don't confuse valgrind */
> osinfo_entity_get_type();
> osinfo_filter_get_type();
> diff --git a/tests/test-treeuris.c b/tests/test-treeuris.c
> index fad10791..2b37bfb7 100644
> --- a/tests/test-treeuris.c
> +++ b/tests/test-treeuris.c
> @@ -119,9 +119,6 @@ main(int argc, char *argv[])
>
> g_test_add_func("/treeuris/uris", test_uris);
>
> - /* Make sure we catch unexpected g_warning() */
> - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
> -
> if (!g_getenv("LIBOSINFO_NETWORK_TESTS"))
> return 77; /* Skip */
>
> --
> 2.14.3
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Wed Feb 14 10:44:48 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 14 Feb 2018 11:44:48 +0100
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
In-Reply-To: <20180206171359.20019-1-vchaves@ymail.com>
References: <20180206171359.20019-1-vchaves@ymail.com>
Message-ID: <20180214104448.GB25895@natto.ory.fergeau.eu>
Hey Vicente, thanks for the patches!
Could you also provide a patch for libosinfo to add test data for these
ISOs? You can generate them with
"iso_name=./NetBSD-6.0-amd64.iso isoinfo -d -i $iso_name >$iso_name.txt"
On Tue, Feb 06, 2018 at 03:13:59PM -0200, Vicente Chaves de Melo wrote:
> ---
> data/os/netbsd.org/netbsd-6.0.xml.in | 75 ++++++++++++++++++++++++++++++++++++
> data/os/netbsd.org/netbsd-6.1.xml.in | 75 ++++++++++++++++++++++++++++++++++++
> data/os/netbsd.org/netbsd-7.0.xml.in | 75 ++++++++++++++++++++++++++++++++++++
> data/os/netbsd.org/netbsd-7.1.xml.in | 75 ++++++++++++++++++++++++++++++++++++
> 4 files changed, 300 insertions(+)
> create mode 100644 data/os/netbsd.org/netbsd-6.0.xml.in
> create mode 100644 data/os/netbsd.org/netbsd-6.1.xml.in
> create mode 100644 data/os/netbsd.org/netbsd-7.0.xml.in
> create mode 100644 data/os/netbsd.org/netbsd-7.1.xml.in
>
> diff --git a/data/os/netbsd.org/netbsd-6.0.xml.in b/data/os/netbsd.org/netbsd-6.0.xml.in
> new file mode 100644
> index 0000000..9897d59
> --- /dev/null
> +++ b/data/os/netbsd.org/netbsd-6.0.xml.in
> @@ -0,0 +1,75 @@
> +
> +
> +
> +
> + netbsd6.0
> + NetBSD 6.0
> + NetBSD 6.0
> + NetBSD 6.0
> + NetBSD 6.0
> + NetBSD 6.0
> + NetBSD 6.0
> + NetBSD 6.0
> + NetBSD 6.0
> + NetBSD 6.0
The translations do not belong in the .xml.in files, but in the .po
files. They are then merged in the XML data as part of the .xml.in ->
.xml transformation.
> + 6.0
> + NetBSD Project
> + Projecte NetBSD
> + NetBSD-Projekt
> + NetBSD Project
> + NetBSD Project
> + NetBSD ??????
> + Projekt NetBSD
> + Projeto NetBSD
> + ?????? NetBSD
> + netbsd
> + netbsd
> +
> +
> +
> + 2012-10-13
> +
There are stray whitespace here in all 4 files, please remove them.
> +
> + ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-amd64.iso
I'd favour the https:// urls https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-amd64.iso
> +
> + NetBSD
> + NETBSD_60
> +
> +
> +
> + ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot.iso
> +
> + NetBSD
> + NETBSD_60
> +
> +
> +
> + ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot-com.iso
> +
> + NetBSD
> + NETBSD_60
> +
> +
Stray whitespaces at the end of this line too.
What are these boot.iso and boot-com.iso images?
> +
> + ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-i386.iso
> +
> + NetBSD
> + NETBSD_60
> +
> +
> +
> + ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot.iso
> +
> + NetBSD
> + NETBSD_60
> +
> +
Here the system-id/volume-id are the same as for the x86_64 image, which
means libosinfo will be unable to know which arch the iso is. You can
use in order to differentiate between the 2.
> diff --git a/data/os/netbsd.org/netbsd-7.0.xml.in b/data/os/netbsd.org/netbsd-7.0.xml.in
> new file mode 100644
> index 0000000..b4eb414
> --- /dev/null
> +++ b/data/os/netbsd.org/netbsd-7.0.xml.in
> @@ -0,0 +1,75 @@
> +
> +
> +
> +
> + netbsd7.0
> + NetBSD 7.0
> + NetBSD 7.0
> + NetBSD 7.0
> + NetBSD 7.0
> + NetBSD 7.0
> + NetBSD 7.0
> + NetBSD 7.0
> + NetBSD 7.0
> + NetBSD 7.0
> + 7.0
> + NetBSD Project
> + Projecte NetBSD
> + NetBSD-Projekt
> + NetBSD Project
> + NetBSD Project
> + NetBSD ??????
> + Projekt NetBSD
> + Projeto NetBSD
> + ?????? NetBSD
> + netbsd
> + netbsd
> +
> +
6.0, not 6.1?
> diff --git a/data/os/netbsd.org/netbsd-7.1.xml.in b/data/os/netbsd.org/netbsd-7.1.xml.in
> new file mode 100644
> index 0000000..c03fcfd
> --- /dev/null
> +++ b/data/os/netbsd.org/netbsd-7.1.xml.in
> @@ -0,0 +1,75 @@
> +
> +
> +
> +
> + netbsd7.1
> + NetBSD 7.1
> + NetBSD 7.1
> + NetBSD 7.1
> + NetBSD 7.1
> + NetBSD 7.1
> + NetBSD 7.1
> + NetBSD 7.1
> + NetBSD 7.1
> + NetBSD 7.1
> + 7.1
> + NetBSD Project
> + Projecte NetBSD
> + NetBSD-Projekt
> + NetBSD Project
> + NetBSD Project
> + NetBSD ??????
> + Projekt NetBSD
> + Projeto NetBSD
> + ?????? NetBSD
> + netbsd
> + netbsd
> +
> +
Same comment about 6.0 VS 7.0 here. I see there has been a 7.1.1
release, maybe this could be added as well?
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Wed Feb 14 10:52:01 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 14 Feb 2018 11:52:01 +0100
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
In-Reply-To: <20180214104448.GB25895@natto.ory.fergeau.eu>
References: <20180206171359.20019-1-vchaves@ymail.com>
<20180214104448.GB25895@natto.ory.fergeau.eu>
Message-ID: <20180214105201.GC25895@natto.ory.fergeau.eu>
On Wed, Feb 14, 2018 at 11:44:48AM +0100, Christophe Fergeau wrote:
> Hey Vicente, thanks for the patches!
>
> Could you also provide a patch for libosinfo to add test data for these
> ISOs? You can generate them with
> "iso_name=./NetBSD-6.0-amd64.iso isoinfo -d -i $iso_name >$iso_name.txt"
>
> On Tue, Feb 06, 2018 at 03:13:59PM -0200, Vicente Chaves de Melo wrote:
> > ---
> > data/os/netbsd.org/netbsd-6.0.xml.in | 75 ++++++++++++++++++++++++++++++++++++
> > data/os/netbsd.org/netbsd-6.1.xml.in | 75 ++++++++++++++++++++++++++++++++++++
> > data/os/netbsd.org/netbsd-7.0.xml.in | 75 ++++++++++++++++++++++++++++++++++++
> > data/os/netbsd.org/netbsd-7.1.xml.in | 75 ++++++++++++++++++++++++++++++++++++
> > 4 files changed, 300 insertions(+)
> > create mode 100644 data/os/netbsd.org/netbsd-6.0.xml.in
> > create mode 100644 data/os/netbsd.org/netbsd-6.1.xml.in
> > create mode 100644 data/os/netbsd.org/netbsd-7.0.xml.in
> > create mode 100644 data/os/netbsd.org/netbsd-7.1.xml.in
> >
> > diff --git a/data/os/netbsd.org/netbsd-6.0.xml.in b/data/os/netbsd.org/netbsd-6.0.xml.in
> > new file mode 100644
> > index 0000000..9897d59
> > --- /dev/null
> > +++ b/data/os/netbsd.org/netbsd-6.0.xml.in
> > @@ -0,0 +1,75 @@
> > +
> > +
> > +
> > +
> > + netbsd6.0
> > + NetBSD 6.0
> > + NetBSD 6.0
> > + NetBSD 6.0
> > + NetBSD 6.0
> > + NetBSD 6.0
> > + NetBSD 6.0
> > + NetBSD 6.0
> > + NetBSD 6.0
> > + NetBSD 6.0
>
> The translations do not belong in the .xml.in files, but in the .po
> files. They are then merged in the XML data as part of the .xml.in ->
> .xml transformation.
Forgot to mention that you need to annotate the xml tag with a _:
<_name>NetBSD 6.0 to mark it for translation.
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Wed Feb 14 10:57:08 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 14 Feb 2018 11:57:08 +0100
Subject: [Libosinfo] [PATCH] pop_os: add Pop!_OS 17.10 data
In-Reply-To: <20180202173106.28165-1-feborges@redhat.com>
References: <20180202173106.28165-1-feborges@redhat.com>
Message-ID: <20180214105708.GD25895@natto.ory.fergeau.eu>
Hey,
On Fri, Feb 02, 2018 at 06:31:06PM +0100, Felipe Borges wrote:
> https://system76.com/pop
>
> Pop!_OS is based on Ubuntu. It follows the Ubuntu version numbers
> and release schedule. The first version, 17.10, shipped on October
> 19th, 2017. There will be a new release every six months.
> ---
> data/os/system76.com/popos-17.10.xml.in | 55 +++++++++++++++++++++++++++++++++
> 1 file changed, 55 insertions(+)
> create mode 100644 data/os/system76.com/popos-17.10.xml.in
>
> diff --git a/data/os/system76.com/popos-17.10.xml.in b/data/os/system76.com/popos-17.10.xml.in
> new file mode 100644
> index 0000000..23c1ade
> --- /dev/null
> +++ b/data/os/system76.com/popos-17.10.xml.in
> @@ -0,0 +1,55 @@
> +
> +
> +
> + popos17.10
> + popos17.10
Duplicate short id
> + <_name>Pop!_OS 17.10
> + 17.10
> + <_vendor>System76, Inc.
> + linux
> + popos
> +
> + 2017-10-19
> +
> +
> + <_name>Pop!_OS 17.10 (NVIDIA)
> +
> +
> + <_name>Pop!_OS 17.10 (Intel/AMD)
> +
> +
> +
> +
> + 1000000000
> + 1
> + 1073741824
> + 5368709120
> +
> +
> + 1000000000
> + 1073741824
> + 16106127360
> +
> +
> +
> +
> +
> + https://d1vhcvzji58n1j.cloudfront.net/pop-os/iso/nvidia/46/pop-os_amd64_nvidia_46.iso
> +
> + Pop_OS 17.10 amd64
> +
> + install/vmlinuz
> + install/initrd.gz
> +
> +
> +
> + https://d1vhcvzji58n1j.cloudfront.net/pop-os/iso/intel/57/pop-os_amd64_intel_57.iso
> +
> + Pop_OS 17.10 amd64
> +
You'll need to use to make it possible to differentiate
between the intel and nvidia variants.
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Wed Feb 14 11:23:42 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 14 Feb 2018 12:23:42 +0100
Subject: [Libosinfo] [PATCH] freedos: add freedos-1.2
In-Reply-To: <20180202152631.27277-1-feborges@redhat.com>
References: <20180202152631.27277-1-feborges@redhat.com>
Message-ID: <20180214112342.GE25895@natto.ory.fergeau.eu>
Looks good,
Acked-by: Christophe Fergeau
On Fri, Feb 02, 2018 at 04:26:31PM +0100, Felipe Borges wrote:
> http://www.freedos.org
> ---
> data/os/freedos.org/freedos-1.2.xml.in | 53 ++++++++++++++++++++++++++++++++++
> 1 file changed, 53 insertions(+)
> create mode 100644 data/os/freedos.org/freedos-1.2.xml.in
>
> diff --git a/data/os/freedos.org/freedos-1.2.xml.in b/data/os/freedos.org/freedos-1.2.xml.in
> new file mode 100644
> index 0000000..c4dee6a
> --- /dev/null
> +++ b/data/os/freedos.org/freedos-1.2.xml.in
> @@ -0,0 +1,53 @@
> +
> +
> +
> + freedos1.2
> + <_name>FreeDOS 1.2
> + 1.2
> + <_vendor>FreeDOS
> + linux
> + freedos
> +
> + 2016-12-25
> +
> +
> + <_name>FreeDOS 1.2 "Standard" Installer
> +
> +
> + <_name>FreeDOS 1.2 "Legacy" Installer
> +
> +
> +
> +
> + http://www.freedos.org/download/download/FD12CD.iso
> +
> + FD-SETUP
> + LINUX
> +
> +
> +
> +
> +
> + http://www.freedos.org/download/download/FD12LGCY.iso
> +
> + FDI-CD
> + LINUX
> +
> +
> +
> +
> +
> + 1
> + 1000000000
> + 33554432
> + 209715200
> +
> +
> +
> + 67108864
> + 419430400
> +
> +
> +
> +
> --
> 2.14.3
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Wed Feb 14 11:23:51 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 14 Feb 2018 12:23:51 +0100
Subject: [Libosinfo] [PATCH] freedos: add freedos 1.2 test data
In-Reply-To: <20180202153041.27888-1-felipeborges@gnome.org>
References: <20180202153041.27888-1-felipeborges@gnome.org>
Message-ID: <20180214112351.GF25895@natto.ory.fergeau.eu>
Acked-by: Christophe Fergeau
On Fri, Feb 02, 2018 at 04:30:41PM +0100, Felipe Borges wrote:
> ---
> tests/isodata/freedos/FD12CD.iso.txt | 29 +++++++++++++++++++++++++++++
> tests/isodata/freedos/FD12LGCY.iso.txt | 29 +++++++++++++++++++++++++++++
> 2 files changed, 58 insertions(+)
> create mode 100644 tests/isodata/freedos/FD12CD.iso.txt
> create mode 100644 tests/isodata/freedos/FD12LGCY.iso.txt
>
> diff --git a/tests/isodata/freedos/FD12CD.iso.txt b/tests/isodata/freedos/FD12CD.iso.txt
> new file mode 100644
> index 0000000..5205591
> --- /dev/null
> +++ b/tests/isodata/freedos/FD12CD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: FD-SETUP
> +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: 214247
> +El Torito VD version 1 found, boot catalog is in sector 69
> +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 0 (No Emulation Boot)
> + Load segment 0
> + Sys type 0
> + Nsect 4
> + Bootoff 46 70
> diff --git a/tests/isodata/freedos/FD12LGCY.iso.txt b/tests/isodata/freedos/FD12LGCY.iso.txt
> new file mode 100644
> index 0000000..44ea185
> --- /dev/null
> +++ b/tests/isodata/freedos/FD12LGCY.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: FDI-CD
> +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: 214188
> +El Torito VD version 1 found, boot catalog is in sector 68
> +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 2 (1.44MB Floppy)
> + Load segment 0
> + Sys type 0
> + Nsect 1
> + Bootoff 45 69
> --
> 2.14.3
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Wed Feb 14 11:42:56 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 14 Feb 2018 12:42:56 +0100
Subject: [Libosinfo] [PATCH] win-2k16: add Windows Server 2016 data
In-Reply-To: <20180202112443.4482-1-feborges@redhat.com>
References: <20180202112443.4482-1-feborges@redhat.com>
Message-ID: <20180214114256.GG25895@natto.ory.fergeau.eu>
On Fri, Feb 02, 2018 at 12:24:43PM +0100, Felipe Borges wrote:
> https://docs.microsoft.com/en-us/windows-server/get-started/server-basics
> ---
> data/os/microsoft.com/win-2k16.xml.in | 60 +++++++++++++++++++++++++++++++++++
> 1 file changed, 60 insertions(+)
> create mode 100644 data/os/microsoft.com/win-2k16.xml.in
>
> diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in
> new file mode 100644
> index 0000000..48bf5e3
> --- /dev/null
> +++ b/data/os/microsoft.com/win-2k16.xml.in
> @@ -0,0 +1,60 @@
> +
> +
> +
> + win2k16
> + <_name>Microsoft Windows Server 2016
> + 1709
> + <_vendor>Microsoft Corporation
> + winnt
> + win
> +
> +
> +
> +
> + <_name>Windows Server 2016 for HyperV
> +
> +
> + 2017-10-17
> +
> +
> +
> + (SSS_X64CHK|SSS_X64FRE|SSS_X64FREE)_
You'll need to anchor the regexp to the start of the string as there are
win2k12 isos with:
HRM_SSS_X64FREV_EN-US_DV5
> + MICROSOFT CORPORATION
> + [[:upper:][:digit:]]*_([[:upper:]]*)
> +
> +
> +
> +
> +
> + ()_
This looks like this a leftover?
> + MICROSOFT CORPORATION
> + [[:upper:][:digit:]]*_([[:upper:]]*)
> +
> +
> +
> +
> +
> + (SHV_X64CHK|SHV_X64FRE)_
Same comment regarding using ^(SHV...)_ instead.
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Wed Feb 14 11:43:27 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 14 Feb 2018 12:43:27 +0100
Subject: [Libosinfo] [PATCH] windows: add win2k16 test data
In-Reply-To: <20180202112723.4850-1-felipeborges@gnome.org>
References: <20180202112723.4850-1-felipeborges@gnome.org>
Message-ID: <20180214114327.GH25895@natto.ory.fergeau.eu>
Acked-by: Christophe Fergeau
maybe a test file for (SHV_X64CHK|SHV_X64FRE)_ would be nice to have
too?
Christophe
On Fri, Feb 02, 2018 at 12:27:23PM +0100, Felipe Borges wrote:
> ---
> .../en_windows_server_2016_x64_dvd_9718492.iso.txt | 29 ++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
> create mode 100644 tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
>
> diff --git a/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt b/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
> new file mode 100644
> index 0000000..a4e98ce
> --- /dev/null
> +++ b/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id:
> +Volume id: SSS_X64FRE_EN-US_DV9
> +Volume set id: SSS_X64FRE_EN-US_DV9
> +Publisher id: MICROSOFT CORPORATION
> +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
> +Application id: CDIMAGE 2.56 (01/01/2005 TM)
> +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: 2872706
> +El Torito VD version 1 found, boot catalog is in sector 22
> +NO Joliet present
> +NO Rock Ridge present
> +Eltorito validation header:
> + Hid 1
> + Arch 0 (x86)
> + ID 'Microsoft Corporation'
> + Key 55 AA
> + Eltorito defaultboot header:
> + Bootid 88 (bootable)
> + Boot media 0 (No Emulation Boot)
> + Load segment 0
> + Sys type 0
> + Nsect 8
> + Bootoff 233 563
> --
> 2.14.3
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Wed Feb 14 12:33:39 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 14 Feb 2018 13:33:39 +0100
Subject: [Libosinfo] [PATCH] freedos: add freedos 1.2 test data
In-Reply-To: <20180214112351.GF25895@natto.ory.fergeau.eu>
References: <20180202153041.27888-1-felipeborges@gnome.org>
<20180214112351.GF25895@natto.ory.fergeau.eu>
Message-ID: <20180214123339.GI25895@natto.ory.fergeau.eu>
On Wed, Feb 14, 2018 at 12:23:51PM +0100, Christophe Fergeau wrote:
>
> Acked-by: Christophe Fergeau
Actually, this was missing
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index 1f6e5504..56dfb440 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -460,6 +460,12 @@ test_sled(void)
test_one("sled");
}
+static void
+test_freedos(void)
+{
+ test_one("freedos");
+}
+
int
main(int argc, char *argv[])
{
@@ -479,6 +485,7 @@ main(int argc, char *argv[])
g_test_add_func("/isodetect/mageia", test_mageia);
g_test_add_func("/isodetect/sles", test_sles);
g_test_add_func("/isodetect/sled", test_sled);
+ g_test_add_func("/isodetect/freedos", test_freedos);
/* Upfront so we don't confuse valgrind */
osinfo_entity_get_type();
and then the tests were failing because the directory hierarchy should
be tests/isodata/freedos/freedos12.
I've squashed that in your commit and pushed.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Thu Feb 15 09:03:17 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 15 Feb 2018 10:03:17 +0100
Subject: [Libosinfo] [PATCH] opensuse: add OpenSUSE Leap 42.3 test data
In-Reply-To: <20180129140923.9170-1-felipeborges@gnome.org>
References: <20180129140923.9170-1-felipeborges@gnome.org>
Message-ID: <20180215090317.GD25895@natto.ory.fergeau.eu>
Acked-by: Christophe Fergeau
I'll push this shortly
On Mon, Jan 29, 2018 at 03:09:23PM +0100, Felipe Borges wrote:
> ---
> .../openSUSE-Leap-42.3-DVD-x86_64.iso.txt | 29 ++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
> create mode 100644 tests/isodata/opensuse/opensuse42.3/openSUSE-Leap-42.3-DVD-x86_64.iso.txt
>
> diff --git a/tests/isodata/opensuse/opensuse42.3/openSUSE-Leap-42.3-DVD-x86_64.iso.txt b/tests/isodata/opensuse/opensuse42.3/openSUSE-Leap-42.3-DVD-x86_64.iso.txt
> new file mode 100644
> index 0000000..1452a16
> --- /dev/null
> +++ b/tests/isodata/opensuse/opensuse42.3/openSUSE-Leap-42.3-DVD-x86_64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: openSUSE-Leap-42.3-DVD-x86_64033
> +Volume set id:
> +Publisher id: SUSE LINUX GmbH
> +Data preparer id: KIWI - http://opensuse.github.com/kiwi
> +Application id: openSUSE-Leap-42.3-DVD-x86_64-Build0331-Media
> +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: 2265499
> +El Torito VD version 1 found, boot catalog is in sector 20
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> + Hid 1
> + Arch 0 (x86)
> + ID 'SUSE LINUX GmbH'
> + Key 55 AA
> + Eltorito defaultboot header:
> + Bootid 88 (bootable)
> + Boot media 0 (No Emulation Boot)
> + Load segment 0
> + Sys type 0
> + Nsect 4
> + Bootoff 1782 6018
> --
> 2.14.3
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Thu Feb 15 09:03:22 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 15 Feb 2018 10:03:22 +0100
Subject: [Libosinfo] [PATCH] openSUSE: Add OpenSUSE Leap 42.3 info
In-Reply-To: <20180129140425.8295-1-feborges@redhat.com>
References: <20180129140425.8295-1-feborges@redhat.com>
Message-ID: <20180215090322.GE25895@natto.ory.fergeau.eu>
Acked-by: Christophe Fergeau
I'll push this shortly
On Mon, Jan 29, 2018 at 03:04:25PM +0100, Felipe Borges wrote:
> https://software.opensuse.org/distributions/leap
> ---
> data/os/opensuse.org/opensuse-42.3.xml.in | 59 +++++++++++++++++++++++++++++++
> 1 file changed, 59 insertions(+)
> create mode 100644 data/os/opensuse.org/opensuse-42.3.xml.in
>
> diff --git a/data/os/opensuse.org/opensuse-42.3.xml.in b/data/os/opensuse.org/opensuse-42.3.xml.in
> new file mode 100644
> index 0000000..e906eb2
> --- /dev/null
> +++ b/data/os/opensuse.org/opensuse-42.3.xml.in
> @@ -0,0 +1,59 @@
> +
> +
> +
> + opensuse42.3
> + <_name>openSUSE Leap 42.3
> + 42.3
> + <_vendor>openSUSE
> + linux
> + opensuse
> +
> +
> +
> + 2017-07-26
> + 2019-01-31
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> + http://download.opensuse.org/distribution/leap/42.3/iso/openSUSE-Leap-42.3-DVD-x86_64.iso
> +
> + openSUSE-Leap-42.3-DVD-x86_64*
> + LINUX
> + SUSE LINUX GmbH
> +
> + boot/x86_64/loader/linux
> + boot/x86_64/loader/initrd
> +
> +
> +
> +
> +
> +
> +
> +
> +
> + 1600000000
> + 1
> + 1073741824
> + 3221225472
> +
> +
> + 2400000000
> + 2147483648
> + 17179869184
> +
> +
> +
> +
> --
> 2.14.3
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From vchaves at ymail.com Thu Feb 15 19:55:58 2018
From: vchaves at ymail.com (Vicente Chaves de Melo)
Date: Thu, 15 Feb 2018 17:55:58 -0200
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
In-Reply-To: <20180214104448.GB25895@natto.ory.fergeau.eu>
References: <20180206171359.20019-1-vchaves@ymail.com>
<20180214104448.GB25895@natto.ory.fergeau.eu>
Message-ID:
Hi Christophe,
1) About the boot.iso and boot-com.iso:
https://mail-index.netbsd.org/port-i386/2007/09/02/0001.html
"boot.iso is a bootable ISO image, with only the kernel and sysinst
(no binary sets, so you have to install from other source - e.g. network).
boot-com.iso is the same but with console on serial port com0"
2) About NetBSD Releases: https://www.netbsd.org/releases/release-map.html
Essentially the 7.0 version is derived from the 6.0 version, and not the
version 6.1
3) Yes, I can add the information about the version 7.1.1
Best regards
Vicente
From vchaves at ymail.com Thu Feb 15 20:37:17 2018
From: vchaves at ymail.com (Vicente Chaves de Melo)
Date: Thu, 15 Feb 2018 18:37:17 -0200
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
Message-ID: <20180215203717.13568-1-vchaves@ymail.com>
---
data/os/netbsd.org/netbsd-6.0.xml.in | 64 ++++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-6.1.xml.in | 64 ++++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-7.0.xml.in | 64 ++++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-7.1.xml.in | 64 ++++++++++++++++++++++++++++++++++++
4 files changed, 256 insertions(+)
create mode 100644 data/os/netbsd.org/netbsd-6.0.xml.in
create mode 100644 data/os/netbsd.org/netbsd-6.1.xml.in
create mode 100644 data/os/netbsd.org/netbsd-7.0.xml.in
create mode 100644 data/os/netbsd.org/netbsd-7.1.xml.in
diff --git a/data/os/netbsd.org/netbsd-6.0.xml.in b/data/os/netbsd.org/netbsd-6.0.xml.in
new file mode 100644
index 0000000..551d530
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-6.0.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd6.0
+ <_name>NetBSD 6.0
+ 6.0
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2012-10-13
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-amd64.iso
+
+ NetBSD
+ NETBSD_60
+ 346052608
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_60
+ 48918528
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_60
+ 48918528
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-i386.iso
+
+ NetBSD
+ NETBSD_60
+ 328036352
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_60
+ 45004800
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_60
+ 45004800
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-6.1.xml.in b/data/os/netbsd.org/netbsd-6.1.xml.in
new file mode 100644
index 0000000..ded21c9
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-6.1.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd6.1
+ <_name>NetBSD 6.1
+ 6.1
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2013-05-13
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-amd64.iso
+
+ NetBSD
+ NETBSD_61
+ 346933248
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_61
+ 49106944
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_61
+ 49106944
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-i386.iso
+
+ NetBSD
+ NETBSD_61
+ 329007104
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_61
+ 45150208
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_61
+ 45150208
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-7.0.xml.in b/data/os/netbsd.org/netbsd-7.0.xml.in
new file mode 100644
index 0000000..fcbec49
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.0.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd7.0
+ <_name>NetBSD 7.0
+ 7.0
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2015-09-25
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-amd64.iso
+
+ NetBSD
+ NETBSD_70
+ 389777408
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_70
+ 85235712
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_70
+ 85235712
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-i386.iso
+
+ NetBSD
+ NETBSD_70
+ 424353792
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_70
+ 90068992
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_70
+ 90068992
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-7.1.xml.in b/data/os/netbsd.org/netbsd-7.1.xml.in
new file mode 100644
index 0000000..5643333
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.1.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd7.1
+ <_name>NetBSD 7.1
+ 7.1
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2017-03-11
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-amd64.iso
+
+ NetBSD
+ NETBSD_71
+ 391266304
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_71
+ 85389312
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_71
+ 85389312
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-i386.iso
+
+ NetBSD
+ NETBSD_71
+ 426010624
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_71
+ 90245120
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_71
+ 90245120
+
+
+
+
--
2.13.6
From vchaves at ymail.com Thu Feb 15 21:41:36 2018
From: vchaves at ymail.com (Vicente Chaves de Melo)
Date: Thu, 15 Feb 2018 19:41:36 -0200
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 7.1.1 data
Message-ID: <20180215214136.14941-1-vchaves@ymail.com>
---
data/os/netbsd.org/netbsd-7.1.1.xml.in | 64 ++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
create mode 100644 data/os/netbsd.org/netbsd-7.1.1.xml.in
diff --git a/data/os/netbsd.org/netbsd-7.1.1.xml.in b/data/os/netbsd.org/netbsd-7.1.1.xml.in
new file mode 100644
index 0000000..ac633fa
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.1.1.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd7.1.1
+ <_name>NetBSD 7.1.1
+ 7.1.1
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2017-12-22
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/images/NetBSD-7.1.1-amd64.iso
+
+ NetBSD
+ NETBSD_711
+ 393820160
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_711
+ 86233088
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_711
+ 86233088
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/images/NetBSD-7.1.1-i386.iso
+
+ NetBSD
+ NETBSD_711
+ 428029952
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_711
+ 91076608
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_711
+ 91076608
+
+
+
+
--
2.13.6
From vchaves at ymail.com Thu Feb 15 21:45:40 2018
From: vchaves at ymail.com (Vicente Chaves de Melo)
Date: Thu, 15 Feb 2018 19:45:40 -0200
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 7.1.1 tests isodata
Message-ID: <20180215214540.15167-1-vchaves@ymail.com>
---
.../netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt | 33 ++++++++++++++++++++++
.../netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt | 33 ++++++++++++++++++++++
2 files changed, 66 insertions(+)
create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
new file mode 100644
index 0000000..827f7ac
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
@@ -0,0 +1,33 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_711
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 192145
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+
+SUSP signatures version 1 found
+Rock Ridge signatures version 1 found
+Rock Ridge id 'IEEE_P1282'
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Cksum AA 55 OK
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 14 20
diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
new file mode 100644
index 0000000..b4b09a0
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
@@ -0,0 +1,33 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_711
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 208849
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+
+SUSP signatures version 1 found
+Rock Ridge signatures version 1 found
+Rock Ridge id 'IEEE_P1282'
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Cksum AA 55 OK
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 14 20
--
2.13.6
From cfergeau at redhat.com Fri Feb 16 10:31:00 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 16 Feb 2018 11:31:00 +0100
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
In-Reply-To:
References: <20180206171359.20019-1-vchaves@ymail.com>
<20180214104448.GB25895@natto.ory.fergeau.eu>
Message-ID: <20180216103100.GF13299@natto.ory.fergeau.eu>
On Thu, Feb 15, 2018 at 05:55:58PM -0200, Vicente Chaves de Melo wrote:
> 2) About NetBSD Releases: https://www.netbsd.org/releases/release-map.html
> Essentially the 7.0 version is derived from the 6.0 version, and not the
> version 6.1
>
But NetBSD 7.1 should be
, not 6.0 as it is now?
No need to resend a patch if this should be changed, I can do the change
myself before pushing.
> 3) Yes, I can add the information about the version 7.1.1
Thanks!
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Fri Feb 16 10:35:59 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 16 Feb 2018 11:35:59 +0100
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
In-Reply-To: <20180215203717.13568-1-vchaves@ymail.com>
References: <20180215203717.13568-1-vchaves@ymail.com>
Message-ID: <20180216103559.GG13299@natto.ory.fergeau.eu>
Hey,
On Thu, Feb 15, 2018 at 06:37:17PM -0200, Vicente Chaves de Melo wrote:
> ---
> data/os/netbsd.org/netbsd-6.0.xml.in | 64 ++++++++++++++++++++++++++++++++++++
> data/os/netbsd.org/netbsd-6.1.xml.in | 64 ++++++++++++++++++++++++++++++++++++
> data/os/netbsd.org/netbsd-7.0.xml.in | 64 ++++++++++++++++++++++++++++++++++++
> data/os/netbsd.org/netbsd-7.1.xml.in | 64 ++++++++++++++++++++++++++++++++++++
> 4 files changed, 256 insertions(+)
> create mode 100644 data/os/netbsd.org/netbsd-6.0.xml.in
> create mode 100644 data/os/netbsd.org/netbsd-6.1.xml.in
> create mode 100644 data/os/netbsd.org/netbsd-7.0.xml.in
> create mode 100644 data/os/netbsd.org/netbsd-7.1.xml.in
>
> diff --git a/data/os/netbsd.org/netbsd-6.0.xml.in b/data/os/netbsd.org/netbsd-6.0.xml.in
> new file mode 100644
> index 0000000..551d530
> --- /dev/null
> +++ b/data/os/netbsd.org/netbsd-6.0.xml.in
> @@ -0,0 +1,64 @@
> +
> +
> +
> + netbsd6.0
> + <_name>NetBSD 6.0
> + 6.0
> + <_vendor>NetBSD Project
> + netbsd
> + netbsd
> +
> +
> +
> + 2012-10-13
> +
> +
> + https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-amd64.iso
> +
> + NetBSD
> + NETBSD_60
> + 346052608
There is some trick with respect to 'volume-size', here it's set to
the size of the NetBSD-6.0-amd64.iso file in bytes once it's downloaded.
However, libosinfo infers that size from the ISO header, not by checking
the file size. In this case, 'isoinfo -d -i /tmp/NetBSD-6.0-amd64.iso'
gives:
CD-ROM is in ISO 9660 format
...
Logical block size is: 2048
Volume size is: 168821
...
so what should be in 'volume-size' is 2048 * 168821, which is 345745408.
I've fixed this, and all the other volume-size entries, so no action
needed from your side. I'm just waiting for confirmation whether NetBSD
7.1 upgrades 7.0 or 6.0 and I'll push this.
Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From cfergeau at redhat.com Fri Feb 16 10:41:07 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 16 Feb 2018 11:41:07 +0100
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 7.1.1 tests isodata
In-Reply-To: <20180215214540.15167-1-vchaves@ymail.com>
References: <20180215214540.15167-1-vchaves@ymail.com>
Message-ID: <20180216104107.GH13299@natto.ory.fergeau.eu>
This is missing an update to tests/test-isodetect.c to take into account
the new test data (netbsd was not tested so far). I've fixed that, and
added test data for all the 6.x and 7.x versions.
Christophe
On Thu, Feb 15, 2018 at 07:45:40PM -0200, Vicente Chaves de Melo wrote:
> ---
> .../netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt | 33 ++++++++++++++++++++++
> .../netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt | 33 ++++++++++++++++++++++
> 2 files changed, 66 insertions(+)
> create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
> create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
>
> diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
> new file mode 100644
> index 0000000..827f7ac
> --- /dev/null
> +++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
> @@ -0,0 +1,33 @@
> +CD-ROM is in ISO 9660 format
> +System id: NetBSD
> +Volume id: NETBSD_711
> +Volume set id:
> +Publisher id: THE_NETBSD_PROJECT
> +Data preparer id:
> +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: 192145
> +El Torito VD version 1 found, boot catalog is in sector 19
> +NO Joliet present
> +
> +SUSP signatures version 1 found
> +Rock Ridge signatures version 1 found
> +Rock Ridge id 'IEEE_P1282'
> +Eltorito validation header:
> + Hid 1
> + Arch 0 (x86)
> + ID ''
> + Cksum AA 55 OK
> + Key 55 AA
> + Eltorito defaultboot header:
> + Bootid 88 (bootable)
> + Boot media 0 (No Emulation Boot)
> + Load segment 0
> + Sys type 0
> + Nsect 4
> + Bootoff 14 20
> diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
> new file mode 100644
> index 0000000..b4b09a0
> --- /dev/null
> +++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
> @@ -0,0 +1,33 @@
> +CD-ROM is in ISO 9660 format
> +System id: NetBSD
> +Volume id: NETBSD_711
> +Volume set id:
> +Publisher id: THE_NETBSD_PROJECT
> +Data preparer id:
> +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: 208849
> +El Torito VD version 1 found, boot catalog is in sector 19
> +NO Joliet present
> +
> +SUSP signatures version 1 found
> +Rock Ridge signatures version 1 found
> +Rock Ridge id 'IEEE_P1282'
> +Eltorito validation header:
> + Hid 1
> + Arch 0 (x86)
> + ID ''
> + Cksum AA 55 OK
> + Key 55 AA
> + Eltorito defaultboot header:
> + Bootid 88 (bootable)
> + Boot media 0 (No Emulation Boot)
> + Load segment 0
> + Sys type 0
> + Nsect 4
> + Bootoff 14 20
> --
> 2.13.6
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
From vchaves at ymail.com Fri Feb 16 11:33:05 2018
From: vchaves at ymail.com (Vicente Chaves de Melo)
Date: Fri, 16 Feb 2018 09:33:05 -0200
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
In-Reply-To: <20180216103100.GF13299@natto.ory.fergeau.eu>
References: <20180206171359.20019-1-vchaves@ymail.com>
<20180214104448.GB25895@natto.ory.fergeau.eu>
<20180216103100.GF13299@natto.ory.fergeau.eu>
Message-ID:
Hi Christophe,
You are right.
NetBSD 7.1 should be
+
+
Vicente.
?Enviado por Blue ?
Em 16 de fev de 2018 08:31, em 08:31, Christophe Fergeau escreveu:
>On Thu, Feb 15, 2018 at 05:55:58PM -0200, Vicente Chaves de Melo wrote:
>> 2) About NetBSD Releases:
>https://www.netbsd.org/releases/release-map.html
>> Essentially the 7.0 version is derived from the 6.0 version, and not
>the
>> version 6.1
>>
>
>But NetBSD 7.1 should be
>, not 6.0 as it is now?
>No need to resend a patch if this should be changed, I can do the
>change
>myself before pushing.
>
>> 3) Yes, I can add the information about the version 7.1.1
>
>Thanks!
>
>Christophe
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
From cfergeau at redhat.com Mon Feb 19 09:11:43 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 19 Feb 2018 10:11:43 +0100
Subject: [Libosinfo] [osinfo-db] NetBSD: add NetBSD 6.x / 7.x data
In-Reply-To: <20180216103559.GG13299@natto.ory.fergeau.eu>
References: <20180216103559.GG13299@natto.ory.fergeau.eu>
Message-ID: <20180219091143.1689-1-cfergeau@redhat.com>
From: Vicente Chaves de Melo
---
I've now pushed this patch, the are fixed, and I've
adjusted the upgrades/derives relationship for version 7.1
data/os/netbsd.org/netbsd-6.0.xml.in | 64 ++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-6.1.xml.in | 64 ++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-7.0.xml.in | 64 ++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-7.1.1.xml.in | 64 ++++++++++++++++++++++++++++++++++
data/os/netbsd.org/netbsd-7.1.xml.in | 64 ++++++++++++++++++++++++++++++++++
5 files changed, 320 insertions(+)
create mode 100644 data/os/netbsd.org/netbsd-6.0.xml.in
create mode 100644 data/os/netbsd.org/netbsd-6.1.xml.in
create mode 100644 data/os/netbsd.org/netbsd-7.0.xml.in
create mode 100644 data/os/netbsd.org/netbsd-7.1.1.xml.in
create mode 100644 data/os/netbsd.org/netbsd-7.1.xml.in
diff --git a/data/os/netbsd.org/netbsd-6.0.xml.in b/data/os/netbsd.org/netbsd-6.0.xml.in
new file mode 100644
index 0000000..4c12e99
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-6.0.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd6.0
+ <_name>NetBSD 6.0
+ 6.0
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2012-10-13
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-amd64.iso
+
+ NetBSD
+ NETBSD_60
+ 345745408
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_60
+ 48611328
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_60
+ 48611328
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-i386.iso
+
+ NetBSD
+ NETBSD_60
+ 327729152
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_60
+ 44697600
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_60
+ 44697600
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-6.1.xml.in b/data/os/netbsd.org/netbsd-6.1.xml.in
new file mode 100644
index 0000000..1598f98
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-6.1.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd6.1
+ <_name>NetBSD 6.1
+ 6.1
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2013-05-13
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-amd64.iso
+
+ NetBSD
+ NETBSD_61
+ 346626048
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_61
+ 48799744
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_61
+ 48799744
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-i386.iso
+
+ NetBSD
+ NETBSD_61
+ 328699904
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_61
+ 44843008
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_61
+ 44843008
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-7.0.xml.in b/data/os/netbsd.org/netbsd-7.0.xml.in
new file mode 100644
index 0000000..f03b360
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.0.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd7.0
+ <_name>NetBSD 7.0
+ 7.0
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2015-09-25
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-amd64.iso
+
+ NetBSD
+ NETBSD_70
+ 389470208
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_70
+ 84928512
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_70
+ 84928512
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-i386.iso
+
+ NetBSD
+ NETBSD_70
+ 424046592
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_70
+ 89761792
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_70
+ 89761792
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-7.1.1.xml.in b/data/os/netbsd.org/netbsd-7.1.1.xml.in
new file mode 100644
index 0000000..0206357
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.1.1.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd7.1.1
+ <_name>NetBSD 7.1.1
+ 7.1.1
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2017-12-22
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/images/NetBSD-7.1.1-amd64.iso
+
+ NetBSD
+ NETBSD_711
+ 393512960
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_711
+ 85925888
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_711
+ 85925888
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/images/NetBSD-7.1.1-i386.iso
+
+ NetBSD
+ NETBSD_711
+ 427722752
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_711
+ 90769408
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1.1/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_711
+ 90769408
+
+
+
+
diff --git a/data/os/netbsd.org/netbsd-7.1.xml.in b/data/os/netbsd.org/netbsd-7.1.xml.in
new file mode 100644
index 0000000..5cd4833
--- /dev/null
+++ b/data/os/netbsd.org/netbsd-7.1.xml.in
@@ -0,0 +1,64 @@
+
+
+
+ netbsd7.1
+ <_name>NetBSD 7.1
+ 7.1
+ <_vendor>NetBSD Project
+ netbsd
+ netbsd
+
+
+
+ 2017-03-11
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-amd64.iso
+
+ NetBSD
+ NETBSD_71
+ 390959104
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_71
+ 85082112
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_71
+ 85082112
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-i386.iso
+
+ NetBSD
+ NETBSD_71
+ 425703424
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot.iso
+
+ NetBSD
+ NETBSD_71
+ 89937920
+
+
+
+ https://cdn.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot-com.iso
+
+ NetBSD
+ NETBSD_71
+ 89937920
+
+
+
+
--
2.14.3
From cfergeau at redhat.com Mon Feb 19 09:12:10 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 19 Feb 2018 10:12:10 +0100
Subject: [Libosinfo] [libosinfo] test-isodetect: Iterate over all isodata/
subdirs
Message-ID: <20180219091210.2122-1-cfergeau@redhat.com>
When adding support for a new vendor, test-isodetect.c needs to be
updated to list it, which is too easy to forget.
This commit iterates over subdirs in tests/isodata/ and uses these as
the vendors to test for. This means no further modification of
test-isodetect.c is needed when adding a new vendor.
Signed-off-by: Christophe Fergeau
---
tests/test-isodetect.c | 164 ++++++++++++++++---------------------------------
1 file changed, 52 insertions(+), 112 deletions(-)
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index 387bf432..3fb0ed8e 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -308,6 +308,46 @@ static GList *load_isos(const gchar *vendor, GError **error)
return ret;
}
+static GList *load_vendors(GError **error)
+{
+ GFile *dir = g_file_new_for_path(SRCDIR "/tests/isodata");
+ GFileEnumerator *children = g_file_enumerate_children(dir,
+ "standard::*",
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
+ error);
+ GFileInfo *childinfo;
+ GList *ret = NULL;
+
+ if (!children)
+ return NULL;
+
+ while ((childinfo = g_file_enumerator_next_file(children, NULL, error)) != NULL) {
+ if (g_file_info_get_file_type(childinfo) != G_FILE_TYPE_DIRECTORY) {
+ g_object_unref(childinfo);
+ continue;
+ }
+
+ ret = g_list_prepend(ret, g_strdup(g_file_info_get_name(childinfo)));
+
+ g_object_unref(childinfo);
+ }
+
+ if (error && *error)
+ goto error;
+
+ cleanup:
+ g_object_unref(children);
+ g_object_unref(dir);
+
+ return ret;
+
+ error:
+ g_list_free_full(ret, g_free);
+ ret = NULL;
+ goto cleanup;
+}
+
static void test_langs(struct ISOInfo *info)
{
@@ -376,123 +416,23 @@ static void test_one(const gchar *vendor)
g_object_unref(loader);
}
-static void
-test_fedora(void)
-{
- test_one("fedora");
-}
-
-static void
-test_rhel(void)
-{
- test_one("rhel");
-}
-
-static void
-test_ubuntu(void)
-{
- test_one("ubuntu");
-}
-
-static void
-test_debian(void)
-{
- test_one("debian");
-}
-
-static void
-test_windows(void)
-{
- test_one("windows");
-}
-
-static void
-test_freebsd(void)
-{
- test_one("freebsd");
-}
-
-static void
-test_openbsd(void)
-{
- test_one("openbsd");
-}
-
-static void
-test_opensuse(void)
-{
- test_one("opensuse");
-}
-
-static void
-test_centos(void)
-{
- test_one("centos");
-}
-
-static void
-test_gnome(void)
-{
- test_one("gnome");
-}
-
-static void
-test_altlinux(void)
-{
- test_one("altlinux");
-}
-
-static void
-test_mageia(void)
-{
- test_one("mageia");
-}
-
-static void
-test_sles(void)
-{
- test_one("sles");
-}
-
-static void
-test_sled(void)
-{
- test_one("sled");
-}
-
-static void
-test_freedos(void)
-{
- test_one("freedos");
-}
-
-static void
-test_netbsd(void)
-{
- test_one("netbsd");
-}
-
int
main(int argc, char *argv[])
{
g_test_init(&argc, &argv, NULL);
- g_test_add_func("/isodetect/fedora", test_fedora);
- g_test_add_func("/isodetect/rhel", test_rhel);
- g_test_add_func("/isodetect/ubuntu", test_ubuntu);
- g_test_add_func("/isodetect/debian", test_debian);
- g_test_add_func("/isodetect/windows", test_windows);
- g_test_add_func("/isodetect/freebsd", test_freebsd);
- g_test_add_func("/isodetect/openbsd", test_openbsd);
- g_test_add_func("/isodetect/opensuse", test_opensuse);
- g_test_add_func("/isodetect/centos", test_centos);
- g_test_add_func("/isodetect/gnome", test_gnome);
- g_test_add_func("/isodetect/altlinux", test_altlinux);
- g_test_add_func("/isodetect/mageia", test_mageia);
- g_test_add_func("/isodetect/sles", test_sles);
- g_test_add_func("/isodetect/sled", test_sled);
- g_test_add_func("/isodetect/freedos", test_freedos);
- g_test_add_func("/isodetect/netbsd", test_netbsd);
+ GList *vendors = load_vendors(NULL);
+ GList *it;
+ for (it = vendors; it != NULL; it = it->next) {
+ char *vendor = (char *)it->data;
+ char *test_path = g_strdup_printf("/isodetect/%s", vendor);
+
+ g_test_add_data_func_full(test_path, vendor, (GTestDataFunc)test_one, g_free);
+
+ g_free(test_path);
+
+ }
+ g_list_free(vendors);
/* Make sure we catch unexpected g_warning() */
g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
--
2.14.3
From cfergeau at redhat.com Mon Feb 19 09:14:03 2018
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Mon, 19 Feb 2018 10:14:03 +0100
Subject: [Libosinfo] [libosinfo] NetBSD: add NetBSD 6.x and 7.x tests isodata
In-Reply-To: <20180215214540.15167-1-vchaves@ymail.com>
References: <20180215214540.15167-1-vchaves@ymail.com>
Message-ID: <20180219091403.2470-1-cfergeau@redhat.com>
Based on a patch from Vicente Chaves de Melo
---
I've expanded on the 7.1.1 patch sent by Vicente, and pushed this one.
Christophe
.../netbsd6.0/NetBSD-6.0-amd64-boot-com.iso.txt | 16 ++++++++++++
.../netbsd/netbsd6.0/NetBSD-6.0-amd64-boot.iso.txt | 16 ++++++++++++
.../netbsd/netbsd6.0/NetBSD-6.0-amd64.iso.txt | 16 ++++++++++++
.../netbsd6.0/NetBSD-6.0-i386-boot-com.iso.txt | 16 ++++++++++++
.../netbsd/netbsd6.0/NetBSD-6.0-i386-boot.iso.txt | 16 ++++++++++++
.../netbsd/netbsd6.0/NetBSD-6.0-i386.iso.txt | 16 ++++++++++++
.../netbsd6.1/NetBSD-6.1-amd64-boot-com.iso.txt | 16 ++++++++++++
.../netbsd/netbsd6.1/NetBSD-6.1-amd64-boot.iso.txt | 16 ++++++++++++
.../netbsd/netbsd6.1/NetBSD-6.1-amd64.iso.txt | 16 ++++++++++++
.../netbsd6.1/NetBSD-6.1-i386-boot-com.iso.txt | 16 ++++++++++++
.../netbsd/netbsd6.1/NetBSD-6.1-i386-boot.iso.txt | 16 ++++++++++++
.../netbsd/netbsd6.1/NetBSD-6.1-i386.iso.txt | 16 ++++++++++++
.../netbsd7.0/NetBSD-7.0-amd64-boot-com.iso.txt | 16 ++++++++++++
.../netbsd/netbsd7.0/NetBSD-7.0-amd64-boot.iso.txt | 16 ++++++++++++
.../netbsd/netbsd7.0/NetBSD-7.0-amd64.iso.txt | 16 ++++++++++++
.../netbsd7.0/NetBSD-7.0-i386-boot-com.iso.txt | 16 ++++++++++++
.../netbsd/netbsd7.0/NetBSD-7.0-i386-boot.iso.txt | 16 ++++++++++++
.../netbsd/netbsd7.0/NetBSD-7.0-i386.iso.txt | 16 ++++++++++++
.../NetBSD-7.1.1-amd64-boot-com.iso.txt | 16 ++++++++++++
.../netbsd7.1.1/NetBSD-7.1.1-amd64-boot.iso.txt | 16 ++++++++++++
.../netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt | 29 ++++++++++++++++++++++
.../netbsd7.1.1/NetBSD-7.1.1-i386-boot-com.iso.txt | 16 ++++++++++++
.../netbsd7.1.1/NetBSD-7.1.1-i386-boot.iso.txt | 16 ++++++++++++
.../netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt | 16 ++++++++++++
.../netbsd7.1/NetBSD-7.1-amd64-boot-com.iso.txt | 16 ++++++++++++
.../netbsd/netbsd7.1/NetBSD-7.1-amd64-boot.iso.txt | 16 ++++++++++++
.../netbsd/netbsd7.1/NetBSD-7.1-amd64.iso.txt | 16 ++++++++++++
.../netbsd7.1/NetBSD-7.1-i386-boot-com.iso.txt | 16 ++++++++++++
.../netbsd/netbsd7.1/NetBSD-7.1-i386-boot.iso.txt | 29 ++++++++++++++++++++++
.../netbsd/netbsd7.1/NetBSD-7.1-i386.iso.txt | 16 ++++++++++++
tests/test-isodetect.c | 7 ++++++
31 files changed, 513 insertions(+)
create mode 100644 tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot-com.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot.iso.txt
create mode 100644 tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386.iso.txt
diff --git a/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot-com.iso.txt b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot-com.iso.txt
new file mode 100644
index 00000000..6da8b2a4
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_60
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 23736
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot.iso.txt b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot.iso.txt
new file mode 100644
index 00000000..6da8b2a4
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64-boot.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_60
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 23736
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64.iso.txt b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64.iso.txt
new file mode 100644
index 00000000..8c9d8ede
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-amd64.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_60
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 168821
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot-com.iso.txt b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot-com.iso.txt
new file mode 100644
index 00000000..f5ca773b
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_60
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 21825
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot.iso.txt b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot.iso.txt
new file mode 100644
index 00000000..f5ca773b
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386-boot.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_60
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 21825
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386.iso.txt b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386.iso.txt
new file mode 100644
index 00000000..6fec4a7d
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.0/NetBSD-6.0-i386.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_60
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 160024
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot-com.iso.txt b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot-com.iso.txt
new file mode 100644
index 00000000..e7d17674
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_61
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 23828
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot.iso.txt b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot.iso.txt
new file mode 100644
index 00000000..e7d17674
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64-boot.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_61
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 23828
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64.iso.txt b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64.iso.txt
new file mode 100644
index 00000000..1954b96a
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-amd64.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_61
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 169251
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot-com.iso.txt b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot-com.iso.txt
new file mode 100644
index 00000000..f13c5ec7
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_61
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 21896
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot.iso.txt b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot.iso.txt
new file mode 100644
index 00000000..f13c5ec7
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386-boot.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_61
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 21896
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386.iso.txt b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386.iso.txt
new file mode 100644
index 00000000..79284743
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd6.1/NetBSD-6.1-i386.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_61
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 160498
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot-com.iso.txt b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot-com.iso.txt
new file mode 100644
index 00000000..7733bc96
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_70
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 41469
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot.iso.txt b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot.iso.txt
new file mode 100644
index 00000000..7733bc96
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64-boot.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_70
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 41469
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64.iso.txt b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64.iso.txt
new file mode 100644
index 00000000..4aec4ea0
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-amd64.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_70
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 190171
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot-com.iso.txt b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot-com.iso.txt
new file mode 100644
index 00000000..3ee1db11
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_70
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 43829
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot.iso.txt b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot.iso.txt
new file mode 100644
index 00000000..3ee1db11
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386-boot.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_70
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 43829
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386.iso.txt b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386.iso.txt
new file mode 100644
index 00000000..5b85b61d
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.0/NetBSD-7.0-i386.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_70
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 207054
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot-com.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot-com.iso.txt
new file mode 100644
index 00000000..cc7381c8
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_711
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 41956
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot.iso.txt
new file mode 100644
index 00000000..cc7381c8
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64-boot.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_711
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 41956
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
new file mode 100644
index 00000000..e06d7323
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_711
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 192145
+El Torito VD version 1 found, boot catalog is in sector 19
+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 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 14 20
diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot-com.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot-com.iso.txt
new file mode 100644
index 00000000..17e87fa9
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_711
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 44321
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot.iso.txt
new file mode 100644
index 00000000..17e87fa9
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386-boot.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_711
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 44321
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
new file mode 100644
index 00000000..f9b81231
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1.1/NetBSD-7.1.1-i386.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_711
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 208849
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot-com.iso.txt b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot-com.iso.txt
new file mode 100644
index 00000000..a18c11ed
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_71
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 41544
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot.iso.txt b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot.iso.txt
new file mode 100644
index 00000000..a18c11ed
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64-boot.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_71
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 41544
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64.iso.txt b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64.iso.txt
new file mode 100644
index 00000000..a5d00a2b
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-amd64.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_71
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 190898
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot-com.iso.txt b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot-com.iso.txt
new file mode 100644
index 00000000..ab29d549
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot-com.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_71
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 43915
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot.iso.txt b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot.iso.txt
new file mode 100644
index 00000000..797cbcd6
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386-boot.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_71
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 43915
+El Torito VD version 1 found, boot catalog is in sector 19
+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 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 14 20
diff --git a/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386.iso.txt b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386.iso.txt
new file mode 100644
index 00000000..e4e582b1
--- /dev/null
+++ b/tests/isodata/netbsd/netbsd7.1/NetBSD-7.1-i386.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: NetBSD
+Volume id: NETBSD_71
+Volume set id:
+Publisher id: THE_NETBSD_PROJECT
+Data preparer id:
+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: 207863
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index b5368325..387bf432 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -466,6 +466,12 @@ test_freedos(void)
test_one("freedos");
}
+static void
+test_netbsd(void)
+{
+ test_one("netbsd");
+}
+
int
main(int argc, char *argv[])
{
@@ -486,6 +492,7 @@ main(int argc, char *argv[])
g_test_add_func("/isodetect/sles", test_sles);
g_test_add_func("/isodetect/sled", test_sled);
g_test_add_func("/isodetect/freedos", test_freedos);
+ g_test_add_func("/isodetect/netbsd", test_netbsd);
/* Make sure we catch unexpected g_warning() */
g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
--
2.14.3
From berrange at redhat.com Mon Feb 19 13:06:13 2018
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 19 Feb 2018 13:06:13 +0000
Subject: [Libosinfo] [libosinfo] test-isodetect: Iterate over all
isodata/ subdirs
In-Reply-To: <20180219091210.2122-1-cfergeau@redhat.com>
References: <20180219091210.2122-1-cfergeau@redhat.com>
Message-ID: <20180219130613.GN11516@redhat.com>
On Mon, Feb 19, 2018 at 10:12:10AM +0100, Christophe Fergeau wrote:
> When adding support for a new vendor, test-isodetect.c needs to be
> updated to list it, which is too easy to forget.
> This commit iterates over subdirs in tests/isodata/ and uses these as
> the vendors to test for. This means no further modification of
> test-isodetect.c is needed when adding a new vendor.
>
> Signed-off-by: Christophe Fergeau
> ---
> tests/test-isodetect.c | 164 ++++++++++++++++---------------------------------
> 1 file changed, 52 insertions(+), 112 deletions(-)
Reviewed-by: Daniel P. Berrang?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From felipe10borges at gmail.com Wed Feb 21 09:47:12 2018
From: felipe10borges at gmail.com (Felipe Borges)
Date: Wed, 21 Feb 2018 10:47:12 +0100
Subject: [Libosinfo] [PATCH] win-2k16: add Windows Server 2016 data
Message-ID: <20180221094712.1253-1-feborges@redhat.com>
https://docs.microsoft.com/en-us/windows-server/get-started/server-basics
---
data/os/microsoft.com/win-2k16.xml.in | 60 +++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
create mode 100644 data/os/microsoft.com/win-2k16.xml.in
diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in
new file mode 100644
index 0000000..1f1bfc7
--- /dev/null
+++ b/data/os/microsoft.com/win-2k16.xml.in
@@ -0,0 +1,60 @@
+
+
+
+ win2k16
+ <_name>Microsoft Windows Server 2016
+ 1709
+ <_vendor>Microsoft Corporation
+ winnt
+ win
+
+
+
+
+ <_name>Windows Server 2016 for HyperV
+
+
+ 2017-10-17
+
+
+
+ ^(SSS_X64CHK|SSS_X64FRE|SSS_X64FREE)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+
+
+
+
+ ^(SESS_X64FRE)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+
+
+
+
+ ^(SHV_X64CHK|SHV_X64FRE)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+
+
+
+
+ 1400000000
+ 1
+ 536870912
+ 10737418240
+
+
+
+ 2000000000
+ 2147483648
+ 42949672960
+
+
+
+
+
--
2.14.3
From felipe10borges at gmail.com Wed Feb 21 09:56:25 2018
From: felipe10borges at gmail.com (Felipe Borges)
Date: Wed, 21 Feb 2018 10:56:25 +0100
Subject: [Libosinfo] [PATCH] pop_os: add Pop!_OS 17.10 data
Message-ID: <20180221095625.3600-1-feborges@redhat.com>
https://system76.com/pop
Pop!_OS is based on Ubuntu. It follows the Ubuntu version numbers
and release schedule. The first version, 17.10, shipped on October
19th, 2017. There will be a new release every six months.
---
data/os/system76.com/popos-17.10.xml.in | 56 +++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 data/os/system76.com/popos-17.10.xml.in
diff --git a/data/os/system76.com/popos-17.10.xml.in b/data/os/system76.com/popos-17.10.xml.in
new file mode 100644
index 0000000..1048839
--- /dev/null
+++ b/data/os/system76.com/popos-17.10.xml.in
@@ -0,0 +1,56 @@
+
+
+
+ popos17.10
+ <_name>Pop!_OS 17.10
+ 17.10
+ <_vendor>System76, Inc.
+ linux
+ popos
+
+ 2017-10-19
+
+
+ <_name>Pop!_OS 17.10 (NVIDIA)
+
+
+ <_name>Pop!_OS 17.10 (Intel/AMD)
+
+
+
+
+ 1000000000
+ 1
+ 1073741824
+ 5368709120
+
+
+ 1000000000
+ 1073741824
+ 16106127360
+
+
+
+
+
+ https://d1vhcvzji58n1j.cloudfront.net/pop-os/iso/nvidia/46/pop-os_amd64_nvidia_46.iso
+
+ Pop_OS 17.10 amd64
+ 2063597568
+
+ install/vmlinuz
+ install/initrd.gz
+
+
+
+ https://d1vhcvzji58n1j.cloudfront.net/pop-os/iso/intel/57/pop-os_amd64_intel_57.iso
+
+ Pop_OS 17.10 amd64
+ 1890271232
+
+ install/vmlinuz
+ install/initrd.gz
+
+
+
--
2.14.3
From felipeborges at gnome.org Wed Feb 21 10:15:12 2018
From: felipeborges at gnome.org (Felipe Borges)
Date: Wed, 21 Feb 2018 11:15:12 +0100
Subject: [Libosinfo] [PATCH] windows: add win2k16 test data
Message-ID: <20180221101512.6530-1-felipeborges@gnome.org>
---
...EFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt | 29 ++++++++++++++++++++++
.../en_windows_server_2016_x64_dvd_9718492.iso.txt | 29 ++++++++++++++++++++++
2 files changed, 58 insertions(+)
create mode 100644 tests/isodata/windows/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
create mode 100644 tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
diff --git a/tests/isodata/windows/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt b/tests/isodata/windows/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
new file mode 100644
index 0000000..67b9ee3
--- /dev/null
+++ b/tests/isodata/windows/win2k16/14393.0.161119-1705.RS1_REFRESH_SERVERHYPERCORE_OEM_X64FRE_EN-US.ISO.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: SHV_X64FRE_EN-US_DV9
+Volume set id: SHV_X64FRE_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.56 (01/01/2005 TM)
+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: 1380217
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 8
+ Bootoff 227 551
diff --git a/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt b/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
new file mode 100644
index 0000000..a4e98ce
--- /dev/null
+++ b/tests/isodata/windows/win2k16/en_windows_server_2016_x64_dvd_9718492.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: SSS_X64FRE_EN-US_DV9
+Volume set id: SSS_X64FRE_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.56 (01/01/2005 TM)
+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: 2872706
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 8
+ Bootoff 233 563
--
2.14.3
From ptoscano at redhat.com Fri Feb 23 15:50:26 2018
From: ptoscano at redhat.com (Pino Toscano)
Date: Fri, 23 Feb 2018 16:50:26 +0100
Subject: [Libosinfo] [PATCH] debian: fix 8 & 9 locations
Message-ID: <20180223155027.30082-1-ptoscano@redhat.com>
Use the latest versions available for them.
---
data/os/debian.org/debian-8.xml.in | 4 ++--
data/os/debian.org/debian-9.xml.in | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index 8ad189b..7b1a690 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -33,7 +33,7 @@
- http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/i386/iso-dvd/debian-8.8.0-i386-DVD-1.iso
+ http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/i386/iso-dvd/debian-8.10.0-i386-DVD-1.iso
Debian 8.\d.\d i386 1
@@ -41,7 +41,7 @@
install.386/initrd.gz
- http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/amd64/iso-dvd/debian-8.8.0-amd64-DVD-1.iso
+ http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/amd64/iso-dvd/debian-8.10.0-amd64-DVD-1.iso
Debian 8.\d.\d amd64 1
diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
index 759422b..54bdde3 100644
--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -49,7 +49,7 @@
- http://cdimage.debian.org/cdimage/archive/9.0.0/i386/iso-cd/debian-9.0.0-i386-netinst.iso
+ http://cdimage.debian.org/cdimage/archive/9.2.1/i386/iso-cd/debian-9.2.1-i386-netinst.iso
Debian 9.(\d)+.(\d)+ i386 n
@@ -58,7 +58,7 @@
- http://cdimage.debian.org/cdimage/archive/9.0.0/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso
+ http://cdimage.debian.org/cdimage/archive/9.2.1/amd64/iso-cd/debian-9.2.1-amd64-netinst.iso
Debian 9.(\d)+.(\d)+ amd64 n
@@ -67,7 +67,7 @@
- http://cdimage.debian.org/cdimage/archive/9.0.0/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso
+ http://cdimage.debian.org/cdimage/archive/9.2.1/arm64/iso-cd/debian-9.2.1-arm64-netinst.iso
Debian 9.(\d)+.(\d)+ arm64 n
@@ -76,7 +76,7 @@
- http://cdimage.debian.org/cdimage/archive/9.0.0/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso
+ http://cdimage.debian.org/cdimage/archive/9.2.1/armhf/iso-cd/debian-9.2.1-armhf-netinst.iso
Debian 9.(\d)+.(\d)+ armhf n
@@ -87,7 +87,7 @@
- http://cdimage.debian.org/cdimage/archive/9.0.0/i386/iso-dvd/debian-9.0.0-i386-DVD-1.iso
+ http://cdimage.debian.org/cdimage/archive/9.2.1/i386/iso-dvd/debian-9.2.1-i386-DVD-1.iso
Debian 9.(\d)+.(\d)+ i386 1
@@ -96,7 +96,7 @@
- http://cdimage.debian.org/cdimage/archive/9.0.0/amd64/iso-dvd/debian-9.0.0-amd64-DVD-1.iso
+ http://cdimage.debian.org/cdimage/archive/9.2.1/amd64/iso-dvd/debian-9.2.1-amd64-DVD-1.iso
Debian 9.(\d)+.(\d)+ amd64 1
@@ -105,7 +105,7 @@
- http://cdimage.debian.org/cdimage/archive/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso
+ http://cdimage.debian.org/cdimage/archive/9.2.1/arm64/iso-dvd/debian-9.2.1-arm64-DVD-1.iso
Debian 9.(\d)+.(\d)+ arm64 1
@@ -114,7 +114,7 @@
- http://cdimage.debian.org/cdimage/archive/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso
+ http://cdimage.debian.org/cdimage/archive/9.2.1/armhf/iso-dvd/debian-9.2.1-armhf-DVD-1.iso
Debian 9.(\d)+.(\d)+ armhf 1
--
2.14.3
From ptoscano at redhat.com Fri Feb 23 15:50:27 2018
From: ptoscano at redhat.com (Pino Toscano)
Date: Fri, 23 Feb 2018 16:50:27 +0100
Subject: [Libosinfo] [PATCH] ubuntu: fix 17.04 & 17.10 locations
Message-ID: <20180223155027.30082-2-ptoscano@redhat.com>
Use the latest versions available, or point to old-releases for EOLed
versions.
---
data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 +++++++-------
data/os/ubuntu.com/ubuntu-17.10.xml.in | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in
index 271d7ea..69e5a27 100644
--- a/data/os/ubuntu.com/ubuntu-17.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in
@@ -30,7 +30,7 @@
- http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-i386.iso
+ http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-i386.iso
Ubuntu-Server 17.04(.\d)? i386
@@ -38,7 +38,7 @@
install/initrd.gz
- http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso
+ http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso
Ubuntu-Server 17.04(.\d)? amd64
@@ -46,7 +46,7 @@
install/initrd.gz
- http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso
+ http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso
Ubuntu 17.04(.\d)? i386
@@ -54,7 +54,7 @@
casper/initrd.lz
- http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-amd64.iso
+ http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-amd64.iso
Ubuntu 17.04(.\d)? amd64
@@ -62,19 +62,19 @@
casper/initrd.lz
- http://cdimage.ubuntu.com/releases/zesty/release/ubuntu-17.04-server-arm64.iso
+ http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-arm64.iso
Ubuntu-Server 17.04(.\d)? arm64
- http://cdimage.ubuntu.com/releases/zesty/release/ubuntu-17.04-server-ppc64el.iso
+ http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-ppc64el.iso
Ubuntu-Server 17.04(.\d)? ppc64
- http://cdimage.ubuntu.com/releases/zesty/release/ubuntu-17.04-server-s390x.iso
+ http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-s390x.iso
Ubuntu-Server 17.04(.\d)? s390x
diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in
index 4b75eed..b396197 100644
--- a/data/os/ubuntu.com/ubuntu-17.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in
@@ -30,7 +30,7 @@
- http://releases.ubuntu.com/releases/artful/ubuntu-17.10-server-i386.iso
+ http://releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-i386.iso
Ubuntu-Server 17.10(.\d)? i386
@@ -38,7 +38,7 @@
install/initrd.gz
- http://releases.ubuntu.com/releases/artful/ubuntu-17.10-server-amd64.iso
+ http://releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-amd64.iso
Ubuntu-Server 17.10(.\d)? amd64
@@ -46,7 +46,7 @@
install/initrd.gz
- http://releases.ubuntu.com/releases/artful/ubuntu-17.10-desktop-amd64.iso
+ http://releases.ubuntu.com/releases/artful/ubuntu-17.10.1-desktop-amd64.iso
Ubuntu 17.10(.\d)? amd64
--
2.14.3
From berrange at redhat.com Fri Feb 23 15:52:43 2018
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 23 Feb 2018 15:52:43 +0000
Subject: [Libosinfo] [PATCH] debian: fix 8 & 9 locations
In-Reply-To: <20180223155027.30082-1-ptoscano@redhat.com>
References: <20180223155027.30082-1-ptoscano@redhat.com>
Message-ID: <20180223155243.GD31076@redhat.com>
On Fri, Feb 23, 2018 at 04:50:26PM +0100, Pino Toscano wrote:
> Use the latest versions available for them.
> ---
> data/os/debian.org/debian-8.xml.in | 4 ++--
> data/os/debian.org/debian-9.xml.in | 16 ++++++++--------
> 2 files changed, 10 insertions(+), 10 deletions(-)
Reviewed-by: Daniel P. Berrang?
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From berrange at redhat.com Fri Feb 23 15:53:58 2018
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 23 Feb 2018 15:53:58 +0000
Subject: [Libosinfo] [PATCH] ubuntu: fix 17.04 & 17.10 locations
In-Reply-To: <20180223155027.30082-2-ptoscano@redhat.com>
References: <20180223155027.30082-2-ptoscano@redhat.com>
Message-ID: <20180223155358.GE31076@redhat.com>
On Fri, Feb 23, 2018 at 04:50:27PM +0100, Pino Toscano wrote:
> Use the latest versions available, or point to old-releases for EOLed
> versions.
> ---
> data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 +++++++-------
> data/os/ubuntu.com/ubuntu-17.10.xml.in | 6 +++---
> 2 files changed, 10 insertions(+), 10 deletions(-)
Reviewed-by: Daniel P. Berrang?
We really ought to set a regular test job with LIBOSINFO_NETWORK_TESTS=1
set, so we detect these breaks immediately.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
From carnold at suse.com Fri Feb 23 21:53:26 2018
From: carnold at suse.com (Charles Arnold)
Date: Fri, 23 Feb 2018 14:53:26 -0700
Subject: [Libosinfo] [PATCH osinfo-db] sles: add SLE12 SP3 Information
Message-ID: <5A908D560200009100098DC6@prv-mh.provo.novell.com>
Add SLE12 SP3 information
Signed-off-by: Charles Arnold
---
data/os/suse.com/sled-12.3.xml.in | 50 +++++++++++++++++++++++++
data/os/suse.com/sles-12.3.xml.in | 77 +++++++++++++++++++++++++++++++++++++++
2 files changed, 127 insertions(+)
create mode 100644 data/os/suse.com/sled-12.3.xml.in
create mode 100644 data/os/suse.com/sles-12.3.xml.in
diff --git a/data/os/suse.com/sled-12.3.xml.in b/data/os/suse.com/sled-12.3.xml.in
new file mode 100644
index 0000000..013cae6
--- /dev/null
+++ b/data/os/suse.com/sled-12.3.xml.in
@@ -0,0 +1,50 @@
+
+
+
+ sled12sp3
+ <_name>SUSE Linux Enterprise Desktop 12 SP3
+ 12.3
+ <_vendor>SUSE
+ linux
+ sled
+
+
+
+ 2017-09-07
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ LINUX
+ SLE-12-SP3-Desktop-DVD-x86_64
+
+ boot/x86_64/loader/linux
+ boot/x86_64/loader/initrd
+
+
+
+
+ 500000000
+ 536870912
+ 1074151424
+
+
+ 2400000000
+ 1073741824
+ 17179869184
+
+
+
+
diff --git a/data/os/suse.com/sles-12.3.xml.in b/data/os/suse.com/sles-12.3.xml.in
new file mode 100644
index 0000000..0ec60f5
--- /dev/null
+++ b/data/os/suse.com/sles-12.3.xml.in
@@ -0,0 +1,77 @@
+
+
+
+ sles12sp3
+ <_name>SUSE Linux Enterprise Server 12 SP3
+ 12.3
+ <_vendor>SUSE
+ linux
+ sles
+
+
+
+ 2017-09-07
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ LINUX
+ SLE-12-SP3-Server-DVD-x86_64
+
+ boot/x86_64/loader/linux
+ boot/x86_64/loader/initrd
+
+
+
+
+ LINUX
+ SLE-12-SP3-Server-DVD-aarch64
+
+ boot/aarch64/linux
+ boot/aarch64/initrd
+
+
+
+
+ LINUX
+ SLE-12-SP3-Server-DVD-ppc64le
+
+ boot/ppc64le/linux
+ boot/ppc64le/initrd
+
+
+
+
+ LINUX
+ SLE-12-SP3-Server-DVD-s390x
+
+ boot/s390x/linux
+ boot/s390x/initrd
+
+
+
+
+ 500000000
+ 536870912
+ 1074151424
+
+
+ 2400000000
+ 1073741824
+ 17179869184
+
+
+
+
--
1.8.5.6
From carnold at suse.com Fri Feb 23 21:53:54 2018
From: carnold at suse.com (Charles Arnold)
Date: Fri, 23 Feb 2018 14:53:54 -0700
Subject: [Libosinfo] [PATCH libosinfo] sles: add SLE12 SP3 ISO Information
Message-ID: <5A908D720200009100098DCB@prv-mh.provo.novell.com>
Add SLE12 SP3 ISO Information
Signed-off-by: Charles Arnold
---
.../SLE-12-SP3-Desktop-DVD-x86_64-GM-DVD1.iso.txt | 29 ++++++++++++++++++++++
.../SLE-12-SP3-Server-DVD-aarch64-GM-DVD1.iso.txt | 29 ++++++++++++++++++++++
.../SLE-12-SP3-Server-DVD-ppc64le-GM-DVD1.iso.txt | 16 ++++++++++++
.../SLE-12-SP3-Server-DVD-s390x-GM-DVD1.iso.txt | 29 ++++++++++++++++++++++
.../SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso.txt | 29 ++++++++++++++++++++++
5 files changed, 132 insertions(+)
create mode 100644 tests/isodata/sled/sled12sp3/SLE-12-SP3-Desktop-DVD-x86_64-GM-DVD1.iso.txt
create mode 100644 tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-aarch64-GM-DVD1.iso.txt
create mode 100644 tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-ppc64le-GM-DVD1.iso.txt
create mode 100644 tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-s390x-GM-DVD1.iso.txt
create mode 100644 tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso.txt
diff --git a/tests/isodata/sled/sled12sp3/SLE-12-SP3-Desktop-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/sled/sled12sp3/SLE-12-SP3-Desktop-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..70328ff
--- /dev/null
+++ b/tests/isodata/sled/sled12sp3/SLE-12-SP3-Desktop-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP3-Desktop-DVD-x86_64029
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP3-Desktop-DVD-x86_64-Build0291-Media1
+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: 2203444
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 153E 5438
diff --git a/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-aarch64-GM-DVD1.iso.txt b/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-aarch64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..1fdfd0a
--- /dev/null
+++ b/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-aarch64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP3-Server-DVD-aarch64047
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP3-Server-DVD-aarch64-Build0473-Media1
+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: 1621865
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect BD0
+ Bootoff E326 58150
diff --git a/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-ppc64le-GM-DVD1.iso.txt b/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-ppc64le-GM-DVD1.iso.txt
new file mode 100644
index 0000000..2f0b562
--- /dev/null
+++ b/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-ppc64le-GM-DVD1.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP3-Server-DVD-ppc64le047
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP3-Server-DVD-ppc64le-Build0473-Media1
+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: 1797526
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-s390x-GM-DVD1.iso.txt b/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-s390x-GM-DVD1.iso.txt
new file mode 100644
index 0000000..ae314c6
--- /dev/null
+++ b/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-s390x-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP3-Server-DVD-s390x04731
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP3-Server-DVD-s390x-Build0473-Media1
+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: 1854223
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 269 617
diff --git a/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..081bd73
--- /dev/null
+++ b/tests/isodata/sles/sles12sp3/SLE-12-SP3-Server-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP3-Server-DVD-x86_640473
+Volume set id:
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP3-Server-DVD-x86_64-Build0473-Media1
+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: 1873035
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'SUSE LINUX GmbH'
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 151A 5402
--
1.8.5.6
From vchaves at ymail.com Fri Feb 2 17:12:31 2018
From: vchaves at ymail.com (Vicente Chaves de Melo)
Date: Fri, 02 Feb 2018 17:12:31 -0000
Subject: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data
Message-ID:
Hello list,
I would like to contribute with the addition of information about NetbSD
6.x and 7.x since the versions currently available are no longer in support:
--- /dev/null?? 2018-02-02 10:38:42.362719082 -0200
+++ /usr/share/osinfo/os/netbsd.org/netbsd-6.0.xml????? 2018-01-31
13:55:17.624960628 -0200
@@ -0,0 +1,75 @@
+
+
+
+?
+??? netbsd6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? NetBSD 6.0
+??? 6.0
+??? NetBSD Project
+??? Projecte NetBSD
+??? NetBSD-Projekt
+??? NetBSD Project
+??? NetBSD Project
+??? NetBSD ??????
+??? Projekt NetBSD
+??? Projeto NetBSD
+??? ?????? NetBSD
+??? netbsd
+??? netbsd
+???
+???
+
+??? 2012-10-13
+
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-amd64.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/amd64/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/images/NetBSD-6.0-i386.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.0/i386/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_60
+?????
+???
+?
+
--- /dev/null?? 2018-02-02 10:38:42.362719082 -0200
+++ /usr/share/osinfo/os/netbsd.org/netbsd-6.1.xml????? 2018-01-31
13:55:17.628960628 -0200
@@ -0,0 +1,75 @@
+
+
+
+?
+??? netbsd6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? NetBSD 6.1
+??? 6.1
+??? NetBSD Project
+??? Projecte NetBSD
+??? NetBSD-Projekt
+??? NetBSD Project
+??? NetBSD Project
+??? NetBSD ??????
+??? Projekt NetBSD
+??? Projeto NetBSD
+??? ?????? NetBSD
+??? netbsd
+??? netbsd
+???
+???
+
+??? 2013-05-13
+
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-amd64.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/amd64/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/images/NetBSD-6.1-i386.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1/i386/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_61
+?????
+???
+?
+
--- /dev/null?? 2018-02-02 10:38:42.362719082 -0200
+++ /usr/share/osinfo/os/netbsd.org/netbsd-7.0.xml????? 2018-01-31
13:55:17.628960628 -0200
@@ -0,0 +1,75 @@
+
+
+
+?
+??? netbsd7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? NetBSD 7.0
+??? 7.0
+??? NetBSD Project
+??? Projecte NetBSD
+??? NetBSD-Projekt
+??? NetBSD Project
+??? NetBSD Project
+??? NetBSD ??????
+??? Projekt NetBSD
+??? Projeto NetBSD
+??? ?????? NetBSD
+??? netbsd
+??? netbsd
+???
+???
+
+??? 2015-09-25
+
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-amd64.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/amd64/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/images/NetBSD-7.0-i386.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.0/i386/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_70
+?????
+???
+?
+
--- /dev/null?? 2018-02-02 10:38:42.362719082 -0200
+++ /usr/share/osinfo/os/netbsd.org/netbsd-7.1.xml????? 2018-01-31
13:55:17.628960628 -0200
@@ -0,0 +1,75 @@
+
+
+
+?
+??? netbsd7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? NetBSD 7.1
+??? 7.1
+??? NetBSD Project
+??? Projecte NetBSD
+??? NetBSD-Projekt
+??? NetBSD Project
+??? NetBSD Project
+??? NetBSD ??????
+??? Projekt NetBSD
+??? Projeto NetBSD
+??? ?????? NetBSD
+??? netbsd
+??? netbsd
+???
+???
+
+??? 2017-03-11
+
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-amd64.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/images/NetBSD-7.1-i386.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+???
+
ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-7.1/i386/installation/cdrom/boot-com.iso
+?????
+??????? NetBSD
+??????? NETBSD_71
+?????
+???
+?
+