From patchwork Fri Sep 19 20:14:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 347 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758312952; bh=x+nBMuPssTVeqsvxJqCu+nSD5QHaok/5cJ8zSFycD3k=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=rzGX6KOTCYzp7si3iqnO9hbS9z57ehOdHfmkzI1EMqTk8McSeiMeSkAvwDgpr3iAK OCC7tm84ciojoXLyNRxCGoWTg46lwxH12oFsC25s1fnnT8tlbS50UPELtiSr6mDIRG kKUxvXe9sKTXG8S6vHJOgRERwT2iFA8tH0tgT/mD3g3fLfRoEgd6CnM8kUQFnlk5OW qX5+gGyHaqVFXbr5vhVG35v6REyuiz5EPJPx9o7RThCuTBNfW2L9FGWeSotFntLkNc gD9/gx51J/YdaaYjdxUw5cq14m3VhXCiVF0POH4gBvWVeKqHK5lzFA+a9K5PRLDTn3 58Y+maEgUByiA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 6AB4067A99 for ; Fri, 19 Sep 2025 14:15:52 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id tbCTsMEGVpPm for ; Fri, 19 Sep 2025 14:15:52 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758312951; bh=x+nBMuPssTVeqsvxJqCu+nSD5QHaok/5cJ8zSFycD3k=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=oMzCetgckxyptsTTQ3/AkEXRzzTVTVsjhJAKRlnIKgMRbiYtSC7bm9wiZCY6umJsC LupR3yraDLMZ+rKZy/jyHwR0FIZu7eQavlF2b27uEr5lUo7rUYH9Ff4jZsptPmFQ/e jEfl2skB/6aOIk59CA0XdKEhyCb5rzeg4Shn1jk/DgCWO+ZjJ7oQkkAn24TPXJkJ4r ijlgvJkwKURkqA8+Gck4JbXl0/GeV9cpfmxBvhz4mTrKuXrJsvXKVDa2BYX7TDonJY BUGunkazUTCgrClCqgoMWu7m0TJ8KBzPj4MXO05wrHYgE7o3v/gsV/5/gATowIgFvz 5mYwcnOlAnIWw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 53D2D67B3B for ; Fri, 19 Sep 2025 14:15:51 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758312949; bh=M+p3CTjZrbNsaI1jMq+F1HwgLzdvlIY6qd/blgwjKQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EF9ixdQOPoVShuvY737kyNMpJS7NKPQQS8uEVl02tYOiCidJ9qhGUvTw6ie3NmMP8 OreQW+znPpxpwCJCX9I1AY/HJ/Dw9Pajs/tuI1HZV6CQq5wkgOl21JzLzI2IPpIkGM /BJgxJG6BOKj4gsPBVLEN9wjmg3WahciHYyca4hEx69M1svdFRTKR70QNHd3RgsnZi WCSN083QH95Wjn+2gfvHtnW4FeV5ecm8oy2/JnG2WfRKots1VG+uWe/4n/Rowa55Ku srBVLK7/sLEkb/F1qYAiqsd7FCaqhmZn/tDwlzP+wTtblTPiRsGPnkGSF6DlX1NUb5 yAcVzeyDZ/HYg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id EE74B67C06; Fri, 19 Sep 2025 14:15:49 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id DxCEPdarZbz9; Fri, 19 Sep 2025 14:15:49 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1758312949; bh=XlCbBdlqH0Wk2ceBgI/GGl+uJto/58mYWMXumSbX+ko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JAjrO3Wq2Tym/zki8fVByWa/TNK+sdWg4VE2woKnJh/3HJQyA+zqj/yv18llZjcbU Uio6wNlpDOWCeGTB9gkQGt/gezlpKN1BWgnNPWHp0ussmYRn8OGkOJYnL6MKAx4mZx Xl6tXJ9RoknDjx3dqz3lPTSYFtWmcPcXNs2pJF4kgGfATbBRSMk4J8uR7koDRulALp zsxnfnj/exvkBw11Kwow0XzAoytqSHiGEd8rq5Uq53i4bBoviqazixXGp90kx+/ePN Mbr8zynEcfSCGpxDbvGk1bFq8pXwqGFoWAF+8t5uzsnBbDfFGE2RHDqFrUVSGB67bl +Y6SD8o5cOLgw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id BAF7567B3B; Fri, 19 Sep 2025 14:15:48 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Fri, 19 Sep 2025 14:14:12 -0600 Message-ID: <20250919201507.4024144-6-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250919201507.4024144-1-sjg@u-boot.org> References: <20250919201507.4024144-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: E7DJZD7EEJG7D34XJPTKVIL5EK2WTPLL X-Message-ID-Hash: E7DJZD7EEJG7D34XJPTKVIL5EK2WTPLL X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass , Claude X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 05/42] scripts: Fix conditional syntax for capsule ESL generation List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass The ifeq/else/endif conditional for capsule_esl_file generation was incorrectly placed inside the recipe, causing malformed Makefile syntax that prevented proper dependency resolution. This resulted in build failures when CONFIG_EFI_CAPSULE_AUTHENTICATE was enabled because the capsule_esl_file target could not be created from the certificate file. Move the conditional to properly wrap the rule definitions, allowing Make to correctly parse and execute the capsule ESL generation rules. Signed-off-by: Simon Glass Co-developed-by: Claude --- scripts/Makefile.lib | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 8300c8104ce..5abe428e752 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -409,17 +409,18 @@ capsule_esl_dtsi=.capsule_esl.dtsi quiet_cmd_capsule_esl_gen = ESL $@ cmd_capsule_esl_gen = cert-to-efi-sig-list $< $@ -$(obj)/capsule_esl_file: $(capsule_crt_file) +$(obj)/capsule_esl_file: $(srctree)/$(capsule_crt_file) ifeq ($(CONFIG_EFI_CAPSULE_CRT_FILE),"") $(error "CONFIG_EFI_CAPSULE_CRT_FILE is empty, EFI capsule authentication \ public key must be specified when CONFIG_EFI_CAPSULE_AUTHENTICATE is enabled") else + $(Q)echo "Building capsule_esl_file: $@ from $<" $(call cmd,capsule_esl_gen) endif quiet_cmd_capsule_dtsi_gen = CAPSULE $@ cmd_capsule_dtsi_gen = \ - $(shell sed "s:ESL_BIN_FILE:$(abspath $<):" $(capsule_esl_input_file) > $@) + sed "s:ESL_BIN_FILE:capsule_esl_file:" $(capsule_esl_input_file) > $@ $(obj)/$(capsule_esl_dtsi): $(obj)/capsule_esl_file $(capsule_esl_input_file) $(call cmd,capsule_dtsi_gen)