From 314b3b2eb73d3b91edef225a2cb5b15b9dc55162 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 12 Jan 2023 11:02:54 +0000 Subject: [PATCH] arm-bsp/fvp-base*: no need to remove rng-tools from openssh Since oe-core 868dfb4 rng-tools is no longer depended on by openssh, so we don't need to remove it ourself. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf | 4 +--- meta-arm-bsp/conf/machine/include/fvp-common.inc | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf index 06bef291..e3f5bfb3 100644 --- a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf +++ b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf @@ -25,9 +25,7 @@ EFI_PROVIDER ?= "grub-efi" MACHINE_FEATURES:append = " efi" # 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" +# no need for real SSH keys. MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys" # testimage configuration diff --git a/meta-arm-bsp/conf/machine/include/fvp-common.inc b/meta-arm-bsp/conf/machine/include/fvp-common.inc index b10977c6..b6fc74da 100644 --- a/meta-arm-bsp/conf/machine/include/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/include/fvp-common.inc @@ -19,9 +19,7 @@ KERNEL_DEVICETREE = "arm/fvp-base-revc.dtb" EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot" # 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" +# no need for real SSH keys. MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys" TEST_TARGET = "OEFVPTarget"