From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a05:651c:a04:: with SMTP id k4mr24900893ljq.12.1637324020001; Fri, 19 Nov 2021 04:13:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3e10:: with SMTP id i16ls223115lfv.3.gmail; Fri, 19 Nov 2021 04:13:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWu1I70O7OTZvNp/pn1af1wUvTmkaLEsuqSUETX5LZKxQukNfEY/TSCTI+jN5O+O1Zhtwt X-Received: by 2002:a05:6512:31ce:: with SMTP id j14mr31811668lfe.247.1637324018967; Fri, 19 Nov 2021 04:13:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324018; cv=none; d=google.com; s=arc-20160816; b=oWQd5EwM3jlOtaK32t2uG9ODlQIgJcwtUpnSNjFWaavg2OSArmRe/tf5i6Ys+AbYR+ Bwc9dF/jqcS2ozy9iMWnyT2qvWdAFrPXW32xekmAMb75g01MIESovkTctzxaTPpq7apg TmJj4mdohTPaDYkBa5qtG0xtosa4C5yUkQmW/JrQb7RBxyOQQPvoyJNj1g65D5hT2j94 VH9H+4U8AmiU5qwrz0+8gR12I81MG4OzrT/p+7oQO3wdIUKQd1KMFELeScMCMsblRqND iXVlku+tdsIBkglAnzbaVuTKpl1C0hdd2Ywa5eGuCPPvvI4OiMObiD0/Y2auW3hhCfco bTIA== 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=IRRrkXx56wBZM9hRVWDAl39kvQ6FWscB5hwId+TQKlHKN9mLHdnPn0pqPpJ7rDUgrd XhqYLdpDmMy+9TmDxoGUIyYuQMNg0hWD41vOozKwY4Im4DhTrFRAO2ZV96h8Z0Fgttr4 yRVptPOgqnnPugHx4fuTxHZJkL2s5v88iU1yEMyCp0ZiWRMnH0TJG8ZUsh92PJpqAoDG Gt7X6vZ/pdXj9XxFIXf20D1y8yhKdnB0Ej5f98BytbXfNMNzb9zll7QZTIwzIQyc55aw 0Bs5XqG4sTVwQTpWqRfBoIuuTH4DIMFWVDZHCncWYUq9X5WA7qyCgKBXXVQMGnepfFL1 IsNg== 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 b11si161873lfv.12.2021.11.19.04.13.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:38 -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 1AJCDX7M021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:38 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 12/24] linux-mainline: Move cfg fragment test to debian/rules Date: Fri, 19 Nov 2021 13:13:21 +0100 Message-Id: <20211119121333.13805-13-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119121333.13805-1-ubely@ilbers.de> References: <20211119121333.13805-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: 48DPqCXPYyb2 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