[PATCH v6 5/5] linux-mainline: Test config fragments and LINUX_VERSION_EXTENSION

[Jan Kiszka <jan.kiszka@siemens.com>]

From: Jan Kiszka <jan.kiszka@siemens.com>

Covers both the case of successful application as well as suppressed one
via "apply=no". And it sets a non-empty local version to stress the
default-off path.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg     |  1 +
 meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg     |  1 +
 meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg
 create mode 100644 meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg

diff --git a/meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg b/meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg
new file mode 100644
index 00000000..97ec48c1
--- /dev/null
+++ b/meta-isar/recipes-kernel/linux/files/no-root-nfs.cfg
@@ -0,0 +1 @@
+# CONFIG_ROOT_NFS is not set
diff --git a/meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg b/meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg
new file mode 100644
index 00000000..72c1f7a4
--- /dev/null
+++ b/meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg
@@ -0,0 +1 @@
+# CONFIG_UBIFS_FS is not set
diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb
index 695eb391..cb4d5e33 100644
--- a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb
+++ b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.88.bb
@@ -11,7 +11,10 @@ ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else
 
 SRC_URI += " \
     https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${ARCHIVE_VERSION}.tar.xz \
-    file://x86_64_defconfig"
+    file://x86_64_defconfig \
+    file://no-ubifs-fs.cfg \
+    file://no-root-nfs.cfg;apply=no"
+
 SRC_URI[sha256sum] = "c1923b6bd166e6dd07be860c15f59e8273aaa8692bc2a1fce1d31b826b9b3fbe"
 
 SRC_URI_append_de0-nano-soc = " \
@@ -20,3 +23,13 @@ SRC_URI_append_de0-nano-soc = " \
 S = "${WORKDIR}/linux-${ARCHIVE_VERSION}"
 
 KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig"
+
+LINUX_VERSION_EXTENSION = "-isar"
+
+# For testing purposes only
+dpkg_configure_kernel_append() {
+    grep "# CONFIG_UBIFS_FS is not set" ${S}/${KERNEL_BUILD_DIR}/.config || \
+        bbfatal "Self-check failed: CONFIG_UBIFS_FS still enabled"
+    grep "CONFIG_ROOT_NFS=y" ${S}/${KERNEL_BUILD_DIR}/.config || \
+        bbfatal "Self-check failed: CONFIG_ROOT_NFS not enabled"
+}
-- 
2.16.4