From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 17 Mar 2025 12:33:31 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tu8ip-000b0y-1z for lore@lore.pengutronix.de; Mon, 17 Mar 2025 12:33:31 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tu8io-0003tc-EW for lore@pengutronix.de; Mon, 17 Mar 2025 12:33:30 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=I82+jQYPx3LQwdlBWVnlnr7NHj1QD83OkO2IzJ7XmSY=; b=OoFspMqrFtLS8v/WeYzWQQkBL9 TbqWo/1Ci0jlKyWUOUX39vka1jwmtnsBWYyNGI0foZH0lRIw/m6eP6BlPisuJEy4EtGvOQkemD3fR XbZNLj8UYBcO6T6JWoWyl0Uq+J9OzcGKIDya0iC9Bz3IDwKPAJ38FtT3ARSYi1KFOVpROuQOjtxmy Xfb+nobzf8cYCbAvlsWipk16V6CCQH9pfkX0Im6HKTFgq3MPrJ/qnHTKFWTQCAXVeuY1JnDf1uP9y lI7IIaK0/NutLc4cviMUvvfm15Tq/4Njon90vB6Q3M0qvfVUsXp3lxNy8ZOJLJbQ7/qtW5tHI66q/ w3LFoepQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tu8iJ-00000002PUL-44wF; Mon, 17 Mar 2025 11:32:59 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tu8hX-00000002PP0-3BLg for barebox@lists.infradead.org; Mon, 17 Mar 2025 11:32:13 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tu8hW-0003K0-G7; Mon, 17 Mar 2025 12:32:10 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tu8hV-000Ej3-2r; Mon, 17 Mar 2025 12:32:10 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1tu8hW-007orl-0i; Mon, 17 Mar 2025 12:32:10 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 17 Mar 2025 12:32:08 +0100 Message-Id: <20250317113208.1863258-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317113208.1863258-1-a.fatoum@pengutronix.de> References: <20250317113208.1863258-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250317_043211_792328_57AB85DB X-CRM114-Status: GOOD ( 10.03 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.4 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 2/2] MAKEALL: parse kconfig_add out of YAML files X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Now that MAKEALL supports direct options in KCONFIG_ADD, teach it to read runner kconfig_add keys out of the labgrid environment YAML files. This is a further step towards removal of test/emulate.pl. Signed-off-by: Ahmad Fatoum --- v1 -> v2: - no change --- MAKEALL | 13 +++++++++++++ test/Containerfile | 1 + 2 files changed, 14 insertions(+) diff --git a/MAKEALL b/MAKEALL index bc612b45561f..a9409fbf7b07 100755 --- a/MAKEALL +++ b/MAKEALL @@ -422,6 +422,19 @@ else if [[ $i =~ ^.*/([^/]+)/([^@]*@|)([^.]+).yaml$ ]]; then arch=${BASH_REMATCH[1]} defconfig=${BASH_REMATCH[3]} + + if grep -q "^\s\+kconfig_add:" $i; then + if command -v yq 2>&1 >/dev/null; then + KCONFIG_ADD="${KCONFIG_ADD} $(yq -M -r \ + '.targets.main.runner.kconfig_add | + keys[] as $k | .[$k]' < $i)" + else + echo "WARNING: yq command not found in path" >&2 + echo "WARNING: ignoring kconfig_add in $i" >&2 + echo + fi + fi + do_build_defconfig $arch $defconfig if [ $? -eq 0 ]; then do_test_defconfig $config $defconfig "${pytest_opts[@]}" diff --git a/test/Containerfile b/test/Containerfile index db43d039b922..53a5443e48fe 100644 --- a/test/Containerfile +++ b/test/Containerfile @@ -51,6 +51,7 @@ RUN apt-get update && apt-get install -y \ sudo \ u-boot-tools \ yamllint \ + yq \ && rm -rf /var/lib/apt/lists/* ENV GCC_VERSION=14.2.0 -- 2.39.5