From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a05:6512:2351:: with SMTP id p17mr48644841lfu.243.1638968749855; Wed, 08 Dec 2021 05:05:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d9e:: with SMTP id k30ls1237426lfv.1.gmail; Wed, 08 Dec 2021 05:05:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwTsMJINxVxUY0HYOwe6s8GuMxgIz+Yawzg7W4CRcrxbu6hqIXBbI2lbcmHdesunSr+V+2i X-Received: by 2002:ac2:4f03:: with SMTP id k3mr47175340lfr.314.1638968748333; Wed, 08 Dec 2021 05:05:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968748; cv=none; d=google.com; s=arc-20160816; b=sbhaUmuG3OjABO2ceIRcP+5Jp24R4IoIowTy0cP/U3cDswyHDoik8Ldd1Q9TGc8MSH 3WY/Ek/674catsElhwPzh1orDjqpPUmXULlNhYX4lq5b7picydkiQDRN3puBvWnDMBXs lD10DRuBN6m9wteLrW1EBVc+jET81mYBnCgeX0tX2xte3vXmHjatdRtbmBexP1lgmjUc LdYc0iaB1XANes7Pwl7vjkU1Os0iYS1lfFoGmXjOo4ZZJEQh+skOH+hVk5GkdqRQYmJ+ 8jhuekBenGnLiDuvcmz8n8zspv8Q6Hqlpe84lSFdw/Wf0n5HnMtvpDbm89Zb2BYyzZiI 4YSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=aJav9hNT7I6Fz1ggcBcRFB/uHPQF6E6geRWDNOb7CNA=; b=FjFAhg9rbZzR1+2A3Gq+T2DyQ4IzAYZ9oYQnuSuT7k5FJzgY61Owfn/O1gLj+PN2bB XQVTSU64LwF2Hbf9Wg+GNODmFQaUSIdhLWgs30MMg2/Qh7A0JQYxJw0K4MEeGEAZdg8s sfJLqDQ8iVCFpdC1nzGD57fXLa8xAtJ6mXgO9ptP8Lc4kOhYUVfhWOu7BIQqVZDiLhxf vGG7MVr3YfOCIZ/KqfrDiVVYkOyvjBKkCDEAxWyAuDPcMeAQlrK6wBM/Jvibu5C27zNs 78dQr9rdbY6zmwainirT87CoEe/dJ2Ini3cJaPi5Ijxfgx3GGTFCHNb/iI2akQ80DWPl sd2A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id e18si200502lji.3.2021.12.08.05.05.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:48 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1B8D5iL9009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:47 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 08/20] linux-mainline: Move cfg fragment test to debian/rules Date: Wed, 8 Dec 2021 14:05:32 +0100 Message-Id: <20211208130544.15133-9-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208130544.15133-1-ubely@ilbers.de> References: <20211208130544.15133-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: VQap5p70h2+2 From: Anton Mikanovich Perform all config fragments checking in Debian way. Signed-off-by: Anton Mikanovich --- .../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