[Libosinfo] [libosinfo PATCH] Update CD URLs to latest Debian Jessie point release
--- data/os/debian.org/debian-8.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in index 146089a..e143dd3 100644 --- a/data/os/debian.org/debian-8.xml.in +++ b/data/os/debian.org/debian-8.xml.in @@ -29,7 +29,7 @@ - http://cdimage.debian.org/debian-cd/8.2.0/i386/iso-dvd/debian-8.2.0-i386-DVD-1.iso + http://cdimage.debian.org/debian-cd/8.3.0/i386/iso-dvd/debian-8.3.0-i386-DVD-1.iso Debian 8.\d.\d i386 1 @@ -37,7 +37,7 @@ install.386/initrd.gz - http://cdimage.debian.org/debian-cd/8.2.0/amd64/iso-dvd/debian-8.2.0-amd64-DVD-1.iso + http://cdimage.debian.org/debian-cd/8.3.0/amd64/iso-dvd/debian-8.3.0-amd64-DVD-1.iso Debian 8.\d.\d amd64 1 -- 2.7.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH] Update CD URLs to latest Debian Jessie point release
Hi Daniel, On Thu, Feb 04, 2016 at 01:21:38PM +, Daniel P. Berrange wrote: > On Thu, Feb 04, 2016 at 12:50:29PM +0100, Guido Günther wrote: > > --- > > data/os/debian.org/debian-8.xml.in | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/data/os/debian.org/debian-8.xml.in > > b/data/os/debian.org/debian-8.xml.in > > index 146089a..e143dd3 100644 > > --- a/data/os/debian.org/debian-8.xml.in > > +++ b/data/os/debian.org/debian-8.xml.in > > @@ -29,7 +29,7 @@ > > > > > > > > - > > http://cdimage.debian.org/debian-cd/8.2.0/i386/iso-dvd/debian-8.2.0-i386-DVD-1.iso > > + > > http://cdimage.debian.org/debian-cd/8.3.0/i386/iso-dvd/debian-8.3.0-i386-DVD-1.iso > > > > Debian 8.\d.\d i386 1 > > > > @@ -37,7 +37,7 @@ > >install.386/initrd.gz > > > > > > - > > http://cdimage.debian.org/debian-cd/8.2.0/amd64/iso-dvd/debian-8.2.0-amd64-DVD-1.iso > > + > > http://cdimage.debian.org/debian-cd/8.3.0/amd64/iso-dvd/debian-8.3.0-amd64-DVD-1.iso > > > > Debian 8.\d.\d amd64 1 > > > > I don't suppose you have any connections with people who maintain the > debian download sites ? It would be nice if there were a perma-link > (eg "8-latest"), that always pointed to the most recent 8.x.y point > release, so we don't have to keep chasing minor rleases like this. I intend to file a bug against the cdimage.debian.org pseudo package but hoped to have the patch applied to libosinfo first so I have a good example why a stable name makes sense to link to. Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] osinfo-db source tarball
Hi, I looked into packaging osinfo-db for Debian and looking at: https://fedorahosted.org/releases/l/i/libosinfo/osinfo-db-20160728.tar.xz it looks quit different from https://gitlab.com/libosinfo/osinfo-db . Would it be possible to ship a proper source tarball that: * contains a license file * contains the Makefile to execute and run the build so we can use the preferred form of modificaation? Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH] README: libarchive is required as well
--- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 6b095ff..0368735 100644 --- a/README +++ b/README @@ -19,6 +19,7 @@ Dependencies - Required: - gobject-2.0 - gio-2.0 + - libarchive3 - libxml-2.0 - libxslt-1.0 -- 2.9.3 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db-tools] validate: correct help output
We validate files, don't install them
---
tools/osinfo-db-validate.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
index c735fc8..d8c3af9 100644
--- a/tools/osinfo-db-validate.c
+++ b/tools/osinfo-db-validate.c
@@ -253,13 +253,13 @@ gint main(gint argc, gchar **argv)
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, (void*)&verbose,
N_("Verbose progress information"), NULL, },
{ "user", 0, 0, G_OPTION_ARG_NONE, (void *)&user,
-N_("Install into user directory"), NULL, },
+N_("Validate files in user directory"), NULL, },
{ "local", 0, 0, G_OPTION_ARG_NONE, (void *)&local,
-N_("Install into local directory"), NULL, },
+N_("Validate files in local directory"), NULL, },
{ "system", 0, 0, G_OPTION_ARG_NONE, (void *)&system,
-N_("Install into system directory"), NULL, },
+N_("Validate files in system directory"), NULL, },
{ "dir", 0, 0, G_OPTION_ARG_STRING, (void *)&custom,
-N_("Import into custom directory"), NULL, },
+N_("Validate files in custom directory"), NULL, },
{ "root", 0, 0, G_OPTION_ARG_STRING, &root,
N_("Installation root directory"), NULL, },
{ NULL, 0, 0, 0, NULL, NULL, NULL },
--
2.9.3
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db] Add release and eol dates for Debian 6, 7 and 8
--- data/os/debian.org/debian-6.xml.in | 3 +++ data/os/debian.org/debian-7.xml.in | 3 +++ data/os/debian.org/debian-8.xml.in | 2 ++ 3 files changed, 8 insertions(+) diff --git a/data/os/debian.org/debian-6.xml.in b/data/os/debian.org/debian-6.xml.in index e29b892..a962661 100644 --- a/data/os/debian.org/debian-6.xml.in +++ b/data/os/debian.org/debian-6.xml.in @@ -12,6 +12,9 @@ http://debian.org/debian/5"/> http://debian.org/debian/5"/> +2011-02-06 +2016-02-29 + http://usb.org/usb/80ee/0021"/> diff --git a/data/os/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in index f6aa50a..4e5ff33 100644 --- a/data/os/debian.org/debian-7.xml.in +++ b/data/os/debian.org/debian-7.xml.in @@ -12,6 +12,9 @@ http://debian.org/debian/6"/> http://debian.org/debian/6"/> +2013-05-04 +2018-05-31 + http://usb.org/usb/80ee/0021"/> diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in index 13e6d62..7fd1d35 100644 --- a/data/os/debian.org/debian-8.xml.in +++ b/data/os/debian.org/debian-8.xml.in @@ -12,6 +12,8 @@ http://debian.org/debian/7"/> http://debian.org/debian/7"/> +2015-04-25 + http://usb.org/usb/80ee/0021"/> -- 2.9.3 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] Add release and eol dates for Debian 6, 7 and 8
On Thu, Oct 20, 2016 at 12:42:43PM +0100, Daniel P. Berrange wrote: > On Thu, Oct 20, 2016 at 01:29:14PM +0200, Guido Günther wrote: > > --- > > data/os/debian.org/debian-6.xml.in | 3 +++ > > data/os/debian.org/debian-7.xml.in | 3 +++ > > data/os/debian.org/debian-8.xml.in | 2 ++ > > 3 files changed, 8 insertions(+) > > ACK Pushed. Thanks, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH] README: libarchive is required as well
On Thu, Oct 20, 2016 at 12:46:54PM +0100, Daniel P. Berrange wrote: > On Thu, Oct 20, 2016 at 01:00:03PM +0200, Guido Günther wrote: > > --- > > README | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/README b/README > > index 6b095ff..0368735 100644 > > --- a/README > > +++ b/README > > @@ -19,6 +19,7 @@ Dependencies > > - Required: > >- gobject-2.0 > >- gio-2.0 > > + - libarchive3 > >- libxml-2.0 > >- libxslt-1.0 > > ACK Pushed. Thanks, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db-tools] validate: correct help output
On Thu, Oct 20, 2016 at 12:44:35PM +0100, Daniel P. Berrange wrote: > On Thu, Oct 20, 2016 at 01:28:10PM +0200, Guido Günther wrote: > > We validate files, don't install them > > --- > > tools/osinfo-db-validate.c | 8 > > 1 file changed, 4 insertions(+), 4 deletions(-) > > ACK Pushed. Thanks, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] osinfo-db source tarball
Hi Daniel, On Tue, Oct 18, 2016 at 09:30:49AM +0100, Daniel P. Berrange wrote: > On Tue, Oct 11, 2016 at 08:32:05PM +0200, Guido Günther wrote: > > Hi, > > I looked into packaging osinfo-db for Debian and looking at: > > > > https://fedorahosted.org/releases/l/i/libosinfo/osinfo-db-20160728.tar.xz > > > > it looks quit different from https://gitlab.com/libosinfo/osinfo-db > > . Would it be possible to ship a proper source tarball that: > > > > * contains a license file > > The tarball isn't supposed to contain anything other than the DB XML > files. Indeed the way it is created is by running osinfo-db-export > on the installed database directory, so it won't pick up anything > other than the files in that dir, so no license file will be found > there. I think it's not exacthel the "source" tarball then. It's the "binary" tarball that contains the database files. I like to be sure we can rebuild the xml files from the xml.in files. In Debian people often fetch the source package, apply pathes on top of it and post these to the bug tracking system (because we have lots of tooling around it). I'd like to make this as simple as possible (including forwarding this upstream you libosinfo authors). So I took a different approch and ran: git archive HEAD | xz -c > ../osinfo-db_0.20160728+git20161020.orig.tar.xz and used that as the source tarball for building. > > * contains the Makefile to execute and run the build so we can use the > > preferred form of modificaation? > > You are *not* supposed to unpack the tarball manually. Run the > osinfo-db-import tool, passing it the tarball, as described at > >https://libosinfo.org/download/ Yes, I'm doing so after rebuilding the XML files: https://anonscm.debian.org/cgit/pkg-libvirt/osinfo-db.git/tree/debian/rules#n10 So would it make sense to build two things: the tarball as shipped atm plus a separate one (osinfo-db-source_.tar.xz) as generated above? If so I'd send a patch for the Makefile to generate both. Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] osinfo-db source tarball
On Fri, Oct 21, 2016 at 10:50:44AM +0100, Daniel P. Berrange wrote: [..snip..] > > So I took a different approch and ran: > > > > git archive HEAD | xz -c > > > ../osinfo-db_0.20160728+git20161020.orig.tar.xz > > > > and used that as the source tarball for building. > > IMHO that does really help in any way. The only difference between s/does/does not/? > xml and xml.in files is the translation data. So having the xml.in > and .po files in deb packages is not doing anything useful. Translations > updates have to go via the Zanata translation system, and any content > updates are fine to send in the .xml files The .in files are only ever in a source package, they never end up on a users system. They're used merely used for building the package. The merging of the .in files creates more fuzz than just adding translations like trailing spaces when dropping comments. Using the generated XML makes carrying distro specific patches harder than necessary (not that intend to not forward upstream but you never know). Furthermore generating from the .in files makes sure we're able to build the xml from within Debian (i.e. have all the tools packaged). > > > > > * contains the Makefile to execute and run the build so we can use the > > > > preferred form of modificaation? > > > > > > You are *not* supposed to unpack the tarball manually. Run the > > > osinfo-db-import tool, passing it the tarball, as described at > > > > > >https://libosinfo.org/download/ > > > > Yes, I'm doing so after rebuilding the XML files: > > > > > > https://anonscm.debian.org/cgit/pkg-libvirt/osinfo-db.git/tree/debian/rules#n10 > > > > So would it make sense to build two things: the tarball as shipped atm > > plus a separate one (osinfo-db-source_.tar.xz) as generated above? > > If so I'd send a patch for the Makefile to generate both. > > No, I don't think providing a raw tarball is useful at all and certainly > don't want to encourage anyone else to do that. Fine with me. I can stick to the above method for generating a source tarball (from the released tags in the future). > The long term intention is to actually provide more tools to automate > the process of downloading & deploying newer osinfo-db archives, > independantly of what the OS vendor provides, because the OS vendor > provided data is inherantly always out of date, particularly for long > term distros like Debian / RHEL. Now with the db split out I'm looking forward to update the database files on point releases. Thanks for making this possible with the split! Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH libosinfo] examples: avoid PyGIWarning
This fixes
demo.py:3: PyGIWarning: Libosinfo was imported without specifying a version
first. Use gi.require_version('Libosinfo', '1.0') before import
to ensure that the right version gets loaded.
from gi.repository import Libosinfo as osinfo;
---
examples/demo.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/demo.py b/examples/demo.py
index bdc9b9a..afd3e7c 100755
--- a/examples/demo.py
+++ b/examples/demo.py
@@ -1,5 +1,7 @@
#!/usr/bin/python
+import gi
+gi.require_version('Libosinfo', '1.0')
from gi.repository import Libosinfo as osinfo;
loader = osinfo.Loader()
--
2.9.3
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH libosinfo] examples: avoid PyGIWarning
On Mon, Oct 31, 2016 at 10:44:50AM +, Daniel P. Berrange wrote:
> On Sat, Oct 29, 2016 at 10:42:35PM +0200, Guido Günther wrote:
> > This fixes
> >
> > demo.py:3: PyGIWarning: Libosinfo was imported without specifying a version
> > first. Use gi.require_version('Libosinfo', '1.0') before import
> > to ensure that the right version gets loaded.
> > from gi.repository import Libosinfo as osinfo;
> > ---
> > examples/demo.py | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/examples/demo.py b/examples/demo.py
> > index bdc9b9a..afd3e7c 100755
> > --- a/examples/demo.py
> > +++ b/examples/demo.py
> > @@ -1,5 +1,7 @@
> > #!/usr/bin/python
> >
> > +import gi
> > +gi.require_version('Libosinfo', '1.0')
> > from gi.repository import Libosinfo as osinfo;
> >
> > loader = osinfo.Loader()
>
> ACK
Pushed. Thanks.
-- Guido
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH libosinfo] test-isodetect: extend arch table
Reduces the output a bit when running under G_DEBUG_MESSAGES
---
test/test-isodetect.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 64d0e9a..ecb7c6f 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -111,6 +111,7 @@ static struct ISOInfo *load_iso(GFile *file, const gchar
*shortid, const gchar *
strstr(name, "64-bit"))
arch = "x86_64";
else if (strstr(name, "i386") ||
+ strstr(name, "i586") ||
strstr(name, "i686") ||
strstr(name, "x86") ||
strstr(name, "32bit") ||
@@ -125,6 +126,10 @@ static struct ISOInfo *load_iso(GFile *file, const gchar
*shortid, const gchar *
arch = "sparc";
else if (strstr(name, "ia64"))
arch = "ia64";
+else if (strstr(name, "s390x"))
+arch = "s390x";
+else if (strstr(name, "aarch64"))
+arch = "aarch64";
else {
g_debug("Unknown arch in %s", name);
arch = "i386";
--
2.10.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH libosinfo] loader: Fix typo in error message
---
osinfo/osinfo_loader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index 46bc633..dba567f 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -2288,7 +2288,7 @@ static GFile *osinfo_loader_get_system_path(void)
static gboolean warned = FALSE;
if (!warned) {
g_printerr(_("$OSINFO_DATA_DIR is deprecated, please "
- "use $OSINFO_SYSTEM_DIR intead. Support "
+ "use $OSINFO_SYSTEM_DIR instead. Support "
"for $OSINFO_DATA_DIR will be removed "
"in a future release\n"));
warned = TRUE;
--
2.10.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH libosinfo] test-isodetect: extend arch table
On Sat, Nov 05, 2016 at 03:54:38PM +0100, Zeeshan Ali (Khattak) wrote: > H Guido, > > ACK to both patches with one minor fix. > > On Sat, Nov 5, 2016 at 2:00 PM, Guido Günther wrote: > > Reduces the output a bit when running under G_DEBUG_MESSAGES > > I think you meant G_MESSAGES_DEBUG. Pushed with that fixed. Thanks, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db] There's no GPL 2.1
Update headers accordingly Spotted-by: Thorsten Alteholz --- If've shortened the patch so it makes it passed the list limit of 256k. The full patch is hold by moderator approval due to its size. Cheers, -- Guido data/datamap/microsoft.com/win-7-l10n-language.xml.in | 2 +- data/datamap/microsoft.com/win-8-l10n-language-reverse.xml.in | 2 +- data/datamap/microsoft.com/win-8-l10n-language.xml.in | 2 +- data/datamap/x.org/x11-keyboard.xml.in| 2 +- data/device/ibasetechnologies.net/isa-ib700.xml.in| 2 +- data/device/ibm.com/ps2-keyboard.xml.in | 2 +- data/device/ibm.com/ps2-mouse.xml.in | 2 +- data/device/pcisig.com/pci-1000-0012.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1013-00b8.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1022-2000.d/class.xml.in | 2 +- data/device/pcisig.com/pci-10ec-8029.d/class.xml.in | 2 +- data/device/pcisig.com/pci-10ec-8139.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1234-.xml.in | 2 +- data/device/pcisig.com/pci-1274-5000.d/class.xml.in | 2 +- data/device/pcisig.com/pci-15ad-0710.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1000.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1001.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1002.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1003.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1004.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1005.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1009.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1041.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1042.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1043.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1044.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1045.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1048.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1049.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1050.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1af4-1052.d/class.xml.in | 2 +- data/device/pcisig.com/pci-1b36-0100.d/class.xml.in | 2 +- data/device/pcisig.com/pci-8086-100e.d/class.xml.in | 2 +- data/device/pcisig.com/pci-8086-2415.d/class.xml.in | 2 +- data/device/pcisig.com/pci-8086-25ab.d/class.xml.in | 2 +- data/device/pcisig.com/pci-8086-2668.d/class.xml.in | 2 +- data/device/usb.org/usb-80ee-0021.d/class.xml.in | 2 +- data/device/xen.org/xen-console.xml.in| 2 +- data/device/xen.org/xen-pci.xml.in| 2 +- data/device/xen.org/xen-vbd.xml.in| 2 +- data/device/xen.org/xen-vfb.xml.in| 2 +- data/device/xen.org/xen-vif.xml.in| 2 +- data/device/xen.org/xen-vkbd.xml.in | 2 +- data/device/xen.org/xen-vscsi.xml.in | 2 +- data/device/xen.org/xen-vtpm.xml.in | 2 +- data/install-script/debian.org/debian-preseed-desktop.xml.in | 2 +- data/install-script/debian.org/debian-preseed-jeos.xml.in | 2 +- data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 2 +- data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in| 2 +- data/install-script/microsoft.com/windows-cmd-desktop.xml.in | 2 +- data/install-script/microsoft.com/windows-reg-desktop.xml.in | 2 +- data/install-script/microsoft.com/windows-sif-desktop.xml.in | 2 +- data/install-script/microsoft.com/windows-sif-jeos.xml.in | 2 +- data/install-script/microsoft.com/windows-unattend-desktop.xml.in | 2 +- data/install-script/microsoft.com/windows-unattend-jeos.xml.in| 2 +- data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in | 2 +- data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in| 2 +- data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 2 +- data/install-script/redhat.com/rhel-kickstart-jeos.xml.in | 2 +- data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 2 +- data/os/altlinux.org/altlinux-1.0.xml.in | 2 +- data/os/altlinux.org/alt
[Libosinfo] [PATCH osinfo-db] Unbreak vpath build
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7f5801a..6b3f8e7 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ mingwrpm: mingw-osinfo-db.spec $(ARCHIVE) $(V_GEN) $(SED) -e "s/@VERSION@/$(TODAY)/" < $< > $@ $(ARCHIVE): $(DATA_FILES) $(SCHEMA_FILES) - $(V_EXP) $(OSINFO_DB_EXPORT) --license COPYING --version "$(TODAY)" --dir data $(ARCHIVE) + $(V_EXP) $(OSINFO_DB_EXPORT) --license $(VPATH)/COPYING --version "$(TODAY)" --dir data $(ARCHIVE) clean: rm -f osinfo-db-*.tar.xz -- 2.10.2 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db 2/3] Remove redundant entries for Debian
that are already being inherited. --- data/os/debian.org/debian-7.xml.in | 1 - data/os/debian.org/debian-8.xml.in | 1 - 2 files changed, 2 deletions(-) diff --git a/data/os/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in index 80014e5..d11a1a2 100644 --- a/data/os/debian.org/debian-7.xml.in +++ b/data/os/debian.org/debian-7.xml.in @@ -20,7 +20,6 @@ http://pcisig.com/pci/1af4/1003"/> http://pcisig.com/pci/1af4/1004"/> http://pcisig.com/pci/1af4/1009"/> - http://usb.org/usb/80ee/0021"/> diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in index 0e2bd10..74f4772 100644 --- a/data/os/debian.org/debian-8.xml.in +++ b/data/os/debian.org/debian-8.xml.in @@ -16,7 +16,6 @@ http://pcisig.com/pci/1af4/1005"/> - http://usb.org/usb/80ee/0021"/> -- 2.10.2 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db 0/3] Updates for Debian
Guido Günther (3): Update virtio device information for Debian Wheezy and Jessie Remove redundant entries for Debian Derive Debian testing from the latest stable release data/os/debian.org/debian-7.xml.in | 7 ++- data/os/debian.org/debian-8.xml.in | 2 +- data/os/debian.org/debian-testing.xml.in | 10 ++ 3 files changed, 9 insertions(+), 10 deletions(-) -- 2.10.2 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db 1/3] Update virtio device information for Debian Wheezy and Jessie
Wheezy has most of the devices alredy while we only have virtio-rng from Jessie onwards. --- data/os/debian.org/debian-7.xml.in | 4 data/os/debian.org/debian-8.xml.in | 1 + 2 files changed, 5 insertions(+) diff --git a/data/os/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in index 4e5ff33..80014e5 100644 --- a/data/os/debian.org/debian-7.xml.in +++ b/data/os/debian.org/debian-7.xml.in @@ -16,6 +16,10 @@ 2018-05-31 + http://pcisig.com/pci/1af4/1002"/> + http://pcisig.com/pci/1af4/1003"/> + http://pcisig.com/pci/1af4/1004"/> + http://pcisig.com/pci/1af4/1009"/> http://usb.org/usb/80ee/0021"/> diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in index 7fd1d35..0e2bd10 100644 --- a/data/os/debian.org/debian-8.xml.in +++ b/data/os/debian.org/debian-8.xml.in @@ -15,6 +15,7 @@ 2015-04-25 + http://pcisig.com/pci/1af4/1005"/> http://usb.org/usb/80ee/0021"/> -- 2.10.2 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db 3/3] Derive Debian testing from the latest stable release
this allows us to move QXL and ac97 back to the current oldstable release and drop redundant entries. --- data/os/debian.org/debian-7.xml.in | 2 ++ data/os/debian.org/debian-testing.xml.in | 10 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/data/os/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in index d11a1a2..93edf89 100644 --- a/data/os/debian.org/debian-7.xml.in +++ b/data/os/debian.org/debian-7.xml.in @@ -16,10 +16,12 @@ 2018-05-31 + http://pcisig.com/pci/8086/2415"/> http://pcisig.com/pci/1af4/1002"/> http://pcisig.com/pci/1af4/1003"/> http://pcisig.com/pci/1af4/1004"/> http://pcisig.com/pci/1af4/1009"/> + http://pcisig.com/pci/1b36/0100"/> diff --git a/data/os/debian.org/debian-testing.xml.in b/data/os/debian.org/debian-testing.xml.in index a06fe3e..744de8f 100644 --- a/data/os/debian.org/debian-testing.xml.in +++ b/data/os/debian.org/debian-testing.xml.in @@ -8,14 +8,8 @@ <_vendor>Debian Project linux debian - - - http://pcisig.com/pci/8086/2415"/> - http://pcisig.com/pci/1b36/0100"/> - http://pcisig.com/pci/1af4/1001"/> - http://pcisig.com/pci/1af4/1000"/> - http://usb.org/usb/80ee/0021"/> - +http://debian.org/debian/8"/> +http://debian.org/debian/8"/> -- 2.10.2 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] There's no GPL 2.1
On Sun, Nov 06, 2016 at 03:42:22PM +0100, Zeeshan Ali (Khattak) wrote: > On Sun, Nov 6, 2016 at 3:34 PM, Guido Günther wrote: > > Update headers accordingly > > > > Spotted-by: Thorsten Alteholz > > Looks good. ACK Pushed. Thanks. -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH libosinfo] loader: Fix typo in error message
On Mon, Nov 07, 2016 at 09:03:56AM +, Daniel P. Berrange wrote: > On Sat, Nov 05, 2016 at 02:00:28PM +0100, Guido Günther wrote: > > --- > > osinfo/osinfo_loader.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > ACK Pushed. Thanks. -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] Unbreak vpath build
On Mon, Nov 07, 2016 at 09:03:10AM +, Daniel P. Berrange wrote: > On Sun, Nov 06, 2016 at 07:45:51PM +0100, Guido Günther wrote: > > --- > > Makefile | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > ACK Pushed. Thanks, -- Guioo ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 0/3] Updates for Debian
On Mon, Nov 07, 2016 at 09:03:38AM +, Daniel P. Berrange wrote: > On Sun, Nov 06, 2016 at 07:51:03PM +0100, Guido Günther wrote: > > Guido Günther (3): > > Update virtio device information for Debian Wheezy and Jessie > > Remove redundant entries for Debian > > Derive Debian testing from the latest stable release > > > > data/os/debian.org/debian-7.xml.in | 7 ++- > > data/os/debian.org/debian-8.xml.in | 2 +- > > data/os/debian.org/debian-testing.xml.in | 10 ++ > > 3 files changed, 9 insertions(+), 10 deletions(-) > > ACK all 3 Pushed. Thanks. -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db] Debian: enhance guest agent support
This also only installs qemu-guest-agent on recent Debian since versions before Jessie don't ship it. --- data/install-script/debian.org/debian-preseed-desktop.xml.in | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/install-script/debian.org/debian-preseed-desktop.xml.in b/data/install-script/debian.org/debian-preseed-desktop.xml.in index 0b84742..42ed421 100644 --- a/data/install-script/debian.org/debian-preseed-desktop.xml.in +++ b/data/install-script/debian.org/debian-preseed-desktop.xml.in @@ -173,7 +173,12 @@ d-i apt-setup/security_host string tasksel tasksel/first multiselect desktop ssh-server ### Install Qemu guest agent -d-i pkgsel/include string qemu-guest-agent + + d-i pkgsel/include string qemu-guest-agent xserver-xorg-video-qxl spice-vdagent + +spice-webdavd + + ### Bootloader -- 2.10.2 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db] Abort on XML errors
While we abort on XML errors the first time the output XML already gets written so a subsequent make call will continue with the next file leading to an incomplete database. Use a temporary file to fix this. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6b3f8e7..d08f5cc 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,8 @@ mingwrpm: mingw-osinfo-db.spec $(ARCHIVE) %.xml: %.xml.in Makefile @mkdir -p `dirname $@` po - $(V_I18N) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_OPTS) -x -u -c po/.intltool-merge-cache $(VPATH)/po $< $@ + $(V_I18N) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_OPTS) -x -u -c po/.intltool-merge-cache $(VPATH)/po $< $@.tmp + @mv $@.tmp $@ %.rng: %.rng.in Makefile @mkdir -p `dirname $@` po -- 2.10.2 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db v2] Abort on XML errors
While we abort on XML errors the first time the output XML already gets
written so a subsequent make call will continue with the next file
leading to an incomplete database. Use a temporary file to fix this.
---
Changes since v1:
* remove temp file on failure
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 6b3f8e7..6ff9b5c 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,9 @@ mingwrpm: mingw-osinfo-db.spec $(ARCHIVE)
%.xml: %.xml.in Makefile
@mkdir -p `dirname $@` po
- $(V_I18N) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_OPTS) -x -u -c
po/.intltool-merge-cache $(VPATH)/po $< $@
+ $(V_I18N) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_OPTS) -x -u -c
po/.intltool-merge-cache $(VPATH)/po $< $@.tmp \
+ || { rm $@.tmp && exit 1; }
+ @mv $@.tmp $@
%.rng: %.rng.in Makefile
@mkdir -p `dirname $@` po
--
2.10.2
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] Debian: enhance guest agent support
On Tue, Nov 08, 2016 at 09:43:44AM +, Daniel P. Berrange wrote: > On Tue, Nov 08, 2016 at 08:13:27AM +0100, Guido Günther wrote: > > This also only installs qemu-guest-agent on recent Debian since versions > > before Jessie don't ship it. > > --- > > data/install-script/debian.org/debian-preseed-desktop.xml.in | 7 ++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > ACK Pushed. Thanks -- Guido > > > Regards, > Daniel > -- > |: http://berrange.com -o-http://www.flickr.com/photos/dberrange/ :| > |: http://libvirt.org -o- http://virt-manager.org :| > |: http://entangle-photo.org -o-http://search.cpan.org/~danberr/ :| > ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] Abort on XML errors
On Tue, Nov 08, 2016 at 09:46:13AM +, Daniel P. Berrange wrote: > On Tue, Nov 08, 2016 at 08:14:07AM +0100, Guido Günther wrote: > > While we abort on XML errors the first time the output XML already gets > > written so a subsequent make call will continue with the next file > > leading to an incomplete database. Use a temporary file to fix this. > > --- > > Makefile | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/Makefile b/Makefile > > index 6b3f8e7..d08f5cc 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -63,7 +63,8 @@ mingwrpm: mingw-osinfo-db.spec $(ARCHIVE) > > > > %.xml: %.xml.in Makefile > > @mkdir -p `dirname $@` po > > - $(V_I18N) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_OPTS) -x -u -c > > po/.intltool-merge-cache $(VPATH)/po $< $@ > > + $(V_I18N) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_OPTS) -x -u -c > > po/.intltool-merge-cache $(VPATH)/po $< $@.tmp > > + @mv $@.tmp $@ > > Won't this leave a .tmp file on disk if it fails. IIUC you need to have > > ...CMD... && mv $@.tmp $@ || rm -f $@.tmp Yes, I've sent a v2 with a slightly different version. Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] github mirror
Hi, the libvirt projects all have mirrors to github which allows fore codesearch and gives better visibility of the project. Could this be done for the liboxinfo/osinfo-db/osinfo-db-tools projects too? Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db] Debian Jessie: Update DVD links
--- data/os/debian.org/debian-8.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) We don't have a stable link for Jessie stable (only for stable in general) so we have to play this catch up game. diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in index 19bb8a5..a72cc89 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/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso + http://cdimage.debian.org/debian-cd/8.7.1/i386/iso-dvd/debian-8.7.1-i386-DVD-1.iso Debian 8.\d.\d i386 1 @@ -41,7 +41,7 @@ install.386/initrd.gz - http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso + http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-dvd/debian-8.7.1-amd64-DVD-1.iso Debian 8.\d.\d amd64 1 -- 2.11.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] Debian Jessie: Update DVD links
On Wed, Mar 15, 2017 at 08:27:02PM +0100, Fabiano Fidêncio wrote: > On Tue, Mar 14, 2017 at 7:49 PM, Guido Günther wrote: > > --- > > data/os/debian.org/debian-8.xml.in | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > We don't have a stable link for Jessie stable (only for stable in > > general) so we have to play this catch up game. > > > > diff --git a/data/os/debian.org/debian-8.xml.in > > b/data/os/debian.org/debian-8.xml.in > > index 19bb8a5..a72cc89 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/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso > > + > > http://cdimage.debian.org/debian-cd/8.7.1/i386/iso-dvd/debian-8.7.1-i386-DVD-1.iso > > > > Debian 8.\d.\d i386 1 > > > > @@ -41,7 +41,7 @@ > >install.386/initrd.gz > > > > > > - > > http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso > > + > > http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-dvd/debian-8.7.1-amd64-DVD-1.iso > > > > Debian 8.\d.\d amd64 1 > > > > -- > > 2.11.0 > > > > ___ > > Libosinfo mailing list > > Libosinfo@redhat.com > > https://www.redhat.com/mailman/listinfo/libosinfo > > Ack! > > (I'll push the patch over the weekend) I went ahead and pushed this. Thanks! -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] Debian Jessie: Update DVD links
On Wed, Mar 15, 2017 at 08:36:37PM +0100, Fabiano Fidêncio wrote: > On Wed, Mar 15, 2017 at 8:27 PM, Fabiano Fidêncio > wrote: > > On Tue, Mar 14, 2017 at 7:49 PM, Guido Günther wrote: > >> --- > >> data/os/debian.org/debian-8.xml.in | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> We don't have a stable link for Jessie stable (only for stable in > >> general) so we have to play this catch up game. > >> > >> diff --git a/data/os/debian.org/debian-8.xml.in > >> b/data/os/debian.org/debian-8.xml.in > >> index 19bb8a5..a72cc89 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/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso > >> + > >> http://cdimage.debian.org/debian-cd/8.7.1/i386/iso-dvd/debian-8.7.1-i386-DVD-1.iso > >> > >> Debian 8.\d.\d i386 1 > >> > >> @@ -41,7 +41,7 @@ > >>install.386/initrd.gz > >> > >> > >> - > >> http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso > >> + > >> http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-dvd/debian-8.7.1-amd64-DVD-1.iso > >> > >> Debian 8.\d.\d amd64 1 > >> > >> -- > >> 2.11.0 > >> > >> ___ > >> Libosinfo mailing list > >> Libosinfo@redhat.com > >> https://www.redhat.com/mailman/listinfo/libosinfo > > > > Ack! > > > > (I'll push the patch over the weekend) > > > > -- > > Fabiano Fidêncio > > Btw, if yoi have the ISO handy, would you mind providing a patch for > libosinfo? > > `isoinfo -d -i /path/to/file` is what we're interested in. > > You can just create a new file under debian8 dir, as you can see here: > https://gitlab.com/libosinfo/libosinfo/tree/master/test/isodata/debian/debian8/ That would be >From 847a5a443f86dd66a8fb63adfd262857af61eb55 Mon Sep 17 00:00:00 2001 Message-Id: <847a5a443f86dd66a8fb63adfd262857af61eb55.1489649543.git@sigxcpu.org> From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Thu, 16 Mar 2017 08:06:46 +0100 Subject: [PATCH libosinfo] Update volume information for Debian Jessie To: libosinfo@redhat.com --- test/isodata/debian/debian8/debian-8.0.0-amd64-CD-1.iso.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/isodata/debian/debian8/debian-8.0.0-amd64-CD-1.iso.txt b/test/isodata/debian/debian8/debian-8.0.0-amd64-CD-1.iso.txt index 4b2a03f..9f8f232 100644 --- a/test/isodata/debian/debian8/debian-8.0.0-amd64-CD-1.iso.txt +++ b/test/isodata/debian/debian8/debian-8.0.0-amd64-CD-1.iso.txt @@ -1,6 +1,6 @@ CD-ROM is in ISO 9660 format System id: -Volume id: Debian 8.0.0 amd64 1 +Volume id: Debian 8.7.1 amd64 1 Volume set id: Publisher id: Data preparer id: XORRISO-1.3.6 2014.04.08.18, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.6 @@ -11,8 +11,8 @@ Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 -Volume size is: 321024 -El Torito VD version 1 found, boot catalog is in sector 2138 +Volume size is: 322560 +El Torito VD version 1 found, boot catalog is in sector 2142 Joliet with UCS level 3 found Rock Ridge signatures version 1 found Eltorito validation header: @@ -26,4 +26,4 @@ Eltorito validation header: Load segment 0 Sys type 0 Nsect 4 -Bootoff 92B 2347 +Bootoff 85F 2143 -- 2.11.0 Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH] debian: update URLs for Debian 8 ISOs
On Thu, Mar 16, 2017 at 09:52:25AM +0100, Pino Toscano wrote: > On Wednesday, 15 March 2017 20:35:03 CET Fabiano Fidêncio wrote: > > On Wed, Mar 15, 2017 at 6:28 PM, Pino Toscano wrote: > > > Switch to URLs to the archive part of cdimage, so they will not become > > > invalid as soon as a new release is available. > > > > > > There is also a switch to version 8.6.0 -- the last Debian version at > > > this time is 8.7.1, which is just 8.7.0 but with fixed Volume IDs for > > > medias. Unfortunately, 8.7.1 is not available in the archive, yet. > > > --- > > > data/os/debian.org/debian-8.xml.in | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/data/os/debian.org/debian-8.xml.in > > > b/data/os/debian.org/debian-8.xml.in > > > index 19bb8a5..e2e131f 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/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso > > > + > > > http://cdimage.debian.org/mirror/cdimage/archive/8.6.0/i386/iso-dvd/debian-8.6.0-i386-DVD-1.iso > > > > > > Debian 8.\d.\d i386 1 > > > > > > @@ -41,7 +41,7 @@ > > >install.386/initrd.gz > > > > > > > > > - > > > http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso > > > + > > > http://cdimage.debian.org/mirror/cdimage/archive/8.6.0/amd64/iso-dvd/debian-8.6.0-amd64-DVD-1.iso > > > > > > Debian 8.\d.\d amd64 1 > > > > > > -- > > > 2.9.3 > > > > > > ___ > > > Libosinfo mailing list > > > Libosinfo@redhat.com > > > https://www.redhat.com/mailman/listinfo/libosinfo > > > > Pino, > > > > I've just reviewed Guido's patch. > > I know your approach and patch are different from his, but I'll go > > with his patch for now. > > Heya, > > that is fine -- though the problem still stands: the current paths > in debian-8.xml point to the non-archive part of cdimage, and there > only the latest version is kept. The consequence is that even the new > updated path (with 8.7.1) will become broken once 8.8 is released in > few months. OTOH, switching to archive means the URL is still working, > although of course may point to the non-latest version of Debian 8. > Still, IMHO it would be better to still be able to install an older > version (which you can easily dist-upgrade later), than nothing at all. > > I'm CCing Guido to get his opinion. (I'm cc'ing the relevant Debian bug report.) While using the archived versions is great for older releases I guess we should stick to the current URL. Another alternative would be a reflection service. I've set up http://cdr.debian.net/debian-cd/8/amd64/iso-dvd that would redirect to the current stable URLs. That would put the load of switching URLs on my end alone but having a non-official URLs in osinfo-db looks bad but it does allow for stable links to the current RC candidates that won't change on release: http://cdr.debian.net/debian-cd/9/i386/iso-dvd so we could add Debian stretch just now. Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] Debian Jessie: Update DVD links
On Thu, Mar 16, 2017 at 09:41:14AM +0100, Fabiano Fidêncio wrote: > Guido, > > On Thu, Mar 16, 2017 at 8:37 AM, Guido Günther wrote: > > On Wed, Mar 15, 2017 at 08:36:37PM +0100, Fabiano Fidêncio wrote: > >> On Wed, Mar 15, 2017 at 8:27 PM, Fabiano Fidêncio > >> wrote: > >> > On Tue, Mar 14, 2017 at 7:49 PM, Guido Günther wrote: > >> >> --- > >> >> data/os/debian.org/debian-8.xml.in | 4 ++-- > >> >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> >> > >> >> We don't have a stable link for Jessie stable (only for stable in > >> >> general) so we have to play this catch up game. > >> >> > >> >> diff --git a/data/os/debian.org/debian-8.xml.in > >> >> b/data/os/debian.org/debian-8.xml.in > >> >> index 19bb8a5..a72cc89 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/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso > >> >> + > >> >> http://cdimage.debian.org/debian-cd/8.7.1/i386/iso-dvd/debian-8.7.1-i386-DVD-1.iso > >> >> > >> >> Debian 8.\d.\d i386 1 > >> >> > >> >> @@ -41,7 +41,7 @@ > >> >>install.386/initrd.gz > >> >> > >> >> > >> >> - > >> >> http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso > >> >> + > >> >> http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-dvd/debian-8.7.1-amd64-DVD-1.iso > >> >> > >> >> Debian 8.\d.\d amd64 1 > >> >> > >> >> -- > >> >> 2.11.0 > >> >> > >> >> ___ > >> >> Libosinfo mailing list > >> >> Libosinfo@redhat.com > >> >> https://www.redhat.com/mailman/listinfo/libosinfo > >> > > >> > Ack! > >> > > >> > (I'll push the patch over the weekend) > >> > > >> > -- > >> > Fabiano Fidêncio > >> > >> Btw, if yoi have the ISO handy, would you mind providing a patch for > >> libosinfo? > >> > >> `isoinfo -d -i /path/to/file` is what we're interested in. > >> > >> You can just create a new file under debian8 dir, as you can see here: > >> https://gitlab.com/libosinfo/libosinfo/tree/master/test/isodata/debian/debian8/ > > > > That would be > > I would rather create a new file instead of changing the old one. Like: >From 2657781cb1699dbb36198b6ed1e6f46cee8f113b Mon Sep 17 00:00:00 2001 Message-Id: <2657781cb1699dbb36198b6ed1e6f46cee8f113b.1489670237.git@sigxcpu.org> From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Thu, 16 Mar 2017 08:06:46 +0100 Subject: [PATCH libosinfo] Update volume information for Debian Jessie To: libosinfo@redhat.com --- .../debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt | 29 ++ 1 file changed, 29 insertions(+) create mode 100644 test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt diff --git a/test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt b/test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt new file mode 100644 index 000..9f8f232 --- /dev/null +++ b/test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 8.7.1 amd64 1 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.3.6 2014.04.08.18, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.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: 322560 +El Torito VD version 1 found, boot catalog is in sector 2142 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: +Hid 1 +Arch 0 (x86) +ID '' +Key 55 AA +Eltorito defaultboot header: +Bootid 88 (bootable) +Boot media 0 (No Emulation Boot) +Load segment 0 +Sys type 0 +Nsect 4 +Bootoff 85F 2143 -- 2.11.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db] Add Debian 9.0 (stretch)
--- data/os/debian.org/debian-9.xml.in | 130 + 1 file changed, 130 insertions(+) create mode 100644 data/os/debian.org/debian-9.xml.in diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in new file mode 100644 index 000..15a0036 --- /dev/null +++ b/data/os/debian.org/debian-9.xml.in @@ -0,0 +1,130 @@ + + + http://debian.org/debian/9";> +debian9 +debianstretch +<_name>Debian Stretch +9 +<_vendor>Debian Project +linux +debian +http://debian.org/debian/8"/> +http://debian.org/debian/8"/> + +2017-06-17 + + + http://pcisig.com/pci/1af4/1041"/> + http://pcisig.com/pci/1af4/1042"/> + http://pcisig.com/pci/1af4/1043"/> + http://pcisig.com/pci/1af4/1044"/> + http://pcisig.com/pci/1af4/1045"/> + http://pcisig.com/pci/1af4/1048"/> + http://pcisig.com/pci/1af4/1049"/> + http://pcisig.com/pci/1af4/1052"/> + + + + +10 +1 +1073741824 +10737418240 + + +10 +1073741824 +21474836480 + + + + + <_name>Debian 9.0 + + + <_name>Debian 9.0 + + + + + + http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-9.0.0-i386-netinst.iso + +Debian 9.0.(\d)+ i386 n + + install.386/vmlinuz + install.386/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso + + Debian 9.0.(\d)+ amd64 n + + install.amd/vmlinuz + install.amd/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso + + Debian 9.0.(\d)+ arm64 n + + install.arm64/vmlinuz + install.arm64/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso + + Debian 9.0.(\d)+ armhf n + + install.armhf/vmlinuz + install.armhf/initrd.gz + + + + + + http://cdimage.debian.org/cdimage/release/9.0.0/i386/iso-dvd/debian-9.0.0-i386-DVD-1.iso + +Debian 9.0.(\d)+ i386 1 + + install.386/vmlinuz + install.386/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/9.0.0/amd64/iso-dvd/debian-9.0.0-amd64-DVD-1.iso + + Debian 9.0.(\d)+ amd64 1 + + install.amd/vmlinuz + install.amd/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso + + Debian 9.0.(\d)+ arm64 1 + + install.arm64/vmlinuz + install.arm64/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso + + Debian 9.0.(\d)+ armhf 1 + + install.armhf/vmlinuz + install.armhf/initrd.gz + + + + + + + + -- 2.11.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH v2 osinfo-db] Add Debian 9 (stretch)
--- This makes sure we detect future version (9.1.0, 9.2.0, ...) as well. data/os/debian.org/debian-9.xml.in | 130 + 1 file changed, 130 insertions(+) create mode 100644 data/os/debian.org/debian-9.xml.in diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in new file mode 100644 index 000..5a3c9db --- /dev/null +++ b/data/os/debian.org/debian-9.xml.in @@ -0,0 +1,130 @@ + + + http://debian.org/debian/9";> +debian9 +debianstretch +<_name>Debian Stretch +9 +<_vendor>Debian Project +linux +debian +http://debian.org/debian/8"/> +http://debian.org/debian/8"/> + +2017-06-17 + + + http://pcisig.com/pci/1af4/1041"/> + http://pcisig.com/pci/1af4/1042"/> + http://pcisig.com/pci/1af4/1043"/> + http://pcisig.com/pci/1af4/1044"/> + http://pcisig.com/pci/1af4/1045"/> + http://pcisig.com/pci/1af4/1048"/> + http://pcisig.com/pci/1af4/1049"/> + http://pcisig.com/pci/1af4/1052"/> + + + + +10 +1 +1073741824 +10737418240 + + +10 +1073741824 +21474836480 + + + + + <_name>Debian 9.0 + + + <_name>Debian 9.0 + + + + + + http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-9.0.0-i386-netinst.iso + +Debian 9.(\d)+.(\d)+ i386 n + + install.386/vmlinuz + install.386/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso + + Debian 9.(\d)+.(\d)+ amd64 n + + install.amd/vmlinuz + install.amd/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso + + Debian 9.(\d)+.(\d)+ arm64 n + + install.arm64/vmlinuz + install.arm64/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso + + Debian 9.(\d)+.(\d)+ armhf n + + install.armhf/vmlinuz + install.armhf/initrd.gz + + + + + + http://cdimage.debian.org/cdimage/release/9.0.0/i386/iso-dvd/debian-9.0.0-i386-DVD-1.iso + +Debian 9.(\d)+.(\d)+ i386 1 + + install.386/vmlinuz + install.386/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/9.0.0/amd64/iso-dvd/debian-9.0.0-amd64-DVD-1.iso + + Debian 9.(\d)+.(\d)+ amd64 1 + + install.amd/vmlinuz + install.amd/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso + + Debian 9.(\d)+.(\d)+ arm64 1 + + install.arm64/vmlinuz + install.arm64/initrd.gz + + + + http://cdimage.debian.org/cdimage/release/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso + + Debian 9.(\d)+.(\d)+ armhf 1 + + install.armhf/vmlinuz + install.armhf/initrd.gz + + + + + + + + -- 2.11.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db] debian: update Debian 8 DVD links
Things moved due to the Stretch release --- data/os/debian.org/debian-8.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in index a72cc89..8ad189b 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/debian-cd/8.7.1/i386/iso-dvd/debian-8.7.1-i386-DVD-1.iso + http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/i386/iso-dvd/debian-8.8.0-i386-DVD-1.iso Debian 8.\d.\d i386 1 @@ -41,7 +41,7 @@ install.386/initrd.gz - http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-dvd/debian-8.7.1-amd64-DVD-1.iso + http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/amd64/iso-dvd/debian-8.8.0-amd64-DVD-1.iso Debian 8.\d.\d amd64 1 -- 2.11.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] debian: update Debian 8 DVD links
On Tue, Jun 20, 2017 at 01:35:02PM +0200, Fabiano Fidêncio wrote: > On Mon, Jun 19, 2017 at 7:39 PM, Guido Günther wrote: > > Things moved due to the Stretch release > > --- > > data/os/debian.org/debian-8.xml.in | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/data/os/debian.org/debian-8.xml.in > > b/data/os/debian.org/debian-8.xml.in > > index a72cc89..8ad189b 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/debian-cd/8.7.1/i386/iso-dvd/debian-8.7.1-i386-DVD-1.iso > > + > > http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/i386/iso-dvd/debian-8.8.0-i386-DVD-1.iso > > > > Debian 8.\d.\d i386 1 > > > > @@ -41,7 +41,7 @@ > >install.386/initrd.gz > > > > > > - > > http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-dvd/debian-8.7.1-amd64-DVD-1.iso > > + > > http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/amd64/iso-dvd/debian-8.8.0-amd64-DVD-1.iso > > > > Debian 8.\d.\d amd64 1 > > > > -- > > 2.11.0 > > > > ___ > > Libosinfo mailing list > > Libosinfo@redhat.com > > https://www.redhat.com/mailman/listinfo/libosinfo > > ACK Pushed. Thanks -- Guido ! > > -- > Fabiano Fidêncio > ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH v2 osinfo-db] Add Debian 9 (stretch)
Hi Fabiano, On Tue, Jun 20, 2017 at 01:36:23PM +0200, Fabiano Fidêncio wrote: > Guido, > > Have you tested whether the express-installation is still working for > this new ISOs? I tested with an RC a while back. I can do another check with the final one tomorrow. > Just let me know, in case you didn't do this test, I'll take some time > and do it by myself before ACKing this patch. I pushed this change together with the other Debian related change, since I somehow remembered you ACKed both. Sorry abou that! Do you want me to revert? Cheers, -- Guido > > On Mon, Jun 19, 2017 at 8:59 AM, Guido Günther wrote: > > --- > > This makes sure we detect future version (9.1.0, 9.2.0, ...) as well. > > > > data/os/debian.org/debian-9.xml.in | 130 > > + > > 1 file changed, 130 insertions(+) > > create mode 100644 data/os/debian.org/debian-9.xml.in > > > > diff --git a/data/os/debian.org/debian-9.xml.in > > b/data/os/debian.org/debian-9.xml.in > > new file mode 100644 > > index 000..5a3c9db > > --- /dev/null > > +++ b/data/os/debian.org/debian-9.xml.in > > @@ -0,0 +1,130 @@ > > + > > + > > + http://debian.org/debian/9";> > > +debian9 > > +debianstretch > > +<_name>Debian Stretch > > +9 > > +<_vendor>Debian Project > > +linux > > +debian > > +http://debian.org/debian/8"/> > > +http://debian.org/debian/8"/> > > + > > +2017-06-17 > > + > > + > > + http://pcisig.com/pci/1af4/1041"/> > > + http://pcisig.com/pci/1af4/1042"/> > > + http://pcisig.com/pci/1af4/1043"/> > > + http://pcisig.com/pci/1af4/1044"/> > > + http://pcisig.com/pci/1af4/1045"/> > > + http://pcisig.com/pci/1af4/1048"/> > > + http://pcisig.com/pci/1af4/1049"/> > > + http://pcisig.com/pci/1af4/1052"/> > > + > > + > > + > > + > > +10 > > +1 > > +1073741824 > > +10737418240 > > + > > + > > +10 > > +1073741824 > > +21474836480 > > + > > + > > + > > + > > + <_name>Debian 9.0 > > + > > + > > + <_name>Debian 9.0 > > + > > + > > + > > + > > + > > + > > http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-9.0.0-i386-netinst.iso > > + > > +Debian 9.(\d)+.(\d)+ i386 n > > + > > + install.386/vmlinuz > > + install.386/initrd.gz > > + > > + > > + > > + > > http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso > > + > > + Debian 9.(\d)+.(\d)+ amd64 n > > + > > + install.amd/vmlinuz > > + install.amd/initrd.gz > > + > > + > > + > > + > > http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso > > + > > + Debian 9.(\d)+.(\d)+ arm64 n > > + > > + install.arm64/vmlinuz > > + install.arm64/initrd.gz > > + > > + > > + > > + > > http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso > > + > > + Debian 9.(\d)+.(\d)+ armhf n > > + > > + install.armhf/vmlinuz > > + install.armhf/initrd.gz > > + > > + > > + > > + > > + > > + > > http://cdimage.debian.org/cdimage/release/9.0.0/i386/iso-dvd/debian-9.0.0-i386-DVD-1.iso > > + > > +Debian 9.(\d)+.(\d)+ i386 1 > > + > > + install.386/vmlinuz > > + install.386/initrd.gz > > + > > + > > + > > + > > http://cdimage.debian.org/cdimage/release/9.0.0/amd64/iso-dvd/debian-9.0.0-amd64-DVD-1.iso > > + > > + Debian 9.(\d)+.(\d)+ amd64 1 > > + > > + install.amd/vmlinuz > > + install.amd/initrd.gz > > + > > + > > + > > + > > http://cdimage.debian.org/cdimage/release/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso > > + > > + Debian 9.(\d)+.(\d)+ arm64 1 > > + > > + install.arm64/vmlinuz > > + install.arm64/initrd.gz > > + > > + > > + > > + > > http://cdimage.debian.org/cdimage/release/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso > > + > > + Debian 9.(\d)+.(\d)+ armhf 1 > > + > > + install.armhf/vmlinuz > > + install.armhf/initrd.gz > > + > > + > > + > > + > > + > > + > > + > > + > > -- > > 2.11.0 > > > > ___ > > Libosinfo mailing list > > Libosinfo@redhat.com > > https://www.redhat.com/mailman/listinfo/libosinfo > > > > -- > Fabiano Fidêncio > ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH v2 osinfo-db] Add Debian 9 (stretch)
On Wed, Jun 21, 2017 at 02:16:18PM +0200, Fabiano Fidêncio wrote: > On Wed, Jun 21, 2017 at 7:53 AM, Guido Günther wrote: > > Hi Fabiano, > > > > On Tue, Jun 20, 2017 at 01:36:23PM +0200, Fabiano Fidêncio wrote: > >> Guido, > >> > >> Have you tested whether the express-installation is still working for > >> this new ISOs? > > > > I tested with an RC a while back. I can do another check with the final > > one tomorrow. > > > >> Just let me know, in case you didn't do this test, I'll take some time > >> and do it by myself before ACKing this patch. > > > > I pushed this change together with the other Debian related change, > > since I somehow remembered you ACKed both. Sorry abou that! Do you want > > me to revert? > > Hmm. No, there's no need to revert but, please, let me know about the > result of your tests Tomorrow. Express install worked as expected. > Also, please, for the next time, add a "Acked-by: ..." in the commit > message before pushing, just for the record :-) Will do. Cheers, -- Guido > > > Cheers, > > -- Guido > > > >> > >> On Mon, Jun 19, 2017 at 8:59 AM, Guido Günther wrote: > >> > --- > >> > This makes sure we detect future version (9.1.0, 9.2.0, ...) as well. > >> > > >> > data/os/debian.org/debian-9.xml.in | 130 > >> > + > >> > 1 file changed, 130 insertions(+) > >> > create mode 100644 data/os/debian.org/debian-9.xml.in > >> > > >> > diff --git a/data/os/debian.org/debian-9.xml.in > >> > b/data/os/debian.org/debian-9.xml.in > >> > new file mode 100644 > >> > index 000..5a3c9db > >> > --- /dev/null > >> > +++ b/data/os/debian.org/debian-9.xml.in > >> > @@ -0,0 +1,130 @@ > >> > + > >> > + > >> > + http://debian.org/debian/9";> > >> > +debian9 > >> > +debianstretch > >> > +<_name>Debian Stretch > >> > +9 > >> > +<_vendor>Debian Project > >> > +linux > >> > +debian > >> > +http://debian.org/debian/8"/> > >> > +http://debian.org/debian/8"/> > >> > + > >> > +2017-06-17 > >> > + > >> > + > >> > + http://pcisig.com/pci/1af4/1041"/> > >> > + http://pcisig.com/pci/1af4/1042"/> > >> > + http://pcisig.com/pci/1af4/1043"/> > >> > + http://pcisig.com/pci/1af4/1044"/> > >> > + http://pcisig.com/pci/1af4/1045"/> > >> > + http://pcisig.com/pci/1af4/1048"/> > >> > + http://pcisig.com/pci/1af4/1049"/> > >> > + http://pcisig.com/pci/1af4/1052"/> > >> > + > >> > + > >> > + > >> > + > >> > +10 > >> > +1 > >> > +1073741824 > >> > +10737418240 > >> > + > >> > + > >> > +10 > >> > +1073741824 > >> > +21474836480 > >> > + > >> > + > >> > + > >> > + > >> > + <_name>Debian 9.0 > >> > + > >> > + > >> > + <_name>Debian 9.0 > >> > + > >> > + > >> > + > >> > + > >> > + > >> > + > >> > http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-9.0.0-i386-netinst.iso > >> > + > >> > +Debian 9.(\d)+.(\d)+ i386 n > >> > + > >> > + install.386/vmlinuz > >> > + install.386/initrd.gz > >> > + > >> > + > >> > + > >> > + > >> > http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso > >> > + > >> > + Debian 9.(\d)+.(\d)+ amd64 n > >> > + > >> > + install.amd/vmlinuz > >> > + install.amd/initrd.gz > >> > + > >> > + > >> > + > >> > + > >> > http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso > >>
[Libosinfo] [PATCH libosinfo] tests: add Debian 9.0 test data
--- .../debian9/debian-9.0-amd64-netinst.iso.txt | 29 ++ .../debian/debian9/debian-9.0-amd64.iso.txt| 29 ++ .../debian9/debian-9.0-arm64-netinst.iso.txt | 29 ++ .../debian/debian9/debian-9.0-arm64.iso.txt| 29 ++ .../debian9/debian-9.0-armhf-netinst.iso.txt | 16 .../debian/debian9/debian-9.0-armhf.iso.txt| 16 .../debian/debian9/debian-9.0-i386-netinst.iso.txt | 29 ++ .../isodata/debian/debian9/debian-9.0-i386.iso.txt | 29 ++ 8 files changed, 206 insertions(+) create mode 100644 tests/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.0-amd64.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.0-arm64-netinst.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.0-arm64.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.0-armhf-netinst.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.0-armhf.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.0-i386-netinst.iso.txt create mode 100644 tests/isodata/debian/debian9/debian-9.0-i386.iso.txt Since the mailing list rejects this as spam I've created a fork on gitlab here: https://gitlab.com/agx1/libosinfo/commit/117029715f90c5c7a2f2a996b21e9fefca6585c8 Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db PATCH] debian: fix architecture names to match schema
On Fri, Jul 07, 2017 at 01:36:29PM +0200, Pino Toscano wrote: > The schema has names for architectures which are closer to the RPM > naming than the dpkg one -- thus, fix: > - arm64 -> aarch64 > - armhf -> armv7l Are the ones in libosinfo/tests/test-isodetect.c the right ones? Asking since I intend to add all our architectures and flavours in the future (once I get around to automate this). > > Fixes commit 5d852472685792a240dc1738e051a59793c47b18. > --- > data/os/debian.org/debian-9.xml.in | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/data/os/debian.org/debian-9.xml.in > b/data/os/debian.org/debian-9.xml.in > index e0b9085..80cc048 100644 > --- a/data/os/debian.org/debian-9.xml.in > +++ b/data/os/debian.org/debian-9.xml.in > @@ -65,7 +65,7 @@ >install.amd/vmlinuz >install.amd/initrd.gz > > - > + > > > http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso > > @@ -74,7 +74,7 @@ >install.arm64/vmlinuz >install.arm64/initrd.gz > > - > + > > > http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso > > @@ -103,7 +103,7 @@ >install.amd/vmlinuz >install.amd/initrd.gz > > - > + > > > http://cdimage.debian.org/cdimage/release/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso > > @@ -112,7 +112,7 @@ >install.arm64/vmlinuz >install.arm64/initrd.gz > > - > + > > > http://cdimage.debian.org/cdimage/release/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso > ACK. -- Guido > -- > 2.9.4 > ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db PATCH] debian: fix architecture names to match schema
On Fri, Jul 07, 2017 at 04:23:53PM +0200, Pino Toscano wrote: > On Friday, 7 July 2017 15:59:39 CEST Guido Günther wrote: > > On Fri, Jul 07, 2017 at 01:36:29PM +0200, Pino Toscano wrote: > > > The schema has names for architectures which are closer to the RPM > > > naming than the dpkg one -- thus, fix: > > > - arm64 -> aarch64 > > > - armhf -> armv7l > > > > Are the ones in libosinfo/tests/test-isodetect.c the right ones? Asking > > since I intend to add all our architectures and flavours in the future > > (once I get around to automate this). > > Do you mean the various string findings in the "load_iso" function? > To me, that looks more like an heuristic to guess the architecture of > the test data based on its filename, rather than the > > One place with the canonical list of the architectures is in osinfo-db, > data/schema/osinfo.rng.in, the "archnames" define. > > PS: please remember to run `make check` in osinfo-db ;-) Oh...didn't notice that we have that yet. Will do, the Debian package just uploaded does this too now. > > > [...] > > > > ACK. > > -- Guido > > Thanks! Can you please push it? Done. Thanks! -- Guido > > -- > Pino Toscano ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH libosinfo] tests: add Debian 9.0 test data
On Tue, Jun 27, 2017 at 01:22:26PM +0200, Guido Günther wrote: > --- > .../debian9/debian-9.0-amd64-netinst.iso.txt | 29 > ++ > .../debian/debian9/debian-9.0-amd64.iso.txt| 29 > ++ > .../debian9/debian-9.0-arm64-netinst.iso.txt | 29 > ++ > .../debian/debian9/debian-9.0-arm64.iso.txt| 29 > ++ > .../debian9/debian-9.0-armhf-netinst.iso.txt | 16 > .../debian/debian9/debian-9.0-armhf.iso.txt| 16 > .../debian/debian9/debian-9.0-i386-netinst.iso.txt | 29 > ++ > .../isodata/debian/debian9/debian-9.0-i386.iso.txt | 29 > ++ > 8 files changed, 206 insertions(+) > create mode 100644 > tests/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt > create mode 100644 tests/isodata/debian/debian9/debian-9.0-amd64.iso.txt > create mode 100644 > tests/isodata/debian/debian9/debian-9.0-arm64-netinst.iso.txt > create mode 100644 tests/isodata/debian/debian9/debian-9.0-arm64.iso.txt > create mode 100644 > tests/isodata/debian/debian9/debian-9.0-armhf-netinst.iso.txt > create mode 100644 tests/isodata/debian/debian9/debian-9.0-armhf.iso.txt > create mode 100644 > tests/isodata/debian/debian9/debian-9.0-i386-netinst.iso.txt > create mode 100644 tests/isodata/debian/debian9/debian-9.0-i386.iso.txt > > Since the mailing list rejects this as spam I've created a fork on > gitlab here: > > > https://gitlab.com/agx1/libosinfo/commit/117029715f90c5c7a2f2a996b21e9fefca6585c8 Ping? -- Guido > > Cheers, > -- Guido > > ___ > Libosinfo mailing list > Libosinfo@redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo > ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH libosinfo] tests: add Debian 9.0 test data
On Mon, Jul 10, 2017 at 01:39:51PM +0200, Fabiano Fidêncio wrote: > On Mon, Jul 10, 2017 at 8:51 AM, Guido Günther wrote: > > On Tue, Jun 27, 2017 at 01:22:26PM +0200, Guido Günther wrote: > >> --- > >> .../debian9/debian-9.0-amd64-netinst.iso.txt | 29 > >> ++ > >> .../debian/debian9/debian-9.0-amd64.iso.txt| 29 > >> ++ > >> .../debian9/debian-9.0-arm64-netinst.iso.txt | 29 > >> ++ > >> .../debian/debian9/debian-9.0-arm64.iso.txt| 29 > >> ++ > >> .../debian9/debian-9.0-armhf-netinst.iso.txt | 16 > >> .../debian/debian9/debian-9.0-armhf.iso.txt| 16 > >> .../debian/debian9/debian-9.0-i386-netinst.iso.txt | 29 > >> ++ > >> .../isodata/debian/debian9/debian-9.0-i386.iso.txt | 29 > >> ++ > >> 8 files changed, 206 insertions(+) > >> create mode 100644 > >> tests/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt > >> create mode 100644 tests/isodata/debian/debian9/debian-9.0-amd64.iso.txt > >> create mode 100644 > >> tests/isodata/debian/debian9/debian-9.0-arm64-netinst.iso.txt > >> create mode 100644 tests/isodata/debian/debian9/debian-9.0-arm64.iso.txt > >> create mode 100644 > >> tests/isodata/debian/debian9/debian-9.0-armhf-netinst.iso.txt > >> create mode 100644 tests/isodata/debian/debian9/debian-9.0-armhf.iso.txt > >> create mode 100644 > >> tests/isodata/debian/debian9/debian-9.0-i386-netinst.iso.txt > >> create mode 100644 tests/isodata/debian/debian9/debian-9.0-i386.iso.txt > >> > >> Since the mailing list rejects this as spam I've created a fork on > >> gitlab here: > >> > >> > >> https://gitlab.com/agx1/libosinfo/commit/117029715f90c5c7a2f2a996b21e9fefca6585c8 > > > > Ping? > > ACK! Pushed. Thanks! -- Guido > > > -- Guido > > > >> > >> Cheers, > >> -- Guido > >> > >> ___ > >> Libosinfo mailing list > >> Libosinfo@redhat.com > >> https://www.redhat.com/mailman/listinfo/libosinfo > >> > > > > ___ > > Libosinfo mailing list > > Libosinfo@redhat.com > > https://www.redhat.com/mailman/listinfo/libosinfo > ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH libosinfo] test-isodetect: add Debian's arm flavours
to avoid "Unknown arch" debug messges
---
tests/test-isodetect.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index c72b8fc..6a38963 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -128,8 +128,12 @@ static struct ISOInfo *load_iso(GFile *file, const gchar
*shortid, const gchar *
arch = "ia64";
else if (strstr(name, "s390x"))
arch = "s390x";
-else if (strstr(name, "aarch64"))
+else if (strstr(name, "aarch64") ||
+ strstr(name, "arm64"))
arch = "aarch64";
+else if (strstr(name, "armhf") ||
+ strstr(name, "armv7l"))
+arch = "armhf";
else {
g_debug("Unknown arch in %s", name);
arch = "i386";
--
2.13.2
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH libosinfo] test-isodetect: fix parsing of application, system and publisher id
---
tests/test-isodetect.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index 0e9aea5..c72b8fc 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -146,13 +146,13 @@ static struct ISOInfo *load_iso(GFile *file, const gchar
*shortid, const gchar *
value = line + strlen("Volume id: ");
} else if (g_str_has_prefix(line, "Publisher id: ")) {
key = OSINFO_MEDIA_PROP_PUBLISHER_ID;
-value = line + strlen("Volume id: ");
+value = line + strlen("Publisher id: ");
} else if (g_str_has_prefix(line, "System id: ")) {
key = OSINFO_MEDIA_PROP_SYSTEM_ID;
-value = line + strlen("Volume id: ");
+value = line + strlen("System id: ");
} else if (g_str_has_prefix(line, "Application id: ")) {
key = OSINFO_MEDIA_PROP_APPLICATION_ID;
-value = line + strlen("Volume id: ");
+value = line + strlen("Application id: ");
} else if (g_str_has_prefix(line, "Logical block size is: ")) {
blk_size = (gint64) atoll(line + strlen("Logical block size is:
"));
} else if (g_str_has_prefix(line, "Volume size is: ")) {
--
2.13.2
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH libosinfo] test-isodetect: fix parsing of application, system and publisher id
On Wed, Jul 12, 2017 at 09:33:15AM +0200, Christophe Fergeau wrote:
>
> Acked-by: Christophe Fergeau
Pushed. Thanks
-- Guido
>
> On Tue, Jul 11, 2017 at 10:00:26PM +0200, Guido Günther wrote:
> > ---
> > tests/test-isodetect.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
> > index 0e9aea5..c72b8fc 100644
> > --- a/tests/test-isodetect.c
> > +++ b/tests/test-isodetect.c
> > @@ -146,13 +146,13 @@ static struct ISOInfo *load_iso(GFile *file, const
> > gchar *shortid, const gchar *
> > value = line + strlen("Volume id: ");
> > } else if (g_str_has_prefix(line, "Publisher id: ")) {
> > key = OSINFO_MEDIA_PROP_PUBLISHER_ID;
> > -value = line + strlen("Volume id: ");
> > +value = line + strlen("Publisher id: ");
> > } else if (g_str_has_prefix(line, "System id: ")) {
> > key = OSINFO_MEDIA_PROP_SYSTEM_ID;
> > -value = line + strlen("Volume id: ");
> > +value = line + strlen("System id: ");
> > } else if (g_str_has_prefix(line, "Application id: ")) {
> > key = OSINFO_MEDIA_PROP_APPLICATION_ID;
> > -value = line + strlen("Volume id: ");
> > +value = line + strlen("Application id: ");
> > } else if (g_str_has_prefix(line, "Logical block size is: ")) {
> > blk_size = (gint64) atoll(line + strlen("Logical block size
> > is: "));
> > } else if (g_str_has_prefix(line, "Volume size is: ")) {
> > --
> > 2.13.2
> >
> > ___
> > Libosinfo mailing list
> > Libosinfo@redhat.com
> > https://www.redhat.com/mailman/listinfo/libosinfo
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH libosinfo v2] test-isodetect: add Debian's arm flavours
to avoid "Unknown arch" debug messages
---
tests/test-isodetect.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index c72b8fc..9306be4 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -128,8 +128,14 @@ static struct ISOInfo *load_iso(GFile *file, const gchar
*shortid, const gchar *
arch = "ia64";
else if (strstr(name, "s390x"))
arch = "s390x";
-else if (strstr(name, "aarch64"))
+else if (strstr(name, "aarch64") ||
+ strstr(name, "arm64"))
arch = "aarch64";
+else if (strstr(name, "armv7l"))
+arch = "armv7l";
+else if (strstr(name, "armhf") ||
+ strstr(name, "armv7hl"))
+arch = "armv7hl";
else {
g_debug("Unknown arch in %s", name);
arch = "i386";
--
2.13.2
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH libosinfo] test-isodetect: add Debian's arm flavours
Hi, On Wed, Jul 12, 2017 at 09:35:16AM +0200, Christophe Fergeau wrote: > On Tue, Jul 11, 2017 at 09:58:26PM +0200, Guido Günther wrote: > > to avoid "Unknown arch" debug messges > > --- > > tests/test-isodetect.c | 6 +- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c > > index c72b8fc..6a38963 100644 > > --- a/tests/test-isodetect.c > > +++ b/tests/test-isodetect.c > > @@ -128,8 +128,12 @@ static struct ISOInfo *load_iso(GFile *file, const > > gchar *shortid, const gchar * > > arch = "ia64"; > > else if (strstr(name, "s390x")) > > arch = "s390x"; > > -else if (strstr(name, "aarch64")) > > +else if (strstr(name, "aarch64") || > > + strstr(name, "arm64")) > > arch = "aarch64"; > > This change looks good. > > > +else if (strstr(name, "armhf") || > > + strstr(name, "armv7l")) > > +arch = "armhf"; > > However for this one I'd expect arch = "armv7l" as this is what is in > the RNG schema? My understanding of > https://bugzilla.redhat.com/show_bug.cgi?id=719609#c13 is that armv7l is > a soft floating point arch, armv7hl would be hard floating point. And > armhf is hard floating point as well. So I don't think we can consider > the 2 are the same here. You probably need to add a new ARM arch to the > schema file, and use that for armhf. On my A20 Olinuxino I see $ uname -m armv7l $ dpkg --print-architecture armhf I assumed that the armv7l refers to an architecture supporting hard float but your link suggests otherwise. In this case we need to fixup osinfo-db as well. I couldn't find any other good references on this. I'll post a v2 for libosinfo and will fix osinfo-db if that looks o.k. Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH libosinfo v2] test-isodetect: add Debian's arm flavours
On Thu, Jul 13, 2017 at 04:35:43PM +0100, Daniel P. Berrange wrote: > On Thu, Jul 13, 2017 at 02:39:47PM +0200, Guido Günther wrote: > > to avoid "Unknown arch" debug messages > > --- > > tests/test-isodetect.c | 8 +++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c > > index c72b8fc..9306be4 100644 > > --- a/tests/test-isodetect.c > > +++ b/tests/test-isodetect.c > > @@ -128,8 +128,14 @@ static struct ISOInfo *load_iso(GFile *file, const > > gchar *shortid, const gchar * > > arch = "ia64"; > > else if (strstr(name, "s390x")) > > arch = "s390x"; > > -else if (strstr(name, "aarch64")) > > +else if (strstr(name, "aarch64") || > > + strstr(name, "arm64")) > > arch = "aarch64"; > > +else if (strstr(name, "armv7l")) > > +arch = "armv7l"; > > +else if (strstr(name, "armhf") || > > + strstr(name, "armv7hl")) > > +arch = "armv7hl"; > > These should all just be normalizing to 'armv7l' - ie arm7 little endian. No > need for a hard vs soft float distinction here, that's just a CPU sub-feature > not a different architecture. That makes sense if armv7l mandates VFP. I couldn't figure that out reliably yesterday but looking at [1] and [2] it seems so. It would be be similar to mips running o32, n32 or n64 and all ABIs are supported by the same CPU. v3 forthcoming. Thanks for the clarification, -- Guido [1]: https://en.wikipedia.org/wiki/Comparison_of_ARMv7-A_cores [2]: http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0471k/pge1358786964554.html ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH libosinfo v3] test-isodetect: add Debian's arm flavours
to avoid "Unknown arch" debug messages
---
tests/test-isodetect.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index c72b8fc..7214531 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -128,8 +128,13 @@ static struct ISOInfo *load_iso(GFile *file, const gchar
*shortid, const gchar *
arch = "ia64";
else if (strstr(name, "s390x"))
arch = "s390x";
-else if (strstr(name, "aarch64"))
+else if (strstr(name, "aarch64") ||
+ strstr(name, "arm64"))
arch = "aarch64";
+else if (strstr(name, "armv7l") ||
+ strstr(name, "armv7hl") ||
+ strstr(name, "armhf"))
+arch = "armv7l";
else {
g_debug("Unknown arch in %s", name);
arch = "i386";
--
2.13.2
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH libosinfo v3] test-isodetect: add Debian's arm flavours
On Thu, Jul 13, 2017 at 05:04:54PM +0100, Daniel P. Berrange wrote:
> On Thu, Jul 13, 2017 at 05:49:02PM +0200, Guido Günther wrote:
> > to avoid "Unknown arch" debug messages
> > ---
> > tests/test-isodetect.c | 7 ++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
> > index c72b8fc..7214531 100644
> > --- a/tests/test-isodetect.c
> > +++ b/tests/test-isodetect.c
> > @@ -128,8 +128,13 @@ static struct ISOInfo *load_iso(GFile *file, const
> > gchar *shortid, const gchar *
> > arch = "ia64";
> > else if (strstr(name, "s390x"))
> > arch = "s390x";
> > -else if (strstr(name, "aarch64"))
> > +else if (strstr(name, "aarch64") ||
> > + strstr(name, "arm64"))
> > arch = "aarch64";
> > +else if (strstr(name, "armv7l") ||
> > + strstr(name, "armv7hl") ||
> > + strstr(name, "armhf"))
> > +arch = "armv7l";
> > else {
> > g_debug("Unknown arch in %s", name);
> > arch = "i386";
>
> ACK
Pushed. Thanks
-- Guido
>
> 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 :|
>
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db PATCH 2/4] debian: fix 7 ISO location
Hi, On Fri, Jul 14, 2017 at 02:30:28PM +0200, Pino Toscano wrote: > Point to the latest release of Debian 7. > --- > data/os/debian.org/debian-7.xml.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/data/os/debian.org/debian-7.xml.in > b/data/os/debian.org/debian-7.xml.in > index 0afe388..8c2d4ca 100644 > --- a/data/os/debian.org/debian-7.xml.in > +++ b/data/os/debian.org/debian-7.xml.in > @@ -39,7 +39,7 @@ > > > > - > http://cdimage.debian.org/mirror/cdimage/archive/7.9.0/i386/iso-dvd/debian-7.9.0-i386-DVD-1.iso > + > http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/i386/iso-dvd/debian-7.11.0-i386-DVD-1.iso > > Debian 7.\d.\d i386 1 > > @@ -47,7 +47,7 @@ >install.386/initrd.gz > > > - > http://cdimage.debian.org/mirror/cdimage/archive/7.9.0/amd64/iso-dvd/debian-7.9.0-amd64-DVD-1.iso > + > http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/amd64/iso-dvd/debian-7.11.0-amd64-DVD-1.iso > > Debian 7.\d.\d amd64 1 > While the old links are still valid it's nicer to use the last point release. ACK. -- Guido > -- > 2.9.4 > > ___ > Libosinfo mailing list > Libosinfo@redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo > ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db PATCH 2/4] debian: fix 7 ISO location
Hi, On Fri, Jul 14, 2017 at 04:21:57PM +0200, Pino Toscano wrote: > On Friday, 14 July 2017 16:04:37 CEST Guido Günther wrote: > > Hi, > > On Fri, Jul 14, 2017 at 02:30:28PM +0200, Pino Toscano wrote: > > > Point to the latest release of Debian 7. > > > --- > > > data/os/debian.org/debian-7.xml.in | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/data/os/debian.org/debian-7.xml.in > > > b/data/os/debian.org/debian-7.xml.in > > > index 0afe388..8c2d4ca 100644 > > > --- a/data/os/debian.org/debian-7.xml.in > > > +++ b/data/os/debian.org/debian-7.xml.in > > > @@ -39,7 +39,7 @@ > > > > > > > > > > > > - > > > http://cdimage.debian.org/mirror/cdimage/archive/7.9.0/i386/iso-dvd/debian-7.9.0-i386-DVD-1.iso > > > + > > > http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/i386/iso-dvd/debian-7.11.0-i386-DVD-1.iso > > > > > > Debian 7.\d.\d i386 1 > > > > > > @@ -47,7 +47,7 @@ > > >install.386/initrd.gz > > > > > > > > > - > > > http://cdimage.debian.org/mirror/cdimage/archive/7.9.0/amd64/iso-dvd/debian-7.9.0-amd64-DVD-1.iso > > > + > > > http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/amd64/iso-dvd/debian-7.11.0-amd64-DVD-1.iso > > > > > > Debian 7.\d.\d amd64 1 > > > > > > > While the old links are still valid it's nicer to use the last point > > release. ACK. > > Actually, the old links are not valid -- only the latest version of a > stable series has media available. For oldstable (Debian 8) the point releases have media back to 8.4 so there seems to be more than one version around. Weird. I've just pushed this patch. -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [PATCH osinfo-db] debian: switch to archive URLs for stretch
Now that the first point release is there switch to archive URLs since these remain stable (at least as long as this is the current stable release). The current URLs are now longer valid since the patchs contain a 9.0.1 in the filename now. --- data/os/debian.org/debian-9.xml.in | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in index 80cc048..759422b 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/release/current/i386/iso-cd/debian-9.0.0-i386-netinst.iso + http://cdimage.debian.org/cdimage/archive/9.0.0/i386/iso-cd/debian-9.0.0-i386-netinst.iso Debian 9.(\d)+.(\d)+ i386 n @@ -58,7 +58,7 @@ - http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso + http://cdimage.debian.org/cdimage/archive/9.0.0/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso Debian 9.(\d)+.(\d)+ amd64 n @@ -67,7 +67,7 @@ - http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso + http://cdimage.debian.org/cdimage/archive/9.0.0/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso Debian 9.(\d)+.(\d)+ arm64 n @@ -76,7 +76,7 @@ - http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso + http://cdimage.debian.org/cdimage/archive/9.0.0/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso Debian 9.(\d)+.(\d)+ armhf n @@ -87,7 +87,7 @@ - http://cdimage.debian.org/cdimage/release/9.0.0/i386/iso-dvd/debian-9.0.0-i386-DVD-1.iso + http://cdimage.debian.org/cdimage/archive/9.0.0/i386/iso-dvd/debian-9.0.0-i386-DVD-1.iso Debian 9.(\d)+.(\d)+ i386 1 @@ -96,7 +96,7 @@ - http://cdimage.debian.org/cdimage/release/9.0.0/amd64/iso-dvd/debian-9.0.0-amd64-DVD-1.iso + http://cdimage.debian.org/cdimage/archive/9.0.0/amd64/iso-dvd/debian-9.0.0-amd64-DVD-1.iso Debian 9.(\d)+.(\d)+ amd64 1 @@ -105,7 +105,7 @@ - http://cdimage.debian.org/cdimage/release/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso + http://cdimage.debian.org/cdimage/archive/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso Debian 9.(\d)+.(\d)+ arm64 1 @@ -114,7 +114,7 @@ - http://cdimage.debian.org/cdimage/release/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso + http://cdimage.debian.org/cdimage/archive/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso Debian 9.(\d)+.(\d)+ armhf 1 -- 2.13.2 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] debian: switch to archive URLs for stretch
Hi, On Wed, Aug 02, 2017 at 12:23:56PM +0200, Christophe Fergeau wrote: > On Sun, Jul 23, 2017 at 02:01:42PM +0200, Guido Günther wrote: > > Now that the first point release is there switch to archive URLs since > > these remain stable (at least as long as this is the current stable > > release). The current URLs are now longer valid since the patchs contain > > s/now/no > > > a 9.0.1 in the filename now. > > Acked-by: Christophe Fergeau > though if we want to be consistent with > dee2dbc5e0d7, we should change the URLs to point to 9.1.0 As Pino pointed out some time go these change with every point release and would leave as with 404 [1]. The archive URLs remain valid for longer (but not forever, see Pino's other patches for older Debian releases). I'll try to check with the Debian CD folks at Debconf if we can do s.th. about this. Cheers, -- Guido [1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813797 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH] tests: convert from check to the GLib testing framework
Hi,
On Thu, Oct 19, 2017 at 04:14:14PM +0200, Pino Toscano wrote:
> On Thursday, 19 October 2017 16:02:18 CEST Daniel P. Berrange wrote:
> > On Thu, Oct 19, 2017 at 03:59:02PM +0200, Pino Toscano wrote:
> > > On Thursday, 19 October 2017 15:36:28 CEST Daniel P. Berrange wrote:
> > > > On Thu, Oct 19, 2017 at 03:14:24PM +0200, Pino Toscano wrote:
> > > > > diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
> > > > > index 7214531..97c86c4 100644
> > > > > --- a/tests/test-isodetect.c
> > > > > +++ b/tests/test-isodetect.c
> > > >
> > > > > -int main(void)
> > > > > -{
> > > > > -int number_failed;
> > > > > -Suite *s = list_suite();
> > > > > -SRunner *sr = srunner_create(s);
> > > > > +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);
> > > >
> > > > We could wrap all of this in a
> > > >
> > > >if (g_test_slow()) {
> > > >
> > > >}
> > > >
> > > > so that this only executes if people request slow tests via '-m slow'
> > > > arg
> > >
> > > Hm aren't these tests worth executing by default? Not sure what is the
> > > proper definition of "slow" for GLib tests though, and test-isodetect
> > > takes less than 20 seconds to run here.
> >
> > They're primarily useful for upstream to run - I don't think there's much
> > benefit downstream users running them. So I think its the kind of thing
> > where we could put '-m slow' into our CI system tests.
>
> Couldn't it be useful for downstream as well, i.e. to check that the
> data provided in osinfo-db actually match the expected ISO data? Say
> in case a downstream adds custom changes (or backport upstream commits),
> so they know the modified osinfo-db is OK.
>
> > THis would avoid downstream users needing networking during tests too IIUC.
>
> Note that test-isodetect does not require networking, as it uses the
> data in tests/isodata.
>From a distro point of view I'd rather have these run by default and see
-mslow preserved for really slow tests.
Cheers,
-- Guido
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] libosinfo signatures
Hi, Older libosinfo releases were signed with Daniel's key: $ gpg --verify libosinfo_1.2.0.orig.tar.gz.asc gpg: assuming signed data in 'libosinfo_1.2.0.orig.tar.gz' gpg: Signature made Mi 20 Jun 2018 11:46:42 CEST gpg:using RSA key 0xBE86EBB415104FDF gpg: Good signature from "Daniel P. Berrange " [unknown] gpg: aka "Daniel P. Berrange " [unknown] gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF And this key can be found on keyservers https://pgp.surfnet.nl/pks/lookup?search=0xBE86EBB415104FDF&fingerprint=on&op=index 1.4.0 seems to use a different key $ gpg --verify libosinfo-1.4.0.tar.gz.asc gpg: assuming signed data in 'libosinfo-1.4.0.tar.gz' gpg: Signature made Fr 01 Mär 2019 17:01:14 CET gpg:using RSA key 09B9C8FF223EF113AFA06A39EE926C2BDACC177B gpg: Can't check signature: No public key However i can't find that key on keyservers nor mentioned on https://libosinfo.org/ nor at https://releases.pagure.org/libosinfo/. Can you point me to the signing key? Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] libosinfo signatures
Hi, On Thu, Apr 11, 2019 at 11:39:51AM +0200, Fabiano Fidêncio wrote: > Guido, > > On Thu, Apr 11, 2019 at 11:10 AM Guido Günther wrote: > > > > Hi, > > Older libosinfo releases were signed with Daniel's key: > > > > $ gpg --verify libosinfo_1.2.0.orig.tar.gz.asc > > gpg: assuming signed data in 'libosinfo_1.2.0.orig.tar.gz' > > gpg: Signature made Mi 20 Jun 2018 11:46:42 CEST > > gpg:using RSA key 0xBE86EBB415104FDF > > gpg: Good signature from "Daniel P. Berrange " [unknown] > > gpg: aka "Daniel P. Berrange " > > [unknown] > > gpg: WARNING: This key is not certified with a trusted signature! > > gpg: There is no indication that the signature belongs to the > > owner. > > Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF > > > > And this key can be found on keyservers > > > > > > https://pgp.surfnet.nl/pks/lookup?search=0xBE86EBB415104FDF&fingerprint=on&op=index > > > > 1.4.0 seems to use a different key > > > > $ gpg --verify libosinfo-1.4.0.tar.gz.asc > > gpg: assuming signed data in 'libosinfo-1.4.0.tar.gz' > > gpg: Signature made Fr 01 Mär 2019 17:01:14 CET > > gpg:using RSA key 09B9C8FF223EF113AFA06A39EE926C2BDACC177B > > gpg: Can't check signature: No public key > > > > However i can't find that key on keyservers nor mentioned on > > https://libosinfo.org/ nor at https://releases.pagure.org/libosinfo/. > > > > Can you point me to the signing key? > > Hmm. That's my fault. > I've added the whole fingerprint, while I should have just added 0xDACC177B > Note taken for the next release. > > Here's the link for the key: > http://hkps.pool.sks-keyservers.net/pks/lookup?search=0xDACC177B&fingerprint=on&op=index Thanks! It'd be nice to have the signing keys in upstreams upstream git or somewhere prominent so one does not need to go hunting for it. Cheers, -- Guido ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db PATCH v2 0/7] Fix out-of-tree builds
Hi,
On Tue, Apr 23, 2019 at 05:20:33PM +0200, Fabiano Fidêncio wrote:
> In order to fix out-of-tree builds we need to:
> - do not consider source (.xml.in) and generated (.xml) files are in the same
> directory;
> - with this, some changes have to be done in order to properly run
> _check_uncommended_devices() test
> - set the proper environmnet variables for INTERNAL_OSINFO_DB_DATA_DIR and
> OSINFO_DB_DATA_SRC_DIR when calling pytest.
> - call pytest pointint to the tests directory
>
> As we don't rely on autoconf, ABS_TOPDIR has been added to our Makefile.
>
> Guido, would you mind to give it a try? It did fix the issue for me, but
> I'd like to be sure it also fixes the issue for you.
Works nicely:
$ make -C build -f ../Makefile VPATH=.. ARCHIVE=osinfo-db.tar.xz check
make: Entering directory '/var/scratch/src/libosinfo/upstream/osinfo-db/build'
I18N data/datamap/microsoft.com/win-8-l10n-language.xml
I18N data/datamap/microsoft.com/win-8-l10n-language-reverse.xml
I18N data/datamap/microsoft.com/win-7-l10n-language.xml
...
I18N data/device/usb.org/usb-80ee-0021.d/class.xml
GEN data/schema/osinfo.rng
INTERNAL_OSINFO_DB_DATA_DIR=data
INTERNAL_OSINFO_DB_DATA_SRC_DIR=/var/scratch/src/libosinfo/upstream/osinfo-db/data
python3 -m pytest /var/scratch/src/libosinfo/upstream/osinfo-db/tests
===
test session starts
===
platform linux -- Python 3.7.3rc1, pytest-3.10.1, py-1.7.0, pluggy-0.8.0
hypothesis profile 'default' ->
database=DirectoryBasedExampleDatabase('/var/scratch/src/libosinfo/upstream/osinfo-db/build/.hypothesis/examples')
rootdir: /var/scratch/src/libosinfo/upstream/osinfo-db, inifile:
plugins: hypothesis-3.71.11, celery-4.2.1
collected 1310 items
../tests/test_devices.py
[ 10%]
../tests/test_isoinfo.py
..
[ 23%]
..
[ 28%]
../tests/test_resources.py
[ 41%]
...
[ 45%]
../tests/test_schema.py
...
[ 59%]
...
[ 74%]
...
[ 90%]
..
[100%]
==
1310 passed in 10.12 seconds
===
make: Leaving directory '/var/scratch/src/libosinfo/upstream/osinfo-db/build'
Thanks!
-- Guido
>
> Please, mind that you'll need to have python3, python3-pytest, python3-lxml,
> and python3-request installed.
>
> Fabiano Fidêncio (7):
> tests: Add _Files() base class
> tests: Move ids_cb() out of os_parametrize()
> tests: Add _SourceFiles() class
> tests: Move _check_uncommended_devices() to its own test
> tests: Add INTERNAL_OSINFO_DB_DATA_SRC_DIR to conftest
> makefile: Fix out-of-tree build
> makefile: Remove unused "TEE" variable
>
> Makefile | 6 ++---
> tests/conftest.py | 5
> tests/test_devices.py | 10 ---
> tests/util.py | 62 +++
