X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2FMakefile.am;h=d1338bf5c212746817a2b3c500ceaffc5766fbc0;hp=9de11cde2e1a6b45f062f45d2eb2ad5ec6e5c100;hb=0c463dd0aa962c405b1be32c925acf9891c96bfc;hpb=a67c46b4b2ff5a2c4305e39d1bb105b658ca5f89 diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 9de11cd..d1338bf 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -16,9 +16,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. EXTRA_DIST = \ - make.sh update.sh supermin-split.sh supermin-make.sh \ libguestfs-supermin-helper \ - kmod.whitelist \ kmod.whitelist.in \ packagelist.in \ init \ @@ -59,8 +57,8 @@ endif $(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist - -mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak - -mv $(VMLINUZ) $(VMLINUZ).bak + mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak 2>/dev/null; : + mv $(VMLINUZ) $(VMLINUZ).bak 2>/dev/null; : if ! bash make.sh; then rm -f $@; exit 1; fi $(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd init update.sh @@ -98,20 +96,18 @@ endif # Extra symlinks needed by the Debian appliance. debirf_symlinks = \ - a0_motd \ a0_prep-root \ - network \ - root-bashrc \ - serial-terminal \ z0_remove-aptitude \ z0_remove-locales \ z1_clean-root noinst_DATA = $(debirf_symlinks:%=debian/modules/%) $(debirf_symlinks:%=debian/modules/%): stamp-debirf-modules stamp-debirf-modules: + mkdir -p debian/modules for f in $(debirf_symlinks); do \ ln -sf /usr/share/debirf/modules/$$f debian/modules/$$f; \ done + touch $@ #---------------------------------------------------------------------- # Extra rules for testing the appliance. @@ -146,8 +142,7 @@ test-boot-realistic: emptydisk # Make clean. -CLEANFILES = $(APPLIANCE_FILES) +CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist supermin.incfiles clean-local: rm -rf $(top_builddir)/initramfs -