From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a17:907:7756:: with SMTP id kx22mr21749468ejc.703.1643734405586; Tue, 01 Feb 2022 08:53:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:2742:: with SMTP id z2ls3472294edd.2.gmail; Tue, 01 Feb 2022 08:53:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvIDuJfxl6V6mY1bGqCmzHLmnLrGKSQ5vibtl2/EP+3MnNcUYiBJtczQIoVp45537Y6ibm X-Received: by 2002:a05:6402:11c7:: with SMTP id j7mr26273859edw.124.1643734404585; Tue, 01 Feb 2022 08:53:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643734404; cv=none; d=google.com; s=arc-20160816; b=oUlHzpvFflwrckwmf+ZaVwVuFLGV/ttPMRBrGVMpBtpK2smeS04oA0AUxMwhnwMZ9l QV6piF/fMPjLH/1qvTm0yCQtXOCdAuFe1bpyg8Va7Nf4mdE9qyBOuk/2Io8GHowPyc8o sMHMNNiDMXqRFmF+RJyXEY4D3AoXuWSk3pXWZfw1AOm+vuGk3xkC8cuu4R2IdLDWWlqd 2pMnE7nQGOp9GRKECeyNnX9vLkJkbIRIy9yRNfqThJ/xylitFK+oNxsB46RgZdqLHqjN UbDEBLdz4Pwu4YNoGNRCMlcynZVC9LL3aA34H2WYz7PwxcCTgezC6ASx2U0FZ6tKBea/ 4uzg== 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=wxm4t91V+cITjIiQIT3sgFD0JyBSYdo3B9ZQUyd+DMmp7MGmzIbdOYLXm2PlWcDk5T DZrFUPwahP24TVDETMghEL85OyigwRApEtrIRUlKgBX+CS6jkvErYzMHiP7RLVNX6hUr kvA4+jtCiNokBHgVubTRxZHfjak+P4UIPdLqDC0F7aj4736o9w+8lXUrNxps0y8XkO6J zvHgdYdy/pncaQaQVgoJURcOlI0xPssVNIadbu+OtNY17kXQfbaBAGPvFmN/OnwSFAPf Iw2V2jHUgW1UWTZZAwXgS3m7Q6UB0TdS/4VIb++GTf6WEfwX/jExqm5AyvkM0CGLzulW fZTw== 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 eb8si214966edb.1.2022.02.01.08.53.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 08:53:24 -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 211Gr4qm019494 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Feb 2022 17:53:21 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 7/8] linux-mainline: Move cfg fragment test to debian/rules Date: Tue, 1 Feb 2022 17:53:03 +0100 Message-Id: <20220201165304.21976-8-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220201165304.21976-1-ubely@ilbers.de> References: <20220201165304.21976-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: TkIQJ9Xw6MsN 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