X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2FMakefile.am;h=bec2b4896f2be98bf4643ef744af289325734009;hp=1fb7699bdfd54222c985a629413ef197c153b95a;hb=36e0f35a5828458ebeaf72999b3461ab66a230d8;hpb=ff704b2291680ca52051452abbce033953f65f3e diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 1fb7699..bec2b48 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -15,51 +15,23 @@ # 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 = \ - libguestfs-supermin-helper \ - kmod.whitelist.in \ packagelist.in \ + excludelist.in \ 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 -# $(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 +superminfsdir = $(libdir)/guestfs/supermin.d -# This is for building the normal appliance: -$(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log - -$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist - mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak 2>/dev/null; : - mv $(VMLINUZ) $(VMLINUZ).bak 2>/dev/null; : - if ! bash make.sh; then rm -f $@; exit 1; fi +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 @@ -70,88 +42,42 @@ make.sh: make.sh.in chmod +x $@-t mv $@-t $@ -$(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 - -# 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 supermin-make.sh + cpp -undef -D$(DISTRO)=1 < $< | \ + grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t + mv $@-t $@ -endif +excludelist: excludelist.in + cpp -undef -D$(DISTRO)=1 < $< | \ + grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t + mv $@-t $@ -# 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 +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 $@ -#---------------------------------------------------------------------- -# Extra rules for testing the appliance. - -# Test-boot the appliance. - -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. +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 $@ -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 guestfs_rescue=1" \ - -nographic \ - -serial stdio \ - -net channel,6666:unix:/tmp/sock,server,nowait \ - -net user,vlan=0 \ - -net nic,model=virtio,vlan=0 +supermin.d/init.img: init + cmp -s $(srcdir)/init $(builddir)/init || cp $(srcdir)/init $(builddir)/init + mkdir -p supermin.d + rm -f $@ $@-t + echo "init" | cpio --quiet -o -H newc > $@-t + mv $@-t $@ # Make clean. -CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist supermin.incfiles +CLEANFILES = packagelist excludelist clean-local: - rm -rf $(top_builddir)/initramfs + rm -rf supermin.d