From a7dc1671044ce2b5a85957225e54f04232e42ce0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 16 Oct 2020 19:19:34 +0100 Subject: [PATCH] gem5: use pre-generated keys instead of haveged in gem5 machine As the gem5 image 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 gem5. 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: I134a421d66eb2b55cf0e4f44781021ac2c96106d Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-gem5/conf/machine/gem5-arm64.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-gem5/conf/machine/gem5-arm64.conf b/meta-gem5/conf/machine/gem5-arm64.conf index 9ca2bb06..3e976825 100644 --- a/meta-gem5/conf/machine/gem5-arm64.conf +++ b/meta-gem5/conf/machine/gem5-arm64.conf @@ -47,7 +47,8 @@ GEM5_RUN_CMDLINE = "" EXTRA_IMAGEDEPENDS += "gem5-aarch64-native" -# 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"