diff options
| author | Matthew Booth <mbooth@redhat.com> | 2010-09-21 10:50:41 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2010-09-21 10:56:47 +0100 |
| commit | d1c2287fe4636db9a54888e71fb150984f00b0e4 (patch) | |
| tree | 13aafc2f50020346db6a6ac4ef7d6315f5253ef0 | |
| parent | ff4ae8633e0ca7c1e679870600830ee4d9f1cd71 (diff) | |
| download | libguestfs-d1c2287fe4636db9a54888e71fb150984f00b0e4.tar.gz libguestfs-d1c2287fe4636db9a54888e71fb150984f00b0e4.tar.xz libguestfs-d1c2287fe4636db9a54888e71fb150984f00b0e4.zip | |
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.
| -rw-r--r-- | appliance/Makefile.am | 2 | ||||
| -rwxr-xr-x | appliance/make.sh.in | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/appliance/Makefile.am b/appliance/Makefile.am index bbf3c243..172f0cf7 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 9150f55b..ccaa7570 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 |