public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v2 7/9] linux-mainline: Move cfg fragment test to debian/rules
Date: Tue, 25 Jan 2022 13:32:17 +0100	[thread overview]
Message-ID: <20220125123219.32395-8-ubely@ilbers.de> (raw)
In-Reply-To: <20220125123219.32395-1-ubely@ilbers.de>

From: Anton Mikanovich <amikan@ilbers.de>

Perform all config fragments checking in Debian way.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 .../linux/linux-mainline_5.4.70.bb               | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb
index 980e137b..28e51c0d 100644
--- a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb
+++ b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb
@@ -25,11 +25,13 @@ LINUX_VERSION_EXTENSION = "-isar"
 
 # For testing purposes only
 dpkg_configure_kernel_append() {
-    if ! grep "# CONFIG_MTD is not set" ${S}/${KERNEL_BUILD_DIR}/.config && \
-       ! grep "# CONFIG_MTD_UBI is not set" ${S}/${KERNEL_BUILD_DIR}/.config; then
-        grep "# CONFIG_UBIFS_FS is not set" ${S}/${KERNEL_BUILD_DIR}/.config || \
-            bbfatal "Self-check failed: CONFIG_UBIFS_FS still enabled"
-    fi
-    grep "CONFIG_ROOT_NFS=y" ${S}/${KERNEL_BUILD_DIR}/.config || \
-        bbfatal "Self-check failed: CONFIG_ROOT_NFS not enabled"
+cat << EOF | sed -i '/^override_dh_auto_build/ r /dev/stdin' ${S}/debian/rules
+	if ! grep "# CONFIG_MTD is not set" \$(O)/.config && \\
+	   ! grep "# CONFIG_MTD_UBI is not set" \$(O)/.config; then \\
+	    grep "# CONFIG_UBIFS_FS is not set" \$(O)/.config || \\
+	        (echo "Self-check failed: CONFIG_UBIFS_FS still enabled" && exit 1); \\
+	fi
+	grep "CONFIG_ROOT_NFS=y" \$(O)/.config || \\
+	    (echo "Self-check failed: CONFIG_ROOT_NFS not enabled" && exit 1)
+EOF
 }
-- 
2.20.1


  parent reply	other threads:[~2022-01-25 12:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-25 12:32 [PATCH v2 0/9] Avoid using shell environment during the build Uladzimir Bely
2022-01-25 12:32 ` [PATCH v2 1/9] template: Copy template attributes on transform Uladzimir Bely
2022-01-25 12:32 ` [PATCH v2 2/9] linux-module: Do not use shell environment Uladzimir Bely
2022-01-25 12:32 ` [PATCH v2 3/9] u-boot: " Uladzimir Bely
2022-01-25 12:32 ` [PATCH v2 4/9] trusted-firmware: " Uladzimir Bely
2022-01-25 12:32 ` [PATCH v2 5/9] optee-os: " Uladzimir Bely
2022-01-25 12:32 ` [PATCH v2 6/9] kselftest: " Uladzimir Bely
2022-01-25 12:32 ` Uladzimir Bely [this message]
2022-01-25 12:32 ` [PATCH v2 8/9] dpkg: Use a specific export function in pre-build tasks Uladzimir Bely
2022-01-25 12:32 ` [PATCH v2 9/9] linux-custom: Move cfg fragments applying to debian/rules Uladzimir Bely
2022-01-25 13:29 ` [PATCH v2 0/9] Avoid using shell environment during the build Jan Kiszka
2022-01-25 13:51   ` Uladzimir Bely
2022-01-25 13:55     ` Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220125123219.32395-8-ubely@ilbers.de \
    --to=ubely@ilbers.de \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox