From e6a83680a88dd51894ed916a85ef79017d266f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20D=C3=ADaz?= Date: Mon, 2 Jul 2018 14:57:14 -0500 Subject: [PATCH] Add haveged to rpb-console-image, not to -desktop nor -weston MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- recipes-samples/images/rpb-console-image.bb | 1 + recipes-samples/images/rpb-desktop-image.bb | 2 ++ recipes-samples/images/rpb-weston-image.bb | 2 ++ recipes-samples/packagegroups/packagegroup-rpb-lkft.bb | 1 - 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-samples/images/rpb-console-image.bb b/recipes-samples/images/rpb-console-image.bb index 676ff66..fef1764 100644 --- 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 index d78d433..3b2beee 100644 --- 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 index 07d9886..4576030 100644 --- 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 index c78a617..69bfd36 100644 --- 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 \