diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 21 |
1 files changed, 18 insertions, 3 deletions
@@ -48,16 +48,31 @@ else | |||
48 | ln -sf /var/cache/kiki/config/tor/hostname ${instdir}/etc/hostname | 48 | ln -sf /var/cache/kiki/config/tor/hostname ${instdir}/etc/hostname |
49 | endif | 49 | endif |
50 | 50 | ||
51 | include user.mk | ||
52 | |||
51 | .PHONY: rootfs | 53 | .PHONY: rootfs |
52 | rootfs: | 54 | rootfs: |
53 | make -C fsmgr | 55 | : git submodule update |
54 | make -C fsmgr install | 56 | $(MAKE) -C fsmgr |
55 | make -C rootfs | 57 | $(MAKE) -C fsmgr install |
58 | $(MAKE) -C rootfs | ||
56 | sudo ln -sf "$$PWD"/rootfs/samizdat.btrfs /srv/nbd/samizdat.btrfs | 59 | sudo ln -sf "$$PWD"/rootfs/samizdat.btrfs /srv/nbd/samizdat.btrfs |
57 | 60 | ||
58 | boot: rootfs | 61 | boot: rootfs |
59 | sudo qemu.sh | 62 | sudo qemu.sh |
60 | 63 | ||
64 | reuse_child := $(shell 2>/dev/null read child < reused-child && echo --reuse_child=$$child; true) | ||
65 | |||
66 | isotest: install | ||
67 | initrd.sh | ||
68 | xorriso-usb.sh $(reuse_child) --bootloader --out samizdat.iso | ||
69 | USE_ISO=y SLOW_BOOT=y qemu.sh | ||
70 | |||
71 | isotest-nonet: install | ||
72 | initrd.sh | ||
73 | xorriso-usb.sh $(reuse_child) --out samizdat-nonet.iso | ||
74 | USE_ISO=y SLOW_BOOT=y NO_NET=y qemu.sh samizdat-nonet.iso | ||
75 | |||
61 | install: ${bin_programs} samizdat-paths.sh ${compiled_programs} | 76 | install: ${bin_programs} samizdat-paths.sh ${compiled_programs} |
62 | install -p ${bin_programs} ${instdir}${samizdat_bindir} | 77 | install -p ${bin_programs} ${instdir}${samizdat_bindir} |
63 | mkdir -p ${instdir}${samizdat_initrd_files_dir} | 78 | mkdir -p ${instdir}${samizdat_initrd_files_dir} |