[PATCH 1/2] arm-bsp: recommend haveged, don't depend

[PATCH 1/2] arm-bsp: recommend haveged, don't depend

[Ross Burton]

From: Ross Burton <ross.burton@arm.com>

Instead of explicitly adding haveged to IMAGE_INSTALL, add it to
MACHINE_EXTRA_RECOMMENDS.

This means people without haveged don't have failing builds, and tiny
images which don't need haveged are not forced to contain it.

Change-Id: Id30139f5b96fb0041eba8612776aaac07c7a3704
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-bsp/conf/machine/foundation-armv8.conf | 2 +-
 meta-arm-bsp/conf/machine/fvp-base.conf         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arm-bsp/conf/machine/foundation-armv8.conf b/meta-arm-bsp/conf/machine/foundation-armv8.conf
index c1b9f4d..0ff1060 100644
--- a/meta-arm-bsp/conf/machine/foundation-armv8.conf
+++ b/meta-arm-bsp/conf/machine/foundation-armv8.conf
@@ -11,4 +11,4 @@ KERNEL_DEVICETREE = "arm/foundation-v8-gicv3-psci.dtb"
 # 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"
-IMAGE_INSTALL_append = " haveged"
+MACHINE_EXTRA_RRECOMMENDS += "haveged"
diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
index bd3c62d..321b5d5 100644
--- a/meta-arm-bsp/conf/machine/fvp-base.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base.conf
@@ -11,4 +11,4 @@ KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
 # 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"
-IMAGE_INSTALL_append = " haveged"
+MACHINE_EXTRA_RRECOMMENDS += "haveged"
-- 
2.26.2

[PATCH 2/2] gem5: recommend haveged, don't depend

[Ross Burton]

From: Ross Burton <ross.burton@arm.com>

Instead of explicitly adding haveged to IMAGE_INSTALL, add it to
MACHINE_EXTRA_RECOMMENDS.

This means people without haveged don't have failing builds, and tiny
images which don't need haveged are not forced to contain it.

Change-Id: I190cdd26dde38fc9039ca1017da3cd2d9ac78721
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-gem5/conf/machine/gem5-arm64.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gem5/conf/machine/gem5-arm64.conf b/meta-gem5/conf/machine/gem5-arm64.conf
index 4db86c9..9ca2bb0 100644
--- a/meta-gem5/conf/machine/gem5-arm64.conf
+++ b/meta-gem5/conf/machine/gem5-arm64.conf
@@ -50,4 +50,4 @@ 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"
-IMAGE_INSTALL_append = " haveged"
+MACHINE_EXTRA_RRECOMMENDS += "haveged"
-- 
2.26.2