From 3b620121541a2bce121ffc0b458e908c5d39fd4e Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 28 Nov 2024 16:57:45 -0500
Subject: [PATCH] meta-agl-core: handle debug-tweaks removal
Handle debug-tweaks image feature removal, removing its use or
expanding into the 4 fine-grained options where applicable.
Bug-AGL: SPEC-5147
Change-Id: Ida9cc37ed5871139cb452ddc058235369f8cb3a2
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
meta-agl-core/conf/include/agl-devel.inc | 2 +-
meta-agl-core/conf/local.conf.sample | 2 +-
meta-agl-core/conf/templates/base/local.conf.sample | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-agl-core/conf/include/agl-devel.inc b/meta-agl-core/conf/include/agl-devel.inc
index 055fa61e3..fd78fd158 100644
--- a/meta-agl-core/conf/include/agl-devel.inc
+++ b/meta-agl-core/conf/include/agl-devel.inc
@@ -1,4 +1,4 @@
-IMAGE_FEATURES =+ "debug-tweaks tools-debug tools-profile"
+IMAGE_FEATURES =+ "allow-empty-password empty-root-password allow-root-login post-install-logging tools-debug tools-profile"
IMAGE_INSTALL:append = " \
packagegroup-agl-core-devel \
diff --git a/meta-agl-core/conf/local.conf.sample b/meta-agl-core/conf/local.conf.sample
index 4cfae4ceb..e05f3c355 100644
--- a/meta-agl-core/conf/local.conf.sample
+++ b/meta-agl-core/conf/local.conf.sample
@@ -139,7 +139,7 @@ PACKAGE_CLASSES ?= "package_rpm"
# There are other application targets that can be used here too, see
# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
# We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+EXTRA_IMAGE_FEATURES ?= ""
#
# Additional image features
diff --git a/meta-agl-core/conf/templates/base/local.conf.sample b/meta-agl-core/conf/templates/base/local.conf.sample
index 5e9de61b3..034988e4b 100644
--- a/meta-agl-core/conf/templates/base/local.conf.sample
+++ b/meta-agl-core/conf/templates/base/local.conf.sample
@@ -140,7 +140,7 @@ PACKAGE_CLASSES ?= "package_rpm"
# There are other application targets that can be used here too, see
# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
# We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+EXTRA_IMAGE_FEATURES ?= ""
#
# Additional image features
--
2.16.6