From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7266376873610838016 X-Received: by 2002:aa7:d884:0:b0:525:6d6e:ed53 with SMTP id u4-20020aa7d884000000b005256d6eed53mr3247011edq.27.1692111604143; Tue, 15 Aug 2023 08:00:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d38d:0:b0:525:455e:f9d1 with SMTP id x13-20020aa7d38d000000b00525455ef9d1ls1828702edq.1.-pod-prod-01-eu; Tue, 15 Aug 2023 08:00:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfrnwvvr0ZNPL5TyAhRcbhRS+cCAPhNncwEckFgoVQkyqUCDsgZ8RPlm+tlwRaRKr1/7IP X-Received: by 2002:a17:906:cc4d:b0:99c:5056:4e29 with SMTP id mm13-20020a170906cc4d00b0099c50564e29mr11151767ejb.21.1692111601566; Tue, 15 Aug 2023 08:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692111601; cv=none; d=google.com; s=arc-20160816; b=xVZXrl+lT9D+K/necWphZAuf6+V6IksxVa2PR8gEp+9OU3Lr5tEUvdYyxUVVzkmW2E 7c5zX0Hn49CUQWYikLO8aNINIOxvx5zXZ3Koijg/7roOdYADAYO7z3TUvhWb0R7QWLII glsCaROaF818Z82tRcpHB3n3n2WquAR25l/PuTAYbnRkj9f5hYeiDU8s8Juf4V1I4JFl 5rTPR2zCFzRbcQZTeKRl9lFthPuslRyZGb/HI7b7r9JSWLrskrfH3TxhqPEvJSDoEl/S 4YsvnKiDo62z78hijPq6kQPNdbDW4QDQeAMGoDwDctR4+ecfWQhHSZpHNGwLcpQxxK3b THcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=TCRYa576HOkzqrtsliklX0AY2PPa4pHIg/Z28Yxv2nM=; fh=2bTUopgBKmEw36QWN2Tr4nystpnda9lxuoNiIayCmr4=; b=durThhBcgIAHdd75BYN/qBYI+xro22N7DpS++aWimFMrcE5dEd+QM1z70w5fbdReWe Po21Zl1ryQ8Zbpe8NIB4ZW8p8RQc73RQDps6fzF5FpAtuAcnjYTGuPdx6Bir5ze/LuBu Opn87+Wo12AS4T7kuBBRzvjCqh5GIPS6utBNWdKA/BsUarERCVmH49sb/0E8DijXH+lY 530mvyWQRcwDL7cwkapnDYcNifGWcr6Er0ZHrND31ckRjeSTZXR2o/sGBYNnQg0l6iNO jzIN0Jo85/Qn/vHlImZQ/6ZdjSkMYk3u5HQ3XMpRLoZt4CuV9ANF1XxaicqZOEWcJLY7 qfTQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id go11-20020a1709070d8b00b009885c0ef8d2si796966ejc.1.2023.08.15.08.00.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Aug 2023 08:00:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 37FExxfm009680 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Aug 2023 17:00:00 +0200 Message-ID: <794742a7fecdc4ef61e3cf008b47ad1e2d5429d4.camel@ilbers.de> Subject: Re: [PATCH] optee-ftpm: Improve parallel build fix patch From: Uladzimir Bely To: Jan Kiszka , isar-users Date: Tue, 15 Aug 2023 18:00:00 +0300 In-Reply-To: <84ae9868-09c2-486e-932f-f16c86483671@siemens.com> References: <84ae9868-09c2-486e-932f-f16c86483671@siemens.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 (by Flathub.org) MIME-Version: 1.0 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: cv4Wtv+9rnkG On Sat, 2023-08-12 at 12:13 +0200, Jan Kiszka wrote: > From: Jan Kiszka >=20 > The current version contains needless code duplication. >=20 > Signed-off-by: Jan Kiszka > --- > =C2=A0.../0001-Fix-parallel-build-of-optee_ta.patch | 74 +++++++++++-----= - > -- > =C2=A01 file changed, 45 insertions(+), 29 deletions(-) >=20 > diff --git a/meta-isar/recipes-bsp/optee-ftpm/files/0001-Fix- > parallel-build-of-optee_ta.patch b/meta-isar/recipes-bsp/optee- > ftpm/files/0001-Fix-parallel-build-of-optee_ta.patch > index 383ef9f7..c1447cc1 100644 > --- a/meta-isar/recipes-bsp/optee-ftpm/files/0001-Fix-parallel-build- > of-optee_ta.patch > +++ b/meta-isar/recipes-bsp/optee-ftpm/files/0001-Fix-parallel-build- > of-optee_ta.patch > @@ -1,11 +1,17 @@ > -From ee13738d203aca490c0fb3d1f79cee1d8f9e0c88 Mon Sep 17 00:00:00 > 2001 > -From: Uladzimir Bely > -Date: Mon, 31 Jul 2023 14:42:52 +0300 > +From f89333a5ee935c87a8c3ff7c72e100f59b03afbe Mon Sep 17 00:00:00 > 2001 > +From: Jan Kiszka > +Date: Thu, 20 Jul 2023 16:32:26 +0200 > =C2=A0Subject: [PATCH] Fix parallel build of optee_ta > =C2=A0 > -TA devkit build system runs creating tpm and wolf symlinks in > parallel > -with building ftpm. This sometimes causes build fail: > +The symlink must be established prio to building any of the source > files > +of the lib and WolfSSL, or things will fail: > =C2=A0 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0TA_CROSS_COMPILE=3D \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0TA_CPU=3Dcortex-a7 \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0TA_DEV_KIT_DIR=3D/usr/lib/opte= e-os/stm32mp15x/export-ta_arm32 \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CFG_TEE_TA_LOG_LEVEL=3D2 \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CFG_FTPM_USE_WOLF=3Dy \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/usr/bin/make -j 24 > =C2=A0make[2]: Entering directory '/<>/Samples/ARM32- > FirmwareTPM/optee_ta' > =C2=A0/usr/bin/make -C fTPM CROSS_COMPILE=3D > =C2=A0make[3]: Entering directory '/<>/Samples/ARM32- > FirmwareTPM/optee_ta/fTPM' > @@ -19,41 +25,51 @@ Establishing symlink. > =C2=A0make[3]: *** No rule to make target > 'lib/wolf/wolf_symlink/wolfcrypt/src/aes.c', needed by > '../out/fTPM/./lib/wolf/wolf_symlink/wolfcrypt/src/aes.o'.=C2=A0 Stop. > =C2=A0make[3]: *** Waiting for unfinished jobs.... > =C2=A0 > -It's easy to reproduce by adding a small sleep to the makefile rules > -that create these symlinks just before 'ln -s' called. > - > -Signed-off-by: Uladzimir Bely > +Signed-off-by: Jan Kiszka > =C2=A0--- > - Samples/ARM32-FirmwareTPM/optee_ta/Makefile=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 | 1 + > - Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile | 6 ++++++ > - 2 files changed, 7 insertions(+) > + Samples/ARM32-FirmwareTPM/optee_ta/Makefile=C2=A0=C2=A0=C2=A0 | 9 +++++= +++- > + Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk | 6 ------ > + 2 files changed, 8 insertions(+), 7 deletions(-) > =C2=A0 > =C2=A0diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/Makefile > b/Samples/ARM32-FirmwareTPM/optee_ta/Makefile > -index ddf6784..2053c01 100644 > +index ddf6784..cef0c6f 100644 > =C2=A0--- a/Samples/ARM32-FirmwareTPM/optee_ta/Makefile > =C2=A0+++ b/Samples/ARM32-FirmwareTPM/optee_ta/Makefile > -@@ -3,6 +3,7 @@ export V?=3D0 > +@@ -3,8 +3,15 @@ export V?=3D0 > =C2=A0=20 > =C2=A0 .PHONY: all > =C2=A0 all: > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$(MAKE) -C fTPM create_ftpm_lib_sym= links > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Link the required external code i= nto the libraries folder. > OP-TEE > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# build does not work well when acc= essing anything below the > root > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# directory. Use symlinks to trick = it. > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$(MAKE) -C fTPM CROSS_COMPILE=3D$(T= A_CROSS_COMPILE) > create_lib_symlinks > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Run the actual build > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$(MAKE) -C fTPM CROSS_COM= PILE=3D$(TA_CROSS_COMPILE) > =C2=A0=20 > =C2=A0 .PHONY: clean > -diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile > b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile > -index c71eecd..2b4309c 100644 > ---- a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile > -+++ b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile > -@@ -11,3 +11,9 @@ clean: clean_stripped_file > - clean_stripped_file: > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0rm -f $(BINARY).stripped.elf > + clean: > +-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$(MAKE) -C fTPM clean > +\ No newline at end of file > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$(MAKE) -C fTPM clean > +diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk > b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk > +index 2d9ba24..4eaf286 100644 > +--- a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk > ++++ b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk > +@@ -36,12 +36,6 @@ cflags-y +=3D -Os > + cflags-y +=3D -DNDEBUG > + endif > +=20 > +-# > +-# Link the required external code into the libraries folder. OP-TEE > build > +-# does not work well when accessing anything below the root > directory. Use > +-# symlinks to trick it. > +-# > +-all: create_lib_symlinks > + clean: clean_lib_symlinks > =C2=A0=20 > -+.PHONY: create_ftpm_lib_symlinks > -+create_ftpm_lib_symlinks: > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0@echo Establishing tpm_symlink. > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0ln -fs ../../$(TPM_ROOT) ./lib/tpm/= tpm_symlink > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0@echo Establishing wolf_symlink. > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0ln -fs ../../$(WOLF_ROOT) ./lib/wol= f/wolf_symlink > + subdirs-y +=3D lib > =C2=A0--=20 > -2.41.0 > +2.35.3 > =C2=A0 Applied to next, thanks.