[Libguestfs] [PATCH] Fix appliance build dependency problem

The appliance was being completely rebuilt every time guestfsd was updated. This was because make.sh depended on guestfsd, which it had to do because it called update.sh to install guestfsd. This fix removes the call to update.sh in make.sh, and therefore the dependency on guestfsd. The Makefile already includes a rule to run update.sh when guestfsd is updated, so this was unnecessary. --- appliance/Makefile.am | 2 +- appliance/make.sh.in | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/appliance/Makefile.am b/appliance/Makefile.am index bbf3c24..172f0cf 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -53,7 +53,7 @@ VMLINUZ = vmlinuz.$(REPO).$(host_cpu) # 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)/daemon/guestfsd +$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak 2>/dev/null; : mv $(VMLINUZ) $(VMLINUZ).bak 2>/dev/null; : if ! bash make.sh; then rm -f $@; exit 1; fi diff --git a/appliance/make.sh.in b/appliance/make.sh.in index 9150f55..ccaa757 100755 --- a/appliance/make.sh.in +++ b/appliance/make.sh.in @@ -168,10 +168,6 @@ __EOF__ ls -lh $koutput - # Now directly run the update script to copy/update the daemon in the - # initramfs. - cd appliance && bash update.sh - elif [ "@DIST@" = "DEBIAN" ]; then cd @top_builddir@/appliance debirf make -n debian -- 1.7.2.3