Re: Suggestion to close this list
On Thu, Jul 16, 2020 at 2:08 PM Daniel P. Berrangé wrote: > > This list does not have a significant amount of traffic on it since we > switched to using merge requests. > > - A handful of patches mistakenly sent to the list instead of merge request > - A couple of release announcements > - A couple of design discussions > > > GitLab has the ability to attach release notices to a tag, and publicises > them as releases. You can see an example of that here: > >https://gitlab.com/virt-viewer/virt-viewer/-/releases > > The source code links there are the auto-generated tarballs from git, > but you have the option of linking to otehr tarballs in the release notes > text. I'd suggest this is sufficient for new releases > > For design discussions, I think we can use GitLab issues. > > So I'm inclined to say we should close this mailing list, as it is largely > just a trap that accidentally attracts people away from our preferred use > of GitLab. > > We would not delete the list, simply configure it to reject any newly > posted mail with a short message pointing people to GitLab. +1. Best Regards, -- Fabiano Fidêncio
ANNOUNCE: libosinfo 1.8.0 release
I am happy to announce a new release of libosinfo, version 1.8.0: https://releases.pagure.org/libosinfo/libosinfo-1.8.0.tar.xz This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC 177B (4096R) https://releases.pagure.org/libosinfo/libosinfo-1.8.0.tar.xz.asc All historical releases are available from: http://libosinfo.org/download/ Changes in this release include: - Several CI improvements - Several release scripts improvements - Several translations improvements - Several syntax-check improvements - Code cleanup in order to modernize the GObject usage - Add API to get whether a firmware is supported or not - Add API to get "cloud-image-username" Thanks to everyone who contributed to this release Best Regards, -- Fabiano Fidêncio
ANNOUNCE: osinfo-db-tools 1.8.0 release
I am happy to announce a new release of osinfo-db-tools, version 1.8.0: https://releases.pagure.org/libosinfo/osinfo-db-tools-1.8.0.tar.xz This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC 177B (4096R) https://releases.pagure.org/libosinfo/osinfo-db-tools-1.8.0.tar.xz.asc All historical releases are available from: http://libosinfo.org/download/ Changes in this release include: - Several CI improvements - Several release scripts improvements - Several translations improvements - Several syntax-check improvements Thanks to everyone who contributed to this release Best Regards, -- Fabiano Fidêncio
Re: State "bios" firmware support for OSes
On Tue, May 26, 2020 at 4:10 PM Daniel P. Berrangé wrote: > > On Tue, May 26, 2020 at 04:05:05PM +0200, Felipe Borges wrote: > > Hi everyone, > > > > We recently landed EFI support in GNOME Boxes where we create guests > > with "firmware = efi" by default when libosinfo reports that the OS > > supports it. This has worked great except for the regression with > > snapshots. Long story short, internal snapshots won't work with EFI, > > external snapshots won't allow our users to revert their domain to a > > certain snapshot. > > > > For this reason, the Boxes designers and I concluded that the best > > approach for us here would be to only create EFI guests for OSes that > > REQUIRE it. If an OS can still boot with the legacy "bios" we should > > go for it, since it maintains our Snapshot management functionality. > > > > The reason I am emailing libosinfo about this is to assess whether you > > folk would be open to having me adding > type="bios"/> to the OSes that support it (some of them already state > > support for EFI). > > > > Since the API returns a list of Osinfo.Firmware objects, we won't need > > any more work on libosinfo side in order to implement what we need in > > Boxes. > > > > All in all, adding to some OSes > > would be something you'd accept? > > Yes, I was pretty much expecting we would need to add such info at some > point. > > Might it be easier to ask which OS do NOT support BIOS ? > > IOW, should we blindly add it to essentially every single OS, except for > the very few known to not support it any more. Oh! I should have read the whole thread before answering. Well, +1 for this approach. Best Regards, -- Fabiano Fidêncio
Re: State "bios" firmware support for OSes
Felipe, On Tue, May 26, 2020 at 4:06 PM Felipe Borges wrote: > > Hi everyone, > > We recently landed EFI support in GNOME Boxes where we create guests > with "firmware = efi" by default when libosinfo reports that the OS > supports it. This has worked great except for the regression with > snapshots. Long story short, internal snapshots won't work with EFI, > external snapshots won't allow our users to revert their domain to a > certain snapshot. > > For this reason, the Boxes designers and I concluded that the best > approach for us here would be to only create EFI guests for OSes that > REQUIRE it. If an OS can still boot with the legacy "bios" we should > go for it, since it maintains our Snapshot management functionality. > > The reason I am emailing libosinfo about this is to assess whether you > folk would be open to having me adding type="bios"/> to the OSes that support it (some of them already state > support for EFI). > > Since the API returns a list of Osinfo.Firmware objects, we won't need > any more work on libosinfo side in order to implement what we need in > Boxes. > > All in all, adding to some OSes > would be something you'd accept? I'd take the opposite direction, Felipe. Although our schema supports , as you can see here[0], I'd rather assume that all OSes support BIOS, unless something like is set, and we're prepared for this[1]. So, what about changing the check we do on Boxes[2] to something like: ``` if (firmware.get_firmware_type () == "bios" && !firmware.is_supported ()) return true ``` That should do the trick. [0]: https://gitlab.com/libosinfo/osinfo-db/-/blob/master/data/schema/osinfo.rng.in#L936 [1]: https://gitlab.com/libosinfo/osinfo-db/-/blob/master/data/schema/osinfo.rng.in#L596 [2]: https://gitlab.gnome.org/GNOME/gnome-boxes/-/blob/master/src/installer-media.vala#L65 Best Regards, -- Fabiano Fidêncio
Re: [PATCH 0/4] Add Ubuntu 20.04
Christian, On Tue, Feb 11, 2020 at 4:55 PM Christian Ehrhardt wrote: > > Hi, > for some recent releases the new ubuntu version was added after the version > was released. Which made it odd for users to not find the version they are on. > This time lets add 20.04 ahead of time. > > Since there isn't a released versions yet the links will have to go to the > daily builds. Those are and will continue to be correct and more up-to-date > than the release images. But obviously e.g. Volume-size will change. > > I have added the expected final URLs in the XML so that you should have an > easy switch after the release in case you want to switch to the release URLs. > > While I was working on that I found some more fixups that could be applied. > Cool, I'll review these patches Tomorrow. Meanwhile, I'd like to mention that the preferred way to submit patches for libosinfo projects is opening a Merge Request against https://gitlab.com/libosinfo/. Would you mind opening the MR there? If you do mind, I'll review the patches here in the ML. Best Regards, -- Fabiano Fidêncio
Re: [Libosinfo] [PATCH v2 osinfo-db 0/2] Add SLE12-SP5 Information to the Database
On Thu, Dec 12, 2019 at 4:45 PM Charles Arnold wrote: > > Add SUSE Linux Enterprise Server and Desktop description and > isodata files for version 12-SP5. > > Charles Arnold (2): > Add SLE12-SP5 to the database > Add SLE12-SP5 isodata to the database > > data/os/suse.com/sled-12.5.xml.in | 38 + > data/os/suse.com/sles-12.5.xml.in | 65 > ++ > .../SLE-12-SP5-Desktop-DVD-x86_64-GM-DVD1.iso.txt | 29 ++ > .../SLE-12-SP5-Server-DVD-aarch64-GM-DVD1.iso.txt | 29 ++ > .../SLE-12-SP5-Server-DVD-ppc64le-GM-DVD1.iso.txt | 16 ++ > .../SLE-12-SP5-Server-DVD-s390x-GM-DVD1.iso.txt| 29 ++ > .../SLE-12-SP5-Server-DVD-x86_64-GM-DVD1.iso.txt | 29 ++ > 7 files changed, 235 insertions(+) > create mode 100644 data/os/suse.com/sled-12.5.xml.in > create mode 100644 data/os/suse.com/sles-12.5.xml.in > create mode 100644 > tests/isodata/sled/sled12sp5/SLE-12-SP5-Desktop-DVD-x86_64-GM-DVD1.iso.txt > create mode 100644 > tests/isodata/sles/sles12sp5/SLE-12-SP5-Server-DVD-aarch64-GM-DVD1.iso.txt > create mode 100644 > tests/isodata/sles/sles12sp5/SLE-12-SP5-Server-DVD-ppc64le-GM-DVD1.iso.txt > create mode 100644 > tests/isodata/sles/sles12sp5/SLE-12-SP5-Server-DVD-s390x-GM-DVD1.iso.txt > create mode 100644 > tests/isodata/sles/sles12sp5/SLE-12-SP5-Server-DVD-x86_64-GM-DVD1.iso.txt > > -- > 2.12.3 > > > ___ > Libosinfo mailing list > Libosinfo@redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo > Reviewed-by: Fabiano Fidêncio and pushed! Thanks for the contribution! ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 0/2] Add SLE12-SP5 Information to the Database
Charles, On Wed, Dec 11, 2019 at 7:13 PM Charles Arnold wrote: > > Add SUSE Linux Enterprise Server and Desktop description and > isodata files for version 12-SP5. > > Charles Arnold (2): > Add SLE12-SP5 to the database > Added SLE12-SP5 isodata to the database Please, change: Added -> Add Apart from this, two comments: - We started requiring that all contributors to assert that contributions are in compliance with the terms of the Developer's Certificate of Origin 1.1 (https://developercertificate.org/). In order to indicate compliance every commit must have a tag Signed-off-by: REAL NAME This can be achieved by passing the "-s" flag to the "git commit" command. To update all commits on the current branch to add a Signed-off-by tag, use git rebase -i master -x 'git commit --amend --no-edit -s' - We need to update the -unknown entries as well. I've cooked a patch for this so you don't have to do so. However, I'd like to have your ack on the changes: ``` >From c161eb72c1d7a16d77c966d5cfb29e9c2c6b054d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 12 Dec 2019 11:33:58 +0100 Subject: [PATCH] sle[ds]-12-unknown: Update after 12.5 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabiano Fidêncio --- data/os/suse.com/sled-12-unknown.xml.in | 6 +++--- data/os/suse.com/sles-12-unknown.xml.in | 12 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/os/suse.com/sled-12-unknown.xml.in b/data/os/suse.com/sled-12-unknown.xml.in index ff2f56d3..defcaad9 100644 --- a/data/os/suse.com/sled-12-unknown.xml.in +++ b/data/os/suse.com/sled-12-unknown.xml.in @@ -8,13 +8,13 @@ <_vendor>SUSE linux sled -http://suse.com/sled/12.4"/> -http://suse.com/sled/12.4"/> +http://suse.com/sled/12.5"/> +http://suse.com/sled/12.5"/> LINUX -SLE-12-SP[5-9]-Desktop-DVD-x86_64 +SLE-12-SP[6-9]-Desktop-DVD-x86_64 boot/x86_64/loader/linux boot/x86_64/loader/initrd diff --git a/data/os/suse.com/sles-12-unknown.xml.in b/data/os/suse.com/sles-12-unknown.xml.in index ee2b975a..4f128580 100644 --- a/data/os/suse.com/sles-12-unknown.xml.in +++ b/data/os/suse.com/sles-12-unknown.xml.in @@ -8,13 +8,13 @@ <_vendor>SUSE linux sles -http://suse.com/sles/12.4"/> -http://suse.com/sles/12.4"/> +http://suse.com/sles/12.5"/> +http://suse.com/sles/12.5"/> LINUX -SLE-12-SP[5-9]-Server-DVD-x86_64 +SLE-12-SP[6-9]-Server-DVD-x86_64 boot/x86_64/loader/linux boot/x86_64/loader/initrd @@ -23,7 +23,7 @@ LINUX -SLE-12-SP[5-9]-Server-DVD-aarch64 +SLE-12-SP[6-9]-Server-DVD-aarch64 boot/aarch64/linux boot/aarch64/initrd @@ -32,7 +32,7 @@ LINUX -SLE-12-SP[5-9]-Server-DVD-ppc64le +SLE-12-SP[6-9]-Server-DVD-ppc64le boot/ppc64le/linux boot/ppc64le/initrd @@ -41,7 +41,7 @@ LINUX -SLE-12-SP[5-9]-Server-DVD-s390x +SLE-12-SP[6-9]-Server-DVD-s390x boot/s390x/linux boot/s390x/initrd -- 2.23.0 ``` ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH] meson: tests: make python3 really optional
On Sun, Dec 8, 2019 at 8:54 AM Roman Bogorodskiy wrote:
>
> As python3 is supposed to be optional, pass
> 'required: false' to python.find_installation(), otherwise when
> it's missing, build fails with:
>
> Program python found: NO
> tests/meson.build:12:0: ERROR: python3 not found
>
> Signed-off-by: Roman Bogorodskiy
> ---
> tests/meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/meson.build b/tests/meson.build
> index 08ba470..05c7e1a 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -9,7 +9,7 @@ test(
>
> python = import('python')
>
> -python3 = python.find_installation('python3')
> +python3 = python.find_installation('python3', required: false)
> if python3.found()
> tests = {
> 'export-import': 'test_osinfo_db_export_import.py',
> --
> 2.23.0
>
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
>
Reviewed-by: Fabiano Fidêncio
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH 2/2] meson: fix GETTEXT_PACKAGE formatting
On Sun, Dec 8, 2019 at 7:13 AM Roman Bogorodskiy wrote: > > Properly specify placeholder value to get it replaced. > > Signed-off-by: Roman Bogorodskiy > --- > meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > index 663b6da..96eb9ae 100644 > --- a/meson.build > +++ b/meson.build > @@ -76,7 +76,7 @@ osinfo_db_tools_cflags += [ > ] > > # gettext package name > -osinfo_db_tools_cflags += > ['-DGETTEXT_PACKAGE="0"'.format(meson.project_name())] > +osinfo_db_tools_cflags += > ['-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())] > > # cflags to check whether the compiler supports them or not > osinfo_db_tools_check_cflags = [ > -- > 2.23.0 > > > ___ > Libosinfo mailing list > Libosinfo@redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo > Reviewed-by: Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH 1/2] meson: respect mandir option
On Sun, Dec 8, 2019 at 7:13 AM Roman Bogorodskiy wrote: > > There's an osinfo_db_tools_mandir setting that respects meson's 'mandir' > option. Use that for tools man installation dir instead of building > a path based on osinfo_db_tools_datadir. > > Signed-off-by: Roman Bogorodskiy > --- > tools/meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/meson.build b/tools/meson.build > index 6c87014..c810fd6 100644 > --- a/tools/meson.build > +++ b/tools/meson.build > @@ -90,7 +90,7 @@ if pod2man.found() > output: file + '.1', > input: file + '.c', > install: true, > -install_dir: join_paths(osinfo_db_tools_datadir, 'man', 'man1'), > +install_dir: join_paths(osinfo_db_tools_mandir, 'man1'), > build_by_default: true, > command: [ > pod2man, > -- > 2.23.0 > > > ___ > Libosinfo mailing list > Libosinfo@redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo > Reviewed-by: Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] ANNOUNCE: libosinfo 1.7.1 release
After some breakage caused by 1.7.0 release, I am happy to announce a new release of libosinfo, version 1.7.1: https://releases.pagure.org/libosinfo/libosinfo-1.7.1.tar.xz This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC 177B (4096R) https://releases.pagure.org/libosinfo/libosinfo-1.7.1.tar.xz.asc All historical releases are available from: http://libosinfo.org/download/ Changes in this release include: - Fix usage of versioned symbols - MinGW spec file fixes and improvements - Fix pci.ids and usb.ids installation Thanks to everyone who contributed to this release and sorry for the breakage caused by 1.7.0 one. Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] ANNOUNCE: osinfo-db-tools 1.7.0 release
I am happy to announce a new release of osinfo-db-tools, version 1.7.0: https://releases.pagure.org/libosinfo/osinfo-db-tools-1.7.0.tar.xz This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC 177B (4096R) https://releases.pagure.org/libosinfo/osinfo-db-tools-1.7.0.tar.xz.asc All historical releases are available from: http://libosinfo.org/download/ Changes in this release include: - Switch to meson build system Thanks to everyone who contributed to this release Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] ANNOUNCE: libosinfo 1.7.0 release
I am happy to announce a new release of libosinfo, version 1.7.0: https://releases.pagure.org/libosinfo/libosinfo-1.7.0.tar.xz This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC 177B (4096R) https://releases.pagure.org/libosinfo/libosinfo-1.7.0.tar.xz.asc All historical releases are available from: http://libosinfo.org/download/ Changes in this release include: - Add API to expose a device driver "priority" - Improve media detection when using "volume-size" to distinguish medias - General improvements on OsinfoList APIs to avoid unsafe access - Minor POD fixes - Switch to meson build system - Add API to expose "firmware" support on OsinfoOS - Drop "env" type support from osinfo-detect - Print the architecture of the detected tree / media on osinfo-detect - Add API to create an OsinfoTree from a treeinfo file Thanks to everyone who contributed to this release Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] freebsd: add FreeBSD 11.3 info
On Tue, Oct 1, 2019 at 6:05 PM Roman Bogorodskiy wrote: > > Signed-off-by: Roman Bogorodskiy Reviewed-by: Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 1/2] debian10: Update dead links
Debian 10.1.0 has been released in September 9th. Signed-off-by: Fabiano Fidêncio --- data/os/debian.org/debian-10.xml.in | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/os/debian.org/debian-10.xml.in b/data/os/debian.org/debian-10.xml.in index 1e0be52..583f8b8 100644 --- a/data/os/debian.org/debian-10.xml.in +++ b/data/os/debian.org/debian-10.xml.in @@ -39,7 +39,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/i386/iso-cd/debian-10.0.0-i386-netinst.iso + http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-10.1.0-i386-netinst.iso Debian 10.(\d)+.(\d)+ i386 n @@ -48,7 +48,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/amd64/iso-cd/debian-10.0.0-amd64-netinst.iso + http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-10.1.0-amd64-netinst.iso Debian 10.(\d)+.(\d)+ amd64 n @@ -57,7 +57,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/arm64/iso-cd/debian-10.0.0-arm64-netinst.iso + http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-10.1.0-arm64-netinst.iso Debian 10.(\d)+.(\d)+ arm64 n @@ -66,7 +66,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/armhf/iso-cd/debian-10.0.0-armhf-netinst.iso + http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-10.1.0-armhf-netinst.iso Debian 10.(\d)+.(\d)+ armhf n @@ -75,7 +75,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/ppc64el/iso-cd/debian-10.0.0-ppc64el-netinst.iso + http://cdimage.debian.org/cdimage/release/current/ppc64el/iso-cd/debian-10.1.0-ppc64el-netinst.iso Debian 10.(\d)+.(\d)+ ppc64el n @@ -84,7 +84,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/s390x/iso-cd/debian-10.0.0-s390x-netinst.iso + http://cdimage.debian.org/cdimage/release/current/s390x/iso-cd/debian-10.1.0-s390x-netinst.iso Debian 10.(\d)+.(\d)+ s390x n @@ -95,7 +95,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/i386/iso-dvd/debian-10.0.0-i386-DVD-1.iso + http://cdimage.debian.org/cdimage/release/current/i386/iso-dvd/debian-10.1.0-i386-DVD-1.iso Debian 10.(\d)+.(\d)+ i386 (\d)+ @@ -104,7 +104,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/amd64/iso-dvd/debian-10.0.0-amd64-DVD-1.iso + http://cdimage.debian.org/cdimage/release/current/amd64/iso-dvd/debian-10.1.0-amd64-DVD-1.iso Debian 10.(\d)+.(\d)+ amd64 (\d)+ @@ -113,7 +113,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/arm64/iso-dvd/debian-10.0.0-arm64-DVD-1.iso + http://cdimage.debian.org/cdimage/release/current/arm64/iso-dvd/debian-10.1.0-arm64-DVD-1.iso Debian 10.(\d)+.(\d)+ arm64 (\d)+ @@ -122,7 +122,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/armhf/iso-dvd/debian-10.0.0-armhf-DVD-1.iso + http://cdimage.debian.org/cdimage/release/current/armhf/iso-dvd/debian-10.1.0-armhf-DVD-1.iso Debian 10.(\d)+.(\d)+ armhf (\d)+ @@ -131,7 +131,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/ppc64el/iso-dvd/debian-10.0.0-ppc64el-DVD-1.iso + http://cdimage.debian.org/cdimage/release/current/ppc64el/iso-dvd/debian-10.1.0-ppc64el-DVD-1.iso Debian 10.(\d)+.(\d)+ ppc64el (\d)+ @@ -140,7 +140,7 @@ - http://cdimage.debian.org/cdimage/release/10.0.0/s390x/iso-dvd/debian-10.0.0-s390x-DVD-1.iso + http://cdimage.debian.org/cdimage/release/current/s390x/iso-dvd/debian-10.1.0-s390x-DVD-1.iso Debian 10.(\d)+.(\d)+ s390x (\d)+ -- 2.23.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 0/2] Update dead links
Debian 10.1 has been released on September 9th, let's update its links. Silverblue 28 has been archived, let's update its link. Patches have already been pushed. Fabiano Fidêncio (2): debian10: Update dead links silverblue28: Update dead link data/os/debian.org/debian-10.xml.in | 24 +-- .../os/fedoraproject.org/silverblue-28.xml.in | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) -- 2.23.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 2/2] silverblue28: Update dead link
ISO has been moved to archive. Signed-off-by: Fabiano Fidêncio --- data/os/fedoraproject.org/silverblue-28.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/fedoraproject.org/silverblue-28.xml.in b/data/os/fedoraproject.org/silverblue-28.xml.in index 9e9e3db..07c244e 100644 --- a/data/os/fedoraproject.org/silverblue-28.xml.in +++ b/data/os/fedoraproject.org/silverblue-28.xml.in @@ -14,7 +14,7 @@ 2019-05-29 - https://download.fedoraproject.org/pub/fedora/linux/releases/28/AtomicWorkstation/x86_64/iso/Fedora-AtomicWorkstation-ostree-x86_64-28-1.1.iso + https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/28/AtomicWorkstation/x86_64/iso/Fedora-AtomicWorkstation-ostree-x86_64-28-1.1.iso Fedora-AW-ostree-x86_64-28 LINUX -- 2.23.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH] force a UTF-8 locale for python3 to avoid broken ascii codec
On Wed, Mar 27, 2019 at 10:57 AM Daniel P. Berrangé wrote: > > The python3 ascii codec violates POSIX C locale requirements by not being > 8-bit clean in its text handling. It raises an error for any byte with > top bit set > > > return codecs.ascii_decode(input, self.errors)[0] > E UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in > position 419: ordinal not in range(128) > > To avoid this python bug we must force use of a UTF-8 locale. Ideally we > would use the C.UTF-8 locale, however, that is not portable across OS, > only existing on certain Linux distros. Instead we use the en_us.UTF-8 > locale, but only for the character set data. > > Signed-off-by: Daniel P. Berrangé > --- > > Pushed as a CI build fix for FreeBSD distros > > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index c63cb6e..9d7f109 100644 > --- a/Makefile > +++ b/Makefile > @@ -123,4 +123,4 @@ update-po: > done > > check: $(DATA_FILES) $(SCHEMA_FILES) > - $(PYTHON) -m pytest $(PYTEST_LOG_LEVEL) > + LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) -m pytest > $(PYTEST_LOG_LEVEL) > -- > 2.20.1 > > ___ > Libosinfo mailing list > Libosinfo@redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo Daniel, This commit is the reason of the following breakage (in my personal gitlab account): https://gitlab.com/fidencio/osinfo-db/-/jobs/288707257 It seems to happen because both debian & fedora (30+) containers do not have the required locale. I'd like to ask your suggestion on how to proceed here: - Shall we explicitly include glibc-langpack-en as part of the base packages? - Its dependencies are: glibc, glibc-commonl - Its size is: 6.0 M (on Fedora 30); - Shall we work around osinfo-db tests in a way that we can make it work without setting the locale? Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH] NetBSD: add NetBSD 8.1 data
On Tue, Sep 3, 2019 at 4:12 PM Vicente Chaves wrote: > > Hi Fabiano, > > I have no objection to your suggestion. You can move on and change as you see > fit. Patch has been pushed! Thanks a lot for your contribution! ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH] NetBSD: add NetBSD 8.1 data
On Tue, Sep 3, 2019 at 6:38 AM Vicente Chaves de Melo wrote: > > Hi Fabiano, > 1) Version 8.1 is derived from branch 8.0. Already fixed this in the new > patch. > 2) Version 8.0 is still supported. > 3) The boot.iso and boot-com.iso files are network installed. One uses > the VGA console and the other the serial console. It's really quite unfortunate that both ISOs have exactly the same ... everything. :-/ Due to that, it's impossible for libosinfo to differentiate one from the other. Do you think a RFE could be opened for NetBSD so, for future releases, they could have different volume ids for different ISOs? > 4) Tried to use "variant id", please make sure it is correct. It looks correct! :-) So, my suggestion ... and I'd do the change before pushing if I get your Ack ... Could we just mark both as netinst only? As there's no way to differentiate between them, I'd rather give less information (as "Network Install") than give wrong information (as showing "Serial Console") in the one that's not intended for that. Please, let me know if you agree with that and I'll push the patches with the changes done. No need to submit a v3. :-) [snip] ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH] NetBSD: add NetBSD 8.1 data
Vicente, Firstly, thanks a lot for the contribution! There are a few things though, that I'd like to understand better and/or have to be fixed before pushing the patches. Please, see the comments below. On Thu, Aug 29, 2019 at 12:46 AM Vicente Chaves de Melo wrote: > > --- > data/os/netbsd.org/netbsd-8.1.xml.in | 64 > ++ > .../netbsd8.1/NetBSD-8.1-amd64-boot-com.iso.txt| 33 +++ > .../netbsd/netbsd8.1/NetBSD-8.1-amd64-boot.iso.txt | 33 +++ > .../netbsd/netbsd8.1/NetBSD-8.1-amd64.iso.txt | 33 +++ > .../netbsd8.1/NetBSD-8.1-i386-boot-com.iso.txt | 33 +++ > .../netbsd/netbsd8.1/NetBSD-8.1-i386-boot.iso.txt | 33 +++ > .../netbsd/netbsd8.1/NetBSD-8.1-i386.iso.txt | 33 +++ > 7 files changed, 262 insertions(+) > create mode 100644 data/os/netbsd.org/netbsd-8.1.xml.in > create mode 100644 > tests/isodata/netbsd/netbsd8.1/NetBSD-8.1-amd64-boot-com.iso.txt > create mode 100644 > tests/isodata/netbsd/netbsd8.1/NetBSD-8.1-amd64-boot.iso.txt > create mode 100644 tests/isodata/netbsd/netbsd8.1/NetBSD-8.1-amd64.iso.txt > create mode 100644 > tests/isodata/netbsd/netbsd8.1/NetBSD-8.1-i386-boot-com.iso.txt > create mode 100644 > tests/isodata/netbsd/netbsd8.1/NetBSD-8.1-i386-boot.iso.txt > create mode 100644 tests/isodata/netbsd/netbsd8.1/NetBSD-8.1-i386.iso.txt > > diff --git a/data/os/netbsd.org/netbsd-8.1.xml.in > b/data/os/netbsd.org/netbsd-8.1.xml.in > new file mode 100644 > index 000..cd81e68 > --- /dev/null > +++ b/data/os/netbsd.org/netbsd-8.1.xml.in > @@ -0,0 +1,64 @@ > + > + > + http://netbsd.org/netbsd/8.1;> > +netbsd8.1 > +<_name>NetBSD 8.1 > +8.1 > +<_vendor>NetBSD Project > +netbsd > +netbsd > +http://netbsd.org/netbsd/8.1"/> > +http://netbsd.org/netbsd/8.1"/> 8.1 should upgrade & derive-from 8.0, not 8.1 Btw, did 8.0 reach its EoL? If so, would be worth updating that entry as well (together with older entries, if possible). [snip] > + > + > https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/amd64/installation/cdrom/boot.iso > + > +NetBSD > +NETBSD_81 > +233302016 > + > + > + > + > https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/amd64/installation/cdrom/boot-com.iso > + > +NetBSD > +NETBSD_81 > +233302016 > + > + I can see that both boot.iso and boot-com.iso have the very same volume-id, system-id, and even volume-size. What's the difference between these medias, if any? Also, would be worth to add a "netinst" variant for those, in case they're supposed to be used as net installers. [snip] > + > + > https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/i386/installation/cdrom/boot.iso > + > +NetBSD > +NETBSD_81 > +215072768 > + > + > + > + > https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/i386/installation/cdrom/boot-com.iso > + > +NetBSD > +NETBSD_81 > +215072768 > + > + Same comment as above. > + > + [snip] Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 2/4] ubuntu-18.10: Fix eol date
According to https://wiki.ubuntu.com/Releases, ubuntu-18.10 has reached its eol date on July 18, 2019. Signed-off-by: Fabiano Fidêncio --- data/os/ubuntu.com/ubuntu-18.10.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index e8d22c0..9400d2d 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -15,7 +15,7 @@ http://ubuntu.com/ubuntu/18.04"/> 2018-10-18 -2019-01-31 +2019-07-18 -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 0/4] Update dead-links
Ubuntu 18.04: - Point to 18.04.3 release; Ubuntu 18.10: - Fix End Of Life date - Point to old-releases.ubuntu.com Fedora Rawhide: - Remove Workstation trees All the patches have been pushed already, under the "test breakage" rule. Fabiano Fidêncio (4): ubuntu-18.04: Update URLs to point to 18.04.3 release ubuntu-18.10: Fix eol date ubuntu-18.10: Update dead links fedora-rawhide: Remove "Workstation" trees .../fedoraproject.org/fedora-rawhide.xml.in | 22 --- data/os/ubuntu.com/ubuntu-18.04.xml.in| 10 - data/os/ubuntu.com/ubuntu-18.10.xml.in| 14 ++-- 3 files changed, 12 insertions(+), 34 deletions(-) -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 1/4] ubuntu-18.04: Update URLs to point to 18.04.3 release
Signed-off-by: Fabiano Fidêncio --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index da3dc37..6d8e8b2 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -32,7 +32,7 @@ - http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-amd64.iso + http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.3-server-amd64.iso Ubuntu-Server 18.04(.\d\+?)? LTS amd64 @@ -40,7 +40,7 @@ casper/initrd - http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.2-desktop-amd64.iso + http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.3-desktop-amd64.iso Ubuntu 18.04(.\d\+?)? LTS amd64 @@ -51,7 +51,7 @@ - http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-arm64.iso + http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.3-server-arm64.iso Ubuntu-Server 18.04(.\d\+?)? LTS arm64 @@ -59,7 +59,7 @@ install/initrd.gz - http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-ppc64el.iso + http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.3-server-ppc64el.iso Ubuntu-Server 18.04(.\d\+?)? LTS ppc64 @@ -67,7 +67,7 @@ install/initrd.gz - http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-s390x.iso + http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.3-server-s390x.iso Ubuntu-Server 18.04(.\d\+?)? LTS s390x -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 4/4] fedora-rawhide: Remove "Workstation" trees
Fedora Workstation is no longer releasing trees, according to: https://pagure.io/fedora-workstation/issue/45 Signed-off-by: Fabiano Fidêncio --- .../fedoraproject.org/fedora-rawhide.xml.in | 22 --- 1 file changed, 22 deletions(-) diff --git a/data/os/fedoraproject.org/fedora-rawhide.xml.in b/data/os/fedoraproject.org/fedora-rawhide.xml.in index 1b13ad0..96299f4 100644 --- a/data/os/fedoraproject.org/fedora-rawhide.xml.in +++ b/data/os/fedoraproject.org/fedora-rawhide.xml.in @@ -36,28 +36,6 @@ - - - https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Workstation/x86_64/os - -Fedora -Rawhide -x86_64 -Workstation - - - - - - https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Workstation/armhfp/os - -Fedora -Rawhide -armhfp -Workstation - - - https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Server/x86_64/os -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] ANNOUNCE: osinfo-db-tools 1.6.0 release
I am happy to announce a new release of osinfo-db-tools, version 1.6.0: https://releases.pagure.org/libosinfo/osinfo-db-tools-1.6.0.tar.gz This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC 177B (4096R) https://releases.pagure.org/libosinfo/osinfo-db-tools-1.6.0.tar.gz.asc All historical releases are available from: http://libosinfo.org/download/ Changes in this release include: - Use libsoup for "http://; & "https://; requests for osinfo-db-import - Drop GVFS dependency Thanks to everyone who contributed to this release Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] ANNOUNCE: libosinfo 1.6.0 release
I am happy to announce a new release of libosinfo, version 1.6.0: https://releases.pagure.org/libosinfo/libosinfo-1.6.0.tar.gz This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC 177B (4096R) https://releases.pagure.org/libosinfo/libosinfo-1.6.0.tar.gz.asc All historical releases are available from: http://libosinfo.org/download/ Changes in this release include: - Add API to get the kernel URL argument for an OsinfoOs - Improve detection of PPC ISOs - Add API to create an OsinfoMedia from location using OsinfoMediaDetectFlags - Add API to get whether a media is bootable or not - Add OsinfoTree treeinfo properties - Add API to identify an OsinfoTree - Deprecate API to guess an OsinfoOs from OsinfoTree - Add --config-file to osinfo-install-script tool - Deprecate --config usage for user & admin passwords on osinfo-install-script tool - Add API to generate an install-script and its command-line for OsinfoTree - Use libsoup for "http://; & "https://; requests for creating both OsinfoMedia & OsinfoTree - Drop GVFS dependency - Add OsinfoOs property to OsinfoTree Thanks to everyone who contributed to this release Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH] spec, mingw: Add mingw*-libsoup as dependency
Commit 3917e5f4ae0e5 introduced libsoup dependency but forgot to add it to the mingw spec files. Signed-off-by: Fabiano Fidêncio --- Already pushed as "build breaker" fix --- mingw-osinfo-db-tools.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in index 14e68c5..ef3d248 100644 --- a/mingw-osinfo-db-tools.spec.in +++ b/mingw-osinfo-db-tools.spec.in @@ -29,6 +29,8 @@ BuildRequires: mingw32-libxslt BuildRequires: mingw64-libxslt BuildRequires: mingw32-libarchive BuildRequires: mingw64-libarchive +BuildRequires: mingw32-libsoup +BuildRequires: mingw64-libsoup BuildRequires: pkgconfig -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH] spec, mingw: Add mingw*-libsoup as dependency
Commit ac692eaa4680 introduced libsoup dependency but forgot to add it to the mingw spec files. Signed-off-by: Fabiano Fidêncio --- Already pushed as "build breaker" fix --- mingw-libosinfo.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in index e8c50f0..aa552b5 100644 --- a/mingw-libosinfo.spec.in +++ b/mingw-libosinfo.spec.in @@ -25,6 +25,8 @@ BuildRequires: mingw32-libxml2 BuildRequires: mingw64-libxml2 BuildRequires: mingw32-libxslt BuildRequires: mingw64-libxslt +BuildRequires: mingw32-libsoup +BuildRequires: mingw64-libsoup BuildRequires: pkgconfig -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH] ubuntu-18.10: Remove dead links
Cosmic cloud images where removed from cloud-images.ubuntu.com. Signed-off-by: Fabiano Fidêncio --- Patch already pushed under "tests breakage" rules --- data/os/ubuntu.com/ubuntu-18.10.xml.in | 28 -- 1 file changed, 28 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index 79ffb8b..e8d22c0 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -100,34 +100,6 @@ current/images/netboot/ubuntu-installer/amd64/initrd.gz - - https://cloud-images.ubuntu.com/cosmic/current/cosmic-server-cloudimg-amd64.img - - - - https://cloud-images.ubuntu.com/cosmic/current/cosmic-server-cloudimg-amd64.vmdk - - - - https://cloud-images.ubuntu.com/cosmic/current/cosmic-server-cloudimg-arm64.img - - - - https://cloud-images.ubuntu.com/cosmic/current/cosmic-server-cloudimg-armhf.img - - - - https://cloud-images.ubuntu.com/cosmic/current/cosmic-server-cloudimg-i386.img - - - - https://cloud-images.ubuntu.com/cosmic/current/cosmic-server-cloudimg-ppc64el.img - - - - https://cloud-images.ubuntu.com/cosmic/current/cosmic-server-cloudimg-s390x.img - - -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 0/6] Add osinfo-installation-successful file on unattended installations
Although this is not the most error-proof way to ensure an installation was successfully finished, this is already something that we can use to (try to) check whether the system was installed in an automated manner. Or, in other words, take those patches as the first step to be able to try to have some kind of CI around the unattended installations. This series does *not* touch Windows related stuff, but the plan is to also have the same done for Windows at some point in the future. Fabiano Fidêncio (6): install-script,debian: Add osinfo-install-successful file install-script,fedora: Add osinfo-install-successful file install-script,silverblue: Add osinfo-install-successful file install-script,opensuse: Add osinfo-install-successful file install-script,rhel,centos: Add osinfo-install-successful file install-script,ubuntu: Add osinfo-install-successful file data/install-script/debian.org/debian-preseed-desktop.xml.in | 4 data/install-script/debian.org/debian-preseed-jeos.xml.in| 4 .../fedoraproject.org/fedora-kickstart-desktop.xml.in| 3 +++ .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 5 + .../fedoraproject.org/silverblue-kickstart-desktop.xml.in| 3 +++ .../opensuse.org/opensuse-autoyast-desktop.xml.in| 3 +++ .../opensuse.org/opensuse-autoyast-jeos.xml.in | 3 +++ data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 3 +++ data/install-script/redhat.com/rhel-kickstart-jeos.xml.in| 5 + data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in | 4 data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in| 4 11 files changed, 41 insertions(+) -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 6/6] install-script, ubuntu: Add osinfo-install-successful file
Let's create an `osinfo-install-successful` file in /root after we finish the installation. Although this may not be totally accurate, it'll help up in the future to test whether the installation was successful in an automated manner. Signed-off-by: Fabiano Fidêncio --- data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in | 4 data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in| 4 2 files changed, 8 insertions(+) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in index 9fd8bcf..f7484f9 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in @@ -91,6 +91,10 @@ d-i finish-install/reboot_in_progress note d-i preseed/early_command string chmod 666 /dev/ttyS0 ubiquity ubiquity/summary note ubiquity ubiquity/reboot boolean true + +# Create an osinfo-install-successful file in /root +d-i preseed/late_command string in-target \ +touch /root/osinfo-install-successful diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index af9eb4c..b1edba3 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -117,6 +117,10 @@ d-i preseed/late_command string \ ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/ [ "$prompt" ] || return 0/' /etc/init.d/casper + +# Create an osinfo-install-successful file in /root +d-i preseed/late_command string in-target \ +touch /root/osinfo-install-successful -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 1/6] install-script, debian: Add osinfo-install-successful file
Let's create an `osinfo-install-successful` file in /root after we finish the installation. Although this may not be totally accurate, it'll help up in the future to test whether the installation was successful in an automated manner. Signed-off-by: Fabiano Fidêncio --- data/install-script/debian.org/debian-preseed-desktop.xml.in | 4 data/install-script/debian.org/debian-preseed-jeos.xml.in| 4 2 files changed, 8 insertions(+) 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 5e6f701..75d65c1 100644 --- a/data/install-script/debian.org/debian-preseed-desktop.xml.in +++ b/data/install-script/debian.org/debian-preseed-desktop.xml.in @@ -212,6 +212,10 @@ d-i preseed/late_command string \ +### Create an osinfo-install-successful file in /root +d-i preseed/late_command string in-target \ +touch /root/osinfo-install-successful + diff --git a/data/install-script/debian.org/debian-preseed-jeos.xml.in b/data/install-script/debian.org/debian-preseed-jeos.xml.in index 43ce0cf..667d955 100644 --- a/data/install-script/debian.org/debian-preseed-jeos.xml.in +++ b/data/install-script/debian.org/debian-preseed-jeos.xml.in @@ -110,6 +110,10 @@ d-i finish-install/reboot_in_progress note ### Remove the installation DVD from the apt-get's sources.list d-i preseed/late_command string in-target sed -i '/cdrom/d' /etc/apt/sources.list +### Create an osinfo-install-successful file in /root +d-i preseed/late_command string in-target \ +touch /root/osinfo-install-successful + -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 5/6] install-script, rhel, centos: Add osinfo-install-successful file
Let's create an `osinfo-install-successful` file in /root after we finish the installation. Although this may not be totally accurate, it'll help up in the future to test whether the installation was successful in an automated manner. Signed-off-by: Fabiano Fidêncio --- data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 3 +++ data/install-script/redhat.com/rhel-kickstart-jeos.xml.in| 5 + 2 files changed, 8 insertions(+) diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in index 7bfaf6e..3eee257 100644 --- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in @@ -248,6 +248,9 @@ AutomaticLogin= [debug] " > /etc/gdm/custom.conf +# Create an osinfo-install-successful file in /root +touch /root/osinfo-install-successful + %end diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in index fdef836..e664168 100644 --- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in @@ -171,6 +171,11 @@ url --url= @core +%post --erroronfail + +# Create an osinfo-install-successful file in /root +touch /root/osinfo-install-successful + %end -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 2/6] install-script, fedora: Add osinfo-install-successful file
Let's create an `osinfo-install-successful` file in /root after we finish the installation. Although this may not be totally accurate, it'll help up in the future to test whether the installation was successful in an automated manner. Signed-off-by: Fabiano Fidêncio --- .../fedoraproject.org/fedora-kickstart-desktop.xml.in| 3 +++ .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 5 + 2 files changed, 8 insertions(+) diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in index 33f674c..7a7557b 100644 --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in @@ -272,6 +272,9 @@ AutomaticLogin= [debug] " > /etc/gdm/custom.conf +# Create an osinfo-install-successful file in /root +touch /root/osinfo-install-successful + %end diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in index 68ece05..c625626 100644 --- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in +++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in @@ -218,6 +218,11 @@ url @hardware-support +%post --erroronfail + +# Create an osinfo-install-successful file in /root +touch /root/osinfo-install-successful + %end -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 3/6] install-script, silverblue: Add osinfo-install-successful file
Let's create an `osinfo-install-successful` file in /root after we finish the installation. Although this may not be totally accurate, it'll help up in the future to test whether the installation was successful in an automated manner. Signed-off-by: Fabiano Fidêncio --- .../fedoraproject.org/silverblue-kickstart-desktop.xml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in index 72ed130..70e8d7d 100644 --- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in +++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in @@ -145,6 +145,9 @@ AutomaticLogin= rm -f /etc/ostree/remotes.d/fedora-''.conf ostree remote add --if-not-exists --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora--primary fedora- 'https://dl.fedoraproject.org/atomic/repo/' +# Create an osinfo-install-successful file in /root +touch /root/osinfo-install-successful + %end -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH] install-script, rhel, centos, desktop: Fix gnome-desktop & multimedia group install
Commit 0a74335fe32ebe moved the x11 group installation to only be done for RHEL < 8. However, the condition was wrong and ended up with gnome-desktop and multimedia groups not being installed on RHEL 7. Let's fix the check and have those two groups installed for RHEL > 6. Signed-off-by: Fabiano Fidêncio --- .../install-script/redhat.com/rhel-kickstart-desktop.xml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in index 7bfaf6e..3565d4f 100644 --- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in @@ -193,11 +193,11 @@ repo --name=AppStream --baseurl= @basic-desktop @general-desktop @desktop-platform - - -@x11 + +@x11 + @gnome-desktop @multimedia -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH] Update NEWS for 1.6.0 release
Signed-off-by: Fabiano Fidêncio --- I'd like to roll an osinfo-db-tools release next Friday (July 26th) and here you can find the proposed update for the NEWS. --- NEWS | 7 +++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 7bdf55d..949d340 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +1.6.0 += + +- Use libsoup for "http://; & "https://; requests for + osinfo-db-import +- Drop GVFS dependency + 1.5.0 = -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH] Update NEWS for 1.6.0 release
Signed-off-by: Fabiano Fidêncio --- I'd like to roll a libosinfo release next Friday (July 26th) and here you can find the proposed update for the NEWS. --- NEWS | 22 ++ 1 file changed, 22 insertions(+) diff --git a/NEWS b/NEWS index 54c525a..6a305c3 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,28 @@ libosinfo News == +1.6.0 - Jul 26, 2019 + + +- Add API to get the kernel URL argument for an OsinfoOs +- Improve detection of PPC ISOs +- Add API to create an OsinfoMedia from location using + OsinfoMediaDetectFlags +- Add API to get whether a media is bootable or not +- Add OsinfoTree treeinfo properties +- Add API to identify an OsinfoTree +- Deprecate API to guess an OsinfoOs from OsinfoTree +- Add --config-file to osinfo-install-script tool +- Deprecate --config usage for user & admin passwords on + osinfo-install-script tool +- Add API to generate an install-script and its command-line + for OsinfoTree +- Use libsoup for "http://; & "https://; requests for creating + both OsinfoMedia & OsinfoTree +- Drop GVFS dependency +- Add OsinfoOs property to OsinfoTree + + 1.5.0 - May 09, 2019 -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 1/2] Add database support for SLE15-SP1
On Thu, Jul 18, 2019 at 4:54 PM Charles Arnold wrote: > > On Thu, 2019-07-18 at 13:25 +0200, Fabiano Fidêncio wrote: > > Charles, > > > > According to the ISO information provided in the second patch, the > > following things should be changed: > > > > On Wed, Jul 17, 2019 at 10:10 PM Charles Arnold > > wrote: > > > > > > --- > > > data/os/suse.com/sle-15.1.xml.in | 65 > > > > > > 1 file changed, 65 insertions(+) > > > create mode 100644 data/os/suse.com/sle-15.1.xml.in > > > > > > diff --git a/data/os/suse.com/sle-15.1.xml.in > > > b/data/os/suse.com/sle-15.1.xml.in > > > new file mode 100644 > > > index 000..649f2bf > > > --- /dev/null > > > +++ b/data/os/suse.com/sle-15.1.xml.in > > > @@ -0,0 +1,65 @@ > > > + > > > + > > > + http://suse.com/sle/15.1;>; > > > +sle15sp1 > > > +<_name>SUSE Linux Enterprise 15 SP1 > > > +15.1 > > > +<_vendor>SUSE > > > +linux > > > +sle > > > +http://suse.com/sle/15"/>; > > > +http://suse.com/sle/15"/>; > > > + > > > +2019-06-24 > > > + > > > + > > > + > > > +LINUX > > > +SLE-15-SP1-Installer-DVD-x86_64 > > > > For some reason, kiwi generates the volume-id as > > "SLE-15-SP1-Installer-DVD-x86.001" ... > > > > > + > > > + boot/x86_64/loader/linux > > > + boot/x86_64/loader/initrd > > > + > > > + > > > + > > > + > > > +LINUX > > > +SLE-15-SP1-Installer-DVD-aarch64 > > > > ... "SLE-15-SP1-Installer-DVD-aar.001" ... > > > > > + > > > + boot/aarch64/linux > > > + boot/aarch64/initrd > > > + > > > + > > > + > > > + > > > +LINUX > > > +SLE-15-SP1-Installer-DVD-ppc64le > > > > ... "SLE-15-SP1-Installer-DVD-ppc.001" ... > > > > > + > > > + boot/ppc64le/linux > > > + boot/ppc64le/initrd > > > + > > > + > > > + > > > + > > > +LINUX > > > +SLE-15-SP1-Installer-DVD-s390x > > > > and ... "SLE-15-SP1-Installer-DVD-s39.001" > > > > > + > > > + boot/s390x/linux > > > + boot/s390x/initrd > > > + > > > + > > > + > > > + > > > +5 > > > +536870912 > > > +1074151424 > > > + > > > + > > > +24 > > > +1073741824 > > > +17179869184 > > > + > > > + > > > + > > > + > > > -- > > > 2.16.4 > > > > > > > > > ___ > > > Libosinfo mailing list > > > Libosinfo@redhat.com > > > https://www.redhat.com/mailman/listinfo/libosinfo > > > > With that in mind, the following patch needs to be squashed into > > yours: > > > > fidencio@laerte ~/src/upstream/osinfo-db $ git diff > > diff --git a/data/os/suse.com/sle-15.1.xml.in b/data/os/suse.com/sle- > > 15.1.xml.in > > index 649f2bf..6d58b61 100644 > > --- a/data/os/suse.com/sle-15.1.xml.in > > +++ b/data/os/suse.com/sle-15.1.xml.in > > @@ -16,7 +16,7 @@ > > > > > > LINUX > > -SLE-15-SP1-Installer-DVD-x86_64 > > +SLE-15-SP1-Installer-DVD-x86\.001 > > > >boot/x86_64/loader/linux > >boot/x86_64/loader/initrd > > @@ -25,7 +25,7 @@ > > > > > > LINUX > > -SLE-15-SP1-Installer-DVD-aarch64 > > +SLE-15-SP1-Installer-DVD-aar\.001 > > > >boot/aarch64/linux > >boot/aarch64/initrd > > @@ -34,7 +34,7 @@ > > > > > > LINUX > > -SLE-15-SP1-Installer-DVD-ppc64le > > +SLE-15-SP1-Installer-DVD-ppc\.001 > > > >boot/ppc64le/linux > >boot/ppc64le/initrd > > @@ -43,7 +43,7 @@ > > > > > > LINUX > > -SLE-15-SP1-Installer-DVD-s390x > > +SLE-15-SP1-Installer-DVD-s39\.001 > > > >boot/s390x/linux > >boot/s390x/initrd > > > > If you think the changes are reasonable, just give me your ack on the > > changes and I'll squash and push them. > > There seems to be some inconsistency in the volume id string of ISOs > from one release to another. Thanks for catching it. > > ACK on this change. Pushed! ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 1/2] Add database support for SLE15-SP1
Charles, According to the ISO information provided in the second patch, the following things should be changed: On Wed, Jul 17, 2019 at 10:10 PM Charles Arnold wrote: > > --- > data/os/suse.com/sle-15.1.xml.in | 65 > > 1 file changed, 65 insertions(+) > create mode 100644 data/os/suse.com/sle-15.1.xml.in > > diff --git a/data/os/suse.com/sle-15.1.xml.in > b/data/os/suse.com/sle-15.1.xml.in > new file mode 100644 > index 000..649f2bf > --- /dev/null > +++ b/data/os/suse.com/sle-15.1.xml.in > @@ -0,0 +1,65 @@ > + > + > + http://suse.com/sle/15.1;> > +sle15sp1 > +<_name>SUSE Linux Enterprise 15 SP1 > +15.1 > +<_vendor>SUSE > +linux > +sle > +http://suse.com/sle/15"/> > +http://suse.com/sle/15"/> > + > +2019-06-24 > + > + > + > +LINUX > +SLE-15-SP1-Installer-DVD-x86_64 For some reason, kiwi generates the volume-id as "SLE-15-SP1-Installer-DVD-x86.001" ... > + > + boot/x86_64/loader/linux > + boot/x86_64/loader/initrd > + > + > + > + > +LINUX > +SLE-15-SP1-Installer-DVD-aarch64 ... "SLE-15-SP1-Installer-DVD-aar.001" ... > + > + boot/aarch64/linux > + boot/aarch64/initrd > + > + > + > + > +LINUX > +SLE-15-SP1-Installer-DVD-ppc64le ... "SLE-15-SP1-Installer-DVD-ppc.001" ... > + > + boot/ppc64le/linux > + boot/ppc64le/initrd > + > + > + > + > +LINUX > +SLE-15-SP1-Installer-DVD-s390x and ... "SLE-15-SP1-Installer-DVD-s39.001" > + > + boot/s390x/linux > + boot/s390x/initrd > + > + > + > + > +5 > +536870912 > +1074151424 > + > + > +24 > +1073741824 > +17179869184 > + > + > + > + > -- > 2.16.4 > > > ___ > Libosinfo mailing list > Libosinfo@redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo With that in mind, the following patch needs to be squashed into yours: fidencio@laerte ~/src/upstream/osinfo-db $ git diff diff --git a/data/os/suse.com/sle-15.1.xml.in b/data/os/suse.com/sle-15.1.xml.in index 649f2bf..6d58b61 100644 --- a/data/os/suse.com/sle-15.1.xml.in +++ b/data/os/suse.com/sle-15.1.xml.in @@ -16,7 +16,7 @@ LINUX -SLE-15-SP1-Installer-DVD-x86_64 +SLE-15-SP1-Installer-DVD-x86\.001 boot/x86_64/loader/linux boot/x86_64/loader/initrd @@ -25,7 +25,7 @@ LINUX -SLE-15-SP1-Installer-DVD-aarch64 +SLE-15-SP1-Installer-DVD-aar\.001 boot/aarch64/linux boot/aarch64/initrd @@ -34,7 +34,7 @@ LINUX -SLE-15-SP1-Installer-DVD-ppc64le +SLE-15-SP1-Installer-DVD-ppc\.001 boot/ppc64le/linux boot/ppc64le/initrd @@ -43,7 +43,7 @@ LINUX -SLE-15-SP1-Installer-DVD-s390x +SLE-15-SP1-Installer-DVD-s39\.001 boot/s390x/linux boot/s390x/initrd If you think the changes are reasonable, just give me your ack on the changes and I'll squash and push them. Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH v2 3/3] tree: cleanup on any error & return on _create_from_location_async_helper()
When calling a g_task_return_error(), we should also cleanup the
CreateFromLocationAsyncData and return immediately after that.
By doing so we avoid errors as:
g_task_return_error: assertion 'task->ever_returned' failed.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_tree.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index b65d399..1524b94 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -758,6 +758,8 @@
osinfo_tree_create_from_location_async_helper(CreateFromLocationAsyncData *data,
_("URL protocol is not supported"));
g_task_return_error(data->res, error);
+create_from_location_async_data_free(data);
+return;
}
location = g_strdup_printf("%s/%s", data->location, treeinfo);
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH v2 2/3] tree: goto cleanup on any error, on on_content_read()
Instead of just free'ing the CreateFromLocationAsyncData, let's just go
to cleanup, which will call create_from_location_async_data_free() and
return after that.
By doing so we avoid errors as:
g_task_return_error: assertion 'task->ever_returned' failed.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_tree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 03b6f3b..b65d399 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -676,7 +676,7 @@ static void on_content_read(GObject *source,
)) {
g_prefix_error(, _("Failed to load .treeinfo|treeinfo content:
"));
g_task_return_error(data->res, error);
-create_from_location_async_data_free(data);
+goto cleanup;
}
if (!(ret = load_keyinfo(data->location,
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH v2 1/3] tree: Use g_clear_object in create_from_location_async_data_free()
We should check whether the objects are NULL or not before calling
g_object_unref(). Instead of doing so, let's use g_clear_object(), which
doesn't require the check.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_tree.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 8e98f6c..03b6f3b 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -47,9 +47,9 @@ struct _CreateFromLocationAsyncData {
static void create_from_location_async_data_free(CreateFromLocationAsyncData
*data)
{
-g_object_unref(data->session);
-g_object_unref(data->message);
-g_object_unref(data->res);
+g_clear_object(>session);
+g_clear_object(>message);
+g_clear_object(>res);
g_slice_free(CreateFromLocationAsyncData, data);
}
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH v2 0/3] CI breakage fixes
Those patches (partially) the breakage caused on virt-manager's tests caught by libvirt-jenkins-ci. There's still an issue happening, which I'm investigating, that I'm getting a SIGTERM when running testCLI0450virt_convert It also seems to be related to the latest tree libsoup related patches on libosinfo, but I'm not totally sure yet. Changes since v1: https://www.redhat.com/archives/libosinfo/2019-July/msg00113.html - Split the patch in 3 patches, in order to make things cleaner; - Addressed Pino's comment and also changed the g_object_unref() call required due to the change requested; Fabiano Fidêncio (3): tree: Use g_clear_object in create_from_location_async_data_free() tree: goto cleanup on any error, on on_content_read() tree: cleanup on any error & return on _create_from_location_async_helper() osinfo/osinfo_tree.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH] tree: Return after calling g_task_return_error()
Otherwise we'll end up reaching:
g_task_return_error: assertion 'task->ever_returned' failed.
Signed-off-by: Fabiano Fidêncio
---
This patch fixes the CI breakage with virt-manager and will be pushed
soon.
---
osinfo/osinfo_tree.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 63604e8..1de68d2 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -701,7 +701,7 @@ static void on_content_read(GObject *source,
)) {
g_prefix_error(, _("Failed to load .treeinfo|treeinfo content:
"));
g_task_return_error(data->res, error);
-create_from_location_async_data_free(data);
+goto cleanup;
}
if (!(ret = load_keyinfo(data->location,
@@ -783,6 +783,7 @@
osinfo_tree_create_from_location_async_helper(CreateFromLocationAsyncData *data,
_("URL protocol is not supported"));
g_task_return_error(data->res, error);
+return;
}
location = g_strdup_printf("%s/%s", data->location, treeinfo);
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH] tools, detect: Check for NULL variants
Both trees & medias may return NULL in case no os-variant was found.
Let's check for this and avoid a segmentation fault on calling
osinfo_list_get_length() with a NULL argument.
Signed-off-by: Fabiano Fidêncio
---
tools/osinfo-detect.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/osinfo-detect.c b/tools/osinfo-detect.c
index feb9978..9529ef5 100644
--- a/tools/osinfo-detect.c
+++ b/tools/osinfo-detect.c
@@ -137,10 +137,12 @@ static void print_media(OsinfoMedia *media)
} else {
OsinfoOsVariantList *variants;
const gchar *name;
-guint num_variants;
+guint num_variants = 0;
variants = osinfo_media_get_os_variants(media);
-num_variants = osinfo_list_get_length(OSINFO_LIST(variants));
+if (variants != NULL)
+num_variants = osinfo_list_get_length(OSINFO_LIST(variants));
+
if (num_variants == 1) {
OsinfoEntity *variant;
@@ -206,10 +208,12 @@ static void print_tree(OsinfoTree *tree)
} else {
OsinfoOsVariantList *variants;
const gchar *name;
-guint num_variants;
+guint num_variants = 0;
variants = osinfo_tree_get_os_variants(tree);
-num_variants = osinfo_list_get_length(OSINFO_LIST(variants));
+if (variants != NULL)
+num_variants = osinfo_list_get_length(OSINFO_LIST(variants));
+
if (num_variants == 1) {
OsinfoEntity *variant;
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH] install-script: Add _generate_*_for_tree()
Similarly to what we already have for media, let's add APIs for
generating both the install-script and the install-script command line
for trees.
These new APIs take a tree as parameter and, by that, can access tree
specific elements as such its URLs.
Signed-off-by: Fabiano Fidêncio
---
osinfo/libosinfo.syms | 10 +
osinfo/osinfo_install_script.c | 326 -
osinfo/osinfo_install_script.h | 36
3 files changed, 371 insertions(+), 1 deletion(-)
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index 016d167..fa1de2f 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -588,6 +588,16 @@ LIBOSINFO_1.6.0 {
global:
osinfo_db_identify_tree;
+ osinfo_install_script_generate_command_line_for_tree;
+
+ osinfo_install_script_generate_for_tree;
+ osinfo_install_script_generate_for_tree_async;
+ osinfo_install_script_generate_for_tree_finish;
+
+ osinfo_install_script_generate_output_for_tree;
+ osinfo_install_script_generate_output_for_tree_async;
+ osinfo_install_script_generate_output_for_tree_finish;
+
osinfo_media_create_from_location_with_flags;
osinfo_media_create_from_location_with_flags_async;
osinfo_media_create_from_location_with_flags_finish;
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index b96e134..906fb83 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -671,6 +671,7 @@ struct _OsinfoInstallScriptGenerateData {
GTask *res;
OsinfoOs *os;
OsinfoMedia *media;
+OsinfoTree *tree;
OsinfoInstallConfig *config;
OsinfoInstallScript *script;
};
@@ -681,6 +682,8 @@ static void
osinfo_install_script_generate_data_free(OsinfoInstallScriptGenerate
g_object_unref(data->os);
if (data->media != NULL)
g_object_unref(data->media);
+if (data->tree != NULL)
+g_object_unref(data->tree);
g_object_unref(data->config);
g_object_unref(data->script);
g_object_unref(data->res);
@@ -884,6 +887,7 @@ static xmlNodePtr
osinfo_install_script_generate_entity_xml(OsinfoInstallScript
static xmlDocPtr osinfo_install_script_generate_config_xml(OsinfoInstallScript
*script,
OsinfoOs *os,
OsinfoMedia *media,
+ OsinfoTree *tree,
OsinfoInstallConfig
*config,
const gchar
*node_name,
GError **error)
@@ -930,6 +934,18 @@ static xmlDocPtr
osinfo_install_script_generate_config_xml(OsinfoInstallScript *
}
}
+if (tree != NULL) {
+if (!(node = osinfo_install_script_generate_entity_xml(script,
+
OSINFO_ENTITY(tree),
+ "tree",
+ error)))
+goto error;
+if (!(xmlAddChild(root, node))) {
+propagate_libxml_error(error, _("Unable to set 'tree' node"));
+goto error;
+}
+}
+
if (!(node = osinfo_install_script_generate_entity_xml(script,
OSINFO_ENTITY(config),
"config",
@@ -985,6 +1001,7 @@ static gchar
*osinfo_install_script_apply_xslt(xsltStylesheetPtr ss,
static gboolean osinfo_install_script_apply_template(OsinfoInstallScript
*script,
OsinfoOs *os,
OsinfoMedia *media,
+ OsinfoTree *tree,
const gchar *templateUri,
const gchar *template,
const gchar *node_name,
@@ -994,7 +1011,7 @@ static gboolean
osinfo_install_script_apply_template(OsinfoInstallScript *script
{
gboolean ret = FALSE;
xsltStylesheetPtr templateXsl =
osinfo_install_script_load_template(templateUri, template, error);
-xmlDocPtr configXml = osinfo_install_script_generate_config_xml(script,
os, media, config, node_name, error);
+xmlDocPtr configXml = osinfo_install_script_generate_config_xml(script,
os, media, tree, config, node_name, error);
if (!templateXsl || !configXml)
goto cleanup;
@@ -1038,6 +1055,7 @@ static void osinfo_install_script_template_loaded(GObject
*src,
if (!osinfo_install_script_apply_template(data->script
[Libosinfo] [libosinfo PATCH v3 6/7] tree: Use libsoup for http:// & https:// requests
As osinfo_tree_create_from_location() handles non-local requests, it'd
end up relying on GVFS under the hood, which would cause this API to not
work when called from an app running as root.
In order to avoid this situation, let's rely on libsoup for this cases.
It's important to mention that glib minimum version has been bumped to
2.44 as that's the version where g_input_stream_read_all_async() has
been introuced.
https://gitlab.com/libosinfo/libosinfo/issues/30
Signed-off-by: Fabiano Fidêncio
---
configure.ac | 4 +-
osinfo/libosinfo.syms | 2 +
osinfo/osinfo_tree.c | 118 +++---
osinfo/osinfo_tree.h | 14 +
4 files changed, 105 insertions(+), 33 deletions(-)
diff --git a/configure.ac b/configure.ac
index 02ea1df..0fde62c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,8 +37,8 @@ m4_if(m4_version_compare([2.61a.100],
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
# Keep these two definitions in agreement.
-GLIB_MINIMUM_VERSION="2.38"
-GLIB_ENCODED_VERSION="GLIB_VERSION_2_38"
+GLIB_MINIMUM_VERSION="2.44"
+GLIB_ENCODED_VERSION="GLIB_VERSION_2_44"
PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0])
PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0])
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index 016d167..6d81e48 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -595,6 +595,8 @@ LIBOSINFO_1.6.0 {
osinfo_media_is_bootable;
osinfo_os_get_kernel_url_argument;
+
+ osinfo_tree_error_get_type;
} LIBOSINFO_1.5.0;
/* Symbols in next release...
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 227f2c9..8e98f6c 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -26,14 +26,19 @@
#include
#include
+#include "osinfo_util_private.h"
#include
#include
#include
#include
+#include
typedef struct _CreateFromLocationAsyncData CreateFromLocationAsyncData;
struct _CreateFromLocationAsyncData {
-GFile *file;
+SoupSession *session;
+SoupMessage *message;
+
+gchar *content;
gchar *location;
gchar *treeinfo;
@@ -42,7 +47,8 @@ struct _CreateFromLocationAsyncData {
static void create_from_location_async_data_free(CreateFromLocationAsyncData
*data)
{
-g_object_unref(data->file);
+g_object_unref(data->session);
+g_object_unref(data->message);
g_object_unref(data->res);
g_slice_free(CreateFromLocationAsyncData, data);
@@ -476,7 +482,7 @@ static void on_tree_create_from_location_ready(GObject
*source_object,
* @error: The location where to store any error, or %NULL
*
* Creates a new #OsinfoTree for installation tree at @location. The @location
- * could be any URI that GIO can handle or a local path.
+ * could be a http:// or a https:// URI.
*
* NOTE: Currently this only works for trees with a .treeinfo file
*
@@ -653,24 +659,57 @@ static void
osinfo_tree_create_from_location_async_helper(CreateFromLocationAsyncData
*data,
const gchar *treeinfo);
+static void on_content_read(GObject *source,
+GAsyncResult *res,
+gpointer user_data)
+{
+CreateFromLocationAsyncData *data;
+gsize length = 0;
+GError *error = NULL;
+OsinfoTree *ret;
+
+data = (CreateFromLocationAsyncData *)user_data;
+
+if (!g_input_stream_read_all_finish(G_INPUT_STREAM(source),
+res,
+,
+)) {
+g_prefix_error(, _("Failed to load .treeinfo|treeinfo content:
"));
+g_task_return_error(data->res, error);
+create_from_location_async_data_free(data);
+}
+
+if (!(ret = load_keyinfo(data->location,
+ data->content,
+ length,
+ ))) {
+g_prefix_error(, _("Failed to process keyinfo file: "));
+g_task_return_error(data->res, error);
+goto cleanup;
+}
+
+g_task_return_pointer(data->res, ret, g_object_unref);
+
+ cleanup:
+create_from_location_async_data_free(data);
+}
+
static void on_location_read(GObject *source,
GAsyncResult *res,
gpointer user_data)
{
CreateFromLocationAsyncData *data;
GError *error = NULL;
-gchar *content = NULL;
-gsize length = 0;
-OsinfoTree *ret = NULL;
+GInputStream *stream;
+goffset content_size;
data = (CreateFromLocationAsyncData *)user_data;
-if (!g_file_load_contents_finish(G_FILE(source),
- res,
- ,
- ,
- NULL,
- )) {
[Libosinfo] [libosinfo PATCH v3 0/7] Drop GVFS dependency in favour of libsoup
Let's rely on libsoup in order to to http:// and https:// requests. By doing this, GVFS (more specifically, gvfs-http) won't be dragged as a dependency, which caused errors for apps running as root (as GVFS relies on being run in the user's session). https://gitlab.com/libosinfo/libosinfo/issues/30 Changes since v2: https://www.redhat.com/archives/libosinfo/2019-July/msg6.html - Moved requires_soup() function to osinfo_util_private.[ch] - Used osinfo_util_requires_soup() when detecting a tree in order to error out in case a "ftp://; tree is passed. - The patch fixing the doc issue was dropped, as it was fixed together with another series Changes since v1: https://www.redhat.com/archives/libosinfo/2019-June/msg00121.html - Explicitly mention that we support only http:// and https:// as "non local"; - One patch was added fixing a doc issue that was noticed during v2 Fabiano Fidêncio (7): media: Fix indentation in create_from_location_asunc_data_free() tree: Remove not used Tree from _CreateFromLocationAsyncData struct media: Improve on_location_read error message readability media: Use GInpuStream directly in on_location_read() media: Use libsoup for http:// & https:// requests tree: Use libsoup for http:// & https:// requests spec: Drop gvfs dependency configure.ac | 5 +- libosinfo.spec.in| 2 +- osinfo/Makefile.am | 7 +- osinfo/libosinfo.syms| 2 + osinfo/osinfo_media.c| 78 +++--- osinfo/osinfo_tree.c | 122 +-- osinfo/osinfo_tree.h | 14 osinfo/osinfo_util_private.c | 35 ++ osinfo/osinfo_util_private.h | 28 9 files changed, 230 insertions(+), 63 deletions(-) create mode 100644 osinfo/osinfo_util_private.c create mode 100644 osinfo/osinfo_util_private.h -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH v3 5/7] media: Use libsoup for http:// & https:// requests
As osinfo_media_create_from_location_with_flags_async() can handle
non-local cases, they'd end up relying on GVFS under the hood, which
would cause those APIs to not work when called from an app running as
root.
In order to avoid this situation, let's rely on libsoup for these cases.
https://gitlab.com/libosinfo/libosinfo/issues/30
Signed-off-by: Fabiano Fidêncio
---
configure.ac | 1 +
libosinfo.spec.in| 1 +
osinfo/Makefile.am | 7 -
osinfo/osinfo_media.c| 60 +++-
osinfo/osinfo_util_private.c | 35 +
osinfo/osinfo_util_private.h | 28 +
6 files changed, 116 insertions(+), 16 deletions(-)
create mode 100644 osinfo/osinfo_util_private.c
create mode 100644 osinfo/osinfo_util_private.h
diff --git a/configure.ac b/configure.ac
index 59c701d..02ea1df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ GLIB_ENCODED_VERSION="GLIB_VERSION_2_38"
PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0])
PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0])
+PKG_CHECK_MODULES([LIBSOUP], [libsoup-2.4])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $GLIB_MINIMUM_VERSION gobject-2.0
gio-2.0])
GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_ENCODED_VERSION"
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 8118755..e5a16aa 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -13,6 +13,7 @@ BuildRequires: gettext-devel
BuildRequires: glib2-devel
BuildRequires: libxml2-devel >= 2.6.0
BuildRequires: libxslt-devel >= 1.0.0
+BuildRequires: libsoup-devel
BuildRequires: vala
BuildRequires: /usr/bin/pod2man
BuildRequires: hwdata
diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am
index cb1df8f..7206c6d 100644
--- a/osinfo/Makefile.am
+++ b/osinfo/Makefile.am
@@ -50,6 +50,7 @@ libosinfo_impl_la_CFLAGS = \
$(GOBJECT_CFLAGS) \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
+ $(LIBSOUP_CFLAGS) \
-DDATA_DIR='"$(datadir)"' \
-DPKG_DATA_DIR='"$(pkgdatadir)"' \
-DSYS_CONF_DIR='"$(sysconfdir)"' \
@@ -61,7 +62,9 @@ libosinfo_impl_la_LIBADD = \
$(LIBXSLT_LIBS) \
$(GOBJECT_LIBS) \
$(GLIB_LIBS) \
- $(GIO_LIBS)
+ $(GIO_LIBS) \
+ $(LIBSOUP_LIBS) \
+ $(NULL)
libosinfo_impl_includedir = $(includedir)/libosinfo-1.0/osinfo
@@ -153,6 +156,7 @@ libosinfo_c_files = \
osinfo_imagelist.c \
osinfo_db.c \
osinfo_loader.c \
+ osinfo_util_private.c\
$(NULL)
libosinfo_private_header_files = \
@@ -161,6 +165,7 @@ libosinfo_private_header_files =\
osinfo_product_private.h \
osinfo_media_private.h \
osinfo_resources_private.h \
+ osinfo_util_private.h\
ignore-value.h \
$(NULL)
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index 60df191..71acb12 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -27,10 +27,12 @@
#include
#include "osinfo_media_private.h"
+#include "osinfo_util_private.h"
#include
#include
#include
#include
+#include
#define MAX_VOLUME 32
#define MAX_SYSTEM 32
@@ -129,6 +131,9 @@ static void
search_ppc_bootinfo_async_data_free(SearchPPCBootinfoAsyncData *data
typedef struct _CreateFromLocationAsyncData CreateFromLocationAsyncData;
struct _CreateFromLocationAsyncData {
GFile *file;
+SoupSession *session;
+SoupMessage *message;
+gchar *uri;
GTask *res;
@@ -150,7 +155,12 @@ struct _CreateFromLocationAsyncData {
static void create_from_location_async_data_free
(CreateFromLocationAsyncData *data)
{
-g_object_unref(data->file);
+if (data->file != NULL)
+g_object_unref(data->file);
+if (data->session != NULL)
+g_object_unref(data->session);
+if (data->message != NULL)
+g_object_unref(data->message);
g_object_unref(data->res);
g_free(data->volume);
g_free(data->system);
@@ -748,7 +758,7 @@ static void on_media_create_from_location_ready(GObject
*source_object,
* @error: The location where to store any error, or %NULL
*
* Creates a new #OsinfoMedia for installation media at @location. The
@location
- * could be any URI that GIO can handle or a local path.
+ * could be a http:// or a https:// URI or a local path.
*
* NOTE: Currently this only works for ISO images/devices.
*
@@ -772,7 +782,7 @@ OsinfoMedia *osinfo_media_create_from_location(const gchar
*location,
* @flags: An #OsinfoMediaDetectFlag, or 0.
*
* Creates a new #OsinfoMedia for installation media at @location. The
@location
- * could be any URI that GIO can handle or a local path.
+ * could be a http:// or a https:// URI or a local
[Libosinfo] [libosinfo PATCH v3 1/7] media: Fix indentation in create_from_location_asunc_data_free()
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_media.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index cf624d2..493ab95 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -150,14 +150,14 @@ struct _CreateFromLocationAsyncData {
static void create_from_location_async_data_free
(CreateFromLocationAsyncData *data)
{
- g_object_unref(data->file);
- g_object_unref(data->res);
- g_free(data->volume);
- g_free(data->system);
- g_free(data->application);
- g_free(data->publisher);
+g_object_unref(data->file);
+g_object_unref(data->res);
+g_free(data->volume);
+g_free(data->system);
+g_free(data->application);
+g_free(data->publisher);
- g_slice_free(CreateFromLocationAsyncData, data);
+g_slice_free(CreateFromLocationAsyncData, data);
}
typedef struct _CreateFromLocationData CreateFromLocationData;
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH v3 3/7] media: Improve on_location_read error message readability
Let's add a ": " by the end of the error message, so the prefix doesn't
get concatenated with error message, increasing its readability.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_media.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index 493ab95..8a7642f 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -1303,7 +1303,7 @@ static void on_location_read(GObject *source,
stream = g_file_read_finish(G_FILE(source), res, );
if (error != NULL) {
-g_prefix_error(, _("Failed to open file"));
+g_prefix_error(, _("Failed to open file: "));
g_task_return_error(data->res, error);
create_from_location_async_data_free(data);
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH v3 7/7] spec: Drop gvfs dependency
As we rely on libsoup to handle http://, https://, and ftp:// requests there's no need to depend on gvfs anymore. https://gitlab.com/libosinfo/libosinfo/issues/30 Signed-off-by: Fabiano Fidêncio --- libosinfo.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/libosinfo.spec.in b/libosinfo.spec.in index e5a16aa..2378853 100644 --- a/libosinfo.spec.in +++ b/libosinfo.spec.in @@ -22,7 +22,6 @@ BuildRequires: osinfo-db Requires: hwdata Requires: osinfo-db Requires: osinfo-db-tools -Requires: gvfs %description libosinfo is a library that allows virtualization provisioning tools to -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH v3 2/7] tree: Remove not used Tree from _CreateFromLocationAsyncData struct
As the OsinfoTree is not used anywhere in our code, let's just remove
it.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_tree.c | 4
1 file changed, 4 deletions(-)
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 8a58dd9..227f2c9 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -38,14 +38,10 @@ struct _CreateFromLocationAsyncData {
gchar *treeinfo;
GTask *res;
-
-OsinfoTree *tree;
};
static void create_from_location_async_data_free(CreateFromLocationAsyncData
*data)
{
-if (data->tree)
-g_object_unref(data->tree);
g_object_unref(data->file);
g_object_unref(data->res);
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 10/20] Add "Since: 0.2.7" to the documentation
Let's add the "Since: ..." information as part of the function's documentation. It helps developers reading our docs to easily figure out when a function has been introduced. Signed-off-by: Fabiano Fidêncio --- osinfo/osinfo_install_script.c | 2 ++ osinfo/osinfo_platform.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c index 826b9e2..d9a0ee7 100644 --- a/osinfo/osinfo_install_script.c +++ b/osinfo/osinfo_install_script.c @@ -1725,6 +1725,8 @@ GFile *osinfo_install_script_generate_output_for_media(OsinfoInstallScript *scri * #osinfo_install_script_generate_command_line_for_media() instead. * * Returns: (transfer full): The generated command line string, NULL otherwise. + * + * Since: 0.2.7 */ gchar *osinfo_install_script_generate_command_line(OsinfoInstallScript *script, OsinfoOs *os, diff --git a/osinfo/osinfo_platform.c b/osinfo/osinfo_platform.c index 3864866..afc4957 100644 --- a/osinfo/osinfo_platform.c +++ b/osinfo/osinfo_platform.c @@ -129,6 +129,8 @@ static void get_all_devices_cb(OsinfoProduct *product, gpointer user_data) * all derived and upgraded platforms. * * Returns: (transfer full): A list of devices + * + * Since: 0.2.7 */ OsinfoDeviceList *osinfo_platform_get_all_devices(OsinfoPlatform *platform, OsinfoFilter *filter) -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 11/20] Add "Since: 0.2.8" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Together with this change, documentation has been added to the functions
missing them.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_avatar_format.c| 2 ++
osinfo/osinfo_install_config.c | 45
osinfo/osinfo_install_config_param.c | 11 +++
osinfo/osinfo_install_script.c | 8 +
osinfo/osinfo_loader.c | 22 +-
osinfo/osinfo_product.c | 40 +
6 files changed, 127 insertions(+), 1 deletion(-)
diff --git a/osinfo/osinfo_avatar_format.c b/osinfo/osinfo_avatar_format.c
index ade4d09..3580e81 100644
--- a/osinfo/osinfo_avatar_format.c
+++ b/osinfo/osinfo_avatar_format.c
@@ -175,6 +175,8 @@ osinfo_avatar_format_init(OsinfoAvatarFormat *avatar)
*
* Returns: (transfer full): the necessary information to create an avatar for
* an user
+ *
+ * Since: 0.2.8
*/
OsinfoAvatarFormat *
osinfo_avatar_format_new(void)
diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c
index 2bd5e4b..3d072d9 100644
--- a/osinfo/osinfo_install_config.c
+++ b/osinfo/osinfo_install_config.c
@@ -135,6 +135,15 @@ void
osinfo_install_config_set_hardware_arch(OsinfoInstallConfig *config,
}
+/**
+ * osinfo_install_config_get_hardware_arch:
+ * @config: the install config
+ *
+ * Returns: The value of #OSINFO_INSTALL_CONFIG_PROP_HARDWARE_ARCH parameter,
+ * or NULL.
+ *
+ * Since: 0.2.8
+ */
const gchar *osinfo_install_config_get_hardware_arch(OsinfoInstallConfig
*config)
{
return osinfo_entity_get_param_value(OSINFO_ENTITY(config),
@@ -476,6 +485,15 @@ void
osinfo_install_config_set_reg_login(OsinfoInstallConfig *config,
name);
}
+/**
+ * osinfo_install_config_get_reg_login:
+ * @config: the install config
+ *
+ * Returns: The value of #OSINFO_INSTALL_CONFIG_PROP_REG_LOGIN paramater,
+ * or NULL.
+ *
+ * Since: 0.2.8
+ */
const gchar *osinfo_install_config_get_reg_login(OsinfoInstallConfig *config)
{
return osinfo_entity_get_param_value(OSINFO_ENTITY(config),
@@ -500,6 +518,15 @@ void
osinfo_install_config_set_reg_password(OsinfoInstallConfig *config,
password);
}
+/**
+ * osinfo_install_config_get_reg_password:
+ * @config: the install config
+ *
+ * Returns: The value of #OSINFO_INSTALL_CONFIG_PROP_REG_PASSWORD paramater,
+ * or NULL.
+ *
+ * Since: 0.2.8
+ */
const gchar *osinfo_install_config_get_reg_password(OsinfoInstallConfig
*config)
{
return osinfo_entity_get_param_value(OSINFO_ENTITY(config),
@@ -524,6 +551,15 @@ void
osinfo_install_config_set_reg_product_key(OsinfoInstallConfig *config,
key);
}
+/**
+ * osinfo_install_config_get_reg_product_key:
+ * @config: the install config
+ *
+ * Returns: The value of #OSINFO_INSTALL_CONFIG_PROP_REG_PRODUCTKEY paramater,
+ * or NULL.
+ *
+ * Since: 0.2.8
+ */
const gchar *osinfo_install_config_get_reg_product_key(OsinfoInstallConfig
*config)
{
return osinfo_entity_get_param_value(OSINFO_ENTITY(config),
@@ -554,6 +590,15 @@ void
osinfo_install_config_set_hostname(OsinfoInstallConfig *config,
hostname);
}
+/**
+ * osinfo_install_config_get_hostname:
+ * @config: the install config
+ *
+ * Returns: The value of #OSINFO_INSTALL_CONFIG_PROP_HOSTNAME parameter,
+ * or NULL.
+ *
+ * Since: 0.2.8
+ */
const gchar *osinfo_install_config_get_hostname(OsinfoInstallConfig *config)
{
return osinfo_entity_get_param_value(OSINFO_ENTITY(config),
diff --git a/osinfo/osinfo_install_config_param.c
b/osinfo/osinfo_install_config_param.c
index ab854b3..13fa088 100644
--- a/osinfo/osinfo_install_config_param.c
+++ b/osinfo/osinfo_install_config_param.c
@@ -277,6 +277,15 @@ gboolean
osinfo_install_config_param_is_optional(OsinfoInstallConfigParam *confi
OSINFO_INSTALL_CONFIG_PARAM_POLICY_OPTIONAL);
}
+/**
+ * osinfo_install_config_get_value_map:
+ * @config_param: the configuration parameter
+ *
+ * Returns: (transfer none): The data map used to transform values set for this
+ * parameter to OS-specific values, or NULL.
+ *
+ * Since: 0.2.8
+ */
OsinfoDatamap
*osinfo_install_config_param_get_value_map(OsinfoInstallConfigParam
*config_param)
{
return config_param->priv->value_map;
@@ -291,6 +300,8 @@ OsinfoDatamap
*osinfo_install_config_param_get_value_map(OsinfoInstallConfigPara
* After a call to osinfo_install_config_param_set_value_map(), @datamap will
* be used to transform values set for this parameter to OS-specific
* values. A NULL @datamap will disable transformations.
+ *
+ * Since: 0.2.8
*/
void osinfo_install_config_param_set_value_map(OsinfoInstallConfigPara
[Libosinfo] [libosinfo PATCH 20/20] Add "Since: 1.6.0" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Together with this change, documentation has been added to the functions
missing them.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_db.c| 2 ++
osinfo/osinfo_media.c | 10 +-
osinfo/osinfo_media.h | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index a2fc8bc..b5cdb71 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -980,6 +980,8 @@ static void fill_tree(OsinfoDb *db, OsinfoTree *tree,
* properties will be set.
*
* Returns: TRUE if @tree was found in @db, FALSE otherwise
+ *
+ * Since: 1.6.0
*/
gboolean osinfo_db_identify_tree(OsinfoDb *db,
OsinfoTree *tree)
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index ad21b78..cf624d2 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -777,6 +777,8 @@ OsinfoMedia *osinfo_media_create_from_location(const gchar
*location,
* NOTE: Currently this only works for ISO images/devices.
*
* Returns: (transfer full): a new #OsinfoMedia , or NULL on error
+ *
+ * Since: 1.6.0
*/
OsinfoMedia *osinfo_media_create_from_location_with_flags(const gchar
*location,
GCancellable
*cancellable,
@@ -1349,6 +1351,8 @@ void osinfo_media_create_from_location_async(const gchar
*location,
* #osinfo_media_create_from_location_async.
*
* Returns: (transfer full): a new #OsinfoMedia , or NULL on error
+ *
+ * Since: 1.6.0
*/
OsinfoMedia *osinfo_media_create_from_location_finish(GAsyncResult *res,
GError **error)
@@ -1365,7 +1369,9 @@ OsinfoMedia
*osinfo_media_create_from_location_finish(GAsyncResult *res,
* @flags: An #OsinfoMediaDetectFlag, or 0.
* @user_data: The user data to pass to @callback, or %NULL
*
- * Asynchronous variant of #osinfo_media_create_from_location.
+ * Asynchronous variant of #osinfo_media_create_from_location_with_flags.
+ *
+ * Since: 1.6.0
*/
void osinfo_media_create_from_location_with_flags_async(const gchar *location,
gint priority,
@@ -1833,6 +1839,8 @@ OsinfoInstallScriptList
*osinfo_media_get_install_script_list(OsinfoMedia *media
* @media: and #OsinfoMedia instance
*
* Returns: #TRUE if the @media is bootable. #FALSE otherwise.
+ *
+ * Since: 1.6.0
*/
gboolean osinfo_media_is_bootable(OsinfoMedia *media)
{
diff --git a/osinfo/osinfo_media.h b/osinfo/osinfo_media.h
index fda5243..8eeb0e2 100644
--- a/osinfo/osinfo_media.h
+++ b/osinfo/osinfo_media.h
@@ -60,6 +60,7 @@ typedef enum {
/**
* OsinfoMediaDetectFlags
+ * Since: 1.6.0
* OSINFO_MEDIA_DETECT_REQUIRE_BOOTABLE: Requires a media to be bootable.
*
* Flags used for detecting a media.
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 14/20] Add "Since: 0.2.11" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_install_script.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 9ae6712..8166a70 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1937,6 +1937,8 @@ unsigned int
osinfo_install_script_get_injection_methods(OsinfoInstallScript *sc
*
* Returns: TRUE if script needs an internet connection, FALSE otherwise
* internet connection.
+ *
+ * Since: 0.2.11
*/
gboolean osinfo_install_script_get_needs_internet(OsinfoInstallScript *script)
{
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 04/20] Add "Since: 0.1.0" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Together with this change, documentation has been added to the functions
missing them.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_tree.c | 43
osinfo/osinfo_treelist.c | 14 +
2 files changed, 57 insertions(+)
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index b797cb4..f804e46 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -67,6 +67,15 @@ static void
create_from_location_data_free(CreateFromLocationData *data)
g_slice_free(CreateFromLocationData, data);
}
+/**
+ * osinfo_tree_error_quark:
+ *
+ * Gets a #GQuark representing the string "osinfo-tree-error"
+ *
+ * Returns: the #GQuark representing the string.
+ *
+ * Since: 0.1.0
+ */
GQuark
osinfo_tree_error_quark(void)
{
@@ -425,6 +434,18 @@ osinfo_tree_init(OsinfoTree *tree)
g_weak_ref_init(>priv->os, NULL);
}
+/**
+ * osinfo_tree_new:
+ *
+ * @id: the id of the tree to be created
+ * @architecture: the architecture of the tree to be created
+ *
+ * Create a new tree entity
+ *
+ * Returns: (trasfer full): A tree entity
+ *
+ * Since: 0.1.0
+ */
OsinfoTree *osinfo_tree_new(const gchar *id,
const gchar *architecture)
{
@@ -464,6 +485,8 @@ static void on_tree_create_from_location_ready(GObject
*source_object,
* NOTE: Currently this only works for trees with a .treeinfo file
*
* Returns: (transfer full): a new #OsinfoTree , or NULL on error
+ *
+ * Since: 0.1.0
*/
OsinfoTree *osinfo_tree_create_from_location(const gchar *location,
GCancellable *cancellable,
@@ -713,6 +736,8 @@
osinfo_tree_create_from_location_async_helper(CreateFromLocationAsyncData *data,
* @user_data: The user data to pass to @callback, or %NULL
*
* Asynchronous variant of #osinfo_tree_create_from_location.
+ *
+ * Since: 0.1.0
*/
void osinfo_tree_create_from_location_async(const gchar *location,
gint priority,
@@ -744,6 +769,8 @@ void osinfo_tree_create_from_location_async(const gchar
*location,
* #osinfo_tree_create_from_location_async.
*
* Returns: (transfer full): a new #OsinfoTree , or NULL on error
+ *
+ * Since: 0.1.0
*/
OsinfoTree *osinfo_tree_create_from_location_finish(GAsyncResult *res,
GError **error)
@@ -762,6 +789,8 @@ OsinfoTree
*osinfo_tree_create_from_location_finish(GAsyncResult *res,
* Retrieves the target hardware architecture of the OS @tree provides.
*
* Returns: (transfer none): the hardware architecture, or NULL
+ *
+ * Since: 0.1.0
*/
const gchar *osinfo_tree_get_architecture(OsinfoTree *tree)
{
@@ -793,6 +822,8 @@ const gchar *osinfo_tree_get_url(OsinfoTree *tree)
* but rather a regular expression that matches it.
*
* Returns: (transfer none): the treeinfo family, or NULL
+ *
+ * Since: 0.1.0
*/
const gchar *osinfo_tree_get_treeinfo_family(OsinfoTree *tree)
{
@@ -810,6 +841,8 @@ const gchar *osinfo_tree_get_treeinfo_family(OsinfoTree
*tree)
* architecture but rather a regular expression that matches it.
*
* Returns: (transfer none): the treeinfo architecture, or NULL
+ *
+ * Since: 0.1.0
*/
const gchar *osinfo_tree_get_treeinfo_arch(OsinfoTree *tree)
{
@@ -827,6 +860,8 @@ const gchar *osinfo_tree_get_treeinfo_arch(OsinfoTree *tree)
* but rather a regular expression that matches it.
*
* Returns: (transfer none): the treeinfo variant, or NULL
+ *
+ * Since: 0.1.0
*/
const gchar *osinfo_tree_get_treeinfo_variant(OsinfoTree *tree)
{
@@ -844,6 +879,8 @@ const gchar *osinfo_tree_get_treeinfo_variant(OsinfoTree
*tree)
* rather a regular expression that matches it.
*
* Returns: (transfer none): the treeinfo version, or NULL
+ *
+ * Since: 0.1.0
*/
const gchar *osinfo_tree_get_treeinfo_version(OsinfoTree *tree)
{
@@ -858,6 +895,8 @@ const gchar *osinfo_tree_get_treeinfo_version(OsinfoTree
*tree)
* Retrieves the path to the boot_iso image in the install tree.
*
* Returns: (transfer none): the path to boot_iso image, or NULL
+ *
+ * Since: 0.1.0
*/
const gchar *osinfo_tree_get_boot_iso_path(OsinfoTree *tree)
{
@@ -874,6 +913,8 @@ const gchar *osinfo_tree_get_boot_iso_path(OsinfoTree *tree)
* Note: This only applies to installer trees of 'linux' OS family.
*
* Returns: (transfer none): the path to kernel image, or NULL
+ *
+ * Since: 0.1.0
*/
const gchar *osinfo_tree_get_kernel_path(OsinfoTree *tree)
{
@@ -890,6 +931,8 @@ const gchar *osinfo_tree_get_kernel_path(OsinfoTree *tree)
* Note: This only applies to installer trees of 'linux' OS family.
*
* Returns: (transfer none): the path to initrd image, or NULL
+ *
+ * Since: 0.1.0
*/
const gchar *osinfo_tree_get_initrd_path(Osinf
[Libosinfo] [libosinfo PATCH 18/20] Add "Since: 1.4.0" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_media.c | 4
osinfo/osinfo_os.h| 1 +
2 files changed, 5 insertions(+)
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index 9b693f6..ad21b78 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -1800,6 +1800,8 @@ gboolean
osinfo_media_supports_installer_script(OsinfoMedia *media)
* @script: an #OsinfoInstallScript instance
*
* Adds an @script to the specified @media
+ *
+ * Since: 1.4.0
*/
void osinfo_media_add_install_script(OsinfoMedia *media, OsinfoInstallScript
*script)
{
@@ -1813,6 +1815,8 @@ void osinfo_media_add_install_script(OsinfoMedia *media,
OsinfoInstallScript *sc
* @media: an #OsinfoMedia instance
*
* Returns: (transfer full): a list of the install scripts for the specified
media
+ *
+ * Since: 1.4.0
*/
OsinfoInstallScriptList *osinfo_media_get_install_script_list(OsinfoMedia
*media)
{
diff --git a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h
index 2bec1c8..1521fbb 100644
--- a/osinfo/osinfo_os.h
+++ b/osinfo/osinfo_os.h
@@ -93,6 +93,7 @@ struct _OsinfoOsClass
* development snapshots of GNOME and nightly build ISOs of Fedora etc.
* @OSINFO_RELEASE_STATUS_PRERELEASE: A pre-release. For example, alpha and
* beta pre-releases of Fedora etc.
+ * Since: 1.4.0
* @OSINFO_RELEASE_STATUS_ROLLING: A rolling version of an OS and thus with no
* actual releases. For example, Gentoo, Arch Linux, etc.
*/
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 02/20] Add "Since: 0.0.5" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_os.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index 08faf4f..afd84b0 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -338,6 +338,8 @@ osinfo_os_get_all_device_links_internal(OsinfoOs *os,
* systems.
*
* Returns: (transfer full): A list of devices
+ *
+ * Since: 0.0.5
*/
OsinfoDeviceList *osinfo_os_get_all_devices(OsinfoOs *os, OsinfoFilter *filter)
{
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 00/20] Add "Since: ..." to the function's documentation
This series adds "Since: ..." information as part of the function's documentation. It helps developers reading our docs to easily figure out when a function has been introduced. For functions missing documentation, it has been added as part of this series as well. And, last but not least, this series addresses everything released since the first release. For the first release, it doesn't actually make sense to add "Since: ...", although it would be good to have those functions documented at some point (but not as part of this series). Fabiano Fidêncio (20): Add "Since: 0.0.3" to the documentation Add "Since: 0.0.5" to the documentation Add "Since: 0.0.6" to the documentation Add "Since: 0.1.0" to the documentation Add "Since: 0.2.0" to the documentation Add "Since: 0.2.1" to the documentation Add "Since: 0.2.2" to the documentation Add "Since: 0.2.3" to the documentation Add "Since: 0.2.6" to the documentation Add "Since: 0.2.7" to the documentation Add "Since: 0.2.8" to the documentation Add "Since: 0.2.9" to the documentation Add "Since: 0.2.10" to the documentation Add "Since: 0.2.11" to the documentation Add "Since: 0.2.12" to the documentation Add "Since: 0.2.13" to the documentation Add "Since: 1.3.0" to the documentation Add "Since: 1.4.0" to the documentation Add "Since: 1.5.0" to the documentation Add "Since: 1.6.0" to the documentation osinfo/osinfo_avatar_format.c| 10 + osinfo/osinfo_datamap.c | 39 osinfo/osinfo_datamaplist.c | 2 + osinfo/osinfo_db.c | 14 ++ osinfo/osinfo_device.c | 8 + osinfo/osinfo_device_driver.c| 12 + osinfo/osinfo_device_driverlist.c| 2 + osinfo/osinfo_entity.c | 114 ++ osinfo/osinfo_image.c| 14 ++ osinfo/osinfo_imagelist.c| 2 + osinfo/osinfo_install_config.c | 276 ++- osinfo/osinfo_install_config_param.c | 21 ++ osinfo/osinfo_install_config_param.h | 1 + osinfo/osinfo_install_config_paramlist.c | 2 + osinfo/osinfo_install_script.c | 160 - osinfo/osinfo_install_script.h | 3 + osinfo/osinfo_install_scriptlist.c | 10 + osinfo/osinfo_list.c | 8 + osinfo/osinfo_loader.c | 24 +- osinfo/osinfo_media.c| 30 ++- osinfo/osinfo_media.h| 1 + osinfo/osinfo_os.c | 48 osinfo/osinfo_os.h | 2 + osinfo/osinfo_os_variant.c | 13 ++ osinfo/osinfo_os_variantlist.c | 2 + osinfo/osinfo_platform.c | 2 + osinfo/osinfo_product.c | 42 osinfo/osinfo_tree.c | 51 + osinfo/osinfo_treelist.c | 14 ++ 29 files changed, 917 insertions(+), 10 deletions(-) -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 17/20] Add "Since: 1.3.0" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_image.c | 8
osinfo/osinfo_imagelist.c | 2 ++
osinfo/osinfo_install_script.c | 8
osinfo/osinfo_install_script.h | 1 +
osinfo/osinfo_loader.c | 2 ++
osinfo/osinfo_media.c | 2 ++
osinfo/osinfo_os.c | 14 ++
osinfo/osinfo_tree.c | 2 ++
8 files changed, 39 insertions(+)
diff --git a/osinfo/osinfo_image.c b/osinfo/osinfo_image.c
index 621ebf0..05115a7 100644
--- a/osinfo/osinfo_image.c
+++ b/osinfo/osinfo_image.c
@@ -230,6 +230,8 @@ OsinfoImage *osinfo_image_new(const gchar *id,
* Retrieves the target hardware architecture of the OS @image provides.
*
* Returns: (transfer none): the hardware architecture, or NULL
+ *
+ * Since: 1.3.0
*/
const gchar *osinfo_image_get_architecture(OsinfoImage *image)
{
@@ -244,6 +246,8 @@ const gchar *osinfo_image_get_architecture(OsinfoImage
*image)
* The format of the @image
*
* Returns: (transfer none): the format, or NULL
+ *
+ * Since: 1.3.0
*/
const gchar *osinfo_image_get_format(OsinfoImage *image)
{
@@ -258,6 +262,8 @@ const gchar *osinfo_image_get_format(OsinfoImage *image)
* The URL to the @image
*
* Returns: (transfer none): the URL, or NULL
+ *
+ * Since: 1.3.0
*/
const gchar *osinfo_image_get_url(OsinfoImage *image)
{
@@ -273,6 +279,8 @@ const gchar *osinfo_image_get_url(OsinfoImage *image)
*
* Returns: #TRUE if @image supports cloud init customizations, #FALSE
* otherwise.
+ *
+ * Since: 1.3.0
*/
gboolean osinfo_image_get_cloud_init(OsinfoImage *image)
{
diff --git a/osinfo/osinfo_imagelist.c b/osinfo/osinfo_imagelist.c
index 0187b89..0f822a8 100644
--- a/osinfo/osinfo_imagelist.c
+++ b/osinfo/osinfo_imagelist.c
@@ -73,6 +73,8 @@ osinfo_imagelist_init(OsinfoImageList *list)
* Construct a new image list that is initially empty.
*
* Returns: (transfer full): an empty image list
+ *
+ * Since: 1.3.0
*/
OsinfoImageList *osinfo_imagelist_new(void)
{
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 3d8c502..b96e134 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1961,6 +1961,8 @@ gboolean
osinfo_install_script_get_needs_internet(OsinfoInstallScript *script)
* OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_WEB
*
* Set the preferred injection method to be used with the @script
+ *
+ * Since: 1.3.0
*/
void osinfo_install_script_set_preferred_injection_method(OsinfoInstallScript
*script,
OsinfoInstallScriptInjectionMethod method)
@@ -1988,6 +1990,8 @@ void
osinfo_install_script_set_preferred_injection_method(OsinfoInstallScript *s
* OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_DISK is supported,
* OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_DISK is returned, otherwise
* OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_INITRD is returned.
+ *
+ * Since: 1.3.0
*/
OsinfoInstallScriptInjectionMethod
osinfo_install_script_get_preferred_injection_method(OsinfoInstallScript
*script)
@@ -2025,6 +2029,8 @@
osinfo_install_script_get_preferred_injection_method(OsinfoInstallScript *script
* OSINFO_INSTALL_SCRIPT_INSTALLATION_SOURCE_NETWORK
*
* Set the installation source to be used with the @script.
+ *
+ * Since: 1.3.0
*/
void osinfo_install_script_set_installation_source(OsinfoInstallScript *script,
OsinfoInstallScriptInstallationSource source)
@@ -2041,6 +2047,8 @@ void
osinfo_install_script_set_installation_source(OsinfoInstallScript *script,
*
* Returns: the installation source to be used with the script. If none is
set, it defaults to
* OSINFO_INSTALL_SCRIPT_INSTALLATION_SOURCE_MEDIA.
+ *
+ * Since: 1.3.0
*/
OsinfoInstallScriptInstallationSource
osinfo_install_script_get_installation_source(OsinfoInstallScript *script)
diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index ccd6cbc..626e66c 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -140,6 +140,7 @@ typedef enum {
/**
* OsinfoInstallScriptInstallationSource:
+ * Since: 1.3.0
* @OSINFO_INSTALL_SCRIPT_INSTALLATION_SOURCE_MEDIA: A media will be used as
* the installation source.
* @OSINFO_INSTALL_SCRIPT_INSTALLATION_SOURCE_NETWORK: A network method will
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index 6d1c801..51bd8ac 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -151,6 +151,8 @@ OsinfoLoader *osinfo_loader_new(void)
* Gets a #GQuark representing the string "libosinfo"
*
* Returns: the #GQuark representing the string.
+ *
+ * Since: 1.3.0
**/
GQuark
osinfo_error_quark(void)
diff --git a/osinfo/osinfo_media.c b/osinfo/
[Libosinfo] [libosinfo PATCH 19/20] Add "Since: 1.5.0" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_image.c | 6 ++
osinfo/osinfo_install_config.c | 4
osinfo/osinfo_product.c| 2 ++
osinfo/osinfo_tree.c | 6 ++
4 files changed, 18 insertions(+)
diff --git a/osinfo/osinfo_image.c b/osinfo/osinfo_image.c
index 05115a7..33fa58d 100644
--- a/osinfo/osinfo_image.c
+++ b/osinfo/osinfo_image.c
@@ -293,6 +293,8 @@ gboolean osinfo_image_get_cloud_init(OsinfoImage *image)
* @image: an #OsinfoImage instance
*
* Returns: (transfer full): the operating system, or NULL
+ *
+ * Since: 1.5.0
*/
OsinfoOs *osinfo_image_get_os(OsinfoImage *image)
{
@@ -307,6 +309,8 @@ OsinfoOs *osinfo_image_get_os(OsinfoImage *image)
* @os: an #OsinfoOs instance
*
* Sets the #OsinfoOs associated to the #OsinfoImage instance.
+ *
+ * Since: 1.5.0
*/
void osinfo_image_set_os(OsinfoImage *image, OsinfoOs *os)
{
@@ -324,6 +328,8 @@ void osinfo_image_set_os(OsinfoImage *image, OsinfoOs *os)
* Gets the varriants of the associated operating system
*
* Returns: (transfer full): the operating system variants, or NULL
+ *
+ * Since: 1.5.0
*/
OsinfoOsVariantList *osinfo_image_get_os_variants(OsinfoImage *image)
{
diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c
index 3d072d9..caec643 100644
--- a/osinfo/osinfo_install_config.c
+++ b/osinfo/osinfo_install_config.c
@@ -963,6 +963,8 @@ gboolean
osinfo_install_config_get_driver_signing(OsinfoInstallConfig *config)
*
* When performing a tree based installation the script will need the
installation
* URL to be set, whenever the installation is performed from a non canonical
place.
+ *
+ * Since: 1.5.0
*/
void osinfo_install_config_set_installation_url(OsinfoInstallConfig *config,
const gchar *url)
@@ -977,6 +979,8 @@ void
osinfo_install_config_set_installation_url(OsinfoInstallConfig *config,
* @config: the install config
*
* Returns the URL the script will use to perform the installation.
+ *
+ * Since: 1.5.0
*/
const gchar *osinfo_install_config_get_installation_url(OsinfoInstallConfig
*config)
{
diff --git a/osinfo/osinfo_product.c b/osinfo/osinfo_product.c
index dbb7402..a767585 100644
--- a/osinfo/osinfo_product.c
+++ b/osinfo/osinfo_product.c
@@ -485,6 +485,8 @@ void osinfo_product_foreach_related(OsinfoProduct *product,
* Retrieve all the short-ids associated with the product.
*
* Returns: (transfer container) (element-type utf8): the list of short-ids.
+ *
+ * Since: 1.5.0
*/
GList *osinfo_product_get_short_id_list(OsinfoProduct *prod)
{
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 98f2334..8a58dd9 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -961,6 +961,8 @@ gboolean osinfo_tree_has_treeinfo(OsinfoTree *tree)
* @tree: an #OsinfoTree instance
*
* Returns: (transfer full): the operating system, or NULL
+ *
+ * Since: 1.5.0
*/
OsinfoOs *osinfo_tree_get_os(OsinfoTree *tree)
{
@@ -976,6 +978,8 @@ OsinfoOs *osinfo_tree_get_os(OsinfoTree *tree)
* @os: an #OsinfoOs instance
*
* Sets the #OsinfoOs associated to the #OsinfoTree instance.
+ *
+ * Since: 1.5.0
*/
void osinfo_tree_set_os(OsinfoTree *tree, OsinfoOs *os)
{
@@ -993,6 +997,8 @@ void osinfo_tree_set_os(OsinfoTree *tree, OsinfoOs *os)
* Gets the variants of the associated operating system.
*
* Returns: (transfer full): the operating system variant, or NULL
+ *
+ * Since: 1.5.0
*/
OsinfoOsVariantList *osinfo_tree_get_os_variants(OsinfoTree *tree)
{
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 06/20] Add "Since: 0.2.1" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Together with this change, documentation has been added to the functions
missing them.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_device.c | 8
osinfo/osinfo_entity.c | 59
osinfo/osinfo_install_config_param.c | 4 ++
osinfo/osinfo_install_script.c | 10 +++--
osinfo/osinfo_media.c| 2 +
5 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/osinfo/osinfo_device.c b/osinfo/osinfo_device.c
index 6de3d2c..529a600 100644
--- a/osinfo/osinfo_device.c
+++ b/osinfo/osinfo_device.c
@@ -116,6 +116,14 @@ const gchar *osinfo_device_get_name(OsinfoDevice *dev)
return osinfo_entity_get_param_value(OSINFO_ENTITY(dev),
OSINFO_DEVICE_PROP_NAME);
}
+/**
+ * osinfo_device_get_subsystem:
+ * @dev: the device
+ *
+ * Returns: the value of the device's subsystem.
+ *
+ * Since: 0.2.1
+ */
const gchar *osinfo_device_get_subsystem(OsinfoDevice *dev)
{
return osinfo_entity_get_param_value(OSINFO_ENTITY(dev),
OSINFO_DEVICE_PROP_SUBSYSTEM);
diff --git a/osinfo/osinfo_entity.c b/osinfo/osinfo_entity.c
index f634d78..86d1c4a 100644
--- a/osinfo/osinfo_entity.c
+++ b/osinfo/osinfo_entity.c
@@ -204,6 +204,18 @@ void osinfo_entity_set_param_boolean(OsinfoEntity *entity,
const gchar *key, gbo
osinfo_entity_set_param(entity, key, value ? "true" : "false");
}
+/**
+ * osinfo_entity_set_param_int64:
+ * @entity: an #OsinfoEntity containing the parameters
+ * @key: the name of the key
+ * @value: the int64 value to be associated with that key
+ *
+ * Sets a new parameter against the entity. If the key already
+ * has a value associated with it, the existing value will be
+ * cleared.
+ *
+ * Since: 0.2.1
+ */
void osinfo_entity_set_param_int64(OsinfoEntity *entity, const gchar *key,
gint64 value)
{
gchar *str;
@@ -363,6 +375,23 @@ gboolean
osinfo_entity_get_param_value_boolean(OsinfoEntity *entity, const gchar
return value && str_to_bool(value);
}
+/**
+ * osinfo_entity_get_param_value_boolean_with_default:
+ * @entity: an #OsinfoEntity containing the parameters
+ * @key: the name of the key
+ * @default_value: the value to be returned in case there's no value
+ * associated with the @key
+ *
+ * Retrieve the parameter value associated with a named key as a
+ * boolean. If multiple values are stored against the key, only the
+ * first value is returned. If no value is associated, @default_value
+ * is returned.
+ *
+ * Returns: the value associated with the key as a boolean, or
+ * @default_value
+ *
+ * Since: 0.2.1
+ */
gboolean osinfo_entity_get_param_value_boolean_with_default(OsinfoEntity
*entity,
const char *key,
gboolean
default_value)
@@ -376,12 +405,42 @@ gboolean
osinfo_entity_get_param_value_boolean_with_default(OsinfoEntity *entity
return str_to_bool(value);
}
+/**
+ * osinfo_entity_get_param_value_int64:
+ * @entity: an #OsinfoEntity containing the parameters
+ * @key: the name of the key
+ *
+ * Retrieve the parameter value associated with a named key as an
+ * int64. If multiple values are stored against the key, only the
+ * first value is returned. If no value is associated, -1 is returned.
+ *
+ * Returns: the value associated with the key as an int64, or -1.
+ *
+ * Since: 0.2.1
+ */
gint64 osinfo_entity_get_param_value_int64(OsinfoEntity *entity,
const gchar *key)
{
return osinfo_entity_get_param_value_int64_with_default(entity, key, -1);
}
+/**
+ * osinfo_entity_get_param_value_int64_with_default:
+ * @entity: an #OsinfoEntity containing the parameters
+ * @key: the name of the key
+ * @default_value: the value to be returned in case there's no value
+ * associated with the @key
+ *
+ * Retrieve the parameter value associated with a named key as an
+ * int64. If multiple values are stored against the key, only the
+ * first value is returned. If no value is associated, @default_value
+ * is returned.
+ *
+ * Returns: the value associated with the key as an int64, or
+ * @default_value
+ *
+ * Since: 0.2.1
+ */
gint64 osinfo_entity_get_param_value_int64_with_default(OsinfoEntity *entity,
const gchar *key,
gint64 default_value)
diff --git a/osinfo/osinfo_install_config_param.c
b/osinfo/osinfo_install_config_param.c
index 187569f..ab854b3 100644
--- a/osinfo/osinfo_install_config_param.c
+++ b/osinfo/osinfo_install_config_param.c
@@ -253,6 +253,8 @@ OsinfoInstallConfigParamPolicy
osinfo_install_config_param_get_policy(OsinfoInst
[Libosinfo] [libosinfo PATCH 08/20] Add "Since: 0.2.3" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Together with this change, documentation has been added to the functions
missing them.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_datamap.c | 39
osinfo/osinfo_datamaplist.c | 2 ++
osinfo/osinfo_db.c | 7 +
osinfo/osinfo_install_config_paramlist.c | 2 ++
osinfo/osinfo_install_script.c | 4 +++
osinfo/osinfo_media.c| 4 +++
6 files changed, 58 insertions(+)
diff --git a/osinfo/osinfo_datamap.c b/osinfo/osinfo_datamap.c
index 05e4631..f8f81a9 100644
--- a/osinfo/osinfo_datamap.c
+++ b/osinfo/osinfo_datamap.c
@@ -85,6 +85,16 @@ osinfo_datamap_init(OsinfoDatamap *list)
}
+/**
+ * osinfo_datamap_new:
+ * @id: the unique identifier
+ *
+ * Construct a new datamapa that is initially empty.
+ *
+ * Returns: (transfer full): an empty datamap
+ *
+ * Since: 0.2.3
+ */
OsinfoDatamap *osinfo_datamap_new(const gchar *id)
{
return g_object_new(OSINFO_TYPE_DATAMAP,
@@ -93,6 +103,17 @@ OsinfoDatamap *osinfo_datamap_new(const gchar *id)
}
+/**
+ * osinfo_datamap_insert:
+ * @map: the OS datamap
+ * @inval: the input value
+ * @outval: the output value
+ *
+ * Adds the input value and the output value associated to it to
+ * the @map.
+ *
+ * Since: 0.2.3
+ */
void osinfo_datamap_insert(OsinfoDatamap *map,
const gchar *inval,
const gchar *outval)
@@ -108,12 +129,30 @@ void osinfo_datamap_insert(OsinfoDatamap *map,
g_hash_table_insert(map->priv->reverse_map, dup_outval, dup_inval);
}
+/**
+ * osinfo_datamap_lookup:
+ * @map: the OS datamap
+ * @inval: the input value
+ *
+ * Returns the output value with which @inval is associated to.
+ *
+ * Since: 0.2.3
+ */
const gchar *osinfo_datamap_lookup(OsinfoDatamap *map,
const gchar *inval)
{
return g_hash_table_lookup(map->priv->map, inval);
}
+/**
+ * osinfo_datamap_reverse_lookup:
+ * @map: the OS datamap
+ * @outval: the output value
+ *
+ * Returns the input value with which @outval is associated to.
+ *
+ * Since: 0.2.3
+ */
const gchar *osinfo_datamap_reverse_lookup(OsinfoDatamap *map,
const gchar *outval)
{
diff --git a/osinfo/osinfo_datamaplist.c b/osinfo/osinfo_datamaplist.c
index 1e45756..e3593b7 100644
--- a/osinfo/osinfo_datamaplist.c
+++ b/osinfo/osinfo_datamaplist.c
@@ -73,6 +73,8 @@ osinfo_datamaplist_init(OsinfoDatamapList *list)
* Construct a new install_datamap list that is initially empty.
*
* Returns: (transfer full): an empty install_datamap list
+ *
+ * Since: 0.2.3
*/
OsinfoDatamapList *osinfo_datamaplist_new(void)
{
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 29f40b5..a2fc8bc 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -261,6 +261,8 @@ OsinfoDeployment *osinfo_db_get_deployment(OsinfoDb *db,
const gchar *id)
* @id: the unique operating system identifier
*
* Returns: (transfer none): the install datamap, or NULL if none is found
+ *
+ * Since: 0.2.3
*/
OsinfoDatamap *osinfo_db_get_datamap(OsinfoDb *db, const gchar *id)
{
@@ -402,6 +404,8 @@ OsinfoDeploymentList
*osinfo_db_get_deployment_list(OsinfoDb *db)
* @db: the database
*
* Returns: (transfer full): the list of install datamaps
+ *
+ * Since: 0.2.3
*/
OsinfoDatamapList *osinfo_db_get_datamap_list(OsinfoDb *db)
{
@@ -498,6 +502,7 @@ void osinfo_db_add_deployment(OsinfoDb *db,
OsinfoDeployment *deployment)
* @db: the database
* @datamap: (transfer none): an install datamap
*
+ * Since: 0.2.3
*/
void osinfo_db_add_datamap(OsinfoDb *db, OsinfoDatamap *datamap)
{
@@ -753,6 +758,8 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media,
* properties will be set.
*
* Returns: TRUE if @media was found in @db, FALSE otherwise
+ *
+ * Since: 0.2.3
*/
gboolean osinfo_db_identify_media(OsinfoDb *db, OsinfoMedia *media)
{
diff --git a/osinfo/osinfo_install_config_paramlist.c
b/osinfo/osinfo_install_config_paramlist.c
index 9925cbf..d5390ed 100644
--- a/osinfo/osinfo_install_config_paramlist.c
+++ b/osinfo/osinfo_install_config_paramlist.c
@@ -75,6 +75,8 @@
osinfo_install_config_paramlist_init(OsinfoInstallConfigParamList *list)
* Construct a new install_config_param list that is initially empty.
*
* Returns: (transfer full): an empty install_config_param list
+ *
+ * Since: 0.2.3
*/
OsinfoInstallConfigParamList *osinfo_install_config_paramlist_new(void)
{
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 7e242c9..934f25c 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -368,6 +368,8 @@ GList
*osinfo_install_script_get_config_param_list(OsinfoInstallScript *s
[Libosinfo] [libosinfo PATCH 13/20] Add "Since: 0.2.10" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_install_script.c | 2 ++
osinfo/osinfo_install_script.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 173e9c6..9ae6712 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1918,6 +1918,8 @@ int
osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScri
*
* Returns: (type OsinfoInstallScriptInjectionMethod): bitwise-or of
* supported methods for install script injection.
+ *
+ * Since: 0.2.10
*/
unsigned int osinfo_install_script_get_injection_methods(OsinfoInstallScript
*script)
{
diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index f3fa5ba..ccd6cbc 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -118,6 +118,7 @@ typedef enum {
/**
* OsinfoInstallScriptInjectionMethod:
+ * Since: 0.2.10
* @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_CDROM: Support injection of the
* installation script trough a CD-ROM.
* @OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_DISK: Support injection of the
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 01/20] Add "Since: 0.0.3" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_media.c | 4
1 file changed, 4 insertions(+)
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index 3bedeb4..9592f04 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -1557,6 +1557,8 @@ const gchar *osinfo_media_get_initrd_path(OsinfoMedia
*media)
* Whether @media provides an installer for an OS.
*
* Returns: #TRUE if media is installer, #FALSE otherwise
+ *
+ * Since: 0.0.3
*/
gboolean osinfo_media_get_installer(OsinfoMedia *media)
{
@@ -1571,6 +1573,8 @@ gboolean osinfo_media_get_installer(OsinfoMedia *media)
* Whether @media can boot directly an OS without any installations.
*
* Returns: #TRUE if media is live, #FALSE otherwise
+ *
+ * Since: 0.0.3
*/
gboolean osinfo_media_get_live(OsinfoMedia *media)
{
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 15/20] Add "Since: 0.2.12" to the documentation
Let's add the "Since: ..." information as part of the function's documentation. It helps developers reading our docs to easily figure out when a function has been introduced. Signed-off-by: Fabiano Fidêncio --- osinfo/osinfo_install_script.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c index 8166a70..3d8c502 100644 --- a/osinfo/osinfo_install_script.c +++ b/osinfo/osinfo_install_script.c @@ -1777,6 +1777,8 @@ gchar *osinfo_install_script_generate_command_line(OsinfoInstallScript *script, * #osinfo_db_identify_media() before calling this function. * * Returns: (transfer full): The generated command line string, NULL otherwise. + * + * Since: 0.2.12 */ gchar *osinfo_install_script_generate_command_line_for_media(OsinfoInstallScript *script, OsinfoMedia *media, -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 03/20] Add "Since: 0.0.6" to the documentation
Let's add the "Since: ..." information as part of the function's documentation. It helps developers reading our docs to easily figure out when a function has been introduced. Signed-off-by: Fabiano Fidêncio --- osinfo/osinfo_os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c index afd84b0..82af6b7 100644 --- a/osinfo/osinfo_os.c +++ b/osinfo/osinfo_os.c @@ -408,6 +408,8 @@ OsinfoDeviceList *osinfo_os_get_all_devices(OsinfoOs *os, OsinfoFilter *filter) * @os supports, for which the value of @property is @value. * * Returns: (transfer full): The found devices + * + * Since: 0.0.6 */ OsinfoDeviceList *osinfo_os_get_devices_by_property(OsinfoOs *os, const gchar *property, -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 12/20] Add "Since: 0.2.9" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Together with this change, documentation has been added to the functions
missing them.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_media.c | 2 ++
osinfo/osinfo_os.c | 6 ++
osinfo/osinfo_os.h | 1 +
osinfo/osinfo_os_variant.c | 13 +
osinfo/osinfo_os_variantlist.c | 2 ++
5 files changed, 24 insertions(+)
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index ccfc704..42a8f37 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -1641,6 +1641,8 @@ void osinfo_media_set_os(OsinfoMedia *media, OsinfoOs *os)
* Gets the variants of the associated operating system.
*
* Returns: (transfer full): the operating system variant, or NULL
+ *
+ * Since: 0.2.9
*/
OsinfoOsVariantList *osinfo_media_get_os_variants(OsinfoMedia *media)
{
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index 61f2c69..7c69bfb 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -620,6 +620,8 @@ const gchar *osinfo_os_get_distro(OsinfoOs *os)
* Use this to determine the release status of the @os.
*
* Returns: (type OsinfoReleaseStatus): release status of @os.
+ *
+ * Since: 0.2.9
*/
int osinfo_os_get_release_status(OsinfoOs *os)
{
@@ -744,6 +746,8 @@ void osinfo_os_add_image(OsinfoOs *os, OsinfoImage *image)
* Gets all known variants of operating system @os.
*
* Returns: (transfer full): A list of variants
+ *
+ * Since: 0.2.9
*/
OsinfoOsVariantList *osinfo_os_get_variant_list(OsinfoOs *os)
{
@@ -762,6 +766,8 @@ OsinfoOsVariantList *osinfo_os_get_variant_list(OsinfoOs
*os)
* @variant: (transfer none): the variant to add
*
* Adds a variant @variant to operating system @os.
+ *
+ * Since: 0.2.9
*/
void osinfo_os_add_variant(OsinfoOs *os, OsinfoOsVariant *variant)
{
diff --git a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h
index 6207a53..2bec1c8 100644
--- a/osinfo/osinfo_os.h
+++ b/osinfo/osinfo_os.h
@@ -86,6 +86,7 @@ struct _OsinfoOsClass
/**
* OsinfoReleaseStatus:
+ * Since: 0.2.9
* @OSINFO_RELEASE_STATUS_RELEASED: A released OS.
* @OSINFO_RELEASE_STATUS_SNAPSHOT: A continuous integration snapshot and not
* an actual released product yet. For example, gnome-continuous images for
diff --git a/osinfo/osinfo_os_variant.c b/osinfo/osinfo_os_variant.c
index 3320209..a623146 100644
--- a/osinfo/osinfo_os_variant.c
+++ b/osinfo/osinfo_os_variant.c
@@ -125,6 +125,17 @@ osinfo_os_variant_init(OsinfoOsVariant *variant)
variant->priv = OSINFO_OS_VARIANT_GET_PRIVATE(variant);
}
+/**
+ * osinfo_os_variant_new:
+ *
+ * @id: the id of the os variant to be created
+ *
+ * Creates a new os variant
+ *
+ * Returns: (transfer full): An os variant entity
+ *
+ * Since: 0.2.9
+ */
OsinfoOsVariant *osinfo_os_variant_new(const gchar *id)
{
OsinfoOsVariant *variant;
@@ -143,6 +154,8 @@ OsinfoOsVariant *osinfo_os_variant_new(const gchar *id)
* The name of the @variant
*
* Returns: (transfer none): the name, or NULL
+ *
+ * Since: 0.2.9
*/
const gchar *osinfo_os_variant_get_name(OsinfoOsVariant *variant)
{
diff --git a/osinfo/osinfo_os_variantlist.c b/osinfo/osinfo_os_variantlist.c
index 4c8a249..73cfb9f 100644
--- a/osinfo/osinfo_os_variantlist.c
+++ b/osinfo/osinfo_os_variantlist.c
@@ -62,6 +62,8 @@ osinfo_os_variantlist_init(OsinfoOsVariantList *list)
* Construct a new install_variant list that is initially empty.
*
* Returns: (transfer full): an empty install_variant list
+ *
+ * Since: 0.2.9
*/
OsinfoOsVariantList *osinfo_os_variantlist_new(void)
{
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 09/20] Add "Since: 0.2.6" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_device_driver.c | 2 ++
osinfo/osinfo_install_config.c | 4
osinfo/osinfo_install_script.c | 4
osinfo/osinfo_install_script.h | 1 +
4 files changed, 11 insertions(+)
diff --git a/osinfo/osinfo_device_driver.c b/osinfo/osinfo_device_driver.c
index 04ab5d8..a0e6222 100644
--- a/osinfo/osinfo_device_driver.c
+++ b/osinfo/osinfo_device_driver.c
@@ -188,6 +188,8 @@ void osinfo_device_driver_add_device(OsinfoDeviceDriver
*driver,
* before these device drivers could be installed on their OS.
*
* Returns: TRUE if @driver is signed, FALSE otherwise.
+ *
+ * Since: 0.2.6
*/
gboolean osinfo_device_driver_get_signed(OsinfoDeviceDriver *driver)
{
diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c
index 05eff36..2bd5e4b 100644
--- a/osinfo/osinfo_install_config.c
+++ b/osinfo/osinfo_install_config.c
@@ -882,6 +882,8 @@ const gchar
*osinfo_install_config_get_post_install_drivers_location(OsinfoInsta
* If a script requires drivers to be signed, this function can be used to
* disable that security feature. WARNING: Disabling driver signing may very
* well mean disabling it permanently.
+ *
+ * Since: 0.2.6
*/
void osinfo_install_config_set_driver_signing(OsinfoInstallConfig *config,
gboolean signing)
@@ -898,6 +900,8 @@ void
osinfo_install_config_set_driver_signing(OsinfoInstallConfig *config,
* Returns: %TRUE if driver signing is currently enabled, %FALSE otherwise, see
* #osinfo_install_config_set_driver_signing() for more details about driver
* signing.
+ *
+ * Since: 0.2.6
*/
gboolean osinfo_install_config_get_driver_signing(OsinfoInstallConfig *config)
{
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 934f25c..826b9e2 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1868,6 +1868,8 @@ gboolean
osinfo_install_script_get_can_post_install_drivers(OsinfoInstallScript
* this function retrieves the requirement about signed status of drivers.
*
* Returns: (type OsinfoDeviceDriverSigningReq):
+ *
+ * Since: 0.2.6
*/
int
osinfo_install_script_get_pre_install_drivers_signing_req(OsinfoInstallScript
*script)
{
@@ -1886,6 +1888,8 @@ int
osinfo_install_script_get_pre_install_drivers_signing_req(OsinfoInstallScrip
* function retrieves the requirement about signed status of drivers.
*
* Returns: (type OsinfoDeviceDriverSigningReq):
+ *
+ * Since: 0.2.6
*/
int
osinfo_install_script_get_post_install_drivers_signing_req(OsinfoInstallScript
*script)
{
diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index e8abe25..f3fa5ba 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -95,6 +95,7 @@ typedef enum {
/**
* OsinfoDeviceDriverSigningReq:
+ * Since: 0.2.6
* @OSINFO_DEVICE_DRIVER_SIGNING_REQ_NONE: Script do not require device drivers
* to be signed.
* @OSINFO_DEVICE_DRIVER_SIGNING_REQ_STRICT: Script must only be given signed
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 05/20] Add "Since: 0.2.0" to the documentation
Let's add the "Since: ..." information as part of the function's
documentation. It helps developers reading our docs to easily figure out
when a function has been introduced.
Together with this change, documentation has been added to the functions
missing them.
Signed-off-by: Fabiano Fidêncio
---
osinfo/osinfo_db.c | 5 +
osinfo/osinfo_entity.c | 25
osinfo/osinfo_install_config.c | 193 ++-
osinfo/osinfo_install_config_param.c | 6 +
osinfo/osinfo_install_script.c | 88 +++-
osinfo/osinfo_install_scriptlist.c | 10 ++
osinfo/osinfo_os.c | 13 ++
7 files changed, 335 insertions(+), 5 deletions(-)
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index 43b66eb..29f40b5 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -277,6 +277,8 @@ OsinfoDatamap *osinfo_db_get_datamap(OsinfoDb *db, const
gchar *id)
* @id: the unique operating system identifier
*
* Returns: (transfer none): the install script, or NULL if none is found
+ *
+ * Since: 0.2.0
*/
OsinfoInstallScript *osinfo_db_get_install_script(OsinfoDb *db, const gchar
*id)
{
@@ -417,6 +419,8 @@ OsinfoDatamapList *osinfo_db_get_datamap_list(OsinfoDb *db)
* @db: the database
*
* Returns: (transfer full): the list of install scripts
+ *
+ * Since: 0.2.0
*/
OsinfoInstallScriptList *osinfo_db_get_install_script_list(OsinfoDb *db)
{
@@ -509,6 +513,7 @@ void osinfo_db_add_datamap(OsinfoDb *db, OsinfoDatamap
*datamap)
* @db: the database
* @script: (transfer none): an install script
*
+ * Since: 0.2.0
*/
void osinfo_db_add_install_script(OsinfoDb *db, OsinfoInstallScript *script)
{
diff --git a/osinfo/osinfo_entity.c b/osinfo/osinfo_entity.c
index f0bfb67..f634d78 100644
--- a/osinfo/osinfo_entity.c
+++ b/osinfo/osinfo_entity.c
@@ -187,6 +187,18 @@ void osinfo_entity_set_param(OsinfoEntity *entity, const
gchar *key, const gchar
}
+/**
+ * osinfo_entity_set_param_boolean:
+ * @entity: an #OsinfoEntity containing the parameters
+ * @key: the name of the key
+ * @value: the boolean value to be associated with that key
+ *
+ * Sets a new parameter against the entity. If the key already
+ * has a value associated with it, the existing value will be
+ * cleared.
+ *
+ * Since: 0.2.0
+ */
void osinfo_entity_set_param_boolean(OsinfoEntity *entity, const gchar *key,
gboolean value)
{
osinfo_entity_set_param(entity, key, value ? "true" : "false");
@@ -331,6 +343,19 @@ static gboolean str_to_bool(const char *str)
return (g_strcmp0("true", str) == 0 || g_strcmp0("yes", str) == 0);
}
+/**
+ * osinfo_entity_get_param_value_boolean:
+ * @entity: an #OsinfoEntity containing the parameters
+ * @key: the name of the key
+ *
+ * Retrieve the parameter value associated with a named key as a
+ * boolean. If multiple values are stored against the key, only the
+ * first value is returned. If no value is associated, FALSE is returned
+ *
+ * Returns: the value associated with the key as a boolean, or FALSE
+ *
+ * Since: 0.2.0
+ */
gboolean osinfo_entity_get_param_value_boolean(OsinfoEntity *entity, const
gchar *key)
{
const gchar *value = osinfo_entity_get_param_value(entity, key);
diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c
index 4a01a81..e8a181e 100644
--- a/osinfo/osinfo_install_config.c
+++ b/osinfo/osinfo_install_config.c
@@ -106,6 +106,7 @@ osinfo_install_config_init(OsinfoInstallConfig *config)
* Returns: (transfer full): an install configuration with default
* values
*
+ * Since: 0.2.0
*/
OsinfoInstallConfig *osinfo_install_config_new(const gchar *id)
{
@@ -114,6 +115,17 @@ OsinfoInstallConfig *osinfo_install_config_new(const gchar
*id)
NULL);
}
+/**
+ * osinfo_install_config_set_hardware_arch:
+ * @config: the install config
+ * @arch: the hardware architecture
+ *
+ * Sets the #OSINFO_INSTALL_CONFIG_PROP_HARDWARE_ARCH parameter.
+ *
+ * The list of valid architectures are part of osinfo.rng schema
+ *
+ * Since: 0.2.0
+ */
void osinfo_install_config_set_hardware_arch(OsinfoInstallConfig *config,
const gchar *arch)
{
@@ -138,6 +150,8 @@ const gchar
*osinfo_install_config_get_hardware_arch(OsinfoInstallConfig *config
*
* The expected format of this string is the same as
* #osinfo_install_config_set_l10n_language function's 'language' parameter.
+ *
+ * Since: 0.2.0
*/
void osinfo_install_config_set_l10n_keyboard(OsinfoInstallConfig *config,
const gchar *keyboard)
@@ -147,7 +161,15 @@ void
osinfo_install_config_set_l10n_keyboard(OsinfoInstallConfig *config,
keyboard);
}
-
+/**
+ * osinfo_install_config_get_l10n_keyboard:
+ * @config: the install config
+ *
+ * Returns: The value of #OSINFO_INSTALL_CONFIG_PROP_L10N_KEYBOARD parameter,
+ *
[Libosinfo] [osinfo-db PATCH 1/2] install-script, centos: Fix distro comparision
We have to single-quote centos, otherwise the test for the os/distro will always fail. Signed-off-by: Fabiano Fidêncio --- data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in index 3a3a370..7bfaf6e 100644 --- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in @@ -136,7 +136,7 @@ - + http://mirror.centos.org/centos/ /os/ -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 0/2] A few fixes for CentOS 7
The first patch fixes the os/distro comparison, which requires the string to be single-quoted; The second patch adjusts CentOS 7 name for its variants; Fabiano Fidêncio (2): install-script,centos: Fix distro comparision centos: Adjust the variant names to CentOS 7 data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 2 +- data/os/centos.org/centos-7.0.xml.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 2/2] centos: Adjust the variant names to CentOS 7
As used in the name, let's adjust the variant names to also use CentOS 7 instead of CentOS 7.0. Signed-off-by: Fabiano Fidêncio --- data/os/centos.org/centos-7.0.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in index c1b4e9f..29e3a41 100644 --- a/data/os/centos.org/centos-7.0.xml.in +++ b/data/os/centos.org/centos-7.0.xml.in @@ -15,10 +15,10 @@ 2014-07-07 - <_name>CentOS 7.0 (GNOME) + <_name>CentOS 7 (GNOME) - <_name>CentOS 7.0 (KDE) + <_name>CentOS 7 (KDE) -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH v2 08/16] Add support to meson build system
On Thu, Jul 11, 2019 at 9:39 PM Cole Robinson wrote:
>
> On 7/10/19 11:25 AM, Fabiano Fidêncio wrote:
> > On Tue, Jul 9, 2019 at 12:47 PM Fabiano Fidêncio
> > wrote:
> >
> > [snip]
> >
> >> +cp $BUILD_ROOT/{mingw-,}osinfo-db-tools.spec $MESON_DIST_ROOT/
> >
> > I've noticed that the current state of osinfo-db-tools tarball is to
> > just include osinfo-db-tools.spec and not mingw-osinfo-db-tools.spec.
> > Shall we keep it as it is? Or shall we also include
> > mingw-osinfo-db-tools.spec?
> >
>
> FWIW Libvirt seems to follow the same pattern of only shipping
> libvirt.spec but not mingw-*.spec, though it does ship the .in version.
>
> Blind guess but maybe it has to do with keeping 'rpmbuild -ta
> FOO.tar.gz' working, which looks for a spec file inside the archive.
That seems to be the case, indeed.
I'll keep this pattern of just shiping osinfo-db-tools.spec and adapt
prepare release to use the shipped .spec file instead of using the one
generated during build time.
>
> - Cole
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 2/2] dragonflybsd: Add 5.6 data
In a conversation with DragonFly BSD developers I've learned that the minor releases (x.y.minor) should not have their own entries. It's too late for fixing this for older releases, but let's follow this for new ones. Signed-off-by: Fabiano Fidêncio --- .../dragonflybsd.org/dragonflybsd-5.6.xml.in | 22 ++ .../dfly-x86_64-5.6.0_REL.iso.txt | 29 +++ .../dfly-x86_64-5.6.1_REL.iso.txt | 29 +++ 3 files changed, 80 insertions(+) create mode 100644 data/os/dragonflybsd.org/dragonflybsd-5.6.xml.in create mode 100644 tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.0_REL.iso.txt create mode 100644 tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.1_REL.iso.txt diff --git a/data/os/dragonflybsd.org/dragonflybsd-5.6.xml.in b/data/os/dragonflybsd.org/dragonflybsd-5.6.xml.in new file mode 100644 index 000..6ee18eb --- /dev/null +++ b/data/os/dragonflybsd.org/dragonflybsd-5.6.xml.in @@ -0,0 +1,22 @@ + + + http://dragonflybsd.org/dragonflybsd/5.6;> +dragonflybsd5.6 +<_name>DragonFlyBSD 5.6 +5.6 +dragonflybsd +dragonflybsd +<_vendor>DragonFlyBSD Project +http://dragonflybsd.org/dragonflybsd/5.4.3"/> + +2019-06-17 + + + +DragonFly +DragonFly_v5.6.(\d)+ + + + + diff --git a/tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.0_REL.iso.txt b/tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.0_REL.iso.txt new file mode 100644 index 000..6be8fbd --- /dev/null +++ b/tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.0_REL.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: DragonFly +Volume id: DragonFly_v5.6.0 +Volume set id: +Publisher id: +Data preparer id: +Application id: MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 368679 +El Torito VD version 1 found, boot catalog is in sector 4220 +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 107D 4221 diff --git a/tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.1_REL.iso.txt b/tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.1_REL.iso.txt new file mode 100644 index 000..23cc54b --- /dev/null +++ b/tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.1_REL.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: DragonFly +Volume id: DragonFly_v5.6.1 +Volume set id: +Publisher id: +Data preparer id: +Application id: MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 368679 +El Torito VD version 1 found, boot catalog is in sector 4220 +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 107D 4221 -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 1/2] drangonflybsd: Add EOL date
Although DragonFlyBSD doesn't have specific EOL dates mentioned in their website, a quick chat on their development IRC channel suggested that a distro reach its EOL once a new version is released. With this in mind, we can add the EOL info based on that. Signed-off-by: Fabiano Fidêncio --- data/os/dragonflybsd.org/dragonflybsd-1.0.xml.in| 1 + data/os/dragonflybsd.org/dragonflybsd-1.0A.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.10.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.10.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.12.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.12.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.2.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.2.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.2.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.2.3.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.2.4.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.2.5.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.2.6.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.4.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.4.4.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.6.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.8.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-1.8.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.0.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.10.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.2.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.2.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.4.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.4.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.6.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.6.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.6.3.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-2.8.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.0.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.2.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.4.1.xml.in | 3 ++- data/os/dragonflybsd.org/dragonflybsd-3.4.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.4.3.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.6.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.6.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.6.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.8.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.8.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-3.8.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.0.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.0.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.2.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.2.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.2.3.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.2.4.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.4.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.4.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.4.3.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.6.0.xml.in | 3 ++- data/os/dragonflybsd.org/dragonflybsd-4.6.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.6.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.8.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-4.8.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.0.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.0.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.0.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.2.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.2.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.2.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.4.0.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.4.1.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.4.2.xml.in | 1 + data/os/dragonflybsd.org/dragonflybsd-5.4.3.xml.in | 1 + 63 files changed, 65 insertions(+), 2 deletions(-) diff --git a/data/os/dragonflybsd.org/dragonflybsd-1.0.xml.in b/data/os/dragonflybsd.org/dragonflybsd-1.0.xml.in index e90a929..d3e3d11 100644 --- a/data/os/dragonflybsd.org/dragonflybsd-1.0.xml.in +++ b/data/os/dragonflybsd.org/dragonflybsd-1.0.xml.in @@ -10,5 +10,6 @@ <_vendor>DragonFlyBSD Project 2004-07-12 +2004-07-14 diff --git a/data/os/dragonflybsd.org/dragonflybsd-1.0A.xml.in b/data/os/dragonflybsd.org/dragonflybsd-1.0A.xml.in index 1cf3d60..6c3b75e 100644 --- a/data/os/dragonflybsd.org/dragonflybsd-1.0A.xml.in +++ b/data/os/dragonflybsd.org/dragonflybsd-1.0A.xml.in @@ -11,5 +11,6 @@ http://dragonflybsd.org/dragonflybsd/1.0"/> 2004-07-14 +2005-04-08 diff --git a/data/os/dragonflybsd.org/dragonflybsd-1.10.0.xml.in b/data/os/dragonflybsd.org/dragonflybsd-1.10.0.xml.in index 9369341..3315f78 100644 --- a/data/os/dragonflybsd.org/dragonflybsd-1.10.
[Libosinfo] [osinfo-db PATCH 0/2] dragonflybsd: Add eol-dates for old releases & add 5.6 info & tests
After a conversation with DragonFly BSD folks on their IRC, I've learned that: - a release can be considered EOL once a new once is out; - With this in mind, let's populate the db with this missing info; - x.y.minor releases should just be considered as x.y releases; - With this in mind, let's add 5.6 in a more proper way than the previous entries; Fabiano Fidêncio (2): drangonflybsd: Add EOL date dragonflybsd: Add 5.6 data .../dragonflybsd.org/dragonflybsd-1.0.xml.in | 1 + .../dragonflybsd.org/dragonflybsd-1.0A.xml.in | 1 + .../dragonflybsd-1.10.0.xml.in| 1 + .../dragonflybsd-1.10.1.xml.in| 1 + .../dragonflybsd-1.12.0.xml.in| 1 + .../dragonflybsd-1.12.1.xml.in| 1 + .../dragonflybsd-1.2.0.xml.in | 1 + .../dragonflybsd-1.2.1.xml.in | 1 + .../dragonflybsd-1.2.2.xml.in | 1 + .../dragonflybsd-1.2.3.xml.in | 1 + .../dragonflybsd-1.2.4.xml.in | 1 + .../dragonflybsd-1.2.5.xml.in | 1 + .../dragonflybsd-1.2.6.xml.in | 1 + .../dragonflybsd-1.4.0.xml.in | 1 + .../dragonflybsd-1.4.4.xml.in | 1 + .../dragonflybsd-1.6.0.xml.in | 1 + .../dragonflybsd-1.8.0.xml.in | 1 + .../dragonflybsd-1.8.1.xml.in | 1 + .../dragonflybsd-2.0.0.xml.in | 1 + .../dragonflybsd-2.10.1.xml.in| 1 + .../dragonflybsd-2.2.0.xml.in | 1 + .../dragonflybsd-2.2.1.xml.in | 1 + .../dragonflybsd-2.4.0.xml.in | 1 + .../dragonflybsd-2.4.1.xml.in | 1 + .../dragonflybsd-2.6.1.xml.in | 1 + .../dragonflybsd-2.6.2.xml.in | 1 + .../dragonflybsd-2.6.3.xml.in | 1 + .../dragonflybsd-2.8.2.xml.in | 1 + .../dragonflybsd-3.0.1.xml.in | 1 + .../dragonflybsd-3.2.1.xml.in | 1 + .../dragonflybsd-3.4.1.xml.in | 3 +- .../dragonflybsd-3.4.2.xml.in | 1 + .../dragonflybsd-3.4.3.xml.in | 1 + .../dragonflybsd-3.6.0.xml.in | 1 + .../dragonflybsd-3.6.1.xml.in | 1 + .../dragonflybsd-3.6.2.xml.in | 1 + .../dragonflybsd-3.8.0.xml.in | 1 + .../dragonflybsd-3.8.1.xml.in | 1 + .../dragonflybsd-3.8.2.xml.in | 1 + .../dragonflybsd-4.0.0.xml.in | 1 + .../dragonflybsd-4.0.1.xml.in | 1 + .../dragonflybsd-4.2.0.xml.in | 1 + .../dragonflybsd-4.2.1.xml.in | 1 + .../dragonflybsd-4.2.3.xml.in | 1 + .../dragonflybsd-4.2.4.xml.in | 1 + .../dragonflybsd-4.4.1.xml.in | 1 + .../dragonflybsd-4.4.2.xml.in | 1 + .../dragonflybsd-4.4.3.xml.in | 1 + .../dragonflybsd-4.6.0.xml.in | 3 +- .../dragonflybsd-4.6.1.xml.in | 1 + .../dragonflybsd-4.6.2.xml.in | 1 + .../dragonflybsd-4.8.0.xml.in | 1 + .../dragonflybsd-4.8.1.xml.in | 1 + .../dragonflybsd-5.0.0.xml.in | 1 + .../dragonflybsd-5.0.1.xml.in | 1 + .../dragonflybsd-5.0.2.xml.in | 1 + .../dragonflybsd-5.2.0.xml.in | 1 + .../dragonflybsd-5.2.1.xml.in | 1 + .../dragonflybsd-5.2.2.xml.in | 1 + .../dragonflybsd-5.4.0.xml.in | 1 + .../dragonflybsd-5.4.1.xml.in | 1 + .../dragonflybsd-5.4.2.xml.in | 1 + .../dragonflybsd-5.4.3.xml.in | 1 + .../dragonflybsd.org/dragonflybsd-5.6.xml.in | 22 ++ .../dfly-x86_64-5.6.0_REL.iso.txt | 29 +++ .../dfly-x86_64-5.6.1_REL.iso.txt | 29 +++ 66 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 data/os/dragonflybsd.org/dragonflybsd-5.6.xml.in create mode 100644 tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.0_REL.iso.txt create mode 100644 tests/isodata/dragonflybsd/dragonflybsd5.6/dfly-x86_64-5.6.1_REL.iso.txt -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 2/2] install-script, rhel: Only add install-source if there's an install URL
When dealing with net-install ISOs, we may reach the situation where the command-line template will generate the command-line adding a "inst.repo=" but the installation URL is not present. The easiest way to deal with this is checking whether an installation URL is present and only adding "inst.repo=" if that's the case. https://gitlab.com/libosinfo/osinfo-db/issues/29 Signed-off-by: Fabiano Fidêncio --- .../redhat.com/rhel-kickstart-desktop.xml.in | 7 +-- data/install-script/redhat.com/rhel-kickstart-jeos.xml.in | 7 +-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in index 3a3a370..d0788e8 100644 --- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in @@ -93,7 +93,10 @@ - + + + + method= @@ -102,7 +105,7 @@ inst.repo= - + diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in index fdef836..f1ffb43 100644 --- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in @@ -69,7 +69,10 @@ - + + + + method= @@ -78,7 +81,7 @@ inst.repo= - + -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 0/2] Only add the install-source there's an install URL
When dealing with Fedora/CentOS net-install ISOs, we may reach the situation where the command-line template will generate the command-line adding a "inst.repo=" but the installation URL is not present. The easiest way to deal with this is checking whether an installation URL is present and only adding "inst.repo=" if that's the case. https://gitlab.com/libosinfo/osinfo-db/issues/29 Cole, I've tested this using the following command-lines: fidencio@laerte ~/src/upstream/virt-manager $ ./virt-install --location ~/Downloads/Fedora-Workstation-netinst-x86_64-30-1.2.iso --unattended --debug --dry-run ... hvm /home/fidencio/.cache/virt-manager/boot/virtinst-78wrkio3-vmlinuz /home/fidencio/.cache/virt-manager/boot/virtinst-1fijdwll-initrd.img ks=file:/fedora.ks ... fidencio@laerte ~/src/upstream/virt-manager $ ./virt-install --install fedora30 --unattended --debug --dry-run ... hvm /home/fidencio/.cache/virt-manager/boot/virtinst-yjqucpkl-vmlinuz /home/fidencio/.cache/virt-manager/boot/virtinst-s1_hgwl6-initrd.img ks=file:/fedora.ks inst.repo=https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/os ... Fabiano Fidêncio (2): install-script,fedora: Only add install-source if there's an install URL install-script,rhel: Only add install-source if there's an install URL .../fedoraproject.org/fedora-kickstart-desktop.xml.in | 7 +-- .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 7 +-- .../redhat.com/rhel-kickstart-desktop.xml.in | 7 +-- data/install-script/redhat.com/rhel-kickstart-jeos.xml.in | 7 +-- 4 files changed, 20 insertions(+), 8 deletions(-) -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 1/2] install-script, fedora: Only add install-source if there's an install URL
When dealing with net-install ISOs, we may reach the situation where the command-line template will generate the command-line adding a "inst.repo=" but the installation URL is not present. The easiest way to deal with this is checking whether an installation URL is present and only adding "inst.repo=" if that's the case. https://gitlab.com/libosinfo/osinfo-db/issues/29 Signed-off-by: Fabiano Fidêncio --- .../fedoraproject.org/fedora-kickstart-desktop.xml.in | 7 +-- .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 7 +-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in index 33f674c..7a16a42 100644 --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in @@ -118,7 +118,10 @@ - + + + + method= @@ -127,7 +130,7 @@ inst.repo= - + diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in index 68ece05..8cc8778 100644 --- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in +++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in @@ -113,7 +113,10 @@ - + + + + method= @@ -122,7 +125,7 @@ inst.repo= - + -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH v2 08/16] Add support to meson build system
On Tue, Jul 9, 2019 at 12:47 PM Fabiano Fidêncio wrote:
[snip]
> +cp $BUILD_ROOT/{mingw-,}osinfo-db-tools.spec $MESON_DIST_ROOT/
I've noticed that the current state of osinfo-db-tools tarball is to
just include osinfo-db-tools.spec and not mingw-osinfo-db-tools.spec.
Shall we keep it as it is? Or shall we also include mingw-osinfo-db-tools.spec?
[snip]
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 07/16] tools: Don't import config.h
config.h file is only used in osinfo-db-tools for the GETTEXT_PACKAGE macro. Fortunately, when AC_CONFIG_HEADER macro is dropped from configure, -DGETTEXT_PACKAGE=... is automatically passed as a compilar argument, allowing us then to drop the file. Together with this change, let's also drop both sc_require_config_h and sc_require_config_h_first checks from `make syntax-check`. Signed-off-by: Fabiano Fidêncio --- cfg.mk | 4 +++- configure.ac | 1 - tools/osinfo-db-export.c | 2 -- tools/osinfo-db-import.c | 2 -- tools/osinfo-db-path.c | 2 -- tools/osinfo-db-util.c | 2 -- tools/osinfo-db-validate.c | 2 -- 7 files changed, 3 insertions(+), 12 deletions(-) diff --git a/cfg.mk b/cfg.mk index fc4b313..84ca1cd 100644 --- a/cfg.mk +++ b/cfg.mk @@ -33,7 +33,9 @@ local-checks-to-skip =\ sc_two_space_separator_in_usage \ sc_error_message_uppercase \ sc_program_name \ - sc_makefile_check + sc_makefile_check\ + sc_require_config_h \ + sc_require_config_h_first # Files that should never cause syntax check failures. VC_LIST_ALWAYS_EXCLUDE_REGEX = \ diff --git a/configure.ac b/configure.ac index 4df1139..e32af7f 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,6 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.11.1 foreign color-tests tar-ustar]) AC_PREREQ([2.61]) AC_CONFIG_SRCDIR([tools/osinfo-db-validate.c]) -AC_CONFIG_HEADERS([config.h]) AC_PROG_CC AC_PROG_LN_S diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c index eef6688..8fa9889 100644 --- a/tools/osinfo-db-export.c +++ b/tools/osinfo-db-export.c @@ -20,8 +20,6 @@ * Daniel P. Berrange */ -#include - #include #include #include diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c index 675961d..026b895 100644 --- a/tools/osinfo-db-import.c +++ b/tools/osinfo-db-import.c @@ -20,8 +20,6 @@ * Daniel P. Berrange */ -#include - #include #include #include diff --git a/tools/osinfo-db-path.c b/tools/osinfo-db-path.c index 8ef7e55..e38758b 100644 --- a/tools/osinfo-db-path.c +++ b/tools/osinfo-db-path.c @@ -20,8 +20,6 @@ * Daniel P. Berrange */ -#include - #include #include #include diff --git a/tools/osinfo-db-util.c b/tools/osinfo-db-util.c index 1030b06..40c6079 100644 --- a/tools/osinfo-db-util.c +++ b/tools/osinfo-db-util.c @@ -20,8 +20,6 @@ * Daniel P. Berrange */ -#include - #include #include "osinfo-db-util.h" diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c index 7fd87d2..97db5f2 100644 --- a/tools/osinfo-db-validate.c +++ b/tools/osinfo-db-validate.c @@ -20,8 +20,6 @@ * Daniel P. Berrange */ -#include - #include #include #include -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 05/16] cfg.mk: Remove exclude_file_name_regexp--sc_bindtextdomain
Let's run the check in all files. Signed-off-by: Fabiano Fidêncio --- cfg.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index b7839c8..fc4b313 100644 --- a/cfg.mk +++ b/cfg.mk @@ -100,5 +100,3 @@ sc_bracket_spacing_check: # We don't use this feature of maint.mk. prev_version_file = /dev/null - -exclude_file_name_regexp--sc_bindtextdomain = ^tools/.*.c|test/.*.c -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 11/16] prepare-release: Adapt to use meson
Let's adapt the prepare-release script to use meson build system instead
of autotools.
This change has been tested and is working fine on Fedora 30+.
Signed-off-by: Fabiano Fidêncio
---
prepare-release.sh | 78 ++
1 file changed, 24 insertions(+), 54 deletions(-)
diff --git a/prepare-release.sh b/prepare-release.sh
index e95a177..5f886c5 100755
--- a/prepare-release.sh
+++ b/prepare-release.sh
@@ -7,86 +7,56 @@ test -n "$1" && RESULTS=$1 || RESULTS=results.log
INSTALL_ROOT=$HOME/builder
# Make things clean.
-test -f Makefile && make -k distclean || :
-
rm -rf build
-mkdir build
-cd build
-
-../autogen.sh --prefix=$INSTALL_ROOT \
---enable-werror
+meson build --prefix=$INSTALL_ROOT --werror
-# If the MAKEFLAGS envvar does not yet include a -j option,
-# add -jN where N depends on the number of processors.
-case $MAKEFLAGS in
- *-j*) ;;
- *) n=$(getconf _NPROCESSORS_ONLN 2> /dev/null)
-test "$n" -gt 0 || n=1
-n=$(expr $n + 1)
-MAKEFLAGS="$MAKEFLAGS -j$n"
-export MAKEFLAGS
-;;
-esac
-
-make
-make install
+ninja -C build
+ninja -C build install
# set -o pipefail is a bashism; this use of exec is the POSIX alternative
exec 3>&1
st=$(
exec 4>&1 >&3
- { make check syntax-check 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS"
+ { ninja -C build test 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS"
)
exec 3>&-
test "$st" = 0
-rm -f *.tar.gz
-make dist
+ninja -C build dist
if [ -f /usr/bin/rpmbuild ]; then
rpmbuild --nodeps \
- --define "_sourcedir `pwd`" \
- -ba --clean osinfo-db-tools.spec
+ --define "_sourcedir `pwd`/build/meson-dist/" \
+ -ba --clean build/osinfo-db-tools.spec
fi
# Test mingw32 cross-compile
-if test -x /usr/bin/i686-w64-mingw32-gcc ; then
- make distclean
-
-
PKG_CONFIG_PATH="$INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
- CC="i686-w64-mingw32-gcc" \
- ../configure \
---build=$(uname -m)-pc-linux \
---host=i686-w64-mingw32 \
---prefix="$INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \
---enable-werror
-
- make
- make install
+if test -x /usr/bin/i686-w64-mingw32-gcc && test -r
/usr/share/mingw/toolchain-mingw32.meson ; then
+ rm -rf build || :
+ meson build --prefix="$INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw"
--werror --cross-file="/usr/share/mingw/toolchain-mingw32.meson"
+ ninja -C build
+ ninja -C build install
fi
# Test mingw64 cross-compile
-if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
- make distclean
-
-
PKG_CONFIG_PATH="$INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig"
\
- CC="x86_64-w64-mingw32-gcc" \
- ../configure \
---build=$(uname -m)-pc-linux \
---host=x86_64-w64-mingw32 \
---prefix="$INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \
---enable-werror
+if test -x /usr/bin/x86_64-w64-mingw32-gcc && test -r
/usr/share/mingw/toolchain-mingw64.meson ; then
+ rm -rf build || :
- make
- make install
+ meson build --prefix="$INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw"
--werror --cross-file="/usr/share/mingw/toolchain-mingw64.meson"
+ ninja -C build
+ ninja -C build install
fi
-if test -x /usr/bin/i686-w64-mingw32-gcc && test -x
/usr/bin/x86_64-w64-mingw32-gcc ; then
+if test -x /usr/bin/i686-w64-mingw32-gcc && test -r
/usr/share/mingw/toolchain-mingw32.meson && test -x
/usr/bin/x86_64-w64-mingw32-gcc && test -r
/usr/share/mingw/toolchain-mingw64.meson ; then
+ rm -rf build || :
+ meson build
+ ninja -C build dist
+
if test -f /usr/bin/rpmbuild ; then
rpmbuild --nodeps \
- --define "_sourcedir `pwd`" \
- -ba --clean mingw-osinfo-db-tools.spec
+ --define "_sourcedir `pwd`/build/meson-dist/" \
+ -ba --clean build/mingw-osinfo-db-tools.spec
fi
fi
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 16/16] prepare-release: Add `ninja syntax-check`
Now that ninja has a `syntax-check` target, let's add it to
prepare-release script in a similar that `make syntax-check` was used
before.
Signed-off-by: Fabiano Fidêncio
---
prepare-release.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/prepare-release.sh b/prepare-release.sh
index 5f886c5..f69ce5e 100755
--- a/prepare-release.sh
+++ b/prepare-release.sh
@@ -18,6 +18,8 @@ exec 3>&1
st=$(
exec 4>&1 >&3
{ ninja -C build test 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS"
+ exec 4>&1 >&3
+ { ninja -C build syntax-check 2>&1 3>&- 4>&-; echo $? >&4; } | tee --append
"$RESULTS"
)
exec 3>&-
test "$st" = 0
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 09/16] spec: Adapt to use meson
The changes needed in the spec files are not so intrusive.
One thing that has to be mentioned is the requirement for
mingw-filesystem >= 107 (which is only present on Fedora 30+) in order
to generate the mingw rpms for osinfo-db-tools. This huge bump in the
version happened because the `%mingw_ninja_install` was only recently
introduced to mingw-filesystem package.
Signed-off-by: Fabiano Fidêncio
---
mingw-osinfo-db-tools.spec.in | 14 +++---
osinfo-db-tools.spec.in | 17 ++---
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 14e68c5..6d9fd95 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -5,15 +5,16 @@ Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
Summary: MinGW Windows port of a library for managing OS information for
virtualization
License: LGPLv2+
-Source: https://releases.pagure.org/libosinfo/osinfo-db-tools-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/osinfo-db-tools-%{version}.tar.xz
URL: https://libosinfo.org
BuildArch: noarch
+BuildRequires: meson
BuildRequires: gettext
-BuildRequires: mingw32-filesystem >= 95
-BuildRequires: mingw64-filesystem >= 95
+BuildRequires: mingw32-filesystem >= 107
+BuildRequires: mingw64-filesystem >= 107
BuildRequires: mingw32-gcc
BuildRequires: mingw64-gcc
BuildRequires: mingw32-binutils
@@ -62,12 +63,11 @@ information about operating systems for use with
virtualization
%setup -q -n osinfo-db-tools-%{version}
%build
-%mingw_configure
-%mingw_make %{?_smp_mflags}
-
+%mingw_meson
+%mingw_ninja
%install
-%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+%mingw_ninja_install
# Manpages don't need to be bundled
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index 459dde9..848ce3b 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -11,8 +11,9 @@ Name: osinfo-db-tools
Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
License: GPLv2+
-Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
URL: https://libosinfo.org
+BuildRequires: meson
BuildRequires: gcc
BuildRequires: gettext-devel
BuildRequires: glib2-devel
@@ -38,18 +39,12 @@ information about operating systems for use with
virtualization
%setup -q
%build
-%configure
-%__make %{?_smp_mflags} V=1
-
-%check
-if ! make check
-then
- cat tests/test-suite.log || true
- exit 1
-fi
+%meson
+%meson_build
+%meson_test
%install
-%__make install DESTDIR=%{buildroot}
+%meson_install
%find_lang %{name}
--
2.21.0
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 04/16] cfg.mk: Remove exclude_file_name_regexp--sc_prohibit_strcmp
Let's run the check in all files. Signed-off-by: Fabiano Fidêncio --- cfg.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index 5490603..b7839c8 100644 --- a/cfg.mk +++ b/cfg.mk @@ -101,6 +101,4 @@ sc_bracket_spacing_check: # We don't use this feature of maint.mk. prev_version_file = /dev/null -exclude_file_name_regexp--sc_prohibit_strcmp = ^*/*.[ch] - exclude_file_name_regexp--sc_bindtextdomain = ^tools/.*.c|test/.*.c -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 08/16] Add support to meson build system
Meson build system is a way simpler and easier to understand build
system that can provide (with some work-arounds here and there) the same
functionalities currently available with our current build system
(autotools).
For now, as meson support is not fully complete* and requires a quite
new version of meson still not present in all systems supported on
libvirt-jenkis-ci, let's keep autotools around so more extensive testing
if meson's functionalities can be done before actually removing
autotools support.
*: the support is not fully complete as there's still no equivalent of
`make syntax-check` provided.
Signed-off-by: Fabiano Fidêncio
---
build-aux/dist.sh | 11 +++
meson.build | 218 ++
po/meson.build| 2 +
tests/meson.build | 21 +
tools/meson.build | 97 +
5 files changed, 349 insertions(+)
create mode 100755 build-aux/dist.sh
create mode 100644 meson.build
create mode 100644 po/meson.build
create mode 100644 tests/meson.build
create mode 100644 tools/meson.build
diff --git a/build-aux/dist.sh b/build-aux/dist.sh
new file mode 100755
index 000..422d593
--- /dev/null
+++ b/build-aux/dist.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+SOURCE_ROOT=$1
+BUILD_ROOT=$2
+
+$SOURCE_ROOT/build-aux/gitlog-to-changelog > $MESON_DIST_ROOT/ChangeLog
+
+cp $BUILD_ROOT/{mingw-,}osinfo-db-tools.spec $MESON_DIST_ROOT/
+
+out="`git log --pretty=format:'%aN <%aE>' | sort -u`"
+perl -p -e "s/#authorslist#// and print '$out'" < $SOURCE_ROOT/AUTHORS.in >
$MESON_DIST_ROOT/AUTHORS
diff --git a/meson.build b/meson.build
new file mode 100644
index 000..97ad60c
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,218 @@
+project(
+'osinfo-db-tools', 'c',
+version: '1.6.0',
+license: 'GPLv2+',
+meson_version: '>= 0.49.0'
+)
+
+osinfo_db_tools_prefix = get_option('prefix')
+
+# those directories have to be known by the project
+osinfo_db_tools_datadir = join_paths(osinfo_db_tools_prefix,
get_option('datadir'))
+osinfo_db_tools_localedir = join_paths(osinfo_db_tools_prefix,
get_option('localedir'))
+osinfo_db_tools_pkgdatadir = join_paths(osinfo_db_tools_datadir,
meson.project_name())
+osinfo_db_tools_sysconfdir = join_paths(osinfo_db_tools_prefix,
get_option('sysconfdir'))
+
+# those directories will have files installed in
+osinfo_db_tools_bindir = join_paths(osinfo_db_tools_prefix,
get_option('bindir'))
+osinfo_db_tools_docdir = join_paths(osinfo_db_tools_datadir, 'doc',
meson.project_name())
+osinfo_db_tools_licensedir = join_paths(osinfo_db_tools_datadir, 'license',
meson.project_name())
+osinfo_db_tools_mandir = join_paths(osinfo_db_tools_prefix,
get_option('mandir'))
+
+# spec files
+osinfo_db_tools_spec_data = configuration_data()
+osinfo_db_tools_spec_data.set('VERSION', meson.project_version())
+
+specs = ['osinfo-db-tools.spec', 'mingw-osinfo-db-tools.spec']
+foreach spec: specs
+configure_file(
+input: spec + '.in',
+output: spec,
+configuration: osinfo_db_tools_spec_data
+)
+endforeach
+
+# ninja dist helper
+meson.add_dist_script('build-aux/dist.sh', meson.source_root(),
meson.build_root())
+
+# dependencies
+# glib stuff
+glib_version = '2.36'
+glib_version_info = '>= @0@'.format(glib_version)
+glib_dep = dependency('glib-2.0', version: glib_version_info)
+gio_dep = dependency('gio-2.0', version: glib_version_info)
+gobject_dep = dependency('gobject-2.0', version: glib_version_info)
+
+# everything else
+libarchive_dep = dependency('libarchive', version: '>= 3.0.0')
+libxml_dep = dependency('libxml-2.0', version: '>= 2.6.0')
+json_glib_dep = dependency('json-glib-1.0')
+
+# common dependencies
+osinfo_db_tools_common_dependencies = [gobject_dep, gio_dep, glib_dep]
+
+# arguments
+osinfo_db_tools_cflags = []
+
+# glib stuff
+osinfo_db_tools_cflags += [
+'-DGLIB_MIN_REQUIRED_VERSION="0"'.format(glib_version),
+'-DGLIB_MAX_ALLOWED_VERSION="0"'.format(glib_version)
+]
+
+# directories used
+osinfo_db_tools_cflags += [
+'-DPKGDATADIR="@0@"'.format(osinfo_db_tools_pkgdatadir),
+'-DDATA_DIR="@0@"'.format(osinfo_db_tools_datadir),
+'-DSYSCONFDIR="@0@"'.format(osinfo_db_tools_sysconfdir),
+'-DLOCALEDIR="@0@"'.format(osinfo_db_tools_localedir),
+]
+
+# gettext package name
+osinfo_db_tools_cflags +=
['-DGETTEXT_PACKAGE="0"'.format(meson.project_name())]
+
+# cflags to check whether the compiler supports them or not
+osinfo_db_tools_check_cflags = [
+ '-W',
+ '-Waddress',
+ '-Waggressive-loop-optimizations',
+ '-Wall',
+ '-Warray-bounds',
+ '-Wattributes',
+ '-Wbuiltin-macro-redefined',
+ '-Wcast-align',
+ '-Wchar-subscripts',
+ '-Wclobbered',
+ '-Wcomment',
+ '-Wcomments',
+ '-Wcoverage-mismatch',
+ '-Wcpp',
+ '-Wdate-time',
+ '-Wdeprecated-declarations',
+ '-Wdisabled-optimization',
+ '-Wdiv-by-zero',
+ '-Wdouble-promotion'
[Libosinfo] [osinfo-db-tools PATCH v2 13/16] Support `make syntax-check` without Makefile
A few dirty hacks have been done in GNUmakefile, cfg.mk, and maint.mk in order to support running `make syntax-check` without having to have a Makefile around. GNUmakefile: set srcdir & top_srcdir and remove the parts that would cause an error due to no presence of a Makefile. cfg.mk: add sc_prohibit_always-defined_macros to the list of local checks to skip as it looks for Makefile, which is generated after running ./configure. maint.mk: allow running `make syntax-check` without having a Makefile generated. Signed-off-by: Fabiano Fidêncio --- GNUmakefile | 28 ++-- cfg.mk | 3 ++- maint.mk| 2 -- 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index ca88b6b..a62b880 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -30,10 +30,8 @@ else SHELL = sh endif -# If the user runs GNU make but has not yet run ./configure, -# give them a diagnostic. -_have-Makefile := $(shell test -f Makefile && echo yes) -ifeq ($(_have-Makefile),yes) +srcdir = . +top_srcdir = . # Make tar archive easier to reproduce. export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner @@ -41,8 +39,6 @@ export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner # Allow the user to add to this in the Makefile. ALL_RECURSIVE_TARGETS = -include Makefile - # Some projects override e.g., _autoreconf here. -include $(srcdir)/cfg.mk @@ -94,26 +90,6 @@ _version: cd $(srcdir) && rm -rf autom4te.cache .version && $(_autoreconf) $(MAKE) $(AM_MAKEFLAGS) Makefile -else - -.DEFAULT_GOAL := abort-due-to-no-makefile -srcdir = . - -# The package can override .DEFAULT_GOAL to run actions like autoreconf. --include ./cfg.mk -include ./maint.mk - -ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile) -$(MAKECMDGOALS): abort-due-to-no-makefile -endif - -abort-due-to-no-makefile: - @echo There seems to be no Makefile in this directory. 1>&2 - @echo "You must run ./configure before running \`make'." 1>&2 - @exit 1 - -endif - # Tell version 3.79 and up of GNU make to not build goals in this # directory in parallel, in case someone tries to build multiple # targets, and one of them can cause a recursive target to be invoked. diff --git a/cfg.mk b/cfg.mk index 84ca1cd..8f41450 100644 --- a/cfg.mk +++ b/cfg.mk @@ -35,7 +35,8 @@ local-checks-to-skip =\ sc_program_name \ sc_makefile_check\ sc_require_config_h \ - sc_require_config_h_first + sc_require_config_h_first\ + sc_prohibit_always-defined_macros # Files that should never cause syntax check failures. VC_LIST_ALWAYS_EXCLUDE_REGEX = \ diff --git a/maint.mk b/maint.mk index 16e9360..b8c207d 100644 --- a/maint.mk +++ b/maint.mk @@ -159,7 +159,6 @@ export LC_ALL = C ## Sanity checks. ## ## --- ## -ifneq ($(_gl-Makefile),) _cfg_mk := $(wildcard $(srcdir)/cfg.mk) # Collect the names of rules starting with 'sc_'. @@ -201,7 +200,6 @@ local-check := \ $(filter-out $(local-checks-to-skip), $(local-checks-available))) syntax-check: $(local-check) -endif # _sc_search_regexp # -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 12/16] Drop autotools support
Let's try to drop autotools support as meson is in place. There are a few files that were not dropped though, as: - cfg.mk - maint.mk - GNUmakefile - build-aux/bracket-spacing.pl - build-aux/gitlog-to-changelog - build-aux/useless-if-before-free - build-aux/vc-list-files >From the list above, build-aux/gitlog-to-changelog is currently used by meson as part of the `dist`. All the other files, with a few changes, will be useful for meson as, with a few changes, we will be able have `ninja syntax-check` working. Signed-off-by: Fabiano Fidêncio --- Makefile.am | 48 -- build-aux/mktempd| 135 - configure.ac | 88 --- docs/Makefile.am | 2 - m4/libosinfo-compile-warnings.m4 | 135 - m4/manywarnings.m4 | 245 --- m4/warnings.m4 | 79 -- po/Makevars | 78 -- tests/Makefile.am| 30 tools/Makefile.am| 53 --- 10 files changed, 893 deletions(-) delete mode 100644 Makefile.am delete mode 100755 build-aux/mktempd delete mode 100644 configure.ac delete mode 100644 docs/Makefile.am delete mode 100644 m4/libosinfo-compile-warnings.m4 delete mode 100644 m4/manywarnings.m4 delete mode 100644 m4/warnings.m4 delete mode 100644 po/Makevars delete mode 100644 tests/Makefile.am delete mode 100644 tools/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 8c81f5a..000 --- a/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ - -SUBDIRS = tools docs po tests - -EXTRA_DIST = \ - osinfo-db-tools.spec \ - osinfo-db-tools.spec.in \ - mingw-osinfo-db-tools.spec.in \ - build-aux/mktempd \ - cfg.mk \ - GNUmakefile \ - maint.mk \ - AUTHORS.in \ - $(NULL) - -MAINTAINERCLEANFILES = \ - po/Makefile.in.in \ - po/Makevars.template\ - po/Rules-quot \ - po/boldquot.sed \ - po/en@boldquot.header \ - po/en@quot.header \ - po/insert-header.sin\ - po/quot.sed \ - po/remove-potcdate.sin \ - $(NULL) - -ACLOCAL_AMFLAGS = -I m4 - -dist-hook: gen-ChangeLog gen-AUTHORS - -# Generate the ChangeLog file (with all entries since the switch to git) -# and insert it into the directory we're about to use to create a tarball. -.PHONY: gen-ChangeLog gen-AUTHORS -gen-ChangeLog: - if test -d $(srcdir)/.git; then \ - $(top_srcdir)/build-aux/gitlog-to-changelog \ - > $(distdir)/cl-t; \ - rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/cl-t $(distdir)/ChangeLog; \ - fi - -gen-AUTHORS: - $(AM_V_GEN)if test -d $(srcdir)/.git; then \ - out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ - perl -p -e "s/#authorslist#// and print '$$out'"\ -< $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp &&\ - mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ - fi diff --git a/build-aux/mktempd b/build-aux/mktempd deleted file mode 100755 index ab3cf14..000 --- a/build-aux/mktempd +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/sh -# Create a temporary directory, much like mktemp -d does. - -# Copyright (C) 2007-2012 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Written by Jim Meyering. - -# Usage: mktempd /tmp phoey.XX - -# First, try to use the mktemp program. -# Failing that, we'll roll our own mktemp-like function: -# - try to get random bytes from /dev/urandom -# - failing that, generate output from a combination of quickly-varying -# sources and gzip. Ignore non-varying gzip header, and extract -# "random" bits from there. -# - given those bits, map to file-name bytes using tr, and try to create -# the desired directory. -# - make only $MAX_TRIES attempts - -ME=`basename "$0"` -di
[Libosinfo] [osinfo-db-tools PATCH v2 10/16] prepare-release: Remove non-valid configure options
Those options have been added as the `prepare-release.sh` was copied from the libosinfo project. However, those options are not valid for osinfo-db-tools project. Signed-off-by: Fabiano Fidêncio --- prepare-release.sh | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/prepare-release.sh b/prepare-release.sh index 731b4e4..e95a177 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -14,7 +14,7 @@ mkdir build cd build ../autogen.sh --prefix=$INSTALL_ROOT \ ---enable-werror --enable-gtk-doc +--enable-werror # If the MAKEFLAGS envvar does not yet include a -j option, # add -jN where N depends on the number of processors. @@ -59,9 +59,7 @@ if test -x /usr/bin/i686-w64-mingw32-gcc ; then --build=$(uname -m)-pc-linux \ --host=i686-w64-mingw32 \ --prefix="$INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ ---enable-werror \ ---enable-introspection=no \ ---enable-tests=no +--enable-werror make make install @@ -78,9 +76,7 @@ if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then --build=$(uname -m)-pc-linux \ --host=x86_64-w64-mingw32 \ --prefix="$INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ ---enable-werror \ ---enable-introspection=no \ ---enable-tests=no +--enable-werror make make install -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 02/16] util: Indent includes/defines
By doing this, we can stop excluding files from sc_preprocessor_indentation check. Signed-off-by: Fabiano Fidêncio --- tools/osinfo-db-util.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/osinfo-db-util.h b/tools/osinfo-db-util.h index 7b4e501..8d7a456 100644 --- a/tools/osinfo-db-util.h +++ b/tools/osinfo-db-util.h @@ -21,11 +21,11 @@ */ #ifndef OSINFO_DB_UTIL_H__ -#define OSINFO_DB_UTIL_H__ +# define OSINFO_DB_UTIL_H__ -#include +# include -#define OSINFO_DB_ERROR osinfo_db_error_quark() +# define OSINFO_DB_ERROR osinfo_db_error_quark() GQuark osinfo_db_error_quark(void); GFile *osinfo_db_get_system_path(const gchar *root); -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 06/16] maint.mk: Update to the latest gnulib version
Signed-off-by: Fabiano Fidêncio
---
maint.mk | 407 ++-
1 file changed, 255 insertions(+), 152 deletions(-)
diff --git a/maint.mk b/maint.mk
index 04a839a..16e9360 100644
--- a/maint.mk
+++ b/maint.mk
@@ -2,7 +2,7 @@
# This Makefile fragment tries to be general-purpose enough to be
# used by many projects via the gnulib maintainer-makefile module.
-## Copyright (C) 2001-2014 Free Software Foundation, Inc.
+## Copyright (C) 2001-2019 Free Software Foundation, Inc.
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -15,12 +15,19 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see <http://www.gnu.org/licenses/>.
+## along with this program. If not, see <https://www.gnu.org/licenses/>.
# This is reported not to work with make-3.79.1
# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
ME := maint.mk
+# These variables ought to be defined through the configure.ac section
+# of the module description. But some packages import this file directly,
+# ignoring the module description.
+AWK ?= awk
+GREP ?= grep
+SED ?= sed
+
# Helper variables.
_empty =
_sp = $(_empty) $(_empty)
@@ -46,7 +53,7 @@ member-check =
\
# Do not save the original name or timestamp in the .tar.gz file.
# Use --rsyncable if available.
gzip_rsyncable := \
- $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null \
+ $(shell gzip --help 2>/dev/null|$(GREP) rsyncable >/dev/null \
&& printf %s --rsyncable)
GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
@@ -55,6 +62,10 @@ VC = $(GIT)
VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir)
+# You can override this variable in cfg.mk if your gnulib submodule lives
+# in a different location.
+gnulib_dir ?= $(srcdir)/gnulib
+
# You can override this variable in cfg.mk to set your own regexp
# matching files to ignore.
VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$
@@ -79,9 +90,9 @@ _sc_excl = \
$(or $(exclude_file_name_regexp--$@),^$$)
VC_LIST_EXCEPT = \
$(VC_LIST) | $(SED) 's|^$(_dot_escaped_srcdir)/||' \
- | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
- else grep -Ev -e "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
- | grep -Ev -e '($(VC_LIST_ALWAYS_EXCLUDE_REGEX)|$(_sc_excl))' \
+ | if test -f $(srcdir)/.x-$@; then $(GREP) -vEf $(srcdir)/.x-$@; \
+ else $(GREP) -Ev -e "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
+ | $(GREP) -Ev -e '($(VC_LIST_ALWAYS_EXCLUDE_REGEX)|$(_sc_excl))' \
$(_prepend_srcdir_prefix)
ifeq ($(origin prev_version_file), undefined)
@@ -126,8 +137,8 @@ gnu_ftp_host-stable = ftp.gnu.org
gnu_rel_host ?= $(gnu_ftp_host-$(release-type))
url_dir_list ?= $(if $(call _equal,$(gnu_rel_host),ftp.gnu.org), \
- http://ftpmirror.gnu.org/$(PACKAGE), \
- ftp://$(gnu_rel_host)/gnu/$(PACKAGE))
+ https://ftpmirror.gnu.org/$(PACKAGE), \
+ https://$(gnu_rel_host)/gnu/$(PACKAGE))
# Override this in cfg.mk if you are using a different format in your
# NEWS file.
@@ -148,6 +159,7 @@ export LC_ALL = C
## Sanity checks. ##
## --- ##
+ifneq ($(_gl-Makefile),)
_cfg_mk := $(wildcard $(srcdir)/cfg.mk)
# Collect the names of rules starting with 'sc_'.
@@ -179,7 +191,7 @@ $(sc_z_rules_): %.z: %
@end=$$(date +%s.%N); \
start=$$(cat .sc-start-$*); \
rm -f .sc-start-$*; \
- awk -v s=$$start -v e=$$end \
+ $(AWK) -v s=$$start -v e=$$end \
'END {printf "%.2f $(patsubst sc_%,%,$*)\n", e - s}' < /dev/null
# The patsubst here is to replace each sc_% rule with its sc_%.z wrapper
@@ -189,6 +201,7 @@ local-check :=
\
$(filter-out $(local-checks-to-skip), $(local-checks-available)))
syntax-check: $(local-check)
+endif
# _sc_search_regexp
#
@@ -286,42 +299,56 @@ define _sc_search_regexp
\
: Filter by file name; \
if test -n "$$in_files"; then \
- files=$$(find $(srcdir) | grep -E "$$in_files"\
- | grep -Ev '$(_sc_excl)'); \
+ files=$$(find $(srcdir) | $(GREP) -E "$$in_files"
[Libosinfo] [osinfo-db-tools PATCH v2 14/16] Move files needed for `make syntax-check` to build-aux
Together with the changes, let's adapt GNUmakefile and maint.mk in order to be able to run those files from build-aux. GNUmakefile: - changing both srcdir & top_srcdir, and adjusting the includes of cfg.mk and maint.mk were enough to be able to run `make syntax-check` from build-aux directory; maint.mk: - "ME" variable had to be changed to point to the right place; - Some paths expecting cfg.mk in the top_srcdir had to be changed; - tight-scope.mk target dependency has been changed from $(ME) to maint.mk; Signed-off-by: Fabiano Fidêncio --- GNUmakefile => build-aux/GNUmakefile | 8 cfg.mk => build-aux/cfg.mk | 0 maint.mk => build-aux/maint.mk | 8 3 files changed, 8 insertions(+), 8 deletions(-) rename GNUmakefile => build-aux/GNUmakefile (97%) rename cfg.mk => build-aux/cfg.mk (100%) rename maint.mk => build-aux/maint.mk (99%) diff --git a/GNUmakefile b/build-aux/GNUmakefile similarity index 97% rename from GNUmakefile rename to build-aux/GNUmakefile index a62b880..6811db1 100644 --- a/GNUmakefile +++ b/build-aux/GNUmakefile @@ -30,8 +30,8 @@ else SHELL = sh endif -srcdir = . -top_srcdir = . +srcdir = .. +top_srcdir = .. # Make tar archive easier to reproduce. export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner @@ -40,13 +40,13 @@ export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner ALL_RECURSIVE_TARGETS = # Some projects override e.g., _autoreconf here. --include $(srcdir)/cfg.mk # Allow cfg.mk to override these. _build-aux ?= build-aux _autoreconf ?= autoreconf -v -include $(srcdir)/maint.mk +-include $(srcdir)/$(_build-aux)/cfg.mk +include $(srcdir)/$(_build-aux)/maint.mk # Ensure that $(VERSION) is up to date for dist-related targets, but not # for others: rerunning autoreconf and recompiling everything isn't cheap. diff --git a/cfg.mk b/build-aux/cfg.mk similarity index 100% rename from cfg.mk rename to build-aux/cfg.mk diff --git a/maint.mk b/build-aux/maint.mk similarity index 99% rename from maint.mk rename to build-aux/maint.mk index b8c207d..fe8bcf4 100644 --- a/maint.mk +++ b/build-aux/maint.mk @@ -19,7 +19,7 @@ # This is reported not to work with make-3.79.1 # ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -ME := maint.mk +ME := $(_build-aux)/maint.mk # These variables ought to be defined through the configure.ac section # of the module description. But some packages import this file directly, @@ -1660,7 +1660,7 @@ _gl_TS_dir ?= src ALL_RECURSIVE_TARGETS += sc_tight_scope sc_tight_scope: tight-scope.mk @fail=0;\ - if ! $(GREP) '^ *export _gl_TS_headers *=' $(srcdir)/cfg.mk \ + if ! $(GREP) '^ *export _gl_TS_headers *=' $(srcdir)/$(_build-aux)/cfg.mk \ > /dev/null \ && ! $(GREP) -w noinst_HEADERS $(srcdir)/$(_gl_TS_dir)/Makefile.am \ > /dev/null 2>&1; then \ @@ -1668,7 +1668,7 @@ sc_tight_scope: tight-scope.mk else\ $(MAKE) -s -C $(_gl_TS_dir) \ -f Makefile \ - -f $(abs_top_srcdir)/cfg.mk \ + -f $(abs_top_srcdir)/$(_build-aux)/cfg.mk \ -f $(abs_top_builddir)/$< \ _gl_tight_scope \ || fail=1; \ @@ -1676,7 +1676,7 @@ sc_tight_scope: tight-scope.mk rm -f $<; \ exit $$fail -tight-scope.mk: $(ME) +tight-scope.mk: maint.mk @rm -f $@ $@-t @perl -ne '/^# TS-start/.../^# TS-end/ and print' $(srcdir)/$(ME) > $@-t @chmod a=r $@-t && mv $@-t $@ -- 2.21.0 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH v2 00/16] Add support to meson build system
The following patch series: - Add suppor to meson build system; - Drop support to autotools build system; If we decide to go for it, there's still work to be done in libvirt-jenkins-ci as it has to have meson support added there. Changes since v1: https://www.redhat.com/archives/libosinfo/2019-June/msg00063.html - Improve commit message in the patch dropping config.h - Some cleanups on cfg.mk were done; - In order to do so, a patch indentng includes/defines in util.h was needed; - Updated maint.mk in order to avoid doing de s/$(SED)/sed hack; - Added the .spec files to the generated tarball; - Don't purge the git checkout, just delete the build dir when running `./prepare-release`; - Moved GNUmakefile, cfg.mk, and maint.mk to build-aux dir; - Introduced a new patch dropping the non-valid configure options, as it makes clear that we're not removing them just because we are switching to meson; A few points that still have to be considered: - meson version in the major distros: - Fedora 29 - 0.50.0 - Fedora 30 - 0.50.1 - Debian 9 - 0.37.1 - Debian 10 - 0.49.2 - OpenSUSE 15.1 - 0.51.0 - Ubuntu 18.04 - 0.45.1-2 - Ubuntu 18.10 - 0.47.2 - Ubuntu 19.04 - 0.49.0 - FreeBSD - 0.51.0 - This is what internet returns me as part of devel/meson - CentOS 7 - not present - EPEL: 0.47.2 If we do the switch, we'd stop building on: - Debian 9 & older; - Ubuntu 18.10 & older; - EL 7 & older; For osinfo-db-tools, I truly believe it's not a big deal, as it'd be for more important packages (as libvirt). - meson support on libvirt-jenkins-ci: - I'll happily work on that before having these patches merged! - a last release with autotools: - I'd like to have a last release with autotools, including some patches that are still pending review (as the ones using libsoup instead of gvfs); - can we have a more generic/simplified version of GNUmakefile & friends? - That would take me some considerable amount of time to do and, although I'm not discarding this for the future, it's not something I'd like to consider for now. Fabiano Fidêncio (16): tests: Unset OSINFO_LOCAL_DIR envvar util: Indent includes/defines cfg.mk: Remove exclude_file_name_regexp--sc_preprocessor_indentation cfg.mk: Remove exclude_file_name_regexp--sc_prohibit_strcmp cfg.mk: Remove exclude_file_name_regexp--sc_bindtextdomain maint.mk: Update to the latest gnulib version tools: Don't import config.h Add support to meson build system spec: Adapt to use meson prepare-release: Remove non-valid configure options prepare-release: Adapt to use meson Drop autotools support Support `make syntax-check` without Makefile Move files needed for `make syntax-check` to build-aux meson: Add ninja syntax-check prepare-release: Add `ninja syntax-check` Makefile.am | 48 GNUmakefile => build-aux/GNUmakefile | 32 +-- cfg.mk => build-aux/cfg.mk | 11 +- build-aux/dist.sh| 11 + maint.mk => build-aux/maint.mk | 411 +-- build-aux/mktempd| 135 - build-aux/syntax-check | 5 + configure.ac | 89 -- docs/Makefile.am | 2 - m4/libosinfo-compile-warnings.m4 | 135 - m4/manywarnings.m4 | 245 m4/warnings.m4 | 79 - meson.build | 221 ++ mingw-osinfo-db-tools.spec.in| 14 +- osinfo-db-tools.spec.in | 17 +- po/Makevars | 78 - po/meson.build | 2 + prepare-release.sh | 84 ++ tests/Makefile.am| 30 -- tests/meson.build| 21 ++ tests/test_osinfo_db_path.py | 4 +- tools/Makefile.am| 53 tools/meson.build| 97 +++ tools/osinfo-db-export.c | 2 - tools/osinfo-db-import.c | 2 - tools/osinfo-db-path.c | 2 - tools/osinfo-db-util.c | 2 - tools/osinfo-db-util.h | 6 +- tools/osinfo-db-validate.c | 2 - 29 files changed, 665 insertions(+), 1175 deletions(-) delete mode 100644 Makefile.am rename GNUmakefile => build-aux/GNUmakefile (85%) rename cfg.mk => build-aux/cfg.mk (94%) create mode 100755 build-aux/dist.sh rename maint.mk => build-aux/maint.mk (83%) delete mode 100755 build-aux/mktempd create mode 100755 build-aux/syntax-check delete mode 100644 configure.ac delete mode 100644 docs/Makefile.am delete mode 100644 m4/libosinfo-compile-warnings.m4 delete mode 100644 m4/manywarnings.m4 delete mode 100644 m4/warnings.m4 create mode 100644 meson.build delete mode 100644 po/Makevars create mode 100644 po/meson.build delete mode 100644 tests/Makefile.am cr
