From patchwork Fri Feb 7 23:12:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3841 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 147AB3F13E for ; Sat, 8 Feb 2025 00:12:14 +0100 (CET) Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-38da6aa2363sf1119092f8f.0 for ; Fri, 07 Feb 2025 15:12:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1738969933; cv=pass; d=google.com; s=arc-20240605; b=MO4ubHXnL0BPedJXSLWhUvZJWYTbD1We/e7LpzPx9dln+jwr/qhGp03AOZrOUQfuyl BrzzDiOhEV8S/YXh8PSa+YN+0LJLXVp2/fyV4LU29dJ46tr7gfsPvTizBKX4QTD1EBjQ UJLZGJdNjNeReqKkXrhJqMSKMnivC+P2kms/wSU4675QqQjYi18yN4s5MTVvKyCycTth iDwHWwZSujq+L0lk1Bpwvs1KTm0M6WK9110Oe7THj049Qp68u+Ct51CIWfLvTzFsuseO 2gWa978cqPlYc8907F51FA55bpFQkAoACAYP+pUsSpzrnwwXErmmAOJ/MFFpT/hUmt8M P6dg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=T8Mn+OtzGyvoWmwd/wBDA0DfHetsAXya8r2CiF19qpw=; fh=XrMvo5CgfBjwkUgWUQxwQiWkP0Bi8qCSsVuacEZDMws=; b=a4NZ9+3EhS1AM7gXdUU6xVccqSrMsis31eJNcirzxBCp+45TXaK1JSxMEp+wb6mJ09 jBfr7cgjDGsQBTWlVVPXwzqaVhQ3GVhWHlqRtIcMfzDSzsuuBTyF/sQdf+4ZcesHK/nT LVQHEhFeN4FkMrXCcApYuQwE3LWHwh947C+IEcqlZnZue0UsFm9b3VwYt5G9qThAc3mS VQwuV9SpczJDl/0xd0J8Aj2aP6bpyhHwhin732B7EhgQkZg8T6284F6JxcbZRlsreEus k9pWwh3zSFinI1/OSZCH37TNPrypaFZZKUpy8x8URP+xy/AY72hxbaECUqatbRaK25Cn 7LPQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=XNLtnJfU; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1738969933; x=1739574733; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=T8Mn+OtzGyvoWmwd/wBDA0DfHetsAXya8r2CiF19qpw=; b=YeR2yvWwteheila9XiR3UI7jTIVLyqws16m9gn4PxJGKGcpJ0++v1HJpYWJj5ml1YM uXaIYxSEw2IO5kJTsNWAhM8YEmOVLiFZdjVxKn/HK4srJ3PRDw/5WeLalhzQPJmUK/4x x7scyqNsdHHBU8pmNwm4okLAy97bbcqkPiFUU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738969933; x=1739574733; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=T8Mn+OtzGyvoWmwd/wBDA0DfHetsAXya8r2CiF19qpw=; b=TquCrKSazxRZYRPcqiOwy10FuJoYtzk36B2myY7DC+wChF01/B7MYf52jEdCDRhoM4 GrMlQ89GdzZOIeos3touC+H92tABNHpuNP+wdO7ku8i2stgqV9OYFy9dMz2lkpva+vKi ugfavzkqyRX6dwuIK7kZ7bRliLY8kXoYm5cc7s1tX8iR8z2gHubPJ/V72v9pycwahai7 O8hL+S/8adeOyN3i4NqkWcpnbuSMBpAMDqaIszy/QV1LZOhjcEwXNuiKLlr0Nkn9lNDy pVBmhyIwaYrYXcjRxEzKf2OlTnBY2vCvjSViUX2O6PzwrSjFw0RzzoDR3lzBx5TCcSsF JfCQ== X-Forwarded-Encrypted: i=2; AJvYcCXsqeHCnbuATqkIRoO8ECRa3/ZLYmiebzM+q1G/xkwYIiK1QXfYi2/E7IbLsHkW4OyCiApNcgDfVESZ00vR@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yz2H6w/Phn9BX4w/s184MqeEAc1w7+7OcUcPMmGtct5swNfbogU b6YqvEp69apnIRYuU5Rt3CC/5j59tDjRBULB+6y87sXRbmxluVTqNcZ0ZJSvGqKN2w== X-Google-Smtp-Source: AGHT+IEzduLteYtIGLxey4IGq7anWxLE/q7MG7iLc92EGoz+fzTeNW6jaT8wDdgml2KcuiJl+evjEg== X-Received: by 2002:a5d:47ca:0:b0:38d:badf:9de6 with SMTP id ffacd0b85a97d-38dc9333a3bmr3316633f8f.34.1738969932572; Fri, 07 Feb 2025 15:12:12 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:adf:a1c3:0:b0:387:85f1:31d9 with SMTP id ffacd0b85a97d-38dc892d037ls501148f8f.0.-pod-prod-04-eu; Fri, 07 Feb 2025 15:12:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWZtODV7rnGwDLomcQcTcPt6rvfrYQlm0KuFu3OLNzshDNK+bQWw/M09GqDP0Ss5aHC8yDRcj0DJVW5ILtd@amarulasolutions.com X-Received: by 2002:a5d:5889:0:b0:385:e303:8dd8 with SMTP id ffacd0b85a97d-38dc8fe4171mr3691867f8f.26.1738969930645; Fri, 07 Feb 2025 15:12:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738969930; cv=none; d=google.com; s=arc-20240605; b=IH1y+6VFRQW15bsb3aMAL/gQJ2IFPM5s1AFIwvugeTtlyvj7FmKDcxdkZMy4viajgQ sNgZjB8q8NtffVBfgHcY+j1Fbzj+JlsMnsMG9arY8MlH+oBO+XRzrmOkE3K1udSyDDi9 OzRiW5PHpY3u0OPj4cx7Gxak6ZXXnE96eE/VwJzyxLT+Rv9mRvmu8jvIZ8yETgK13vs3 JL5xWZH6fdQvGuFDele3yilBTCd7Xtlf9XVGIVNlbxOOqTfRH2o62H+4aJ36oXmOXF57 FRjweqi2wfqgEztLWdukZ14jkOP79nTeCWQUN+v8begV9hGUEMogvsVQJL+MI3uCOFVI ZTEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=dLryetmn0kobyr6Kg19ZKfuNbRk5z1+NRCCuhcCjShI=; fh=rT/VapxJbbY45/IViUpe2cWa3m8ujGb+LyYSEyGZPIk=; b=Mg3/N522rFwcVi2R5JZTEeYTbk2LGUC9BXcF9OyMyhE2q7qOeIMhXVwrXTaGPJ5mgg /facQqHPJhpnPHEyZmM5l1WawIyOkucwe3IOu6LxG2DQp/isG/jb5EnWzou8EgplXotm 62ShwTb5X+prQ9WN2QB0nxcus7nx8kNzxENu0BzNWta9Nwawq2f5giBnWtn7Ab7AJ75j Ia4tF1nE5u+Fi/1NAAQ6qLEGM6Ds1ssXSxDgccU0EZOdsqoD08KIlV8HCzogAON7fOWH uzQFlY5ohIDe+n5+NBlOChRmttLcoC3df6ynxHNAQiGLqtBp1k/Aw/ItOlRqp3la154R 5PhQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=XNLtnJfU; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id ffacd0b85a97d-38dd3d3e399sor73142f8f.6.2025.02.07.15.12.10 for (Google Transport Security); Fri, 07 Feb 2025 15:12:10 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCUYelIQNSOFDN+ohalY4ZcSRikE69r1RhmH8Yqms4trEG60WicroFGRfO3ty5qldtv1ARxnmJf5pSgAdShY@amarulasolutions.com X-Gm-Gg: ASbGncvW8rk+W+jvHdC87TkI8sBC7KlhmupN7y26i7T0/vkESfejJd8WC9WvNzxFy4u ecGiiX5ShclKXXoCa0/vAYSzRl7hYBUHYXRLm/l/R+zaiKaQhx5IRe+nGRIQRHHM0mjFNxIS7yv goG0I6VPsj/tpyCdnl18OunDdwBNaQJawahInTl7Vllr486ngxG6tp8oKQzXrmtQDcQDYVaGAu9 SOUHmftCmkOojpiQs0ZJpNFT3dmHyHYokWwSu9ieXMMdgyTalKkXZSrsmz48Nf7onDcbXxP1Bf6 5XhnvlI6vw1/2xBQvlvM5fXqO0i67YUi4FwVLB0U1q+4sUD3bT2vkHHUPBp+Qt7ZFRF5K24UOHZ c5+g= X-Received: by 2002:a5d:6d0b:0:b0:38b:ed88:f045 with SMTP id ffacd0b85a97d-38dc90f0daemr3750334f8f.33.1738969930087; Fri, 07 Feb 2025 15:12:10 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.43.9]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4390db1150csm105175775e9.39.2025.02.07.15.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 15:12:09 -0800 (PST) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] boot/uboot: fix binman failure Date: Sat, 8 Feb 2025 00:12:03 +0100 Message-ID: <20250207231203.3952765-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=XNLtnJfU; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The commit 4bce3270d680 ("Config.in: timeout earlier when connecting to download servers"), among other things, adds the connection timeout parameter to the default scp command: config BR2_SCP string "Secure copy (scp) command" default "scp -o ConnectTimeout=10" Since the package/pkg-download.mk file exports this command using the SCP variable: export SCP := $(call qstrip,$(BR2_SCP)) and the U-Boot Makefile uses this variable as the path for the scp command (rather than the command itself): cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(foreach f,$(BINMAN_TOOLPATHS),--toolpath $(f)) \ --toolpath $(objtree)/tools \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d $(binman_dtb) -O . -m \ --allow-missing --fake-ext-blobs \ $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ $(foreach f,$(of_list_dirs),-I $(f)) -a of-list=$(of_list) \ $(foreach f,$(BINMAN_INDIRS),-I $(f)) \ -a atf-bl31-path=${BL31} \ -a tee-os-path=${TEE} \ -a ti-dm-path=${TI_DM} \ -a opensbi-path=${OPENSBI} \ -a default-dt=$(default_dt) \ -a scp-path=$(SCP) \ the following error occurs: BINMAN .binman_stamp usage: binman [-h] [-B BUILD_DIR] [-D] [-H] [--tooldir TOOLDIR] [--toolpath TOOLPATH] [-T THREADS] [--test-section-timeout] [-v VERBOSITY] [-V] {build,bintool-docs,entry-docs,ls,extract,replace,sign,test,tool} ... binman: error: unrecognized arguments: -o ConnectTimeout=10 make[2]: *** [Makefile:1126: .binman_stamp] Error 2 The patch fixes the SCP setting passed to U-Boot to ensure that its parameters are not included. Fixes: 4bce3270d680 ("Config.in: timeout earlier when connecting to download servers") Signed-off-by: Dario Binacchi Tested-by: Sergey Matyukevich Tested-by: Niklas Cassel --- boot/uboot/uboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 2796b0a31010..6bbdc4151fac 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -176,7 +176,8 @@ UBOOT_MAKE_OPTS += \ ARCH=$(UBOOT_ARCH) \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" \ - $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS)) + $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS)) \ + SCP=$(word 1, $(SCP)) # Disable FDPIC if enabled by default in toolchain ifeq ($(BR2_BINFMT_FDPIC),y)