X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2FMakefile.am;h=6c8a972e2ff79edb7d254bd8caf040b803f31786;hp=0002663cee8a50e3deb2816b91c326d2c7cb2208;hb=f8f10578093e926f5f36289a6c11615d067fbcad;hpb=a1e8cdf2a254c5eddaf525cd7c34e4c937690204

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 0002663..6c8a972 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -16,36 +16,103 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 EXTRA_DIST = \
-	make-initramfs.sh update-initramfs.sh
+	libguestfs-supermin-helper \
+	kmod.whitelist.in \
+	packagelist.in \
+	init \
+	debian/modules/install_kernel \
+	debian/modules/y0_install-guestfsd \
+	debian/modules/z99_final-cleanups \
+	debian/debirf.conf.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
-
+fs_DATA = $(APPLIANCE_FILES)
+
+# 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:
+#   SUPERMINIMG    initramfs (ie. partial root fs) for the supermin appliance
+#   SUPERMINFILES  list of missing files (the ones we will pull out of the
+#                    host filesystem at runtime) in the supermin appliance
+APPLIANCE_FILES = $(INITRAMFSIMG) $(VMLINUZ)
+if SUPERMIN
+APPLIANCE_FILES += $(SUPERMINIMG) $(SUPERMINFILES) kmod.whitelist
+bin_SCRIPTS = libguestfs-supermin-helper
+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)
+if SUPERMIN
+SUPERMINIMG = initramfs.$(REPO).$(host_cpu).supermin.img
+SUPERMINFILES = initramfs.$(REPO).$(host_cpu).supermin.hostfiles
+endif
 
-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
+$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist
 	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
 	-mv $(VMLINUZ) $(VMLINUZ).bak
-	if ! bash make-initramfs.sh; then rm -f $@; exit 1; fi
+	if ! bash make.sh; then rm -f $@; exit 1; fi
+
+$(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd init update.sh
+	rm -f $@
+	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
+
+# First we need to decide which files go in and out of the supermin
+# appliance.  This decision is made by 'supermin-split.sh'.
+$(SUPERMINFILES): supermin.incfiles
+supermin.incfiles: $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd supermin-split.sh
+	rm -f supermin.incfiles $(SUPERMINFILES)
+	bash supermin-split.sh
 
-$(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd
+# Second we need to create a supermin appliance with just the included
+# files (leaving out the host files, which we'll add back at runtime).
+$(SUPERMINIMG): supermin.incfiles supermin-make.sh
 	rm -f $@
-	bash update-initramfs.sh
+	bash 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 $@
 
-make-initramfs.sh: make-initramfs.sh.in
-	./config.status $@
+#----------------------------------------------------------------------
+# Extra rules for testing the appliance.
 
-# Test-boot the image.
+# Test-boot the appliance.
 
 test-boot: emptydisk
 	qemu-system-$(host_cpu) \
@@ -66,7 +133,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,7 +142,7 @@ test-boot-realistic: emptydisk
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA)
+CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist supermin.incfiles
 
 clean-local:
 	rm -rf $(top_builddir)/initramfs