From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a2e:9b84:: with SMTP id z4mr12023400lji.179.1627307226115; Mon, 26 Jul 2021 06:47:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a7c4:: with SMTP id x4ls2698714ljp.8.gmail; Mon, 26 Jul 2021 06:47:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzinQ3aJcHuxkrZ/Y4VPRvo+zNsao33csLqcWZVN1FRyhm6jvR3H1cM4mpOoNdQ/skxQk07 X-Received: by 2002:a2e:505b:: with SMTP id v27mr11757184ljd.177.1627307225188; Mon, 26 Jul 2021 06:47:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307225; cv=none; d=google.com; s=arc-20160816; b=0+wQTS9aaYMYFzzy6UVZarr7oV5N/D3Tgi8TaxFQkc7G/HeCZ6c+TQT9ibJz1dElTl qJqJ+X5HyfMvgE55j3WKGOR8b8jKSUyKHdhjdAe3Zkzd9JcJ0EkDQpsW0ffgH/1Y/QyX /shxjStPWrflP4WJXWQyF2KGAJMuBMT8ab6YD4jKdDrbPlvC1dQBaIEnqlX4CX24Ibmp pU+3xUY8U8loBrI8kLXUbiHtE2S4Xv8/JUz6zpPXyzt29SFpI+NfLaA7LtmYSaG1kLHc Bp3NWsphGUxBpJ913mt7Nezii9Wm3ZEa+drnaFxmAO3lYo4A8kNax8LL0QscnJD9KuzO Jlsw== 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:cc:to:from; bh=qS94yvoAUKqxr/9gmjroRGZRJcME2yc6rko9wEXbH3M=; b=Db7W+4tH6OOiawylSRbZ6WAUDsaWPexx3DH/bKk7syf/NsOCCdHmkaLvi5hWiI662d +69deM3rshlkeNVl+rOE5+IEqure1xRjgVj2zKiTzDP9bWYE6rGacphZ5GxaiTSBPmIx 87oqaaJSoParyZTiiu52wERcS4n7/f/borj+OM9FV8r3vBDs9ggiLh728CwCAQg/1YYY CzAh6k/P5JcO7dzpNNcEA1OTCcAjq7eYBITd3aZgyaps4CvaJD1tjqt//bNCPMI533K7 X/HXdSF8WmL+vK8vkUpdoQk25xNxEmMUxVCXrK/pAdfKlBgCqNR1wPWQVeCA4X//4uoa 2puw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id w10si1656057ljw.8.2021.07.26.06.47.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 06:47:05 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-198-62-214-37.mgts.dynamic.pppoe.byfly.by [37.214.62.198] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16QDknv6019679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jul 2021 15:47:04 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 14/15] linux-mainline: Move cfg fragment test to debian/rules Date: Mon, 26 Jul 2021 16:46:35 +0300 Message-Id: <20210726134636.30800-15-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726134636.30800-1-amikan@ilbers.de> References: <20210726134636.30800-1-amikan@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: +v9PDfbRsvbx 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 980e137..28e51c0 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.25.1