From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 13 Oct 2026 13:17:32 +0200 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 1xGaVg-00D8qz-2d for lore@lore.pengutronix.de; Tue, 13 Oct 2026 13:17:32 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xGaVf-0007aO-Vg; Tue, 13 Oct 2026 13:17:31 +0200 Received: from mx1.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::107]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xGaVV-0007aF-6G for ptxdist@pengutronix.de; Tue, 13 Oct 2026 13:17:21 +0200 Received: from h4.cmg2.smtp.forpsi.com (h4.cmg2.smtp.forpsi.com [185.129.138.189]) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPS id B576B20007C for ; Tue, 13 Oct 2026 13:17:20 +0200 (CEST) ARC-Seal: i=1; s=20260414; d=pengutronix.de; t=1791890240; a=rsa-sha256; cv=none; b=Zr9ScyRTtsGC4enaEkwrabjVoXLHn1AhUyI3LAdImegYbUzMTxJ5eNr9+4YY9UbJ5K/nma wR0hGPm80zRlePXj0MyCXlb6J47754nmqSSRL30XuhD+RO32EndyGgz9mzNGzcEXT5RGJf kqA241GliyvydTTUwsALxva1CYByjWLpxt7THP/cZrCAXNCeQj0jk2m/2gDro1HN8Cu3pB FnNzB6iOKyT3iELN3j2M0N34vjwxTpnwpjc2OqyLYAnCTY+BilotMcyWKDNhZsKTjGE/pj SfKryGynQPOffy3xrtJrT9JowrCP9gpS+des8r9Mm+6RFG/zLse//Bq1yw4+zA== ARC-Authentication-Results: i=1; mx1.white.stw.pengutronix.de; dkim=pass header.d=triops.cz header.s=f2019 header.b=2BAym4wH; spf=none (mx1.white.stw.pengutronix.de: domain of oss-lists@triops.cz has no SPF policy when checking 185.129.138.189) smtp.mailfrom=oss-lists@triops.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=pengutronix.de; s=20260414; t=1791890240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cAj3E2NS0Jjya2prcCXtHLPbZDyfhl2WBZbcOr3JQb8=; b=dw3axHJjCmpyrDbYGNRpdX3VCvKcYER+5y5ANjNscYbwhY7TOqvvYw0bVXrowBn/qST5at wdbVSQNfrQHXlKBO2ZgF+42QROvfukDAb14D2Ex+ijuRJzi3gByU0A/KjLvS+bt+LpScnv qR24TE+BUn+wYfAwo2stPyBIdmrq68kvglXJY0d8Jc7ohG95gASHxFUd4OV4VxbHo2to7l vf8qdUZb5ADKqxboCawz8MSydRwy/MzkgVC8AgpLd7duWgA6fucRY7arMdzyDMSQQfadS5 TtIGA7XXzq2c1xdrFDVayNxedVKgFpz80Gg243nwoV3rWOPXWu/ptG0zFMnVPw== Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA id GaVTxUuqSA7ufGaVUx9naW; Tue, 13 Oct 2026 13:17:20 +0200 Date: Tue, 13 Oct 2026 13:17:18 +0200 From: Ladislav Michl To: ptxdist@pengutronix.de Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-CMAE-Envelope: MS4xfOu7iOLhUHqjLVuKzxT4YSfDI69VO6uU/JoW3IkPR23/A//LgFs4MH0HyLWgy/NWcU5ZofI79cM7VCh6c2nbO3pTHVEAtXHYujchPg2cBxy2Fsh+IjU1 kUKv5iDC0LKCiQvgnI0opDQ8CwrqC13AHIr2stFkCij7fEEHeNeWNu8iv6iWXSEJy2DXdEU23d1ImQ== X-Spamd-Result: default: False [-2.60 / 15.00]; BAYES_HAM(-3.00)[100.00%]; MID_RHS_NOT_FQDN(0.50)[]; ONCE_RECEIVED(0.20)[]; R_DKIM_ALLOW(-0.20)[triops.cz:s=f2019]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:24806, ipnet:185.129.136.0/22, country:CZ]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_TLS_ALL(0.00)[]; NEURAL_HAM(-0.00)[-1.000]; ARC_SIGNED(0.00)[pengutronix.de:s=20260414:i=1]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[triops.cz]; R_SPF_NA(0.00)[no SPF record]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[triops.cz:+] X-Rspamd-Action: no action X-Rspamd-Server: mx1 X-Rspamd-Queue-Id: B576B20007C X-Stat-Signature: dxj5htbdcie1w5m134rf6w8zzhhethaa Subject: [ptxdist] [PATCH 2/6] ptxdist: introduce PTXDIST_HOSTTOOLS_DIR X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false From: Ladislav Michl Store the links to the host tools and kconfig in a separate variable for now the same as PTXDIST_TOPDIR. Signed-off-by: Ladislav Michl --- bin/ptxdist | 7 +++++-- rules/host-qemu.make | 2 +- rules/other/Toplevel.make | 6 +++--- scripts/lib/ptxd_lib_kconfig.sh | 6 +++--- scripts/lib/ptxd_make_nested.sh | 2 +- scripts/lib/ptxd_make_report.sh | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/bin/ptxdist b/bin/ptxdist index 2557cb9a2..94c41412f 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -2118,6 +2118,7 @@ _realpath() # # out: PTXDIST # PTXDIST_TOPDIR +# PTXDIST_HOSTTOOLS_DIR # PTXDIST_WORKSPACE # PTXDIST_PTXCONFIG_DEFAULT # PTXDIST_PLATFORMCONFIG_DEFAULT @@ -2142,6 +2143,7 @@ setup_topdir() { PTXDIST="${ptxdist}" PTXDIST_TOPDIR="${topdir}" + PTXDIST_HOSTTOOLS_DIR="${topdir}" PTXDIST_WORKSPACE="$(pwd)" eval PTXDIST_PTXCONFIG_DEFAULT="${PTXDIST_PTXCONFIG_DEFAULT}" @@ -2149,8 +2151,8 @@ setup_topdir() { eval PTXDIST_COLLECTIONCONFIG_DEFAULT="${PTXDIST_COLLECTIONCONFIG_DEFAULT}" eval PTXDIST_TOOLCHAIN_DEFAULT="${PTXDIST_TOOLCHAIN_DEFAULT}" - # ${PTXDIST_TOPDIR}/bin contains links to sane tools found by configure - export PATH="${PTXDIST_TOPDIR}/bin:${PATH}" + # ${PTXDIST_HOSTTOOLS_DIR}/bin contains links to sane tools found by configure + export PATH="${PTXDIST_HOSTTOOLS_DIR}/bin:${PATH}" } @@ -2727,6 +2729,7 @@ setup_export() { \ PTXDIST \ PTXDIST_TOPDIR \ + PTXDIST_HOSTTOOLS_DIR \ PTXDIST_SRCDIR \ PTXDIST_TEMPDIR \ PTXDIST_LIB_DIR \ diff --git a/rules/host-qemu.make b/rules/host-qemu.make index eef2dc133..77cd8dcea 100644 --- a/rules/host-qemu.make +++ b/rules/host-qemu.make @@ -249,7 +249,7 @@ ifdef PTXCONF_HOST_QEMU_USR -e 's|RTLDLIST=.*|RTLDLIST="$(PTXDIST_SYSROOT_TOOLCHAIN)$(QEMU_CROSS_DL)"|' \ -e 's|eval $$add_env|eval $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross -E "$${add_env// /,}"|' \ -e 's|verify_out=`|verify_out=`$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross |' \ - -e 's|#! */.*$$|#!$(shell readlink $(PTXDIST_TOPDIR)/bin/bash)|' \ + -e 's|#! */.*$$|#!$(shell readlink $(PTXDIST_HOSTTOOLS_DIR)/bin/bash)|' \ $(PTXDIST_SYSROOT_TOOLCHAIN)/usr/bin/ldd > $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd endif diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index 44a030825..5dec61bb3 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -8,7 +8,7 @@ ifneq ($(findstring n,$(filter-out --%,$(MAKEFLAGS))),) MAKE=true SHELL=true define ptx/force-shell -$(eval SHELL=$(realpath $(PTXDIST_TOPDIR)/bin/bash))$(shell $(1))$(eval SHELL=true) +$(eval SHELL=$(realpath $(PTXDIST_HOSTTOOLS_DIR)/bin/bash))$(shell $(1))$(eval SHELL=true) endef define ptx/force-sh $(eval SHELL=/bin/sh)$(shell $(1))$(eval SHELL=true) @@ -17,12 +17,12 @@ define ptx/sh endef else # make sure bash is used to execute commands from makefiles -SHELL=$(realpath $(PTXDIST_TOPDIR)/bin/bash) +SHELL=$(realpath $(PTXDIST_HOSTTOOLS_DIR)/bin/bash) define ptx/force-shell $(shell $(1)) endef define ptx/force-sh -$(eval SHELL=/bin/sh)$(shell $(1))$(eval SHELL=$(realpath $(PTXDIST_TOPDIR)/bin/bash)) +$(eval SHELL=/bin/sh)$(shell $(1))$(eval SHELL=$(realpath $(PTXDIST_HOSTTOOLS_DIR)/bin/bash)) endef define ptx/sh $(call ptx/force-sh,$(1)) diff --git a/scripts/lib/ptxd_lib_kconfig.sh b/scripts/lib/ptxd_lib_kconfig.sh index 0cec1edac..625a32c8a 100644 --- a/scripts/lib/ptxd_lib_kconfig.sh +++ b/scripts/lib/ptxd_lib_kconfig.sh @@ -781,9 +781,9 @@ ptxd_kconfig() { ;; esac - local conf="${PTXDIST_TOPDIR}/scripts/kconfig/conf" - local mconf="${PTXDIST_TOPDIR}/scripts/kconfig/mconf" - local nconf="${PTXDIST_TOPDIR}/scripts/kconfig/nconf" + local conf="${PTXDIST_HOSTTOOLS_DIR}/scripts/kconfig/conf" + local mconf="${PTXDIST_HOSTTOOLS_DIR}/scripts/kconfig/mconf" + local nconf="${PTXDIST_HOSTTOOLS_DIR}/scripts/kconfig/nconf" export \ KCONFIG_NOTIMESTAMP="1" \ diff --git a/scripts/lib/ptxd_make_nested.sh b/scripts/lib/ptxd_make_nested.sh index 54535377f..35087034c 100644 --- a/scripts/lib/ptxd_make_nested.sh +++ b/scripts/lib/ptxd_make_nested.sh @@ -47,7 +47,7 @@ ptxd_make_nested_ptxdist() { args=( "cd" "${pkg_workspace}" "&&" "${PTXDIST_TOPDIR}/bin/ptxdist" ) PTXDIST_TOOLCHAIN="$(readlink "${PTXDIST_PLATFORMDIR}/selected_toolchain")" - PATH=$(sed -e 's;[^:]*/sysroot-\(host\|cross\)/[^:]*:;;g' -e "s;${PTXDIST_TOPDIR}/bin:;;" -e "s;${PTXDIST_TOOLCHAIN}:;;" <<< "${PATH}") + PATH=$(sed -e 's;[^:]*/sysroot-\(host\|cross\)/[^:]*:;;g' -e "s;${PTXDIST_HOSTTOOLS_DIR}/bin:;;" -e "s;${PTXDIST_TOOLCHAIN}:;;" <<< "${PATH}") if [ "${PTXDIST_WORKSPACE}" != "${pkg_workspace}" ]; then unset PTXDIST_PLATFORMDIR diff --git a/scripts/lib/ptxd_make_report.sh b/scripts/lib/ptxd_make_report.sh index 7eea60900..7f8ad07ad 100644 --- a/scripts/lib/ptxd_make_report.sh +++ b/scripts/lib/ptxd_make_report.sh @@ -24,7 +24,7 @@ ptxd_make_bsp_report_header() { do_path() { local orig_IFS="${IFS}" # only the paths added by PTXdist - local path="${2%:${PTXDIST_TOPDIR}/bin:*}:${PTXDIST_TOPDIR}/bin" + local path="${2%:${PTXDIST_HOSTTOOLS_DIR}/bin:*}:${PTXDIST_HOSTTOOLS_DIR}/bin" echo "${indent}${1}" awk "BEGIN { RS=\":\" } { if (\$1) print \"${indent}- '\" \$1 \"'\" }" <<<"${path}" } -- 2.47.3