X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2FMakefile.am;h=e1c9ef67baf440d230e0188ebaef041e1bd5ffd2;hp=066becbbef37f32a19ef71d17516fc00eb7ac495;hb=a554c62b709491401c9d3db744c21f6e543e11ba;hpb=a011c5f3263601cd8555e50a4dfa03e27fdb7361

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 066becb..e1c9ef6 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -15,37 +15,111 @@
 # 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-initramfs.sh update-initramfs.sh
+	kmod.whitelist.in \
+	packagelist.in \
+	init \
+	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
 # $(libdir) is best.  When we build cross-architecture filesystems we
 # should probably move them to $(datadir).
-
 fsdir = $(libdir)/guestfs
-
+superminfsdir = $(libdir)/guestfs/supermin.d
+
+# These are the resulting output files from the whole process:
+#   VMLINUZ        kernel for the full appliance
+#   INITRAMFSIMG   initramfs (ie. root fs) for the full appliance
+# For details of the supermin appliance, read the README file.
+fs_DATA = $(INITRAMFSIMG) $(VMLINUZ)
+if SUPERMIN
+fs_DATA += kmod.whitelist
+superminfs_DATA = \
+	supermin.d/base.img \
+	supermin.d/daemon.img \
+	supermin.d/hostfiles
+endif
+
+# Don't change these names - they must be the same as in '*.sh' scripts.
 INITRAMFSIMG = initramfs.$(REPO).$(host_cpu).img
 VMLINUZ = vmlinuz.$(REPO).$(host_cpu)
 
-fs_DATA =  $(INITRAMFSIMG) $(VMLINUZ)
-
+# This is for building the normal appliance:
 $(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log
 
-$(top_builddir)/initramfs/fakeroot.log: make-initramfs.sh.in
-	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
-	-mv $(VMLINUZ) $(VMLINUZ).bak
-	if ! bash make-initramfs.sh; then rm -f $@; exit 1; fi
-
-$(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd
+$(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
+
+# 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-initramfs.sh
+	bash update.sh
+	touch $@
+
+kmod.whitelist: kmod.whitelist.in
+	grep -v '^[[:space:]]*$$' < $< | grep -v '^#' > $@
+
+packagelist: packagelist.in
+	cpp -undef -D$(DIST)=1 < $< | \
+	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@
+
+# This is for building the supermin appliance.  It has to be enabled
+# specifically with './configure --enable-supermin'.  You really need
+# to read the README file.
+
+if SUPERMIN
+
+supermin.d/base.img supermin.d/hostfiles: stamp-supermin
+stamp-supermin: $(INITRAMFSIMG)
+	mkdir -p supermin.d
+	rm -f $@ supermin.d/base.img supermin.d/hostfiles
+	febootstrap-to-supermin $(top_builddir)/initramfs supermin.d/base.img supermin.d/hostfiles
 	touch $@
 
-make-initramfs.sh: make-initramfs.sh.in
-	cd .. && ./config.status appliance/$@
+supermin.d/daemon.img: $(INITRAMFSIMG)
+	mkdir -p supermin.d
+	rm -f $@ $@-t
+	(cd $(top_builddir)/initramfs && \
+	  echo -e "sbin\nsbin/guestfsd" | cpio --quiet -o -H newc ) > $@-t
+	mv $@-t $@
+endif
+
+# Extra symlinks needed by the Debian appliance.
+debirf_symlinks = \
+	a0_prep-root \
+	install-kernel \
+	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.
 
-# Test-boot the image.
+# Test-boot the appliance.
 
 test-boot: emptydisk
 	qemu-system-$(host_cpu) \
@@ -66,7 +140,7 @@ test-boot-realistic: emptydisk
 	  -m 384 \
 	  -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
 	  -hda emptydisk \
-	  -append "console=ttyS0 guestfs=10.0.2.4:6666" \
+	  -append "console=ttyS0 guestfs=10.0.2.4:6666 guestfs_rescue=1" \
 	  -nographic \
 	  -serial stdio \
 	  -net channel,6666:unix:/tmp/sock,server,nowait \
@@ -75,8 +149,8 @@ test-boot-realistic: emptydisk
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA)
+CLEANFILES = packagelist kmod.whitelist
 
 clean-local:
+	rm -f supermin.d/*
 	rm -rf $(top_builddir)/initramfs
-