[libvirt] [PATCH] Fix rpm build failures
The 'make check' was rebuilding the binaries just overrided, so for more safety also override the C program Also daemon-conf isn't built anymore so remove it from the list Pushed under the build breaker rule Daniel diff --git a/libvirt.spec.in b/libvirt.spec.in index c642f80..2d86e3c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1323,11 +1323,13 @@ rm -fr %{buildroot} %check cd tests -# These 3 tests don't current work in a mock build root -for i in nodeinfotest daemon-conf seclabeltest +make +# These tests don't current work in a mock build root +for i in nodeinfotest seclabeltest do rm -f $i - printf "#!/bin/sh\nexit 0\n" > $i + printf 'int main(void) { return(0); }' > $i.c + printf '#!/bin/sh\nexit 0\n' > $i chmod +x $i done make check -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
On 08/01/2012 02:17 AM, Daniel Veillard wrote:
The 'make check' was rebuilding the binaries just overrided, so for more safety also override the C program Also daemon-conf isn't built anymore so remove it from the list
Pushed under the build breaker rule
Daniel
diff --git a/libvirt.spec.in b/libvirt.spec.in index c642f80..2d86e3c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1323,11 +1323,13 @@ rm -fr %{buildroot}
%check cd tests -# These 3 tests don't current work in a mock build root -for i in nodeinfotest daemon-conf seclabeltest +make +# These tests don't current work in a mock build root +for i in nodeinfotest seclabeltest
I recently fixed nodeinfotest so it wouldn't read host files. Is it still broken under a mock build, or did commit 2b366b4 fix the need for this hack? Also, what is the failure with seclabeltest? It has also had recent fixes (commit a22a36e), although I'm not sure that they would be of the nature to fix a host-dependency. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Wed, Aug 01, 2012 at 06:45:29AM -0600, Eric Blake wrote:
On 08/01/2012 02:17 AM, Daniel Veillard wrote:
The 'make check' was rebuilding the binaries just overrided, so for more safety also override the C program Also daemon-conf isn't built anymore so remove it from the list
Pushed under the build breaker rule
Daniel
diff --git a/libvirt.spec.in b/libvirt.spec.in index c642f80..2d86e3c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1323,11 +1323,13 @@ rm -fr %{buildroot}
%check cd tests -# These 3 tests don't current work in a mock build root -for i in nodeinfotest daemon-conf seclabeltest +make +# These tests don't current work in a mock build root +for i in nodeinfotest seclabeltest
I recently fixed nodeinfotest so it wouldn't read host files. Is it still broken under a mock build, or did commit 2b366b4 fix the need for this hack?
Also, what is the failure with seclabeltest? It has also had recent fixes (commit a22a36e), although I'm not sure that they would be of the nature to fix a host-dependency.
Honnestly I didn't tried, I removed daemon-conf as a cleanup since it didn't exist anymore. The two others were actually removed from that list in the RHEL builds, so I'm inclined to revisit that part. What I actually used that patch for was to work around the moduletest error you reported and isn't fixed yet: https://www.redhat.com/archives/libvir-list/2012-July/msg01762.html Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
participants (2)
-
Daniel Veillard -
Eric Blake