From 300b17fa25e0611de8e33a201dace14386352748 Mon Sep 17 00:00:00 2001 From: Trammell Hudson Date: Fri, 7 Apr 2017 09:53:02 -0400 Subject: [PATCH] add dropbear ssh to qubes and moc configurations (issue #169) --- Makefile | 9 ++++++++- config/qemu-moc.config | 1 + config/x230-moc.config | 1 + config/x230-qubes.config | 1 + modules/dropbear | 24 ++++++++++++++++++++++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 modules/dropbear diff --git a/Makefile b/Makefile index 9a60a820..d1032f34 100644 --- a/Makefile +++ b/Makefile @@ -251,6 +251,7 @@ bin_modules-$(CONFIG_CRYPTSETUP) += cryptsetup bin_modules-$(CONFIG_GPG) += gpg bin_modules-$(CONFIG_LVM2) += lvm2 bin_modules-$(CONFIG_XEN) += xen +bin_modules-$(CONFIG_DROPBEAR) += dropbear $(foreach m, $(bin_modules-y), \ $(call map,initrd_bin_add,$(call bins,$m)) \ @@ -382,14 +383,20 @@ modules.clean: for dir in \ $(busybox_dir) \ $(cryptsetup_dir) \ + $(dropbear_dir) \ + $(flashrom_dir) \ $(gnupg_dir) \ $(kexec_dir) \ - $(libuuid_dir) \ + $(libusb_dir) \ + $(libusb-compat_dir) \ $(lvm2_dir) \ $(mbedtls_dir) \ + $(pciutils_dir) \ $(popt_dir) \ $(qrencode_dir) \ $(tpmtotp_dir) \ + $(util-linux_dir) \ + $(zlib_dir) \ ; do \ $(MAKE) -C "build/$$dir" clean ; \ rm "build/$$dir/.configured" ; \ diff --git a/config/qemu-moc.config b/config/qemu-moc.config index 18ad85f7..e16a56f7 100644 --- a/config/qemu-moc.config +++ b/config/qemu-moc.config @@ -13,6 +13,7 @@ CONFIG_PCIUTILS=y CONFIG_POPT=y CONFIG_QRENCODE=y CONFIG_TPMTOTP=y +CONFIG_DROPBEAR=y CONFIG_XEN=n CONFIG_LINUX_USB=y diff --git a/config/x230-moc.config b/config/x230-moc.config index 1a7dc419..970d9886 100644 --- a/config/x230-moc.config +++ b/config/x230-moc.config @@ -12,6 +12,7 @@ CONFIG_PCIUTILS=y CONFIG_POPT=y CONFIG_QRENCODE=y CONFIG_TPMTOTP=y +CONFIG_DROPBEAR=y # xen is not used on the MOC machines CONFIG_XEN=n diff --git a/config/x230-qubes.config b/config/x230-qubes.config index 3dad5709..29b2a0f8 100644 --- a/config/x230-qubes.config +++ b/config/x230-qubes.config @@ -13,6 +13,7 @@ CONFIG_POPT=y CONFIG_QRENCODE=y CONFIG_TPMTOTP=y CONFIG_XEN=y +CONFIG_DROPBEAR=y CONFIG_LINUX_USB=y CONFIG_LINUX_E1000E=y diff --git a/modules/dropbear b/modules/dropbear new file mode 100644 index 00000000..46698432 --- /dev/null +++ b/modules/dropbear @@ -0,0 +1,24 @@ +# dropbear is a tiny ssh client +modules-$(CONFIG_DROPBEAR) += dropbear + +dropbear_version := 2016.74 +dropbear_dir := dropbear-$(dropbear_version) +dropbear_tar := dropbear-$(dropbear_version).tar.bz2 +dropbear_url := http://matt.ucc.asn.au/dropbear/releases/$(dropbear_tar) +dropbear_hash := 2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891 + +dropbear_configure := ./configure \ + CC="$(heads_cc)" \ + --host i386-elf-linux \ + --prefix "/" \ + +dropbear_config := +dropbear_output := ssh scp +dropbear_target := \ + $(MAKE_JOBS) \ + DESTDIR="$(INSTALL)" \ + dbclient scp \ + && \ + cp $(build)/$(dropbear_dir)/dbclient $(build)/$(dropbear_dir)/ssh + +dropbear_depends := zlib $(musl_dep)