Add haveged to rpb-console-image, not to -desktop nor -weston

This moves haveged from the LKFT packagegroup to all headless images, as it's a useful thing to have where no desktop environment is available. Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
96boards · Jul 5, 2018 · e6a8368 · e6a8368
1 parent 870fc15
commit e6a8368
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/recipes-samples/images/rpb-console-image.bb b/recipes-samples/images/rpb-console-image.bb
@@ -6,6 +6,7 @@ IMAGE_FEATURES += "package-management ssh-server-openssh hwcodecs"
 
 CORE_IMAGE_BASE_INSTALL += " \
     packagegroup-rpb \
+    haveged \
 "
 
 # docker pulls runc/containerd, which in turn recommend lxc unecessarily

diff --git a/recipes-samples/images/rpb-desktop-image.bb b/recipes-samples/images/rpb-desktop-image.bb
@@ -14,6 +14,8 @@ CORE_IMAGE_BASE_INSTALL += " \
     packagegroup-rpb-x11 \
 "
 
+CORE_IMAGE_BASE_INSTALL_remove = "haveged"
+
 EXTRA_USERS_PARAMS += "\
 usermod -a -G video linaro; \
 "
diff --git a/recipes-samples/images/rpb-weston-image.bb b/recipes-samples/images/rpb-weston-image.bb
@@ -14,6 +14,8 @@ CORE_IMAGE_BASE_INSTALL += " \
     packagegroup-rpb-weston \
 "
 
+CORE_IMAGE_BASE_INSTALL_remove = "haveged"
+
 EXTRA_USERS_PARAMS += "\
 usermod -a -G weston-launch,video linaro; \
 "
diff --git a/recipes-samples/packagegroups/packagegroup-rpb-lkft.bb b/recipes-samples/packagegroups/packagegroup-rpb-lkft.bb
@@ -5,7 +5,6 @@ inherit packagegroup
 # contains basic dependencies for LKFT
 RDEPENDS_packagegroup-rpb-lkft = "\
     git \
-    haveged \
     kernel-selftests \
     kselftests-mainline \
     kselftests-next \