From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a05:651c:506:: with SMTP id o6mr14152774ljp.115.1643113943903; Tue, 25 Jan 2022 04:32:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:39c3:: with SMTP id k3ls2339714lfu.0.gmail; Tue, 25 Jan 2022 04:32:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxUGIXSwEL++d4y/fVMOy5wnvPb4aZqZz9YqSzR26Wh2/g2jF0bvZCF/SDkG9am5qCciMaF X-Received: by 2002:a05:6512:3e04:: with SMTP id i4mr5991724lfv.277.1643113942838; Tue, 25 Jan 2022 04:32:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643113942; cv=none; d=google.com; s=arc-20160816; b=XKEUnlmeDP6ML6rGdnq0rrRxnler16u7BcrIQRx+00wvZlLOsa7xihf2+n1INsxTzc flRQQNBrFg+w/qd1iJ0XTYKV+7WutjrYSOOhqpkrWOZrqd3q5pnm3aqqkCwT9Uw3PJdh JDPj3+dUEjNmMdtza6ORaGuNbN+dxUhqMI4EoSTza71bPb98qimcg2Pbp72fO6vzIC0w D/vpoozqBCEbW/GWmbJbuNfXSdK0QvFKdjWscWDzMRMZ5vVhLH+H71bb9nsPOPtjkjPV wxj5lSw9xXR0J1OLEh/ukXopNet2Je2jXl02AEXgJ8KWmHB0XY7Ygm/TBozmHV2e3lhc lNhg== 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=K5JJ+gs3B/hghbDiBszao8eILeFKrmE2OYiLLn883BU03jg8jpDGo5GXCIN7ASM+My p/qLhqdYUqkv9cMge78/lYCe4wjPhyKST2y72hWgMkoXYkWKotutb3GFqJgOo/1L8ODb nZiEfWAl4mIRs3NR6vSgdLXPP+P9TfFM3AqIavv6iNXtDiyPaUh1xKwo+Ik+dBSgC3vs +3a6Hondgp6ST2thpGdjpfymmgL/UOa1xbKSoTY1RyLwrhi83c41zOqpXFk1jB1k+yq2 oz2F3Ye4yrRG1R1pBZoJWegBMLyIeN9ovzSOnYl5s/YmTgH5rckytcoNA0SQXD/E1o8G qgnQ== 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 i4si468250lfg.6.2022.01.25.04.32.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:32:22 -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 20PCWJHt019024 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jan 2022 13:32:22 +0100 From: Uladzimir Bely 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 Message-Id: <20220125123219.32395-8-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220125123219.32395-1-ubely@ilbers.de> References: <20220125123219.32395-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: vGE8nym23vKo 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