From 8d4a60880f751e18b4a3d8b97a2d894283279d42 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 16 Oct 2020 19:19:33 +0100 Subject: [PATCH] arm-bsp: use pre-generated keys instead of haveged in FVP machines As the FVP images won't be used in production there is no need to generate unique SSH keys on the first boot, which takes a long time in a FVP. Instead of recommending haveged (from meta-oe) we can simply install pre-generated SSH keys. These keys are static so should not be used in production! Change-Id: I6a538de6bee892a77816c1d938dd2b55c94257f4 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/fvp-common.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc index 22793385..da45026a 100644 --- a/meta-arm-bsp/conf/machine/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/fvp-common.inc @@ -33,8 +33,8 @@ PREFERRED_VERSION_linux-yocto ?= "5.4%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot" -# Use haveged as a source of entropy instead of rng-tools (Needed for ssh). -# rngd (Part of rng-tools) takes ~7 mins to init resulting in a slow boot time. -PACKAGE_EXCLUDE_append = " rng-tools" -MACHINE_EXTRA_RRECOMMENDS += "haveged" - +# As this is a virtual target that will not be used in the real world there is +# no need for real SSH keys. Disable rng-tools (which takes too long to +# initialise) and install the pre-generated keys. +PACKAGECONFIG_remove_pn-openssh = "rng-tools" +MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys"