From 0c9f5a58657e137a6b0fcaab82b8033e2cb7906a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 2 Oct 2018 23:37:07 +0200 Subject: [PATCH] rename console-base-image-no-nm -> console-base-image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Yes there is a recipe with same name in Angstrom but two distro layers in one build environment are not recommended exactly. Signed-off-by: Andreas Müller --- recipes-image/console/console-base-image-nm.bb | 3 ++- .../{console-base-image-no-nm.bb => console-base-image.bb} | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) rename recipes-image/console/{console-base-image-no-nm.bb => console-base-image.bb} (92%) diff --git a/recipes-image/console/console-base-image-nm.bb b/recipes-image/console/console-base-image-nm.bb index 79d651a..54359a5 100644 --- a/recipes-image/console/console-base-image-nm.bb +++ b/recipes-image/console/console-base-image-nm.bb @@ -1,5 +1,6 @@ -require console-base-image-no-nm.bb +require console-base-image.bb +# by default it connects by dhcp and does useful initializations - e.g for wifi IMAGE_INSTALL += " \ networkmanager \ " diff --git a/recipes-image/console/console-base-image-no-nm.bb b/recipes-image/console/console-base-image.bb similarity index 92% rename from recipes-image/console/console-base-image-no-nm.bb rename to recipes-image/console/console-base-image.bb index a5bbb6e..8023d71 100644 --- a/recipes-image/console/console-base-image-no-nm.bb +++ b/recipes-image/console/console-base-image.bb @@ -26,7 +26,7 @@ IMAGE_LOGIN_MANAGER = "busybox shadow" inherit image -export IMAGE_BASENAME = "console-base-image-no-nm" +export IMAGE_BASENAME = "console-base-image" # we have journal BAD_RECOMMENDATIONS += "busybox-syslog"