From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7044759803119271936 X-Received: by 2002:a2e:3918:: with SMTP id g24mr556558lja.48.1640235962143; Wed, 22 Dec 2021 21:06:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:514:: with SMTP id o20ls556447ljp.4.gmail; Wed, 22 Dec 2021 21:06:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkcQPbRGmWZ07aav1bTyHMjdmNjdXTSCal/Ybfk3qS59bLhXnjMXgRzJH9Qjjy1BYCS1AC X-Received: by 2002:a2e:f1a:: with SMTP id 26mr561381ljp.480.1640235960962; Wed, 22 Dec 2021 21:06:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640235960; cv=none; d=google.com; s=arc-20160816; b=ZLwixVuOaYFdJe3G2zEyhlB09msZ4JM1zVMx7TffiY9xzoTB1OTK0y+00ZzPC+w2C1 EUfc9Sy5vytPSifS+mk4QENxyvJ8NG1Ixa/2IzTKfedGRjzOI/cx2dZvkTvgqbJmgl3M 89n6/4Ri5EAUFQZp8hTauEz2B8DRat5ulTBfXm/lWx5/xwyI/zUV3A3kdeDjGj4W6yPE 8QdlqUmwTBhMoAFg5GyvrV29fz1W+oQzO2N5dLAAn9L4qm90a/iNG7KKfWYnSVQmMXfU gdlh9QP+OdA1Xey6wlbl+2qlbluShnZHb5cDd4PYfnNPOMVZq1yMOh2BJoDmVXDeeinN OuVw== 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=gsZTjqB+sPgLSPK4CQ1Guj2cSy1Ex4zfpnw7T2CvgvljNG6HX4JHHSbEaJUti/r0i2 ejkSOfC0YlLqJD22OySkU6P2dBuDNkmYe886q8boBe+LGcvi75eUj4Uqpx0MaY6kmXbV Jd1BbETF+fYy/kkC/Gg5+Ct4Y4/HlFqnmfYxCp34sp4E3z8djHTOMqAA11Qi9amkpgd+ TeaKl656FfYi+xLqDoatBtZOhtR66cnWDPFYz+SUdbatdxwYzhj7MFMUVwwawWCkSUHK nw9Sf1UfChrRtYJWw1E9Zq+bgJNsqh+k4wdfF+Ur3IeBiAT7PLFP53LiPoP6m1YVx2pi JHBA== 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 g42si213628lfv.2.2021.12.22.21.06.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Dec 2021 21:06:00 -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 1BN55vqH009371 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Dec 2021 06:06:00 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 7/7] linux-mainline: Move cfg fragment test to debian/rules Date: Thu, 23 Dec 2021 06:05:57 +0100 Message-Id: <20211223050557.28269-8-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211223050557.28269-1-ubely@ilbers.de> References: <20211223050557.28269-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: dOdCyTCfFvvF 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