From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7261955842613706752 X-Received: by 2002:ac2:5b9c:0:b0:4fe:8f0:6aa with SMTP id o28-20020ac25b9c000000b004fe08f006aamr5335999lfn.49.1690805856806; Mon, 31 Jul 2023 05:17:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d34c:0:b0:521:e522:ba52 with SMTP id m12-20020aa7d34c000000b00521e522ba52ls2988724edr.0.-pod-prod-08-eu; Mon, 31 Jul 2023 05:17:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlF0cg1AJijXdXW6ztQrVv1XKnGSOKMLFlYFbgKV0RuZgtllD+rKRmmIOUDAFDiFWsmMc+EU X-Received: by 2002:a17:907:2ccc:b0:965:6075:d100 with SMTP id hg12-20020a1709072ccc00b009656075d100mr6682615ejc.39.1690805854475; Mon, 31 Jul 2023 05:17:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690805854; cv=none; d=google.com; s=arc-20160816; b=ZHw0tB06s3o0FnSQuVSrZeNvIuB5+9ttr6l+LGmSKBqW39oZFaGmViR5J+qNBC82jZ ZB+Kk73dyD65nkonWfFTtzBivPZDELCOQbS6wwVBPDCkm2MdhgObYx+iC0pqiZZsUvMU 5g5+Sm3aQFNLgP6sr+2msBiaxYqap51Raf4UHOuOhTbUnuwI5SYxBOJylqq7Nd+xwQb2 onrgoQz34MbxkMjsWMXHnZ/KQkUIlc8IY/wB7V68bZsj5t1xMP02+f9XBL0CYH+kqTqn a+a3BMVw7KnI2GXjpZoItzPqaK5Rqz8jjFtTBpTYGhLOzBZ8XOgiMBiH7Iyj344foxzo GxCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=eKQo21lEBkGbuaoza/Eu1UL8OSk5vfAm9PZLqGSvAUQ=; fh=swRs1+OhWjovx1IrvOlKBWsdq9manB5qdcuGoHoh5Ak=; b=Jk/xx5GBIu/xYoHTXcbopcsSlE1CZKwuV78/AMLsPUPKTSMWsloxU8w1hA7BBIUZRl S8Zt1VM1njyy+HnNXe6FSrZ77Hn/W1zLmOFsaCB+7wtaVObuSaXdxLjjDyNUa6DyJVBR iLOnBs3diklb6nKWeONklJuYSDCEedZ7YL1hJxcUcSqAt2KsNljulQ7arMsmKGVII+aa tvmmwxrhKgMCpZdK3N58vhj6t9aGIbQo8XeK50vOwzArhQAJag/1AunIKI7adeTPRWNX i+D5YWsbHe6JrzNepqhvlnJL+VQAaQv9j6/QBBFOIxgXUiX5rwixzhfC7JMixaZHmOmn c1EA== 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 tl14-20020a170907c30e00b0099b4a2b2721si744865ejc.0.2023.07.31.05.17.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Jul 2023 05:17:34 -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 baighyz.m.ilbers.de (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 36VCHTOg015705 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 31 Jul 2023 14:17:33 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 11/11] optee-ftpm-stm32mp15x: Add patch to fix parallel build issues Date: Mon, 31 Jul 2023 14:17:29 +0200 Message-Id: <20230731121729.16972-12-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230731121729.16972-1-ubely@ilbers.de> References: <20230731121729.16972-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Q8rQB8qRJudf From: Jan Kiszka Signed-off-by: Jan Kiszka Signed-off-by: Uladzimir Bely --- .../0001-Fix-parallel-build-of-optee_ta.patch | 59 +++++++++++++++++++ .../optee-ftpm-stm32mp15x_0~230316+git.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta-isar/recipes-bsp/optee-ftpm/files/0001-Fix-parallel-build-of-optee_ta.patch 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 new file mode 100644 index 00000000..383ef9f7 --- /dev/null +++ b/meta-isar/recipes-bsp/optee-ftpm/files/0001-Fix-parallel-build-of-optee_ta.patch @@ -0,0 +1,59 @@ +From ee13738d203aca490c0fb3d1f79cee1d8f9e0c88 Mon Sep 17 00:00:00 2001 +From: Uladzimir Bely +Date: Mon, 31 Jul 2023 14:42:52 +0300 +Subject: [PATCH] Fix parallel build of optee_ta + +TA devkit build system runs creating tpm and wolf symlinks in parallel +with building ftpm. This sometimes causes build fail: + +make[2]: Entering directory '/<>/Samples/ARM32-FirmwareTPM/optee_ta' +/usr/bin/make -C fTPM CROSS_COMPILE= +make[3]: Entering directory '/<>/Samples/ARM32-FirmwareTPM/optee_ta/fTPM' +Checking symlink to the TPM folder: /<> +Checking symlink to the WolfSSL folder: /<>/external/wolfssl +Establishing symlink. + CC ../out/fTPM/platform/Cancel.o +Establishing symlink. + CC ../out/fTPM/platform/AdminPPI.o + CC ../out/fTPM/platform/Entropy.o +make[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'. Stop. +make[3]: *** Waiting for unfinished jobs.... + +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 +--- + Samples/ARM32-FirmwareTPM/optee_ta/Makefile | 1 + + Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile | 6 ++++++ + 2 files changed, 7 insertions(+) + +diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/Makefile b/Samples/ARM32-FirmwareTPM/optee_ta/Makefile +index ddf6784..2053c01 100644 +--- a/Samples/ARM32-FirmwareTPM/optee_ta/Makefile ++++ b/Samples/ARM32-FirmwareTPM/optee_ta/Makefile +@@ -3,6 +3,7 @@ export V?=0 + + .PHONY: all + all: ++ $(MAKE) -C fTPM create_ftpm_lib_symlinks + $(MAKE) -C fTPM CROSS_COMPILE=$(TA_CROSS_COMPILE) + + .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: + rm -f $(BINARY).stripped.elf + ++.PHONY: create_ftpm_lib_symlinks ++create_ftpm_lib_symlinks: ++ @echo Establishing tpm_symlink. ++ ln -fs ../../$(TPM_ROOT) ./lib/tpm/tpm_symlink ++ @echo Establishing wolf_symlink. ++ ln -fs ../../$(WOLF_ROOT) ./lib/wolf/wolf_symlink +-- +2.41.0 + diff --git a/meta-isar/recipes-bsp/optee-ftpm/optee-ftpm-stm32mp15x_0~230316+git.bb b/meta-isar/recipes-bsp/optee-ftpm/optee-ftpm-stm32mp15x_0~230316+git.bb index 441bc4ac..c92620e1 100644 --- a/meta-isar/recipes-bsp/optee-ftpm/optee-ftpm-stm32mp15x_0~230316+git.bb +++ b/meta-isar/recipes-bsp/optee-ftpm/optee-ftpm-stm32mp15x_0~230316+git.bb @@ -12,6 +12,7 @@ SRC_URI += " \ https://github.com/Microsoft/ms-tpm-20-ref/archive/${SRCREV}.tar.gz \ https://github.com/wolfSSL/wolfssl/archive/${SRCREV-wolfssl}.tar.gz;name=wolfssl \ file://0001-add-enum-to-ta-flags.patch \ + file://0001-Fix-parallel-build-of-optee_ta.patch \ " SRCREV = "f74c0d9686625c02b0fdd5b2bbe792a22aa96cb6" -- 2.20.1