From berrange at redhat.com Fri Mar 1 14:17:45 2013 From: berrange at redhat.com (Daniel P. Berrange) Date: Fri, 1 Mar 2013 14:17:45 +0000 Subject: [Libosinfo] [PATCHv2 1/4] installer, windows: Use '/c' option of cmd.exe In-Reply-To: <1362010735-13957-2-git-send-email-zeeshanak@gnome.org> References: <1362010735-13957-1-git-send-email-zeeshanak@gnome.org> <1362010735-13957-2-git-send-email-zeeshanak@gnome.org> Message-ID: <20130301141744.GQ13555@redhat.com> On Thu, Feb 28, 2013 at 02:18:52AM +0200, Zeeshan Ali (Khattak) wrote: > From: "Zeeshan Ali (Khattak)" > > Use '/c' option of cmd.exe instead of '/k' as that apparently keeps the > process running (at least on windows7) and any commands after the loop > never gets executed. > > TBH I'm a bit confused about '/c' vs '/k' option and the docs don't > help: http://technet.microsoft.com/en-us/library/bb490880.aspx#EBAA > > What I know for certain is that without this change, Windows 7 installer > just hangs with an empty cmd.exe window open forever at the end of > installation. Also I have tested that this change doesn't break this > script for Windows XP. > --- > data/install-scripts/windows-cmd.xml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/data/install-scripts/windows-cmd.xml b/data/install-scripts/windows-cmd.xml > index b3121dc..7a56846 100644 > --- a/data/install-scripts/windows-cmd.xml > +++ b/data/install-scripts/windows-cmd.xml > @@ -69,7 +69,7 @@ if not ""=="" copy " REGEDIT /S :\windows.reg > : > reg add "HKCU\Software\Policies\Microsoft\Windows NT\Driver Signing" /v BehaviorOnFailedVerify /t reg_dword /d 00000000 /f > -for %%i in (":\*.cmd") do cmd /k %%i > +for %%i in (":\*.cmd") do cmd /c %%i > reg add "HKCU\Software\Policies\Microsoft\Windows NT\Driver Signing" /v BehaviorOnFailedVerify /t reg_dword /d 00000001 /f > EXIT > ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| From berrange at redhat.com Fri Mar 1 14:18:36 2013 From: berrange at redhat.com (Daniel P. Berrange) Date: Fri, 1 Mar 2013 14:18:36 +0000 Subject: [Libosinfo] [PATCHv2 2/4] win7, winxp: Add new driver files of virtio/QXL drivers In-Reply-To: <1362010735-13957-3-git-send-email-zeeshanak@gnome.org> References: <1362010735-13957-1-git-send-email-zeeshanak@gnome.org> <1362010735-13957-3-git-send-email-zeeshanak@gnome.org> Message-ID: <20130301141836.GR13555@redhat.com> On Thu, Feb 28, 2013 at 02:18:53AM +0200, Zeeshan Ali (Khattak) wrote: > From: "Zeeshan Ali (Khattak)" > > These are publisher certificates that the driver's .cmd file use to > silence Windows 7 installer warning about untrusted publisher. Obviously > such a warning dialog that requires user interaction breaks unattended > installation for apps. > > Although these are (at least currently) redundant for Windows XP, we > better list them for completion/consistency. > --- > data/oses/windows.xml.in | 8 ++++++++ > 1 file changed, 8 insertions(+) ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| From berrange at redhat.com Fri Mar 1 14:19:59 2013 From: berrange at redhat.com (Daniel P. Berrange) Date: Fri, 1 Mar 2013 14:19:59 +0000 Subject: [Libosinfo] [PATCHv2 3/4] installer, win7: Adapt windows-cmd.xml for Windows 7 In-Reply-To: <1362010735-13957-4-git-send-email-zeeshanak@gnome.org> References: <1362010735-13957-1-git-send-email-zeeshanak@gnome.org> <1362010735-13957-4-git-send-email-zeeshanak@gnome.org> Message-ID: <20130301141959.GS13555@redhat.com> On Thu, Feb 28, 2013 at 02:18:54AM +0200, Zeeshan Ali (Khattak) wrote: > From: "Zeeshan Ali (Khattak)" > > On Windows 7, we need to make use of integrated bcdedit.exe to enable > test signing and disable integrity checks before we could attempt to > install (possibly) unsigned drivers. We use the same app to disable test > signing and enable integrity checks after installing drivers. > > Since bcdedit.exe does not exist in Window XP, we don't use it on that > OS. Moreover, since the registry key manipulation on Windows 7 does not > help anything, we better not fiddle with those on Windows 7 as doing so > is always discouraged. > > Also since the certutil.exe thats used by driver's .cmd file to add > driver publisher to trusted list does not exist on Windows XP, we have to > continue resorting to registry fiddling to enable installation of drivers > from untrusted publishers for Windows XP. > --- > data/install-scripts/windows-cmd.xml | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) ACK, though I don't know much about windows signing, so good to have a second review on it. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| From berrange at redhat.com Fri Mar 1 14:21:03 2013 From: berrange at redhat.com (Daniel P. Berrange) Date: Fri, 1 Mar 2013 14:21:03 +0000 Subject: [Libosinfo] [PATCHv2 4/4] installer, win7: Use post-installation script In-Reply-To: <1362010735-13957-5-git-send-email-zeeshanak@gnome.org> References: <1362010735-13957-1-git-send-email-zeeshanak@gnome.org> <1362010735-13957-5-git-send-email-zeeshanak@gnome.org> Message-ID: <20130301142103.GT13555@redhat.com> On Thu, Feb 28, 2013 at 02:18:55AM +0200, Zeeshan Ali (Khattak) wrote: > From: "Zeeshan Ali (Khattak)" > > Launch post-installation setup file, windows.cmd at the end of Windows 7 > installation as well. > > This combined will previous patches in this series, enables out of the > box installation of virtio, and QXL drivers and vdagent for apps making > use of our post-installation drivers API (currently only Boxes). > --- > data/install-scripts/windows-unattend.xml | 24 ++++++++++++++++++++++++ > data/oses/windows.xml.in | 1 + > 2 files changed, 25 insertions(+) ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| From cfergeau at redhat.com Fri Mar 1 15:05:03 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Fri, 1 Mar 2013 16:05:03 +0100 Subject: [Libosinfo] [PATCHv2 2/4] win7, winxp: Add new driver files of virtio/QXL drivers In-Reply-To: <1362010735-13957-3-git-send-email-zeeshanak@gnome.org> References: <1362010735-13957-1-git-send-email-zeeshanak@gnome.org> <1362010735-13957-3-git-send-email-zeeshanak@gnome.org> Message-ID: <20130301150503.GB3396@teriyaki.cdg.redhat.com> On Thu, Feb 28, 2013 at 02:18:53AM +0200, Zeeshan Ali (Khattak) wrote: > From: "Zeeshan Ali (Khattak)" > > These are publisher certificates that the driver's .cmd file use to > silence Windows 7 installer warning about untrusted publisher. Obviously > such a warning dialog that requires user interaction breaks unattended > installation for apps. > > Although these are (at least currently) redundant for Windows XP, we > better list them for completion/consistency. > --- > data/oses/windows.xml.in | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in > index 6e976d9..9a8de3a 100644 > --- a/data/oses/windows.xml.in > +++ b/data/oses/windows.xml.in > @@ -405,6 +405,8 @@ > > spice-guest-tools-0.52.exe > spice-guest-tools-0.52.cmd > + redhat09.cer > + redhat10.cer Any idea why there are 2 certificates? And why 09 and 10? /me curious Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From cfergeau at redhat.com Fri Mar 1 15:12:17 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Fri, 1 Mar 2013 16:12:17 +0100 Subject: [Libosinfo] [PATCHv2 3/4] installer, win7: Adapt windows-cmd.xml for Windows 7 In-Reply-To: <1362010735-13957-4-git-send-email-zeeshanak@gnome.org> References: <1362010735-13957-1-git-send-email-zeeshanak@gnome.org> <1362010735-13957-4-git-send-email-zeeshanak@gnome.org> Message-ID: <20130301151216.GC3396@teriyaki.cdg.redhat.com> On Thu, Feb 28, 2013 at 02:18:54AM +0200, Zeeshan Ali (Khattak) wrote: > From: "Zeeshan Ali (Khattak)" > > On Windows 7, we need to make use of integrated bcdedit.exe to enable > test signing and disable integrity checks before we could attempt to > install (possibly) unsigned drivers. We use the same app to disable test > signing and enable integrity checks after installing drivers. > > Since bcdedit.exe does not exist in Window XP, we don't use it on that > OS. Moreover, since the registry key manipulation on Windows 7 does not > help anything, we better not fiddle with those on Windows 7 as doing so > is always discouraged. > > Also since the certutil.exe thats used by driver's .cmd file to add > driver publisher to trusted list does not exist on Windows XP, we have to > continue resorting to registry fiddling to enable installation of drivers > from untrusted publishers for Windows XP. > --- > data/install-scripts/windows-cmd.xml | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/data/install-scripts/windows-cmd.xml b/data/install-scripts/windows-cmd.xml > index 7a56846..569df30 100644 > --- a/data/install-scripts/windows-cmd.xml > +++ b/data/install-scripts/windows-cmd.xml > @@ -61,16 +61,37 @@ > > > > + > sc config TlntSvr start= auto > net user /add /passwordreq:no > net localgroup administrators /add > net accounts /maxpwage:unlimited > if not ""=="" copy ":" ":\Documents and Settings\All Users\Application Data\Microsoft\User Account Pictures\.bmp" > REGEDIT /S :\windows.reg > + > + > : > + > + 6.1 is Windows 7 if I'm not mistaken, for at least Windows Vista you want to use the bcdedit method as well (http://www.overclock.net/t/187919/how-to-disable-driver-signature-enforcement-in-vista ), so I'd use 6.0 here. Using a win7-drivers.cmd and winxp-drivers.cmd could make this windows.cmd script more readable, but not really urgent. ACK Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From zeeshanak at gnome.org Fri Mar 1 15:15:04 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Fri, 1 Mar 2013 17:15:04 +0200 Subject: [Libosinfo] [PATCHv2 2/4] win7, winxp: Add new driver files of virtio/QXL drivers In-Reply-To: <20130301150503.GB3396@teriyaki.cdg.redhat.com> References: <1362010735-13957-1-git-send-email-zeeshanak@gnome.org> <1362010735-13957-3-git-send-email-zeeshanak@gnome.org> <20130301150503.GB3396@teriyaki.cdg.redhat.com> Message-ID: On Fri, Mar 1, 2013 at 5:05 PM, Christophe Fergeau wrote: > On Thu, Feb 28, 2013 at 02:18:53AM +0200, Zeeshan Ali (Khattak) wrote: >> From: "Zeeshan Ali (Khattak)" >> >> These are publisher certificates that the driver's .cmd file use to >> silence Windows 7 installer warning about untrusted publisher. Obviously >> such a warning dialog that requires user interaction breaks unattended >> installation for apps. >> >> Although these are (at least currently) redundant for Windows XP, we >> better list them for completion/consistency. >> --- >> data/oses/windows.xml.in | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in >> index 6e976d9..9a8de3a 100644 >> --- a/data/oses/windows.xml.in >> +++ b/data/oses/windows.xml.in >> @@ -405,6 +405,8 @@ >> >> spice-guest-tools-0.52.exe >> spice-guest-tools-0.52.cmd >> + redhat09.cer >> + redhat10.cer > > Any idea why there are 2 certificates? And why 09 and 10? /me curious I extracted them from the drivers and for some reason some has certificates from 2009 and some has certificate from 2010 (with different expiry dates). Thats all i know. -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From zeeshanak at gnome.org Fri Mar 1 15:19:04 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Fri, 1 Mar 2013 17:19:04 +0200 Subject: [Libosinfo] [PATCHv2 3/4] installer, win7: Adapt windows-cmd.xml for Windows 7 In-Reply-To: <20130301151216.GC3396@teriyaki.cdg.redhat.com> References: <1362010735-13957-1-git-send-email-zeeshanak@gnome.org> <1362010735-13957-4-git-send-email-zeeshanak@gnome.org> <20130301151216.GC3396@teriyaki.cdg.redhat.com> Message-ID: On Fri, Mar 1, 2013 at 5:12 PM, Christophe Fergeau wrote: > On Thu, Feb 28, 2013 at 02:18:54AM +0200, Zeeshan Ali (Khattak) wrote: >> From: "Zeeshan Ali (Khattak)" >> >> On Windows 7, we need to make use of integrated bcdedit.exe to enable >> test signing and disable integrity checks before we could attempt to >> install (possibly) unsigned drivers. We use the same app to disable test >> signing and enable integrity checks after installing drivers. >> >> Since bcdedit.exe does not exist in Window XP, we don't use it on that >> OS. Moreover, since the registry key manipulation on Windows 7 does not >> help anything, we better not fiddle with those on Windows 7 as doing so >> is always discouraged. >> >> Also since the certutil.exe thats used by driver's .cmd file to add >> driver publisher to trusted list does not exist on Windows XP, we have to >> continue resorting to registry fiddling to enable installation of drivers >> from untrusted publishers for Windows XP. >> --- >> data/install-scripts/windows-cmd.xml | 21 +++++++++++++++++++++ >> 1 file changed, 21 insertions(+) >> >> diff --git a/data/install-scripts/windows-cmd.xml b/data/install-scripts/windows-cmd.xml >> index 7a56846..569df30 100644 >> --- a/data/install-scripts/windows-cmd.xml >> +++ b/data/install-scripts/windows-cmd.xml >> @@ -61,16 +61,37 @@ >> >> >> >> + >> sc config TlntSvr start= auto >> net user /add /passwordreq:no >> net localgroup administrators /add >> net accounts /maxpwage:unlimited >> if not ""=="" copy ":" ":\Documents and Settings\All Users\Application Data\Microsoft\User Account Pictures\.bmp" >> REGEDIT /S :\windows.reg >> + >> + >> : >> + >> + > > 6.1 is Windows 7 if I'm not mistaken, for at least Windows Vista you want > to use the bcdedit method as well > (http://www.overclock.net/t/187919/how-to-disable-driver-signature-enforcement-in-vista > ), so I'd use 6.0 here. ACK. Lets look into enabling this for Vista after this too. > Using a win7-drivers.cmd and winxp-drivers.cmd could make this windows.cmd > script more readable, but not really urgent. Either that or see if any of the other commands could work for win7 as well. Adding avatar to win7 installs has been on my todo for a while now. Anyways, I'll push this now and work that after wards if you don't mind. -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From cfergeau at redhat.com Fri Mar 1 15:26:20 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Fri, 1 Mar 2013 16:26:20 +0100 Subject: [Libosinfo] [PATCHv2 3/4] installer, win7: Adapt windows-cmd.xml for Windows 7 In-Reply-To: References: <1362010735-13957-1-git-send-email-zeeshanak@gnome.org> <1362010735-13957-4-git-send-email-zeeshanak@gnome.org> <20130301151216.GC3396@teriyaki.cdg.redhat.com> Message-ID: <20130301152619.GD3396@teriyaki.cdg.redhat.com> On Fri, Mar 01, 2013 at 05:19:04PM +0200, Zeeshan Ali (Khattak) wrote: > On Fri, Mar 1, 2013 at 5:12 PM, Christophe Fergeau wrote: > > On Thu, Feb 28, 2013 at 02:18:54AM +0200, Zeeshan Ali (Khattak) wrote: > >> From: "Zeeshan Ali (Khattak)" > > Using a win7-drivers.cmd and winxp-drivers.cmd could make this windows.cmd > > script more readable, but not really urgent. > > Either that or see if any of the other commands could work for win7 as > well. Adding avatar to win7 installs has been on my todo for a while > now. Anyways, I'll push this now and work that after wards if you > don't mind. note the -drivers suffix, I was thinking that we keep all the generic commands in the existing file, but have it call into os-specific files to do the driver installation work. didn't know that avatar only worked on older windows. Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From cfergeau at redhat.com Mon Mar 4 14:56:30 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 4 Mar 2013 15:56:30 +0100 Subject: [Libosinfo] [PATCHv2] installer,win7: Require product key In-Reply-To: <1362055772-25036-1-git-send-email-zeeshanak@gnome.org> References: <1361974836-16613-3-git-send-email-zeeshanak@gnome.org> <1362055772-25036-1-git-send-email-zeeshanak@gnome.org> Message-ID: <20130304145629.GB17565@teriyaki.cdg.redhat.com> On Thu, Feb 28, 2013 at 02:49:32PM +0200, Zeeshan Ali (Khattak) wrote: > From: "Zeeshan Ali (Khattak)" > > It turns out that windows installer media can have multiple products and > product key is a way for windows to choose which product to install. is one possible way > Since we already require product key for windows XP and it is required > by Windows 8 too (for which we'll use this same script), its not too bad ... it's not ... ACK with that fixed Christophe > to start requiring this for Windows 7 as well. > > Also, the product key will be used to automatically activate the Windows > copy during unattended installation rather than requiring the user to do > it him/herself at most 30 days after installation. > > Moreover, the following patch that removes /IMAGE/INDEX, will break > unattended install without a product key in place. > > Co-author: Christophe Fergeau > --- > data/install-scripts/windows-unattend.xml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows-unattend.xml > index d4e1b98..743d918 100644 > --- a/data/install-scripts/windows-unattend.xml > +++ b/data/install-scripts/windows-unattend.xml > @@ -12,7 +12,7 @@ > > > > - > + > > > > @@ -228,7 +228,7 @@ > > > > - > + > > > > -- > 1.8.1.2 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From cfergeau at redhat.com Mon Mar 4 16:40:05 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 4 Mar 2013 17:40:05 +0100 Subject: [Libosinfo] [libosinfo] Add identification data for win7sp1 checked build Message-ID: <1362415205-25553-1-git-send-email-cfergeau@redhat.com> Data kindly provided by Alon Levy. --- data/oses/windows.xml.in | 2 +- ..._sp1_debug_checked_build_x64_dvd_619601.iso.txt | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in index 6e976d9..1fb38cf 100644 --- a/data/oses/windows.xml.in +++ b/data/oses/windows.xml.in @@ -741,7 +741,7 @@ - (GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL)_ + (GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GRMCXCHK|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL)_ MICROSOFT CORPORATION [[:upper:][:digit:]]*_([[:upper:]]*) diff --git a/test/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt b/test/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt new file mode 100644 index 0000000..79e8cb7 --- /dev/null +++ b/test/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x64_dvd_619601.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: GRMCXCHK_EN_DVD +Volume set id: GRMCXCHK_EN_DVD +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.54 (01/01/2005 TM) +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 1549490 +El Torito VD version 1 found, boot catalog is in sector 22 +NO Joliet present +NO Rock Ridge present +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'Microsoft Corporation' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 8 + Bootoff 2E2 738 -- 1.8.1.2 From zeeshanak at gnome.org Mon Mar 4 16:52:44 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Mon, 4 Mar 2013 18:52:44 +0200 Subject: [Libosinfo] [libosinfo] Add identification data for win7sp1 checked build In-Reply-To: <1362415205-25553-1-git-send-email-cfergeau@redhat.com> References: <1362415205-25553-1-git-send-email-cfergeau@redhat.com> Message-ID: On Mon, Mar 4, 2013 at 6:40 PM, Christophe Fergeau wrote: > Data kindly provided by Alon Levy. > --- ACK -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From cfergeau at redhat.com Mon Mar 4 16:59:53 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 4 Mar 2013 17:59:53 +0100 Subject: [Libosinfo] [libosinfo] Add identification data for win7sp1 checked build In-Reply-To: References: <1362415205-25553-1-git-send-email-cfergeau@redhat.com> Message-ID: <20130304165952.GJ17565@teriyaki.cdg.redhat.com> On Mon, Mar 04, 2013 at 06:52:44PM +0200, Zeeshan Ali (Khattak) wrote: > On Mon, Mar 4, 2013 at 6:40 PM, Christophe Fergeau wrote: > > Data kindly provided by Alon Levy. > > --- > > ACK Pushed, thanks, Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From zeeshanak at gnome.org Mon Mar 4 17:18:29 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Mon, 4 Mar 2013 19:18:29 +0200 Subject: [Libosinfo] Libosinfo 0.2.5 Message-ID: Libosinfo 0.2.5 is out! Changes since 0.2.4: - Make use of post-installation drivers in Windows 7 install scripts. This implies apps can now easily setup virtio+QXL device drivers and spice-vdagent as part of Windows 7 unattended installation. - Windows 7 install script now requires product key, mainly because product key is the only way to choose product when dealing with installer media with multiple products on it. - Actually add install scripts for Windows 8. This was supposed to be merged in release 0.2.3. - Formalize architecture names in DB to align with libvirt. The main change is that i386, i486, i586, all merge to just i686, since in practice these differences haven't mattered for at least 15 years now. - Fixes to mingw RPM spec from Fedora. - Add a Windows 7 volume ID to DB. Release tarball available here for download: https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.5.tar.gz What is libosinfo? ============= libosinfo is a GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support. It includes a database containing device metadata and provides APIs to match/identify optimal devices for deploying an operating system on a hypervisor. Via the magic of GObject Introspection, the API is available in all common programming languages with demos for javascript (GJS/Seed) and python (PyGObject). Also provided are Vala bindings. libosinfo is Free Software and licenced under LGPLv2+. Dependencies ============ - Required: - gobject-2.0 - gio-2.0 - libxml-2.0 - Optional: - gobject-introspection - Vala (build-time only) For further information about libosinfo please consult the project homepage https://libosinfo.org/ -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From berrange at redhat.com Mon Mar 4 17:57:29 2013 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 4 Mar 2013 17:57:29 +0000 Subject: [Libosinfo] [libosinfo] Allow to use system pci.ids/usb.ids files In-Reply-To: <1362051193-15553-1-git-send-email-cfergeau@redhat.com> References: <1362051193-15553-1-git-send-email-cfergeau@redhat.com> Message-ID: <20130304175729.GJ8123@redhat.com> On Thu, Feb 28, 2013 at 12:33:13PM +0100, Christophe Fergeau wrote: > Most distros already ship copies of pci.ids/usb.ids. This commit > allows to make use of these rather than the ones shipped with > libosinfo. This is achieved through the use of > --with-usb-ids-path and --with-pci-ids-path configure flags. > --- > configure.ac | 24 ++++++++++++++++++++++++ > data/Makefile.am | 25 ++++++++++++++----------- > libosinfo.spec.in | 2 +- > osinfo/osinfo_loader.c | 45 +++++++++++++++++++++++++++++++++++++++++---- > 4 files changed, 80 insertions(+), 16 deletions(-) > diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c > index 76e9bc2..ec8c94c 100644 > --- a/osinfo/osinfo_loader.c > +++ b/osinfo/osinfo_loader.c > @@ -1653,10 +1653,26 @@ osinfo_loader_process_file(OsinfoLoader *loader, > case G_FILE_TYPE_REGULAR: > if (g_str_has_suffix(name, ".xml")) > osinfo_loader_process_file_reg_xml(loader, file, info, &error); > - else if (strcmp(name, "usb.ids") == 0) > - osinfo_loader_process_file_reg_usb(loader, file, info, &error); > - else if (strcmp(name, "pci.ids") == 0) > - osinfo_loader_process_file_reg_pci(loader, file, info, &error); > + else { > + gchar *pci_ids_filename; > + gchar *usb_ids_filename; > +#if defined(PCI_IDS) > + pci_ids_filename = g_path_get_basename(PCI_IDS); > +#else > + pci_ids_filename = g_strdup("pci.ids"); > +#endif > +#if defined(USB_IDS) > + usb_ids_filename = g_path_get_basename(USB_IDS); > +#else > + usb_ids_filename = g_strdup("usb.ids"); > +#endif This seems pretty strange to me - I don't see why we need to change this part of the code at all in fact. If the user wants to drop a usb.ids file into the osinfo database directory we should load that regardless of whether we shipped one in the RPM or pointed at the common file instead. > + if (strcmp(name, pci_ids_filename) == 0) > + osinfo_loader_process_file_reg_pci(loader, file, info, &error); > + else if (strcmp(name, usb_ids_filename) == 0) > + osinfo_loader_process_file_reg_usb(loader, file, info, &error); > + g_free(pci_ids_filename); > + g_free(usb_ids_filename); > + } > break; > > case G_FILE_TYPE_DIRECTORY: > @@ -1782,6 +1798,27 @@ void osinfo_loader_process_system_path(OsinfoLoader *loader, > FALSE, > err); > g_object_unref(file); > + if (error_is_set(err)) > + return; > + > +#ifdef PCI_IDS > + /* Load external pci.ids file */ > + file = g_file_new_for_path(PCI_IDS); > + osinfo_loader_process_file(loader, file, FALSE, err); > + g_object_unref(file); > + if (error_is_set(err)) > + return; > +#endif > + > +#ifdef USB_IDS > + /* Load external usb.ids file */ > + file = g_file_new_for_path(USB_IDS); > + osinfo_loader_process_file(loader, file, FALSE, err); > + g_object_unref(file); > + if (error_is_set(err)) > + return; > +#endif I think rather than doing this, I'd just make /usr/share/osinfo/db/devices/pci.ids be a symlink to the real shared file. Then we don't need any code changes at all, both scenarios would work in the same way. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| From zeeshanak at gnome.org Mon Mar 4 18:18:12 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Mon, 4 Mar 2013 20:18:12 +0200 Subject: [Libosinfo] [libosinfo] Allow to use system pci.ids/usb.ids files In-Reply-To: <20130304175729.GJ8123@redhat.com> References: <1362051193-15553-1-git-send-email-cfergeau@redhat.com> <20130304175729.GJ8123@redhat.com> Message-ID: On Mon, Mar 4, 2013 at 7:57 PM, Daniel P. Berrange wrote: > On Thu, Feb 28, 2013 at 12:33:13PM +0100, Christophe Fergeau wrote: >> Most distros already ship copies of pci.ids/usb.ids. This commit >> allows to make use of these rather than the ones shipped with >> libosinfo. This is achieved through the use of >> --with-usb-ids-path and --with-pci-ids-path configure flags. >> --- >> configure.ac | 24 ++++++++++++++++++++++++ >> data/Makefile.am | 25 ++++++++++++++----------- >> libosinfo.spec.in | 2 +- >> osinfo/osinfo_loader.c | 45 +++++++++++++++++++++++++++++++++++++++++---- >> 4 files changed, 80 insertions(+), 16 deletions(-) > >> diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c >> index 76e9bc2..ec8c94c 100644 >> --- a/osinfo/osinfo_loader.c >> +++ b/osinfo/osinfo_loader.c >> @@ -1653,10 +1653,26 @@ osinfo_loader_process_file(OsinfoLoader *loader, >> case G_FILE_TYPE_REGULAR: >> if (g_str_has_suffix(name, ".xml")) >> osinfo_loader_process_file_reg_xml(loader, file, info, &error); >> - else if (strcmp(name, "usb.ids") == 0) >> - osinfo_loader_process_file_reg_usb(loader, file, info, &error); >> - else if (strcmp(name, "pci.ids") == 0) >> - osinfo_loader_process_file_reg_pci(loader, file, info, &error); >> + else { >> + gchar *pci_ids_filename; >> + gchar *usb_ids_filename; >> +#if defined(PCI_IDS) >> + pci_ids_filename = g_path_get_basename(PCI_IDS); >> +#else >> + pci_ids_filename = g_strdup("pci.ids"); >> +#endif >> +#if defined(USB_IDS) >> + usb_ids_filename = g_path_get_basename(USB_IDS); >> +#else >> + usb_ids_filename = g_strdup("usb.ids"); >> +#endif > > This seems pretty strange to me - I don't see why we need to change this > part of the code at all in fact. If the user wants to drop a usb.ids > file into the osinfo database directory we should load that regardless > of whether we shipped one in the RPM or pointed at the common file > instead. Except that they are not doing this for libosinfo. AFAIK, these files are even going to be part of systemd in near future. >> + if (strcmp(name, pci_ids_filename) == 0) >> + osinfo_loader_process_file_reg_pci(loader, file, info, &error); >> + else if (strcmp(name, usb_ids_filename) == 0) >> + osinfo_loader_process_file_reg_usb(loader, file, info, &error); >> + g_free(pci_ids_filename); >> + g_free(usb_ids_filename); >> + } >> break; >> >> case G_FILE_TYPE_DIRECTORY: >> @@ -1782,6 +1798,27 @@ void osinfo_loader_process_system_path(OsinfoLoader *loader, >> FALSE, >> err); >> g_object_unref(file); >> + if (error_is_set(err)) >> + return; >> + >> +#ifdef PCI_IDS >> + /* Load external pci.ids file */ >> + file = g_file_new_for_path(PCI_IDS); >> + osinfo_loader_process_file(loader, file, FALSE, err); >> + g_object_unref(file); >> + if (error_is_set(err)) >> + return; >> +#endif >> + >> +#ifdef USB_IDS >> + /* Load external usb.ids file */ >> + file = g_file_new_for_path(USB_IDS); >> + osinfo_loader_process_file(loader, file, FALSE, err); >> + g_object_unref(file); >> + if (error_is_set(err)) >> + return; >> +#endif > > I think rather than doing this, I'd just make /usr/share/osinfo/db/devices/pci.ids > be a symlink to the real shared file. Then we don't need any code changes > at all, both scenarios would work in the same way. Yeah, that sounds better. -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From berrange at redhat.com Mon Mar 4 18:37:41 2013 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 4 Mar 2013 18:37:41 +0000 Subject: [Libosinfo] [libosinfo] Allow to use system pci.ids/usb.ids files In-Reply-To: References: <1362051193-15553-1-git-send-email-cfergeau@redhat.com> <20130304175729.GJ8123@redhat.com> Message-ID: <20130304183741.GL8123@redhat.com> On Mon, Mar 04, 2013 at 08:18:12PM +0200, Zeeshan Ali (Khattak) wrote: > On Mon, Mar 4, 2013 at 7:57 PM, Daniel P. Berrange wrote: > > On Thu, Feb 28, 2013 at 12:33:13PM +0100, Christophe Fergeau wrote: > >> Most distros already ship copies of pci.ids/usb.ids. This commit > >> allows to make use of these rather than the ones shipped with > >> libosinfo. This is achieved through the use of > >> --with-usb-ids-path and --with-pci-ids-path configure flags. > >> --- > >> configure.ac | 24 ++++++++++++++++++++++++ > >> data/Makefile.am | 25 ++++++++++++++----------- > >> libosinfo.spec.in | 2 +- > >> osinfo/osinfo_loader.c | 45 +++++++++++++++++++++++++++++++++++++++++---- > >> 4 files changed, 80 insertions(+), 16 deletions(-) > > > >> diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c > >> index 76e9bc2..ec8c94c 100644 > >> --- a/osinfo/osinfo_loader.c > >> +++ b/osinfo/osinfo_loader.c > >> @@ -1653,10 +1653,26 @@ osinfo_loader_process_file(OsinfoLoader *loader, > >> case G_FILE_TYPE_REGULAR: > >> if (g_str_has_suffix(name, ".xml")) > >> osinfo_loader_process_file_reg_xml(loader, file, info, &error); > >> - else if (strcmp(name, "usb.ids") == 0) > >> - osinfo_loader_process_file_reg_usb(loader, file, info, &error); > >> - else if (strcmp(name, "pci.ids") == 0) > >> - osinfo_loader_process_file_reg_pci(loader, file, info, &error); > >> + else { > >> + gchar *pci_ids_filename; > >> + gchar *usb_ids_filename; > >> +#if defined(PCI_IDS) > >> + pci_ids_filename = g_path_get_basename(PCI_IDS); > >> +#else > >> + pci_ids_filename = g_strdup("pci.ids"); > >> +#endif > >> +#if defined(USB_IDS) > >> + usb_ids_filename = g_path_get_basename(USB_IDS); > >> +#else > >> + usb_ids_filename = g_strdup("usb.ids"); > >> +#endif > > > > This seems pretty strange to me - I don't see why we need to change this > > part of the code at all in fact. If the user wants to drop a usb.ids > > file into the osinfo database directory we should load that regardless > > of whether we shipped one in the RPM or pointed at the common file > > instead. > > Except that they are not doing this for libosinfo. AFAIK, these files > are even going to be part of systemd in near future. You're missing my point. If I, as a end user, want to update the PCI IDs file, I should be able to just put it into $HOME/.config/libosinfo/db/pci.ids We shouldn't be changing /the way/ libosinfo loads files from the database directories. We should only change /where/ the default data comes from. This is nothing todo with systemd or any distro decision on whether to use the built-in pci.ids, or a distro default version of the file. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| From zeeshanak at gnome.org Mon Mar 4 19:56:55 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Mon, 4 Mar 2013 21:56:55 +0200 Subject: [Libosinfo] [libosinfo] Allow to use system pci.ids/usb.ids files In-Reply-To: <20130304183741.GL8123@redhat.com> References: <1362051193-15553-1-git-send-email-cfergeau@redhat.com> <20130304175729.GJ8123@redhat.com> <20130304183741.GL8123@redhat.com> Message-ID: On Mon, Mar 4, 2013 at 8:37 PM, Daniel P. Berrange wrote: > On Mon, Mar 04, 2013 at 08:18:12PM +0200, Zeeshan Ali (Khattak) wrote: >> On Mon, Mar 4, 2013 at 7:57 PM, Daniel P. Berrange wrote: >> > On Thu, Feb 28, 2013 at 12:33:13PM +0100, Christophe Fergeau wrote: >> >> Most distros already ship copies of pci.ids/usb.ids. This commit >> >> allows to make use of these rather than the ones shipped with >> >> libosinfo. This is achieved through the use of >> >> --with-usb-ids-path and --with-pci-ids-path configure flags. >> >> --- >> >> configure.ac | 24 ++++++++++++++++++++++++ >> >> data/Makefile.am | 25 ++++++++++++++----------- >> >> libosinfo.spec.in | 2 +- >> >> osinfo/osinfo_loader.c | 45 +++++++++++++++++++++++++++++++++++++++++---- >> >> 4 files changed, 80 insertions(+), 16 deletions(-) >> > >> >> diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c >> >> index 76e9bc2..ec8c94c 100644 >> >> --- a/osinfo/osinfo_loader.c >> >> +++ b/osinfo/osinfo_loader.c >> >> @@ -1653,10 +1653,26 @@ osinfo_loader_process_file(OsinfoLoader *loader, >> >> case G_FILE_TYPE_REGULAR: >> >> if (g_str_has_suffix(name, ".xml")) >> >> osinfo_loader_process_file_reg_xml(loader, file, info, &error); >> >> - else if (strcmp(name, "usb.ids") == 0) >> >> - osinfo_loader_process_file_reg_usb(loader, file, info, &error); >> >> - else if (strcmp(name, "pci.ids") == 0) >> >> - osinfo_loader_process_file_reg_pci(loader, file, info, &error); >> >> + else { >> >> + gchar *pci_ids_filename; >> >> + gchar *usb_ids_filename; >> >> +#if defined(PCI_IDS) >> >> + pci_ids_filename = g_path_get_basename(PCI_IDS); >> >> +#else >> >> + pci_ids_filename = g_strdup("pci.ids"); >> >> +#endif >> >> +#if defined(USB_IDS) >> >> + usb_ids_filename = g_path_get_basename(USB_IDS); >> >> +#else >> >> + usb_ids_filename = g_strdup("usb.ids"); >> >> +#endif >> > >> > This seems pretty strange to me - I don't see why we need to change this >> > part of the code at all in fact. If the user wants to drop a usb.ids >> > file into the osinfo database directory we should load that regardless >> > of whether we shipped one in the RPM or pointed at the common file >> > instead. >> >> Except that they are not doing this for libosinfo. AFAIK, these files >> are even going to be part of systemd in near future. > > You're missing my point. If I, as a end user, want to update the PCI > IDs file, I should be able to just put it into $HOME/.config/libosinfo/db/pci.ids > We shouldn't be changing /the way/ libosinfo loads files from the database > directories. We should only change /where/ the default data comes from. > This is nothing todo with systemd or any distro decision on whether to > use the built-in pci.ids, or a distro default version of the file. Indeed I did. Sorry. -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From cfergeau at redhat.com Tue Mar 5 17:11:15 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Tue, 5 Mar 2013 18:11:15 +0100 Subject: [Libosinfo] [libosinfo] Allow to use system pci.ids/usb.ids files Message-ID: <1362503475-11781-1-git-send-email-cfergeau@redhat.com> Most distros already ship copies of pci.ids/usb.ids. This commit allows to make use of these rather than the ones shipped with libosinfo. This is achieved through the use of --with-usb-ids-path and --with-pci-ids-path configure flags. --- configure.ac | 21 +++++++++++++++++++++ data/Makefile.am | 37 ++++++++++++++++++++++++++----------- libosinfo.spec.in | 2 +- 3 files changed, 48 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 1e255c1..5ad9b6d 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,7 @@ AC_CONFIG_SRCDIR([osinfo/osinfo_db.c]) AC_CONFIG_HEADERS([config.h]) AC_PROG_LIBTOOL AC_PROG_CC +AC_PROG_LN_S LIBOSINFO_COMPILE_WARNINGS GNOME_MAINTAINER_MODE_DEFINES @@ -171,6 +172,26 @@ fi AC_SUBST(COVERAGE_CFLAGS) AC_SUBST(COVERAGE_LDFLAGS) +# Path to the usb.ids file -- to know if we use one shipped with another +# package, or an internal file +AC_ARG_WITH(usb-ids-path, + [AC_HELP_STRING([--with-usb-ids-path], + [Specify the path to usb.ids @<:@default=(internal)@:>@])],, + [with_usb_ids_path="\${usb_databasedir}/usb.ids"]) + +AM_CONDITIONAL(USE_INTERNAL_USB_IDS, test "x$with_usb_ids_path" = "x\${usb_databasedir}/usb.ids") +AC_SUBST([USB_IDS], ["$with_usb_ids_path"]) + +# Path to the pci.ids file -- to know if we use one shipped with another +# package, or an internal file +AC_ARG_WITH(pci-ids-path, + [AC_HELP_STRING([--with-pci-ids-path], + [Specify the path to pci.ids @<:@default=(internal)@:>@])],, + [with_pci_ids_path="\${pci_databasedir}/pci.ids"]) + +AM_CONDITIONAL(USE_INTERNAL_PCI_IDS, test "x$with_pci_ids_path" = "x\${pci_databasedir}/pci.ids") +AC_SUBST([PCI_IDS], ["$with_pci_ids_path"]) + # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled. GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` AC_SUBST(GLIB_MKENUMS) diff --git a/data/Makefile.am b/data/Makefile.am index 747f0e9..77ad889 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,10 +1,30 @@ +INSTALL_DATA_HOOK_DEPS = SUBDIRS = datamaps devices oses hypervisors install-scripts schemas - EXTRA_DIST = usb.ids pci.ids 95-osinfo.rules.in +CLEANFILES = usb.ids pci.ids + +if USE_INTERNAL_USB_IDS +usb_database_DATA = usb.ids +usb_databasedir = $(pkgdatadir)/db/ +usb.ids: + -wget -q -O $@ http://www.linux-usb.org/usb.ids +else +usb_ids_install: + $(LN_S) $(USB_IDS) $(pkgdatadir)/db/usb.ids +INSTALL_DATA_HOOK_DEPS += usb_ids_install +endif -databasedir = $(pkgdatadir)/db/ -database_DATA = usb.ids pci.ids +if USE_INTERNAL_PCI_IDS +pci_database_DATA = pci.ids +pci_databasedir = $(pkgdatadir)/db/ +pci.ids: + -wget -q -O $@ http://pciids.sourceforge.net/v2.2/pci.ids +else +pci_ids_install: + $(LN_S) $(PCI_IDS) $(pkgdatadir)/db/pci.ids +INSTALL_DATA_HOOK_DEPS += pci_ids_install +endif if WITH_UDEV BUILT_SOURCES = 95-osinfo.rules @@ -12,16 +32,11 @@ BUILT_SOURCES = 95-osinfo.rules 95-osinfo.rules: 95-osinfo.rules.in sed 's,\@bindir\@,$(exec_prefix)/bin,' $< > $@ -install-data-hook: 95-osinfo.rules +95-osinfo.rules-install: 95-osinfo.rules mkdir -p $(DESTDIR)$(UDEV_RULESDIR) $(INSTALL) -m 0644 95-osinfo.rules $(DESTDIR)$(UDEV_RULESDIR) +INSTALL_DATA_HOOK_DEPS += 95-osinfo.rules-install endif -CLEANFILES = usb.ids pci.ids - -usb.ids: - -wget -q -O $@ http://www.linux-usb.org/usb.ids - -pci.ids: - -wget -q -O $@ http://pciids.sourceforge.net/v2.2/pci.ids +install-data-hook: $(INSTALL_DATA_HOOK_DEPS) diff --git a/libosinfo.spec.in b/libosinfo.spec.in index 75de896..0864a2b 100644 --- a/libosinfo.spec.in +++ b/libosinfo.spec.in @@ -85,7 +85,7 @@ This package provides the Vala bindings for libosinfo library. %define udev_arg --enable-udev=no %endif -%configure %{gir_arg} %{udev_arg} --enable-vala=yes +%configure %{gir_arg} %{udev_arg} --enable-vala=yes --with-usb-ids-path=/usr/share/hwdata/usb.ids --with-pci-ids-path=/usr/share/hwdata/pci.ids %__make %{?_smp_mflags} V=1 chmod a-x examples/*.js examples/*.py -- 1.8.1.4 From cfergeau at redhat.com Tue Mar 5 17:17:51 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Tue, 5 Mar 2013 18:17:51 +0100 Subject: [Libosinfo] [libosinfo] Allow to use system pci.ids/usb.ids files In-Reply-To: <20130304175729.GJ8123@redhat.com> References: <1362051193-15553-1-git-send-email-cfergeau@redhat.com> <20130304175729.GJ8123@redhat.com> Message-ID: <20130305171750.GA2475@teriyaki.redhat.com> On Mon, Mar 04, 2013 at 05:57:29PM +0000, Daniel P. Berrange wrote: > I think rather than doing this, I'd just make /usr/share/osinfo/db/devices/pci.ids > be a symlink to the real shared file. Then we don't need any code changes > at all, both scenarios would work in the same way. This makes sense to me, I've sent a v2 (which I forgot to label accordingly) doing that. Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From berrange at redhat.com Tue Mar 5 17:21:04 2013 From: berrange at redhat.com (Daniel P. Berrange) Date: Tue, 5 Mar 2013 17:21:04 +0000 Subject: [Libosinfo] [libosinfo] Allow to use system pci.ids/usb.ids files In-Reply-To: <1362503475-11781-1-git-send-email-cfergeau@redhat.com> References: <1362503475-11781-1-git-send-email-cfergeau@redhat.com> Message-ID: <20130305172104.GJ6039@redhat.com> On Tue, Mar 05, 2013 at 06:11:15PM +0100, Christophe Fergeau wrote: > diff --git a/libosinfo.spec.in b/libosinfo.spec.in > index 75de896..0864a2b 100644 > --- a/libosinfo.spec.in > +++ b/libosinfo.spec.in > @@ -85,7 +85,7 @@ This package provides the Vala bindings for libosinfo library. > %define udev_arg --enable-udev=no > %endif > > -%configure %{gir_arg} %{udev_arg} --enable-vala=yes > +%configure %{gir_arg} %{udev_arg} --enable-vala=yes --with-usb-ids-path=/usr/share/hwdata/usb.ids --with-pci-ids-path=/usr/share/hwdata/pci.ids > %__make %{?_smp_mflags} V=1 > > chmod a-x examples/*.js examples/*.py I think we also need to add Requires: hwdata ACK with that change Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| From cfergeau at redhat.com Tue Mar 5 17:26:13 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Tue, 5 Mar 2013 18:26:13 +0100 Subject: [Libosinfo] [libosinfo] Allow to use system pci.ids/usb.ids files In-Reply-To: References: <1362051193-15553-1-git-send-email-cfergeau@redhat.com> <20130304175729.GJ8123@redhat.com> Message-ID: <20130305172613.GB2475@teriyaki.redhat.com> On Mon, Mar 04, 2013 at 08:18:12PM +0200, Zeeshan Ali (Khattak) wrote: > AFAIK, these files are even going to be part of systemd in near future. There was some opposition to that on fedora-devel ;) For what it's worth, I've also looked at the udev hwdb API. It seems using it optionnally in libosinfo wouldn't be very hard, and this should save us some parsing work. The problematic part would be to support osinfo_db_get_device_list() which at the moment lists all devices contained in usb.ids/pci.ids, and the udev hwdb API does not provide a way to get that (maybe that could be added). I don't know if this would be an acceptable change to only return the list of devices that are actually used by an OS, install script, ... in the osinfo DB. Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From cfergeau at redhat.com Tue Mar 5 17:32:03 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Tue, 5 Mar 2013 18:32:03 +0100 Subject: [Libosinfo] [libosinfo] spec: Don't require udev on newer distros Message-ID: <1362504723-13969-1-git-send-email-cfergeau@redhat.com> 96c66b8 disabled building of the udev rule on newer Fedoras, however the .spec still has a Requires: udev, which is not relevant when the udev rule is not built. --- libosinfo.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libosinfo.spec.in b/libosinfo.spec.in index 49ebd52..fc2f2d1 100644 --- a/libosinfo.spec.in +++ b/libosinfo.spec.in @@ -37,7 +37,9 @@ BuildRequires: /usr/bin/pod2man BuildRequires: gobject-introspection-devel %endif Requires: hwdata +%if %{with_udev} Requires: udev +%endif %description libosinfo is a library that allows virtualization provisioning tools to -- 1.8.1.4 From zeeshanak at gnome.org Tue Mar 5 18:56:47 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Tue, 5 Mar 2013 20:56:47 +0200 Subject: [Libosinfo] [libosinfo] spec: Don't require udev on newer distros In-Reply-To: <1362504723-13969-1-git-send-email-cfergeau@redhat.com> References: <1362504723-13969-1-git-send-email-cfergeau@redhat.com> Message-ID: On Tue, Mar 5, 2013 at 7:32 PM, Christophe Fergeau wrote: > 96c66b8 disabled building of the udev rule on newer Fedoras, however > the .spec still has a Requires: udev, which is not relevant > when the udev rule is not built. > --- ACK -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From cfergeau at redhat.com Mon Mar 11 11:29:50 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 11 Mar 2013 12:29:50 +0100 Subject: [Libosinfo] [libosinfo] Fix FSF address Message-ID: <1363001390-22518-1-git-send-email-cfergeau@redhat.com> 2 source files have the old FSF address, fix them to use the new one. --- osinfo/osinfo_product.c | 2 +- osinfo/osinfo_product.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osinfo/osinfo_product.c b/osinfo/osinfo_product.c index 47edb9c..00c4442 100644 --- a/osinfo/osinfo_product.c +++ b/osinfo/osinfo_product.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Bproductton, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_product.h b/osinfo/osinfo_product.h index daf512a..6406580 100644 --- a/osinfo/osinfo_product.h +++ b/osinfo/osinfo_product.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Bproductton, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: * Arjun Roy -- 1.8.1.4 From cfergeau at redhat.com Mon Mar 11 13:15:06 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 11 Mar 2013 14:15:06 +0100 Subject: [Libosinfo] [libosinfo] Fix FSF address In-Reply-To: <1363001390-22518-1-git-send-email-cfergeau@redhat.com> References: <1363001390-22518-1-git-send-email-cfergeau@redhat.com> Message-ID: <20130311131506.GD5276@teriyaki.redhat.com> Self-NACK, I'm going to send a patch removing the FSF address from all header files instead. Christophe On Mon, Mar 11, 2013 at 12:29:50PM +0100, Christophe Fergeau wrote: > 2 source files have the old FSF address, fix them to use the new one. > --- > osinfo/osinfo_product.c | 2 +- > osinfo/osinfo_product.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/osinfo/osinfo_product.c b/osinfo/osinfo_product.c > index 47edb9c..00c4442 100644 > --- a/osinfo/osinfo_product.c > +++ b/osinfo/osinfo_product.c > @@ -15,7 +15,7 @@ > * > * You should have received a copy of the GNU Lesser General Public > * License along with this library; if not, write to the Free Software > - * Foundation, Inc., 59 Temple Place, Suite 330, Bproductton, MA 02111-1307 USA > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > * > * Authors: > * Arjun Roy > diff --git a/osinfo/osinfo_product.h b/osinfo/osinfo_product.h > index daf512a..6406580 100644 > --- a/osinfo/osinfo_product.h > +++ b/osinfo/osinfo_product.h > @@ -15,7 +15,7 @@ > * > * You should have received a copy of the GNU Lesser General Public > * License along with this library; if not, write to the Free Software > - * Foundation, Inc., 59 Temple Place, Suite 330, Bproductton, MA 02111-1307 USA > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > * > * Authors: > * Arjun Roy > -- > 1.8.1.4 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From cfergeau at redhat.com Mon Mar 11 13:15:36 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 11 Mar 2013 14:15:36 +0100 Subject: [Libosinfo] [libosinfo PATCHv2] Remove FSF address from source file headers Message-ID: <1363007736-7098-1-git-send-email-cfergeau@redhat.com> The FSF moved a while ago which made the address we use in every source file header invalid. Follow the recommendation from http://www.gnu.org/licenses/gpl-howto.html and don't put any address in these headers, just a link to the fsf website. --- osinfo/osinfo.h | 4 ++-- osinfo/osinfo_datamap.c | 4 ++-- osinfo/osinfo_datamap.h | 4 ++-- osinfo/osinfo_datamaplist.c | 4 ++-- osinfo/osinfo_datamaplist.h | 4 ++-- osinfo/osinfo_db.c | 4 ++-- osinfo/osinfo_db.h | 4 ++-- osinfo/osinfo_deployment.c | 4 ++-- osinfo/osinfo_deployment.h | 4 ++-- osinfo/osinfo_deploymentlist.c | 4 ++-- osinfo/osinfo_deploymentlist.h | 4 ++-- osinfo/osinfo_device.c | 4 ++-- osinfo/osinfo_device.h | 4 ++-- osinfo/osinfo_device_driver.c | 4 ++-- osinfo/osinfo_device_driver.h | 4 ++-- osinfo/osinfo_device_driver_private.h | 4 ++-- osinfo/osinfo_device_driverlist.c | 4 ++-- osinfo/osinfo_device_driverlist.h | 4 ++-- osinfo/osinfo_devicelink.c | 4 ++-- osinfo/osinfo_devicelink.h | 4 ++-- osinfo/osinfo_devicelinkfilter.c | 4 ++-- osinfo/osinfo_devicelinkfilter.h | 4 ++-- osinfo/osinfo_devicelinklist.c | 4 ++-- osinfo/osinfo_devicelinklist.h | 4 ++-- osinfo/osinfo_devicelist.c | 4 ++-- osinfo/osinfo_devicelist.h | 4 ++-- osinfo/osinfo_entity.c | 4 ++-- osinfo/osinfo_entity.h | 4 ++-- osinfo/osinfo_filter.c | 4 ++-- osinfo/osinfo_filter.h | 4 ++-- osinfo/osinfo_install_config.c | 4 ++-- osinfo/osinfo_install_config.h | 4 ++-- osinfo/osinfo_install_config_param.c | 4 ++-- osinfo/osinfo_install_config_param.h | 4 ++-- osinfo/osinfo_install_config_paramlist.c | 4 ++-- osinfo/osinfo_install_config_paramlist.h | 4 ++-- osinfo/osinfo_install_script.c | 4 ++-- osinfo/osinfo_install_script.h | 4 ++-- osinfo/osinfo_install_script_private.h | 4 ++-- osinfo/osinfo_install_scriptlist.c | 4 ++-- osinfo/osinfo_install_scriptlist.h | 4 ++-- osinfo/osinfo_list.c | 4 ++-- osinfo/osinfo_list.h | 4 ++-- osinfo/osinfo_loader.c | 4 ++-- osinfo/osinfo_loader.h | 4 ++-- osinfo/osinfo_media.c | 4 ++-- osinfo/osinfo_media.h | 4 ++-- osinfo/osinfo_media_private.h | 4 ++-- osinfo/osinfo_medialist.c | 4 ++-- osinfo/osinfo_medialist.h | 4 ++-- osinfo/osinfo_os.c | 4 ++-- osinfo/osinfo_os.h | 4 ++-- osinfo/osinfo_oslist.c | 4 ++-- osinfo/osinfo_oslist.h | 4 ++-- osinfo/osinfo_platform.c | 4 ++-- osinfo/osinfo_platform.h | 4 ++-- osinfo/osinfo_platformlist.c | 4 ++-- osinfo/osinfo_platformlist.h | 4 ++-- osinfo/osinfo_product.c | 4 ++-- osinfo/osinfo_product.h | 4 ++-- osinfo/osinfo_productfilter.c | 4 ++-- osinfo/osinfo_productfilter.h | 4 ++-- osinfo/osinfo_productlist.c | 4 ++-- osinfo/osinfo_productlist.h | 4 ++-- osinfo/osinfo_resources.c | 4 ++-- osinfo/osinfo_resources.h | 4 ++-- osinfo/osinfo_resourceslist.c | 4 ++-- osinfo/osinfo_resourceslist.h | 4 ++-- osinfo/osinfo_tree.c | 4 ++-- osinfo/osinfo_tree.h | 4 ++-- osinfo/osinfo_treelist.c | 4 ++-- osinfo/osinfo_treelist.h | 4 ++-- 72 files changed, 144 insertions(+), 144 deletions(-) diff --git a/osinfo/osinfo.h b/osinfo/osinfo.h index 1012ede..0d0f3d2 100644 --- a/osinfo/osinfo.h +++ b/osinfo/osinfo.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_datamap.c b/osinfo/osinfo_datamap.c index 98ce0a6..efd5d1d 100644 --- a/osinfo/osinfo_datamap.c +++ b/osinfo/osinfo_datamap.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Daniel P. Berrange diff --git a/osinfo/osinfo_datamap.h b/osinfo/osinfo_datamap.h index 238157c..871d804 100644 --- a/osinfo/osinfo_datamap.h +++ b/osinfo/osinfo_datamap.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Daniel P. Berrange diff --git a/osinfo/osinfo_datamaplist.c b/osinfo/osinfo_datamaplist.c index 5d0d7b6..01b58f1 100644 --- a/osinfo/osinfo_datamaplist.c +++ b/osinfo/osinfo_datamaplist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_datamaplist.h b/osinfo/osinfo_datamaplist.h index 9b7fd1c..dc506a1 100644 --- a/osinfo/osinfo_datamaplist.h +++ b/osinfo/osinfo_datamaplist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c index 413db8f..f19d9b4 100644 --- a/osinfo/osinfo_db.c +++ b/osinfo/osinfo_db.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_db.h b/osinfo/osinfo_db.h index bad3c6d..f2df973 100644 --- a/osinfo/osinfo_db.h +++ b/osinfo/osinfo_db.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_deployment.c b/osinfo/osinfo_deployment.c index 3e511e2..a00497d 100644 --- a/osinfo/osinfo_deployment.c +++ b/osinfo/osinfo_deployment.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_deployment.h b/osinfo/osinfo_deployment.h index 45a9d14..6e2fb5d 100644 --- a/osinfo/osinfo_deployment.h +++ b/osinfo/osinfo_deployment.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_deploymentlist.c b/osinfo/osinfo_deploymentlist.c index 41a5575..acf5e6e 100644 --- a/osinfo/osinfo_deploymentlist.c +++ b/osinfo/osinfo_deploymentlist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_deploymentlist.h b/osinfo/osinfo_deploymentlist.h index f9ce4c5..c21c8ff 100644 --- a/osinfo/osinfo_deploymentlist.h +++ b/osinfo/osinfo_deploymentlist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_device.c b/osinfo/osinfo_device.c index 183ae41..8308817 100644 --- a/osinfo/osinfo_device.c +++ b/osinfo/osinfo_device.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_device.h b/osinfo/osinfo_device.h index 7ce4259..5eb1168 100644 --- a/osinfo/osinfo_device.h +++ b/osinfo/osinfo_device.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_device_driver.c b/osinfo/osinfo_device_driver.c index 23731bf..b2302b4 100644 --- a/osinfo/osinfo_device_driver.c +++ b/osinfo/osinfo_device_driver.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_device_driver.h b/osinfo/osinfo_device_driver.h index c894fe8..ea30437 100644 --- a/osinfo/osinfo_device_driver.h +++ b/osinfo/osinfo_device_driver.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_device_driver_private.h b/osinfo/osinfo_device_driver_private.h index d49ffa1..074ed60 100644 --- a/osinfo/osinfo_device_driver_private.h +++ b/osinfo/osinfo_device_driver_private.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_device_driverlist.c b/osinfo/osinfo_device_driverlist.c index 11f29db..f802e38 100644 --- a/osinfo/osinfo_device_driverlist.c +++ b/osinfo/osinfo_device_driverlist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_device_driverlist.h b/osinfo/osinfo_device_driverlist.h index 8e0481d..5d97e4d 100644 --- a/osinfo/osinfo_device_driverlist.h +++ b/osinfo/osinfo_device_driverlist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_devicelink.c b/osinfo/osinfo_devicelink.c index 95b5770..fd72a1b 100644 --- a/osinfo/osinfo_devicelink.c +++ b/osinfo/osinfo_devicelink.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_devicelink.h b/osinfo/osinfo_devicelink.h index 0ed32ca..1ca6402 100644 --- a/osinfo/osinfo_devicelink.h +++ b/osinfo/osinfo_devicelink.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_devicelinkfilter.c b/osinfo/osinfo_devicelinkfilter.c index 6e30823..2c84009 100644 --- a/osinfo/osinfo_devicelinkfilter.c +++ b/osinfo/osinfo_devicelinkfilter.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_devicelinkfilter.h b/osinfo/osinfo_devicelinkfilter.h index ae7c4a1..7f18185 100644 --- a/osinfo/osinfo_devicelinkfilter.h +++ b/osinfo/osinfo_devicelinkfilter.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_devicelinklist.c b/osinfo/osinfo_devicelinklist.c index 672934f..14f1a7f 100644 --- a/osinfo/osinfo_devicelinklist.c +++ b/osinfo/osinfo_devicelinklist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_devicelinklist.h b/osinfo/osinfo_devicelinklist.h index 3f68447..42691b1 100644 --- a/osinfo/osinfo_devicelinklist.h +++ b/osinfo/osinfo_devicelinklist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_devicelist.c b/osinfo/osinfo_devicelist.c index ca2ceef..f390ba5 100644 --- a/osinfo/osinfo_devicelist.c +++ b/osinfo/osinfo_devicelist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_devicelist.h b/osinfo/osinfo_devicelist.h index 6217de9..62fec89 100644 --- a/osinfo/osinfo_devicelist.h +++ b/osinfo/osinfo_devicelist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_entity.c b/osinfo/osinfo_entity.c index 543c710..5c062bc 100644 --- a/osinfo/osinfo_entity.c +++ b/osinfo/osinfo_entity.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_entity.h b/osinfo/osinfo_entity.h index 4c6dc45..d41237b 100644 --- a/osinfo/osinfo_entity.h +++ b/osinfo/osinfo_entity.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_filter.c b/osinfo/osinfo_filter.c index 959ab6e..a3d5840 100644 --- a/osinfo/osinfo_filter.c +++ b/osinfo/osinfo_filter.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_filter.h b/osinfo/osinfo_filter.h index a3d4f89..14de129 100644 --- a/osinfo/osinfo_filter.h +++ b/osinfo/osinfo_filter.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c index 1712be5..abe12d9 100644 --- a/osinfo/osinfo_install_config.c +++ b/osinfo/osinfo_install_config.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Daniel P. Berrange diff --git a/osinfo/osinfo_install_config.h b/osinfo/osinfo_install_config.h index d650a0a..d6552fd 100644 --- a/osinfo/osinfo_install_config.h +++ b/osinfo/osinfo_install_config.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Daniel P. Berrange diff --git a/osinfo/osinfo_install_config_param.c b/osinfo/osinfo_install_config_param.c index 541f066..401279f 100644 --- a/osinfo/osinfo_install_config_param.c +++ b/osinfo/osinfo_install_config_param.c @@ -15,8 +15,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Christophe Fergeau diff --git a/osinfo/osinfo_install_config_param.h b/osinfo/osinfo_install_config_param.h index b0f2217..58bb40b 100644 --- a/osinfo/osinfo_install_config_param.h +++ b/osinfo/osinfo_install_config_param.h @@ -15,8 +15,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Fabiano Fid?ncio diff --git a/osinfo/osinfo_install_config_paramlist.c b/osinfo/osinfo_install_config_paramlist.c index 740de70..df44b58 100644 --- a/osinfo/osinfo_install_config_paramlist.c +++ b/osinfo/osinfo_install_config_paramlist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_install_config_paramlist.h b/osinfo/osinfo_install_config_paramlist.h index 81254c3..e27c3ab 100644 --- a/osinfo/osinfo_install_config_paramlist.h +++ b/osinfo/osinfo_install_config_paramlist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c index 276c756..e0af694 100644 --- a/osinfo/osinfo_install_script.c +++ b/osinfo/osinfo_install_script.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Daniel P. Berrange diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h index d91751e..fc0c8f8 100644 --- a/osinfo/osinfo_install_script.h +++ b/osinfo/osinfo_install_script.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Daniel P. Berrange diff --git a/osinfo/osinfo_install_script_private.h b/osinfo/osinfo_install_script_private.h index 2ce0a41..9a9c17a 100644 --- a/osinfo/osinfo_install_script_private.h +++ b/osinfo/osinfo_install_script_private.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali (Khattak) diff --git a/osinfo/osinfo_install_scriptlist.c b/osinfo/osinfo_install_scriptlist.c index 9edc4fa..c870ddf 100644 --- a/osinfo/osinfo_install_scriptlist.c +++ b/osinfo/osinfo_install_scriptlist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_install_scriptlist.h b/osinfo/osinfo_install_scriptlist.h index daa4e64..fba8196 100644 --- a/osinfo/osinfo_install_scriptlist.h +++ b/osinfo/osinfo_install_scriptlist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_list.c b/osinfo/osinfo_list.c index ddfd58d..c3fe92f 100644 --- a/osinfo/osinfo_list.c +++ b/osinfo/osinfo_list.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_list.h b/osinfo/osinfo_list.h index c8509bf..bdd9b58 100644 --- a/osinfo/osinfo_list.h +++ b/osinfo/osinfo_list.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index 491e60b..15e6190 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_loader.h b/osinfo/osinfo_loader.h index 530e7ba..41bfb14 100644 --- a/osinfo/osinfo_loader.h +++ b/osinfo/osinfo_loader.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c index 67dd6af..118ff8b 100644 --- a/osinfo/osinfo_media.c +++ b/osinfo/osinfo_media.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_media.h b/osinfo/osinfo_media.h index f365e2b..308f75e 100644 --- a/osinfo/osinfo_media.h +++ b/osinfo/osinfo_media.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_media_private.h b/osinfo/osinfo_media_private.h index efaffd1..0c75319 100644 --- a/osinfo/osinfo_media_private.h +++ b/osinfo/osinfo_media_private.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Christophe Fergeau diff --git a/osinfo/osinfo_medialist.c b/osinfo/osinfo_medialist.c index 9ec06bf..da018a6 100644 --- a/osinfo/osinfo_medialist.c +++ b/osinfo/osinfo_medialist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_medialist.h b/osinfo/osinfo_medialist.h index c31f1fa..2782194 100644 --- a/osinfo/osinfo_medialist.h +++ b/osinfo/osinfo_medialist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c index 25f7a4c..1adb3e2 100644 --- a/osinfo/osinfo_os.c +++ b/osinfo/osinfo_os.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h index 486afb3..d667e3b 100644 --- a/osinfo/osinfo_os.h +++ b/osinfo/osinfo_os.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_oslist.c b/osinfo/osinfo_oslist.c index e2f5c42..59e8750 100644 --- a/osinfo/osinfo_oslist.c +++ b/osinfo/osinfo_oslist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_oslist.h b/osinfo/osinfo_oslist.h index a5ecd08..7a18950 100644 --- a/osinfo/osinfo_oslist.h +++ b/osinfo/osinfo_oslist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_platform.c b/osinfo/osinfo_platform.c index fdec4c6..222eb93 100644 --- a/osinfo/osinfo_platform.c +++ b/osinfo/osinfo_platform.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_platform.h b/osinfo/osinfo_platform.h index fc99bf9..8455a32 100644 --- a/osinfo/osinfo_platform.h +++ b/osinfo/osinfo_platform.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_platformlist.c b/osinfo/osinfo_platformlist.c index cdd7052..8322fc2 100644 --- a/osinfo/osinfo_platformlist.c +++ b/osinfo/osinfo_platformlist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_platformlist.h b/osinfo/osinfo_platformlist.h index b4009cc..c99f5c0 100644 --- a/osinfo/osinfo_platformlist.h +++ b/osinfo/osinfo_platformlist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_product.c b/osinfo/osinfo_product.c index 47edb9c..d4d9ec9 100644 --- a/osinfo/osinfo_product.c +++ b/osinfo/osinfo_product.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Bproductton, MA 02111-1307 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_product.h b/osinfo/osinfo_product.h index daf512a..b2beebd 100644 --- a/osinfo/osinfo_product.h +++ b/osinfo/osinfo_product.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Bproductton, MA 02111-1307 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_productfilter.c b/osinfo/osinfo_productfilter.c index 075ccc6..435a202 100644 --- a/osinfo/osinfo_productfilter.c +++ b/osinfo/osinfo_productfilter.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_productfilter.h b/osinfo/osinfo_productfilter.h index b2c541c..16fd65f 100644 --- a/osinfo/osinfo_productfilter.h +++ b/osinfo/osinfo_productfilter.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_productlist.c b/osinfo/osinfo_productlist.c index 5ebcc90..b166403 100644 --- a/osinfo/osinfo_productlist.c +++ b/osinfo/osinfo_productlist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_productlist.h b/osinfo/osinfo_productlist.h index a22c6f8..8439b7f 100644 --- a/osinfo/osinfo_productlist.h +++ b/osinfo/osinfo_productlist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_resources.c b/osinfo/osinfo_resources.c index 7dfb3d1..9f12055 100644 --- a/osinfo/osinfo_resources.c +++ b/osinfo/osinfo_resources.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_resources.h b/osinfo/osinfo_resources.h index 8e1878a..2429f5f 100644 --- a/osinfo/osinfo_resources.h +++ b/osinfo/osinfo_resources.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_resourceslist.c b/osinfo/osinfo_resourceslist.c index 407ccf9..057d4a4 100644 --- a/osinfo/osinfo_resourceslist.c +++ b/osinfo/osinfo_resourceslist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_resourceslist.h b/osinfo/osinfo_resourceslist.h index ad782b3..b304e8c 100644 --- a/osinfo/osinfo_resourceslist.h +++ b/osinfo/osinfo_resourceslist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c index 96db760..b4dad63 100644 --- a/osinfo/osinfo_tree.c +++ b/osinfo/osinfo_tree.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_tree.h b/osinfo/osinfo_tree.h index 516dec9..b0b42b6 100644 --- a/osinfo/osinfo_tree.h +++ b/osinfo/osinfo_tree.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali diff --git a/osinfo/osinfo_treelist.c b/osinfo/osinfo_treelist.c index d3508a2..45410df 100644 --- a/osinfo/osinfo_treelist.c +++ b/osinfo/osinfo_treelist.c @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Arjun Roy diff --git a/osinfo/osinfo_treelist.h b/osinfo/osinfo_treelist.h index ac161d3..3cf8bd4 100644 --- a/osinfo/osinfo_treelist.h +++ b/osinfo/osinfo_treelist.h @@ -14,8 +14,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see + * . * * Authors: * Zeeshan Ali -- 1.8.1.4 From mprivozn at redhat.com Mon Mar 11 13:29:22 2013 From: mprivozn at redhat.com (Michal Privoznik) Date: Mon, 11 Mar 2013 14:29:22 +0100 Subject: [Libosinfo] [libosinfo PATCHv2] Remove FSF address from source file headers In-Reply-To: <1363007736-7098-1-git-send-email-cfergeau@redhat.com> References: <1363007736-7098-1-git-send-email-cfergeau@redhat.com> Message-ID: <513DDC32.6060306@redhat.com> On 11.03.2013 14:15, Christophe Fergeau wrote: > The FSF moved a while ago which made the address we use in every > source file header invalid. Follow the recommendation from > http://www.gnu.org/licenses/gpl-howto.html and don't put any address > in these headers, just a link to the fsf website. > --- > osinfo/osinfo.h | 4 ++-- > osinfo/osinfo_datamap.c | 4 ++-- > osinfo/osinfo_datamap.h | 4 ++-- > osinfo/osinfo_datamaplist.c | 4 ++-- > osinfo/osinfo_datamaplist.h | 4 ++-- > osinfo/osinfo_db.c | 4 ++-- > osinfo/osinfo_db.h | 4 ++-- > osinfo/osinfo_deployment.c | 4 ++-- > osinfo/osinfo_deployment.h | 4 ++-- > osinfo/osinfo_deploymentlist.c | 4 ++-- > osinfo/osinfo_deploymentlist.h | 4 ++-- > osinfo/osinfo_device.c | 4 ++-- > osinfo/osinfo_device.h | 4 ++-- > osinfo/osinfo_device_driver.c | 4 ++-- > osinfo/osinfo_device_driver.h | 4 ++-- > osinfo/osinfo_device_driver_private.h | 4 ++-- > osinfo/osinfo_device_driverlist.c | 4 ++-- > osinfo/osinfo_device_driverlist.h | 4 ++-- > osinfo/osinfo_devicelink.c | 4 ++-- > osinfo/osinfo_devicelink.h | 4 ++-- > osinfo/osinfo_devicelinkfilter.c | 4 ++-- > osinfo/osinfo_devicelinkfilter.h | 4 ++-- > osinfo/osinfo_devicelinklist.c | 4 ++-- > osinfo/osinfo_devicelinklist.h | 4 ++-- > osinfo/osinfo_devicelist.c | 4 ++-- > osinfo/osinfo_devicelist.h | 4 ++-- > osinfo/osinfo_entity.c | 4 ++-- > osinfo/osinfo_entity.h | 4 ++-- > osinfo/osinfo_filter.c | 4 ++-- > osinfo/osinfo_filter.h | 4 ++-- > osinfo/osinfo_install_config.c | 4 ++-- > osinfo/osinfo_install_config.h | 4 ++-- > osinfo/osinfo_install_config_param.c | 4 ++-- > osinfo/osinfo_install_config_param.h | 4 ++-- > osinfo/osinfo_install_config_paramlist.c | 4 ++-- > osinfo/osinfo_install_config_paramlist.h | 4 ++-- > osinfo/osinfo_install_script.c | 4 ++-- > osinfo/osinfo_install_script.h | 4 ++-- > osinfo/osinfo_install_script_private.h | 4 ++-- > osinfo/osinfo_install_scriptlist.c | 4 ++-- > osinfo/osinfo_install_scriptlist.h | 4 ++-- > osinfo/osinfo_list.c | 4 ++-- > osinfo/osinfo_list.h | 4 ++-- > osinfo/osinfo_loader.c | 4 ++-- > osinfo/osinfo_loader.h | 4 ++-- > osinfo/osinfo_media.c | 4 ++-- > osinfo/osinfo_media.h | 4 ++-- > osinfo/osinfo_media_private.h | 4 ++-- > osinfo/osinfo_medialist.c | 4 ++-- > osinfo/osinfo_medialist.h | 4 ++-- > osinfo/osinfo_os.c | 4 ++-- > osinfo/osinfo_os.h | 4 ++-- > osinfo/osinfo_oslist.c | 4 ++-- > osinfo/osinfo_oslist.h | 4 ++-- > osinfo/osinfo_platform.c | 4 ++-- > osinfo/osinfo_platform.h | 4 ++-- > osinfo/osinfo_platformlist.c | 4 ++-- > osinfo/osinfo_platformlist.h | 4 ++-- > osinfo/osinfo_product.c | 4 ++-- > osinfo/osinfo_product.h | 4 ++-- > osinfo/osinfo_productfilter.c | 4 ++-- > osinfo/osinfo_productfilter.h | 4 ++-- > osinfo/osinfo_productlist.c | 4 ++-- > osinfo/osinfo_productlist.h | 4 ++-- > osinfo/osinfo_resources.c | 4 ++-- > osinfo/osinfo_resources.h | 4 ++-- > osinfo/osinfo_resourceslist.c | 4 ++-- > osinfo/osinfo_resourceslist.h | 4 ++-- > osinfo/osinfo_tree.c | 4 ++-- > osinfo/osinfo_tree.h | 4 ++-- > osinfo/osinfo_treelist.c | 4 ++-- > osinfo/osinfo_treelist.h | 4 ++-- > 72 files changed, 144 insertions(+), 144 deletions(-) > ACK Michal From cfergeau at redhat.com Tue Mar 12 16:16:12 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Tue, 12 Mar 2013 17:16:12 +0100 Subject: [Libosinfo] [libosinfo] Don't ignore vendor/device name in pci/usb id parser Message-ID: <1363104972-21569-1-git-send-email-cfergeau@redhat.com> These values were parsed but ignored using ignore_value(), leading to very incomplete data when the data from pci.ids/usb.ids is used. As generally this data is complemented by nodes in libosinfo database, and as this data takes precedence over the pci.ids/usb.ids data, this is not visible without removing the additional data. --- osinfo/osinfo_loader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index b6d8401..7ed86f9 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -1622,7 +1622,6 @@ osinfo_loader_process_file_reg_ids(OsinfoLoader *loader, WANT_ID(device_id); WANT_REST(device); SAVE_BUF(device_buf); - ignore_value(device); gchar *id = g_strdup_printf("%s/%s/%s", baseURI, vendor_id, device_id); @@ -1632,9 +1631,15 @@ osinfo_loader_process_file_reg_ids(OsinfoLoader *loader, OSINFO_DEVICE_PROP_VENDOR_ID, vendor_id); osinfo_entity_set_param(OSINFO_ENTITY(dev), + OSINFO_DEVICE_PROP_VENDOR, + vendor); + osinfo_entity_set_param(OSINFO_ENTITY(dev), OSINFO_DEVICE_PROP_PRODUCT_ID, device_id); osinfo_entity_set_param(OSINFO_ENTITY(dev), + OSINFO_DEVICE_PROP_PRODUCT, + device); + osinfo_entity_set_param(OSINFO_ENTITY(dev), OSINFO_DEVICE_PROP_BUS_TYPE, busType); g_free(id); @@ -1644,7 +1649,6 @@ osinfo_loader_process_file_reg_ids(OsinfoLoader *loader, WANT_ID(vendor_id); WANT_REST(vendor); SAVE_BUF(vendor_buf); - ignore_value(vendor); } done: -- 1.8.1.4 From zeeshanak at gnome.org Tue Mar 12 21:04:06 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Tue, 12 Mar 2013 23:04:06 +0200 Subject: [Libosinfo] [libosinfo] Don't ignore vendor/device name in pci/usb id parser In-Reply-To: <1363104972-21569-1-git-send-email-cfergeau@redhat.com> References: <1363104972-21569-1-git-send-email-cfergeau@redhat.com> Message-ID: On Tue, Mar 12, 2013 at 6:16 PM, Christophe Fergeau wrote: > These values were parsed but ignored using ignore_value(), leading > to very incomplete data when the data from pci.ids/usb.ids is used. > As generally this data is complemented by nodes in > libosinfo database, and as this data takes precedence over > the pci.ids/usb.ids data, this is not visible without removing > the additional data. Are you using 'this data' to refer to different data in the same sentence or am I getting confused for no reason? -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From cfergeau at redhat.com Tue Mar 12 21:17:07 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Tue, 12 Mar 2013 22:17:07 +0100 Subject: [Libosinfo] [libosinfo] Don't ignore vendor/device name in pci/usb id parser In-Reply-To: References: <1363104972-21569-1-git-send-email-cfergeau@redhat.com> Message-ID: <20130312211707.GA30387@teriyaki.cdg.redhat.com> On Tue, Mar 12, 2013 at 11:04:06PM +0200, Zeeshan Ali (Khattak) wrote: > On Tue, Mar 12, 2013 at 6:16 PM, Christophe Fergeau wrote: > > These values were parsed but ignored using ignore_value(), leading > > to very incomplete data when the data from pci.ids/usb.ids is used. > > As generally this data is complemented by nodes in > > libosinfo database, and as this data takes precedence over > > the pci.ids/usb.ids data, this is not visible without removing > > the additional data. > > Are you using 'this data' to refer to different data in the same > sentence or am I getting confused for no reason? Yup, my bad, I'll have to remove some uses of data ;) These values were parsed but ignored using ignore_value(), leading to very incomplete device information when using pci.ids/usb.ids. As generally this data comes from nodes in libosinfo database, which takes precedence over the pci.ids/usb.ids data, this is not visible without removing the additional data from the osinfo database. Is the log better phrased this way or does this need more improvement? Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From zeeshanak at gnome.org Wed Mar 13 00:42:43 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Wed, 13 Mar 2013 02:42:43 +0200 Subject: [Libosinfo] [libosinfo] Don't ignore vendor/device name in pci/usb id parser In-Reply-To: <20130312211707.GA30387@teriyaki.cdg.redhat.com> References: <1363104972-21569-1-git-send-email-cfergeau@redhat.com> <20130312211707.GA30387@teriyaki.cdg.redhat.com> Message-ID: On Tue, Mar 12, 2013 at 11:17 PM, Christophe Fergeau wrote: > On Tue, Mar 12, 2013 at 11:04:06PM +0200, Zeeshan Ali (Khattak) wrote: >> On Tue, Mar 12, 2013 at 6:16 PM, Christophe Fergeau wrote: >> > These values were parsed but ignored using ignore_value(), leading >> > to very incomplete data when the data from pci.ids/usb.ids is used. >> > As generally this data is complemented by nodes in >> > libosinfo database, and as this data takes precedence over >> > the pci.ids/usb.ids data, this is not visible without removing >> > the additional data. >> >> Are you using 'this data' to refer to different data in the same >> sentence or am I getting confused for no reason? > > Yup, my bad, I'll have to remove some uses of data ;) > > These values were parsed but ignored using ignore_value(), leading > to very incomplete device information when using pci.ids/usb.ids. > As generally this data comes from nodes in > libosinfo database, which takes precedence over > the pci.ids/usb.ids data, this is not visible without removing > the additional data from the osinfo database. > > Is the log better phrased this way or does this need more improvement? So if I understand correctly, you are saying that data from pci.ids/usb.ids get over written by data from database in general but sometimes the same data is not provided by db and in those cases this data gets used? If that is the case, I think the log is still a bit ambiguous as the last part/sentence is not referring to any problem but it sounds like it is. > Christophe -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From cfergeau at redhat.com Wed Mar 13 08:53:57 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Wed, 13 Mar 2013 09:53:57 +0100 Subject: [Libosinfo] [libosinfo] Don't ignore vendor/device name in pci/usb id parser In-Reply-To: References: <1363104972-21569-1-git-send-email-cfergeau@redhat.com> <20130312211707.GA30387@teriyaki.cdg.redhat.com> Message-ID: <20130313085357.GD30387@teriyaki.cdg.redhat.com> On Wed, Mar 13, 2013 at 02:42:43AM +0200, Zeeshan Ali (Khattak) wrote: > On Tue, Mar 12, 2013 at 11:17 PM, Christophe Fergeau > wrote: > > On Tue, Mar 12, 2013 at 11:04:06PM +0200, Zeeshan Ali (Khattak) wrote: > >> On Tue, Mar 12, 2013 at 6:16 PM, Christophe Fergeau wrote: > >> > These values were parsed but ignored using ignore_value(), leading > >> > to very incomplete data when the data from pci.ids/usb.ids is used. > >> > As generally this data is complemented by nodes in > >> > libosinfo database, and as this data takes precedence over > >> > the pci.ids/usb.ids data, this is not visible without removing > >> > the additional data. > >> > >> Are you using 'this data' to refer to different data in the same > >> sentence or am I getting confused for no reason? > > > > Yup, my bad, I'll have to remove some uses of data ;) > > > > These values were parsed but ignored using ignore_value(), leading > > to very incomplete device information when using pci.ids/usb.ids. > > As generally this data comes from nodes in > > libosinfo database, which takes precedence over > > the pci.ids/usb.ids data, this is not visible without removing > > the additional data from the osinfo database. > > > > Is the log better phrased this way or does this need more improvement? > > So if I understand correctly, you are saying that data from > pci.ids/usb.ids get over written by data from database in general but > sometimes the same data is not provided by db and in those cases this > data gets used? Yes, that's it. > If that is the case, I think the log is still a bit > ambiguous as the last part/sentence is not referring to any problem > but it sounds like it is. 'This bug is not visible without removing the additional data from the osinfo database' Does this make the last part better with the word 'bug' added? Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From zeeshanak at gnome.org Wed Mar 13 13:03:30 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Wed, 13 Mar 2013 15:03:30 +0200 Subject: [Libosinfo] [libosinfo] Don't ignore vendor/device name in pci/usb id parser In-Reply-To: <20130313085357.GD30387@teriyaki.cdg.redhat.com> References: <1363104972-21569-1-git-send-email-cfergeau@redhat.com> <20130312211707.GA30387@teriyaki.cdg.redhat.com> <20130313085357.GD30387@teriyaki.cdg.redhat.com> Message-ID: On Wed, Mar 13, 2013 at 10:53 AM, Christophe Fergeau wrote: > On Wed, Mar 13, 2013 at 02:42:43AM +0200, Zeeshan Ali (Khattak) wrote: >> On Tue, Mar 12, 2013 at 11:17 PM, Christophe Fergeau >> wrote: >> > On Tue, Mar 12, 2013 at 11:04:06PM +0200, Zeeshan Ali (Khattak) wrote: >> >> On Tue, Mar 12, 2013 at 6:16 PM, Christophe Fergeau wrote: >> >> > These values were parsed but ignored using ignore_value(), leading >> >> > to very incomplete data when the data from pci.ids/usb.ids is used. >> >> > As generally this data is complemented by nodes in >> >> > libosinfo database, and as this data takes precedence over >> >> > the pci.ids/usb.ids data, this is not visible without removing >> >> > the additional data. >> >> >> >> Are you using 'this data' to refer to different data in the same >> >> sentence or am I getting confused for no reason? >> > >> > Yup, my bad, I'll have to remove some uses of data ;) >> > >> > These values were parsed but ignored using ignore_value(), leading >> > to very incomplete device information when using pci.ids/usb.ids. >> > As generally this data comes from nodes in >> > libosinfo database, which takes precedence over >> > the pci.ids/usb.ids data, this is not visible without removing >> > the additional data from the osinfo database. >> > >> > Is the log better phrased this way or does this need more improvement? >> >> So if I understand correctly, you are saying that data from >> pci.ids/usb.ids get over written by data from database in general but >> sometimes the same data is not provided by db and in those cases this >> data gets used? > > Yes, that's it. > >> If that is the case, I think the log is still a bit >> ambiguous as the last part/sentence is not referring to any problem >> but it sounds like it is. > > > 'This bug is not visible without removing the additional data from > the osinfo database' > > Does this make the last part better with the word 'bug' added? Yeah. ACK with that changed. -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From zeeshanak at gnome.org Thu Mar 14 02:16:56 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Thu, 14 Mar 2013 04:16:56 +0200 Subject: [Libosinfo] Really enable QXL Message-ID: <1363227419-1987-1-git-send-email-zeeshanak@gnome.org> These patches are required to actually enable QXL in Windows XP and 7. They have already been through many iterations and I kinda lost track of versions so sending them as new patches. Hope thats acceptable. Please find more details about each patch in it's commit log. Apps (e.g Boxes) will have to adapt to these changes if they want virtio/QXL drivers to be automatically installed on new VMs. Its not really a problem since one of the most essential driver, QXL was not working anyways. From zeeshanak at gnome.org Thu Mar 14 02:16:57 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Thu, 14 Mar 2013 04:16:57 +0200 Subject: [Libosinfo] [PATCH 1/3] API to query signed status of device drivers In-Reply-To: <1363227419-1987-1-git-send-email-zeeshanak@gnome.org> References: <1363227419-1987-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1363227419-1987-2-git-send-email-zeeshanak@gnome.org> From: "Zeeshan Ali (Khattak)" Some OS vendors recommend or require device drivers to be signed by them before these device drivers could be installed on their OS. An API to query signed status of the device driver will be useful for apps to be able to make a decision whether they want to use the driver or not. Later patches add API for querying signature requirements from a script and to possibly disable these checks. --- data/oses/windows.xml.in | 17 ++++++++--------- data/schemas/libosinfo.rng | 5 +++++ osinfo/libosinfo.syms | 6 ++++++ osinfo/osinfo_device_driver.c | 16 ++++++++++++++++ osinfo/osinfo_device_driver.h | 2 ++ osinfo/osinfo_loader.c | 8 ++++++++ 6 files changed, 45 insertions(+), 9 deletions(-) diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in index 069459e..26d4410 100644 --- a/data/oses/windows.xml.in +++ b/data/oses/windows.xml.in @@ -383,7 +383,7 @@ - + viostor.cat viostor.inf viostor.sys @@ -392,7 +392,7 @@ - + viostor.cat viostor.inf viostor.sys @@ -402,7 +402,7 @@ - + spice-guest-tools-0.52.exe spice-guest-tools-0.52.cmd redhat09.cer @@ -414,7 +414,7 @@ - + spice-guest-tools-0.52.exe spice-guest-tools-0.52.cmd redhat09.cer @@ -780,23 +780,22 @@ - + viostor.cat viostor.inf viostor.sys - + viostor.cat viostor.inf viostor.sys - - + spice-guest-tools-0.52.exe spice-guest-tools-0.52.cmd redhat09.cer @@ -808,7 +807,7 @@ - + spice-guest-tools-0.52.exe spice-guest-tools-0.52.cmd redhat09.cer diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng index bfa0ddb..e01f140 100644 --- a/data/schemas/libosinfo.rng +++ b/data/schemas/libosinfo.rng @@ -451,6 +451,11 @@ + + + + + diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms index 4615829..df2ba90 100644 --- a/osinfo/libosinfo.syms +++ b/osinfo/libosinfo.syms @@ -399,6 +399,12 @@ LIBOSINFO_0.2.3 { } LIBOSINFO_0.2.2; +LIBOSINFO_0.2.6 { + global: + osinfo_device_driver_get_signed; + osinfo_device_driver_set_signed; +} LIBOSINFO_0.2.3; + /* Symbols in next release... LIBOSINFO_0.0.2 { diff --git a/osinfo/osinfo_device_driver.c b/osinfo/osinfo_device_driver.c index 23731bf..c5aaaec 100644 --- a/osinfo/osinfo_device_driver.c +++ b/osinfo/osinfo_device_driver.c @@ -170,6 +170,22 @@ void osinfo_device_driver_add_device(OsinfoDeviceDriver *driver, OSINFO_ENTITY(device)); } +/** + * osinfo_device_driver_get_signed: + * @driver: an #OsinfoDeviceDriver instance + * + * Some OS vendors recommend or require device drivers to be signed by them + * before these device drivers could be installed on their OS. + * + * Returns: TRUE if @driver is signed, FALSE otherwise. + */ +gboolean osinfo_device_driver_get_signed(OsinfoDeviceDriver *driver) +{ + return osinfo_entity_get_param_value_boolean + (OSINFO_ENTITY(driver), + OSINFO_DEVICE_DRIVER_PROP_SIGNED); +} + /* * Local variables: * indent-tabs-mode: nil diff --git a/osinfo/osinfo_device_driver.h b/osinfo/osinfo_device_driver.h index c894fe8..7aa193e 100644 --- a/osinfo/osinfo_device_driver.h +++ b/osinfo/osinfo_device_driver.h @@ -55,6 +55,7 @@ typedef struct _OsinfoDeviceDriverPrivate OsinfoDeviceDriverPrivate; #define OSINFO_DEVICE_DRIVER_PROP_PRE_INSTALLABLE "pre-installable" #define OSINFO_DEVICE_DRIVER_PROP_FILE "file" #define OSINFO_DEVICE_DRIVER_PROP_DEVICE "device" +#define OSINFO_DEVICE_DRIVER_PROP_SIGNED "signed" /* object */ struct _OsinfoDeviceDriver @@ -83,6 +84,7 @@ const gchar *osinfo_device_driver_get_location(OsinfoDeviceDriver *driver); gboolean osinfo_device_driver_get_pre_installable(OsinfoDeviceDriver *driver); GList *osinfo_device_driver_get_files(OsinfoDeviceDriver *driver); OsinfoDeviceList *osinfo_device_driver_get_devices(OsinfoDeviceDriver *driver); +gboolean osinfo_device_driver_get_signed(OsinfoDeviceDriver *driver); #endif /* __OSINFO_DEVICE_DRIVER_H__ */ /* diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index 76e9bc2..bd32314 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -1017,6 +1017,7 @@ static OsinfoDeviceDriver *osinfo_loader_driver(OsinfoLoader *loader, xmlChar *arch = xmlGetProp(root, BAD_CAST OSINFO_DEVICE_DRIVER_PROP_ARCHITECTURE); xmlChar *location = xmlGetProp(root, BAD_CAST OSINFO_DEVICE_DRIVER_PROP_LOCATION); xmlChar *preinst = xmlGetProp(root, BAD_CAST OSINFO_DEVICE_DRIVER_PROP_PRE_INSTALLABLE); + xmlChar *is_signed = xmlGetProp(root, BAD_CAST OSINFO_DEVICE_DRIVER_PROP_SIGNED); OsinfoDeviceDriver *driver = osinfo_device_driver_new(id); @@ -1041,6 +1042,13 @@ static OsinfoDeviceDriver *osinfo_loader_driver(OsinfoLoader *loader, xmlFree(preinst); } + if (is_signed) { + osinfo_entity_set_param(OSINFO_ENTITY(driver), + OSINFO_DEVICE_DRIVER_PROP_SIGNED, + (gchar *)is_signed); + xmlFree(is_signed); + } + gint nnodes = osinfo_loader_nodeset("./*", ctxt, &nodes, err); if (error_is_set(err)) { g_object_unref(G_OBJECT(driver)); -- 1.8.1.4 From zeeshanak at gnome.org Thu Mar 14 02:16:58 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Thu, 14 Mar 2013 04:16:58 +0200 Subject: [Libosinfo] [PATCH 2/3] install-config, winxp, win7: API to enable/disable driver signing In-Reply-To: <1363227419-1987-1-git-send-email-zeeshanak@gnome.org> References: <1363227419-1987-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1363227419-1987-3-git-send-email-zeeshanak@gnome.org> From: "Zeeshan Ali (Khattak)" While I thought that I had solved the problem of Windows requiring signed device drivers and QXL driver being unsigned, I could't be more wrong: * The registry key magic I used for disabling driver signature checks on XP seems to be far from reliable. I tested it many many times but on a weird broken version of XP home edition that I can't seem to have access to anymore. I now tested against both home and professional editions both with and without this registry key magic and I observed the same result in both cases: Drivers do get installed but they remain unused by the OS after installation. The only reliable way of effectively disabling signture checks during installation is through the 'DriverSigningPolicy' option in .sif file, which means disabling signature checks permanently. * On Windows 7, disabling integrity checks and test signing after drivers' installation disables the already installed drivers too if they are not signed. * The reason I thought QXL was functional at first was that automatic resolution setting was working. Turns out that unlike on Linux, on windows automatic resolution setting only requires spice-vdagent where as QXL is only required for arbitrary resolutions. So to make QXL working out of the box, I'm afraid we don't have any choice but to disable driver signature checks permanently. Since signature checks is a security measure from vendors, we need to leave it to applications to decide whether they want to do this or not. --- data/install-scripts/windows-cmd.xml | 19 +++---------------- data/install-scripts/windows-sif.xml | 8 ++++++++ osinfo/libosinfo.syms | 3 +++ osinfo/osinfo_install_config.c | 25 +++++++++++++++++++++++++ osinfo/osinfo_install_config.h | 6 ++++++ 5 files changed, 45 insertions(+), 16 deletions(-) diff --git a/data/install-scripts/windows-cmd.xml b/data/install-scripts/windows-cmd.xml index e8ffc35..c45c543 100644 --- a/data/install-scripts/windows-cmd.xml +++ b/data/install-scripts/windows-cmd.xml @@ -14,6 +14,7 @@ + image/bmp @@ -71,27 +72,13 @@ REGEDIT /S :\windows.reg : - - -reg add "HKCU\Software\Policies\Microsoft\Windows NT\Driver Signing" /v BehaviorOnFailedVerify /t reg_dword /d 00000000 /f - - + bcdedit.exe -set loadoptions DDISABLE_INTEGRITY_CHECKS bcdedit.exe -set TESTSIGNING ON - - + for %%i in (":\*.cmd") do cmd /c %%i - - -reg add "HKCU\Software\Policies\Microsoft\Windows NT\Driver Signing" /v BehaviorOnFailedVerify /t reg_dword /d 00000001 /f - - -bcdedit.exe -set loadoptions EENABLE_INTEGRITY_CHECKS -bcdedit.exe -set TESTSIGNING OFF - - EXIT diff --git a/data/install-scripts/windows-sif.xml b/data/install-scripts/windows-sif.xml index 630df56..2bccc5d 100644 --- a/data/install-scripts/windows-sif.xml +++ b/data/install-scripts/windows-sif.xml @@ -10,6 +10,7 @@ +