Fix more build dependency problems
For convenience you can pull it from the 'build' branch in: git://heisenbug.com/matthew/libguestfs.git Matt
This change ensure that making the appliance will always rebuild the daemon if required. --- subdir-rules.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/subdir-rules.mk b/subdir-rules.mk index fd8bfef..70ab8a2 100644 --- a/subdir-rules.mk +++ b/subdir-rules.mk @@ -27,3 +27,7 @@ $(top_builddir)/src/libguestfs.la: force $(generator_built): $(top_builddir)/src/stamp-generator $(top_builddir)/src/stamp-generator: force $(MAKE) -C $(top_builddir)/src stamp-generator + +# The daemon +$(top_builddir)/daemon/guestfsd: force + $(MAKE) -C $(top_builddir)/daemon -- 1.6.5.2
--- daemon/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 9fa8dda..7034bbf 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -28,7 +28,8 @@ generator_built = \ .PHONY: force -$(generator_built): force +$(generator_build): $(libsrcdir)/stamp-generator +$(libsrcdir)/stamp-generator: force $(MAKE) -C $(libsrcdir) stamp-generator BUILT_SOURCES = $(generator_built) -- 1.6.5.2
Previously, only the update.sh rule checked the daemon had been built. update.sh is called directly from within make.sh, so in that path the dependency was never checked. This adds the daemon dependency explicitly to the rebuild-from-scratch path. --- appliance/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/appliance/Makefile.am b/appliance/Makefile.am index bf1183d..abb5086 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -59,7 +59,7 @@ endif # This is for building the normal appliance: $(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log -$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist +$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist $(top_builddir)/daemon/guestfsd mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak 2>/dev/null; : mv $(VMLINUZ) $(VMLINUZ).bak 2>/dev/null; : if ! bash make.sh; then rm -f $@; exit 1; fi -- 1.6.5.2
make all in the perl directory was missing a check that the library had been built. make check in the perl directory was missing a check that the appliance and test images had been built. --- perl/Makefile.am | 13 ++++++++++++- subdir-rules.mk | 5 +++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/perl/Makefile.am b/perl/Makefile.am index b766244..c192290 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -39,15 +39,26 @@ if HAVE_PERL # Interfacing automake and ExtUtils::MakeMaker known to be # a nightmare, news at 11. +# src/ dependencies +.PHONY: src_deps +src_deps: $(top_builddir)/src/libguestfs.la $(generator_built) + +# Images used by tests +.PHONY: test_images +test_images: + $(MAKE) -C $(top_builddir)/images + TESTS = run-bindtests run-perl-tests +$(TESTS): src_deps all appliance test_images + TESTS_ENVIRONMENT = \ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ LIBGUESTFS_PATH=$(top_builddir)/appliance INSTALLDIRS = site -all: Makefile-pl $(generator_built) +all: Makefile-pl src_deps $(MAKE) -f Makefile-pl Makefile-pl: Makefile.PL diff --git a/subdir-rules.mk b/subdir-rules.mk index 70ab8a2..b73fc9d 100644 --- a/subdir-rules.mk +++ b/subdir-rules.mk @@ -31,3 +31,8 @@ $(top_builddir)/src/stamp-generator: force # The daemon $(top_builddir)/daemon/guestfsd: force $(MAKE) -C $(top_builddir)/daemon + +# A symbolic rule to regenerate the appliance +.PHONY: appliance +appliance: force + $(MAKE) -C $(top_builddir)/appliance -- 1.6.5.2
On Fri, Nov 20, 2009 at 06:52:44PM +0000, Matthew Booth wrote:
For convenience you can pull it from the 'build' branch in: git://heisenbug.com/matthew/libguestfs.git
ACK to all four patches. Unfortunately I couldn't work out how to pull them from your repo above. Did you really push them there? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top
participants (2)
-
Matthew Booth -
Richard W.M. Jones