[Ovirt-devel] work around "*** ERROR: No build ID note found in..." on rawhide

[Jim Meyering]

"Daniel P. Berrange" <berrange at redhat.com> wrote:
> On Mon, Sep 08, 2008 at 02:32:03PM +0200, Jim Meyering wrote:
>> --- a/ovirt-identify-node/Makefile
>> +++ b/Makefile.am
...
>> +include release.mk
>>
>> -clean:
>> -	rm -rf $(OBJECTS) $(TARGET)
>> -
>> -$(TARGET): $(OBJECTS)
>> -	$(CC) -o $@ $(OBJECTS) $(LFLAGS)
>> -
>> -.PHONY: all clean
>> +pkg_name = ovirt-node
>> +.PHONY: tar
>> +tar: dist
>> +	tar xf $(distdir).tar.gz
>> +	mkdir -p rpm-build/BUILDROOT
>> +	tar zcvf rpm-build/$(NV).tar.gz $(NV)
>> +	cp version rpm-build
>> +	chmod -R u+rwx $(NV)
>> +	rm -rf $(NV)
>
> Do we really need to preserve this custom target  when automake
> provides a perfectly good 'make dist'. It just seems to be taking
> the tar.gz, extracting it, and then re-creating it with files having
> a rpm-build/  prefix which is just wierd. RPMs should be built from
> the real tar.gz automake provides.

Not really, but since other things (see 5 other copies of included
release.mk) currently rely on that layout, this keeps my changes
small and relatively safe.

>> diff --git a/autogen.sh b/autogen.sh
>> --- /dev/null
>> +++ b/configure.ac
>> @@ -0,0 +1,13 @@
>> +# FIXME: version
>> +AC_INIT([ovirt-node], [0.1], [ovirt-devel at redhat.com])
>> +AM_INIT_AUTOMAKE([-Wall -Werror foreign])
>> +AC_PROG_CC
>> +AC_CONFIG_HEADERS([config.h])
>> +
>> +# for ovirt-identify-node
>> +PKG_CHECK_MODULES([DBUS], [dbus-1])
>> +PKG_CHECK_MODULES([HAL], [hal])
>> +PKG_CHECK_MODULES([VIRT], [libvirt])
>
> Should check for minimum required versions really - I'm sure there's
> a minimal libvirt you need. If you don't know what version of DBus
> or HAL is required, then pick one from F9 and we can tweak it later
>
> eg,
>
>   PKG_CHECK_MODULES([VIRT], [libvirt >= 0.4.4])

Thanks, but how about feature checks instead of version checks?
IME, they're less work in the long run, assuming you can come
up with a good witness to the desired feature.  I.e., if some
function was added for libvirt-0.4.4, a simple check for its
existence in libvirt.

I hesitated to use PKG_CHECK_MODULES, because of the grief
it's given me in other projects ;-), but in an attempt to keep
this change quick, small and simple I used it nonetheless.
Well, in keeping with KISS, I'll take your advice after all.

Here's the incremental change:

  F9 has hal-0.5.11-2 and dbus-1.2.1-1

diff --git a/configure.ac b/configure.ac
index c780142..443f4d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
-# FIXME: version
+# note: the version number here is overridden by the one in release.mk
 AC_INIT([ovirt-node], [0.1], [ovirt-devel at redhat.com])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
 AC_CONFIG_HEADERS([config.h])

 # for ovirt-identify-node
-PKG_CHECK_MODULES([DBUS], [dbus-1])
-PKG_CHECK_MODULES([HAL], [hal])
-PKG_CHECK_MODULES([VIRT], [libvirt])
+PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.1])
+PKG_CHECK_MODULES([HAL], [hal >= 0.5.11])
+PKG_CHECK_MODULES([VIRT], [libvirt >= 0.4.4])

 AC_CONFIG_FILES([Makefile ovirt-identify-node/Makefile])
 AC_OUTPUT