From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899511488964198400 X-Received: by 2002:a5d:66d2:: with SMTP id k18mr5441354wrw.327.1606417700885; Thu, 26 Nov 2020 11:08:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1fc7:: with SMTP id f190ls1396710wmf.1.gmail; Thu, 26 Nov 2020 11:08:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdD4qEYy8TSGRiwzw+GJOfRq4lfYkAddA1pkPDrXJy/bs8qYJNqIwoodTy07ItKMilFRw9 X-Received: by 2002:a7b:c5c6:: with SMTP id n6mr4785571wmk.131.1606417700014; Thu, 26 Nov 2020 11:08:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606417700; cv=none; d=google.com; s=arc-20160816; b=KuQkAzVlBm2zAcAj0LP42coM8OTEu+fonruHyPt18mYWe8KDlcBvpdXXx1AB94j/y6 LoiqagyNZW03SfrYGIoV5wx/5Gb8RiR9wDMgiXmQAHAHbYkKXS5emuBOvdNp3L7/zFAm PezmCRF/q7cJi1f4Fu5rDxZ8iVKA0WbabOvZKY/jTFU6X4uOgc9uqGbT9ouNHgAsdkJ1 dRJq7KVd/GtjauwNs6vXyHD3vl9JVfRuPUTN14rZ6H1+VfsUixjI55znnuBfRZ3218zO 7CmCYb5ONmD2ry0Cy7NbS+yh0/QFJ+Cdh/uKZ0YwVfccLhwoBtsNE9qy4JJplGPigxwB Y71Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from; bh=K3kJguIdzdBYv4Q9SQTVcwX6gtH5au+lrE6EbJp7uFw=; b=DO1GRdcAaMSSeR4mefQd+7GmbygLEwBqgOrOgH4rqIkOq7JIbqacCVXW40sOZdYxIj lD6KiAqa+1fHQ/YG59gNnx9qIBX6SbofWblEUTA/mIXV2UYVSSKMGpnZk6Anb7dxT1Ma fIH9AugHKsrvj1Z3SUeuRa0YviPB2X600emaqgAHWgQz+51PMAyEzulr6JrmyLCrCU8d +Umq00pprQnroXbdmGH+jSKU4In9jERd+hIH8k5VDLCc7I8TbmBpTaFk/kPstQSJIo8/ fXAq8XEaJmiPRsdJJbwFVs7PJFf24gKwxQnD3LOapLdLMbf5CZDWhmcm4afN+rM6pRB9 F5Bg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id i3si219908wra.1.2020.11.26.11.08.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 11:08:20 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 0AQJ8JLG016047 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 26 Nov 2020 20:08:19 +0100 Received: from [167.87.38.29] ([167.87.38.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0AQJ8Jew023840 for ; Thu, 26 Nov 2020 20:08:19 +0100 From: Jan Kiszka Subject: [PATCH] stm32mp15x: Update to OP-TEE 3.11.0 and tune version output To: isar-users Message-ID: <2a104134-cc96-45fe-fc1c-e9f686ccab49@siemens.com> Date: Thu, 26 Nov 2020 20:08:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: nvpX/1fGSXN5 From: Jan Kiszka Bump the version and make sure it is visible to the build as we are not compiling over a git tree with tags. Signed-off-by: Jan Kiszka --- This was supposed to be folded into v4 of the original series but somehow got lost locally. ...stm32mp15x_3.10.0.bb => optee-os-stm32mp15x_3.11.0.bb} | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) rename meta-isar/recipes-bsp/optee-os/{optee-os-stm32mp15x_3.10.0.bb => optee-os-stm32mp15x_3.11.0.bb} (63%) diff --git a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb similarity index 63% rename from meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb rename to meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb index a2570946..0fa2005d 100644 --- a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb +++ b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb @@ -6,7 +6,7 @@ require recipes-bsp/optee-os/optee-os-custom.inc SRC_URI += "https://github.com/OP-TEE/optee_os/archive/${PV}.tar.gz" -SRC_URI[sha256sum] = "d30776ab051b701cdd2b71d32ff5cd54285a688440cc90aefd14b4f0f6495d7c" +SRC_URI[sha256sum] = "3c34eda1052fbb9ed36fcfdfaecfd2685023b9290670c1a5982f8a0457bfd2cb" S = "${WORKDIR}/optee_os-${PV}" @@ -17,3 +17,9 @@ OPTEE_EXTRA_BUILDARGS = " \ ARCH=arm CFG_EMBED_DTB_SOURCE_FILE=stm32mp157c-ev1.dts \ CFG_TEE_CORE_LOG_LEVEL=2" OPTEE_BINARIES = "tee-header_v2.stm32 tee-pageable_v2.stm32 tee-pager_v2.stm32" + +# Set version manually to PV, the tarball does not contain any hint. +# Alternative: pull from git and add git as build dependency. +dpkg_runbuild_prepend() { + export TEE_IMPL_VERSION=${PV} +} -- 2.26.2