From 0d146e72e99a4a36c8e56a143e54d787e921e32a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 2 Jan 2013 19:22:14 +0100 Subject: [PATCH] meta-digi-del: fix IMAGE_FEATURES in del-image-minimal recipes If we override the variable with '=' instead of '+=' then extra image features set in project's local.conf (EXTRA_IMAGE_FEATURES variable) are discarded. Signed-off-by: Javier Viguera --- meta-digi-del/recipes-core/images/del-image-minimal-dev.bb | 4 ++-- meta-digi-del/recipes-core/images/del-image-minimal.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb b/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb index 405a838a6..00f621650 100644 --- a/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb +++ b/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb @@ -11,13 +11,13 @@ LICENSE = "MIT" inherit core-image -IMAGE_FEATURES = "core-ssh-dropbear" +IMAGE_FEATURES += "core-ssh-dropbear" IMAGE_FEATURES += "dev-pkgs" # Adding debug-tweaks will enable empty password login. # Note that adding debug-tweaks to EXTRA_IMAGE_FEATURES will not # allow for empty password logins. -IMAGE_FEATURES =+ "debug-tweaks" +IMAGE_FEATURES += "debug-tweaks" # core-image disables the root password if debug-tweak is not enabled. # This override will use the shadow file instead. diff --git a/meta-digi-del/recipes-core/images/del-image-minimal.bb b/meta-digi-del/recipes-core/images/del-image-minimal.bb index a2873d2a4..fd31a8ae2 100644 --- a/meta-digi-del/recipes-core/images/del-image-minimal.bb +++ b/meta-digi-del/recipes-core/images/del-image-minimal.bb @@ -16,7 +16,7 @@ inherit del-image # where they can be customized by platform. # Only common features to remain here. -IMAGE_FEATURES = "ssh-server-dropbear" +IMAGE_FEATURES += "ssh-server-dropbear" IMAGE_FEATURES += "del-network" # Machine dependant features