X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2FMakefile.am;h=abb508643710e0fa7066daee243b792cc6e45aaf;hp=c06d7ae9593ccc4dc4fc0f8e85b43690cd63d061;hb=1b60344e672e4fc233d7fe6b8ecfcda46a40f4d5;hpb=53f5ea28ffe26c112e51ebdef6d46c25919ced4f

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index c06d7ae..abb5086 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -15,13 +15,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
-	make.sh update.sh supermin-split.sh supermin-make.sh \
 	libguestfs-supermin-helper \
-	kmod.whitelist \
 	kmod.whitelist.in \
 	packagelist.in \
-	init
+	init \
+	debian/modules/install_kernel \
+	debian/modules/y0_install-guestfsd \
+	debian/modules/z99_final-cleanups \
+	debian/debirf.conf.in \
+	make.sh.in
 
 # Build the root filesystem (appliance).
 # Currently this is arch-dependent, so it seems like putting it in
@@ -54,12 +59,21 @@ 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 init
-	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
-	-mv $(VMLINUZ) $(VMLINUZ).bak
+$(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
 
-$(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd update.sh
+# This used to be a configure-generated file (as is update.sh still).
+# However config.status always touches the destination file, which
+# means the appliance got rebuilt too often.
+make.sh: make.sh.in
+	cd $(top_builddir) && \
+	  ./config.status --file=appliance/$@-t:appliance/$<
+	chmod +x $@-t
+	mv $@-t $@
+
+$(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd init update.sh
 	rm -f $@
 	bash update.sh
 	touch $@
@@ -68,7 +82,7 @@ kmod.whitelist: kmod.whitelist.in
 	grep -v '^[[:space:]]*$$' < $< | grep -v '^#' > $@
 
 packagelist: packagelist.in
-	cpp -undef -DREDHAT=1 < $< | \
+	cpp -undef -D$(DIST)=1 < $< | \
 	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@
 
 # This is for building the supermin appliance.  It has to be enabled
@@ -92,6 +106,21 @@ $(SUPERMINIMG): supermin.incfiles supermin-make.sh
 
 endif
 
+# Extra symlinks needed by the Debian appliance.
+debirf_symlinks = \
+	a0_prep-root \
+	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.
 
@@ -125,8 +154,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
-