diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 30 |
1 files changed, 4 insertions, 26 deletions
@@ -8,7 +8,7 @@ compiled_programs=${cc_files} ${cpp_files} | |||
8 | CC=gcc -std=gnu99 | 8 | CC=gcc -std=gnu99 |
9 | CFLAGS=-Os | 9 | CFLAGS=-Os |
10 | 10 | ||
11 | INSTALL_SUBMODULES = fsmgr kiki | 11 | INSTALL_SUBMODULES = fsmgr |
12 | NO_INSTALL_SUBMODULES = cryptonomic-dyndns-server | 12 | NO_INSTALL_SUBMODULES = cryptonomic-dyndns-server |
13 | SUBMODULES = $(INSTALL_SUBMODULES) $(NO_INSTALL_SUBMODULES) | 13 | SUBMODULES = $(INSTALL_SUBMODULES) $(NO_INSTALL_SUBMODULES) |
14 | 14 | ||
@@ -47,9 +47,8 @@ $(addprefix src/, $(dyndns_links)): | |||
47 | 47 | ||
48 | src_bin_programs = xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh \ | 48 | src_bin_programs = xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh \ |
49 | btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh \ | 49 | btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh \ |
50 | dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh \ | 50 | dnsmasq-dhcp-script.sh publish-ip.sh \ |
51 | samizdat-daily-snapshot-root samizdat-diff-root kiki-export-stdout \ | 51 | git-ll-remote usb \ |
52 | kiki-import-stdin store-child-permanently git-ll-remote usb \ | ||
53 | hostname.cryptonomic.net partvi ficlonerange.py ${dyndns_progs} | 52 | hostname.cryptonomic.net partvi ficlonerange.py ${dyndns_progs} |
54 | 53 | ||
55 | bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils} | 54 | bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils} |
@@ -118,8 +117,6 @@ ifndef instdir | |||
118 | else | 117 | else |
119 | install -p -m0644 -DT conf/postfix_main.cf ${instdir}/etc/postfix/main.cf | 118 | install -p -m0644 -DT conf/postfix_main.cf ${instdir}/etc/postfix/main.cf |
120 | install -p -m0644 -DT conf/torrc ${instdir}/etc/tor/torrc | 119 | install -p -m0644 -DT conf/torrc ${instdir}/etc/tor/torrc |
121 | ln -sf /var/cache/kiki/config/tor/hostname ${instdir}/etc/mailname | ||
122 | ln -sf /var/cache/kiki/config/tor/hostname ${instdir}/etc/hostname | ||
123 | endif | 120 | endif |
124 | 121 | ||
125 | include user.mk | 122 | include user.mk |
@@ -178,23 +175,10 @@ boot: rootfs | |||
178 | fastboot: rootfs | 175 | fastboot: rootfs |
179 | sudo qemu.sh | 176 | sudo qemu.sh |
180 | 177 | ||
181 | reuse_child := $(shell 2>/dev/null read child < reused-child && echo --reuse-child=$$child; true) | ||
182 | |||
183 | samizdat.netinst.iso: | rootfs/samizdat.btrfs | 178 | samizdat.netinst.iso: | rootfs/samizdat.btrfs |
184 | exit 1; sudo initrd.sh | 179 | exit 1; sudo initrd.sh |
185 | sudo xorriso-usb.sh $(reuse_child) --bootloader --out $@ | 180 | sudo xorriso-usb.sh $(reuse_child) --bootloader --out $@ |
186 | 181 | ||
187 | reused-child: | ||
188 | sudo keygen.sh ${samizdat_child_dir}/child.$$$$ && \ | ||
189 | sudo store-child-permanently $$$$ && \ | ||
190 | echo $$$$ > $@ | ||
191 | |||
192 | testclean: | ||
193 | make -C kiki install | ||
194 | sudo mv /root/.gnupg /root/.gnupg.$$(date -Im) || true | ||
195 | sudo killall gpg-agent || true | ||
196 | rm -f reused-child | ||
197 | |||
198 | cleantest: | 182 | cleantest: |
199 | make testclean | 183 | make testclean |
200 | make isotest | 184 | make isotest |
@@ -205,9 +189,6 @@ isotest: samizdat.iso | |||
205 | isotest-netinst: samizdat.netinst.iso | 189 | isotest-netinst: samizdat.netinst.iso |
206 | USE_ISO=y SLOW_BOOT=y qemu.sh $^ | 190 | USE_ISO=y SLOW_BOOT=y qemu.sh $^ |
207 | 191 | ||
208 | gpg_iso_path=gnupghome | ||
209 | GPG_INPUT_DIR=${samizdat_child_dir}/child.$(shell cat reused-child)/root/.gnupg | ||
210 | |||
211 | samizdat_btrfs_patch_size=256M | 192 | samizdat_btrfs_patch_size=256M |
212 | 193 | ||
213 | get_loop_dev="$$(sudo losetup -n -O name -j $@~tmp)" | 194 | get_loop_dev="$$(sudo losetup -n -O name -j $@~tmp)" |
@@ -233,9 +214,6 @@ veritymount: rootfs/samizdat.seed.btrfs.verity.log | |||
233 | $(verity_root_hash) | 214 | $(verity_root_hash) |
234 | sudo veritysetup remove samizverity | 215 | sudo veritysetup remove samizverity |
235 | 216 | ||
236 | %.verity.log.asc: %.verity.log | ||
237 | sudo gpg --armor --detach-sign $^ | ||
238 | |||
239 | rootfs/%.btrfs: | 217 | rootfs/%.btrfs: |
240 | $(SUDO_MAKE) -C rootfs $(notdir $@) | 218 | $(SUDO_MAKE) -C rootfs $(notdir $@) |
241 | 219 | ||
@@ -298,7 +276,7 @@ gold.iso: rootfs/seed.iso reused-child | |||
298 | mv $@~tmp $@ | 276 | mv $@~tmp $@ |
299 | 277 | ||
300 | rootfs/seed.iso: $(addprefix rootfs/samizdat.seed.btrf, s \ | 278 | rootfs/seed.iso: $(addprefix rootfs/samizdat.seed.btrf, s \ |
301 | $(if $(VERITY), s.verity s.verity.log $(if $(VERITY_SIGN), s.verity.log.asc))) | 279 | $(if $(VERITY), s.verity s.verity.log)) |
302 | rm -f $@~tmp | 280 | rm -f $@~tmp |
303 | touch $@~tmp | 281 | touch $@~tmp |
304 | fallocate -n -l 10G $@~tmp | 282 | fallocate -n -l 10G $@~tmp |