[PATCH 5/6] kas: port isar-exclude-docs to rootfs feature

["'Felix Moessbauer' via isar-users" <isar-users@googlegroups.com>]

The logic to exclude documentation has been ported over to a rootfs
feature. The former isar-exclude-docs package is just kept for
compatibility.

By that, we also port over the kas menu logic to use the rootfs feature
instead of installing the package.

For compatibility, we still keep the isar-exclude-docs package but issue
a warning if it is build.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 kas/opt/Kconfig                                       |  9 +++++++++
 .../exclude-docs.yaml}                                |  4 ++--
 kas/package/Kconfig                                   | 11 -----------
 scripts/generate_yaml.sh                              |  1 -
 4 files changed, 11 insertions(+), 14 deletions(-)
 rename kas/{package/pkg_isar-exclude-docs.yaml => opt/exclude-docs.yaml} (58%)

diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig
index bc4ed997..ec010757 100644
--- a/kas/opt/Kconfig
+++ b/kas/opt/Kconfig
@@ -213,3 +213,12 @@ config KAS_INCLUDE_USE_DRACUT
 	string
 	default "kas/opt/dracut.yaml"
 	depends on USE_DRACUT
+
+config IMAGE_EXCLUDE_DOCS
+	bool "Exclude docs from the image"
+	default y
+
+config KAS_INCLUDE_IMAGE_EXCLUDE_DOCS
+	string
+	default "kas/opt/exclude-docs.yaml"
+	depends on IMAGE_EXCLUDE_DOCS
diff --git a/kas/package/pkg_isar-exclude-docs.yaml b/kas/opt/exclude-docs.yaml
similarity index 58%
rename from kas/package/pkg_isar-exclude-docs.yaml
rename to kas/opt/exclude-docs.yaml
index 0c24e982..c86b93ab 100644
--- a/kas/package/pkg_isar-exclude-docs.yaml
+++ b/kas/opt/exclude-docs.yaml
@@ -5,5 +5,5 @@ header:
   version: 14
 
 local_conf_header:
-  package-isar-exclude-docs: |
-    IMAGE_INSTALL:append = " isar-exclude-docs"
+  image-exclude-docs: |
+    IMAGE_ROOTFS_FEATURES += "exclude-docs"
diff --git a/kas/package/Kconfig b/kas/package/Kconfig
index 527aec0f..e342f8ef 100644
--- a/kas/package/Kconfig
+++ b/kas/package/Kconfig
@@ -89,17 +89,6 @@ config KAS_INCLUDE_PACKAGE_HELLO_ISAR
         default "kas/package/pkg_hello-isar.yaml"
         depends on PACKAGE_HELLO_ISAR
 
-
-config PACKAGE_ISAR_EXCLUDE_DOCS
-        bool "isar-exclude-docs"
-        default y
-
-config KAS_INCLUDE_PACKAGE_ISAR_EXCLUDE_DOCS
-        string
-        default "kas/package/pkg_isar-exclude-docs.yaml"
-        depends on PACKAGE_ISAR_EXCLUDE_DOCS
-
-
 config PACKAGE_ISAR_DISABLE_APT_CACHE
         bool "isar-disable-apt-cache"
         default y
diff --git a/scripts/generate_yaml.sh b/scripts/generate_yaml.sh
index aaa8bcba..904d241d 100755
--- a/scripts/generate_yaml.sh
+++ b/scripts/generate_yaml.sh
@@ -109,7 +109,6 @@ PKGS=" \
   hello-isar \
   hello \
   isar-disable-apt-cache \
-  isar-exclude-docs \
   kselftest \
   samefile \
   sshd-regen-keys \
-- 
2.55.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260924073811.4058349-6-felix.moessbauer%40siemens.com.