remove gpg

1 files changed, 4 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index 634a418..a376a64 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ compiled_programs=${cc_files} ${cpp_files}
 CC=gcc -std=gnu99
 CFLAGS=-Os
 
-INSTALL_SUBMODULES = fsmgr kiki
+INSTALL_SUBMODULES = fsmgr
 NO_INSTALL_SUBMODULES = cryptonomic-dyndns-server
 SUBMODULES = $(INSTALL_SUBMODULES) $(NO_INSTALL_SUBMODULES)
 
@@ -47,9 +47,8 @@ $(addprefix src/, $(dyndns_links)):
 
 src_bin_programs = xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh      \
 btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh               \
-dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh \
-samizdat-daily-snapshot-root samizdat-diff-root kiki-export-stdout              \
-kiki-import-stdin store-child-permanently git-ll-remote usb                     \
+dnsmasq-dhcp-script.sh publish-ip.sh \
+git-ll-remote usb \
 hostname.cryptonomic.net partvi ficlonerange.py ${dyndns_progs}
 
 bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils}
@@ -118,8 +117,6 @@ ifndef instdir
 else
         install  -p  -m0644  -DT  conf/postfix_main.cf           ${instdir}/etc/postfix/main.cf
         install  -p  -m0644  -DT  conf/torrc                     ${instdir}/etc/tor/torrc
-        ln -sf /var/cache/kiki/config/tor/hostname  ${instdir}/etc/mailname
-        ln -sf /var/cache/kiki/config/tor/hostname  ${instdir}/etc/hostname
 endif
 
 include user.mk
@@ -178,23 +175,10 @@ boot: rootfs
 fastboot: rootfs
         sudo qemu.sh
 
-reuse_child := $(shell 2>/dev/null read child < reused-child && echo --reuse-child=$$child; true)
-
 samizdat.netinst.iso: | rootfs/samizdat.btrfs
         exit 1; sudo initrd.sh
         sudo xorriso-usb.sh $(reuse_child) --bootloader --out $@
 
-reused-child:
-        sudo keygen.sh ${samizdat_child_dir}/child.$$$$ && \
-                sudo store-child-permanently $$$$ && \
-                echo $$$$ > $@
-
-testclean:
-        make -C kiki install
-        sudo mv /root/.gnupg /root/.gnupg.$$(date -Im) || true
-        sudo killall gpg-agent || true
-        rm -f reused-child
-
 cleantest:
         make testclean
         make isotest
@@ -205,9 +189,6 @@ isotest: samizdat.iso
 isotest-netinst: samizdat.netinst.iso
         USE_ISO=y SLOW_BOOT=y qemu.sh $^
 
-gpg_iso_path=gnupghome
-GPG_INPUT_DIR=${samizdat_child_dir}/child.$(shell cat reused-child)/root/.gnupg
-
 samizdat_btrfs_patch_size=256M
 
 get_loop_dev="$$(sudo losetup -n -O name -j $@~tmp)"
@@ -233,9 +214,6 @@ veritymount: rootfs/samizdat.seed.btrfs.verity.log
                               $(verity_root_hash)
         sudo veritysetup remove samizverity
 
-%.verity.log.asc: %.verity.log
-        sudo gpg --armor --detach-sign $^
-
 rootfs/%.btrfs:
         $(SUDO_MAKE) -C rootfs $(notdir $@)
 
@@ -298,7 +276,7 @@ gold.iso: rootfs/seed.iso reused-child
         mv $@~tmp $@
 
 rootfs/seed.iso: $(addprefix rootfs/samizdat.seed.btrf, s \
-                  $(if $(VERITY), s.verity s.verity.log $(if $(VERITY_SIGN), s.verity.log.asc)))
+                  $(if $(VERITY), s.verity s.verity.log))
         rm -f $@~tmp
         touch $@~tmp
         fallocate -n -l 10G $@~tmp