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

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 0002663..503160e 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -15,68 +15,68 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-EXTRA_DIST = \
-	make-initramfs.sh update-initramfs.sh
+include $(top_srcdir)/subdir-rules.mk
 
-# 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).
+EXTRA_DIST = \
+	packagelist.in \
+	excludelist.in \
+	init \
+	make.sh.in
 
 fsdir = $(libdir)/guestfs
-
-INITRAMFSIMG = initramfs.$(REPO).$(host_cpu).img
-VMLINUZ = vmlinuz.$(REPO).$(host_cpu)
-
-fs_DATA =  $(INITRAMFSIMG) $(VMLINUZ)
-
-$(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
-	rm -f $@
-	bash update-initramfs.sh
+superminfsdir = $(libdir)/guestfs/supermin.d
+
+fs_DATA =
+superminfs_DATA = \
+	supermin.d/base.img \
+	supermin.d/daemon.img \
+	supermin.d/init.img \
+	supermin.d/hostfiles
+
+# 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 $@
+
+packagelist: packagelist.in
+	cpp -undef -D$(DISTRO)=1 < $< | \
+	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
+	mv $@-t $@
+
+excludelist: excludelist.in
+	cpp -undef -D$(DISTRO)=1 < $< | \
+	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
+	mv $@-t $@
+
+supermin.d/base.img supermin.d/hostfiles: stamp-supermin
+stamp-supermin: make.sh packagelist excludelist
+	mkdir -p supermin.d
+	rm -f $@ supermin.d/base.img supermin.d/hostfiles
+	./make.sh
 	touch $@
 
-make-initramfs.sh: make-initramfs.sh.in
-	./config.status $@
-
-# Test-boot the image.
-
-test-boot: emptydisk
-	qemu-system-$(host_cpu) \
-	  -m 384 \
-	  -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
-	  -hda emptydisk
-
-emptydisk:
-	rm -f emptydisk
-	dd if=/dev/zero of=emptydisk bs=1024 count=1440
-	echo 0, | sfdisk -q -C 80 -H 2 -S 18 emptydisk > /dev/null
-
-# This is a more realistic test boot command line which better
-# reflects what the library does.
-
-test-boot-realistic: emptydisk
-	qemu-system-$(host_cpu) \
-	  -m 384 \
-	  -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
-	  -hda emptydisk \
-	  -append "console=ttyS0 guestfs=10.0.2.4:6666" \
-	  -nographic \
-	  -serial stdio \
-	  -net channel,6666:unix:/tmp/sock,server,nowait \
-	  -net user,vlan=0 \
-	  -net nic,model=virtio,vlan=0
+supermin.d/daemon.img: ../daemon/guestfsd
+	mkdir -p supermin.d
+	rm -f $@ $@-t
+	mkdir sbin
+	cd sbin && ln ../../daemon/guestfsd
+	echo -e "sbin\nsbin/guestfsd" | cpio --quiet -o -H newc > $@-t
+	rm -r sbin
+	mv $@-t $@
+
+supermin.d/init.img: init
+	mkdir -p supermin.d
+	rm -f $@ $@-t
+	echo "init" | cpio --quiet -o -H newc > $@-t
+	mv $@-t $@
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA)
+CLEANFILES = packagelist excludelist
 
 clean-local:
-	rm -rf $(top_builddir)/initramfs
-
+	rm -rf supermin.d