diff mbox series

[1/6] arm/trusted-services: Fix trusted-service license file paths

Message ID 20250822131813.93724-1-jon.mason@arm.com
State New
Headers show
Series [1/6] arm/trusted-services: Fix trusted-service license file paths | expand

Commit Message

Jon Mason Aug. 22, 2025, 1:18 p.m. UTC
From: Norbert Kocsis <norbert.kocsis@arm.com>

Use UNPACKDIR instead of relative paths.

Signed-off-by: Norbert Kocsis <norbert.kocsis@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../trusted-services/trusted-services-src.inc        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Jon Mason Aug. 22, 2025, 1:19 p.m. UTC | #1
Sorry all, I forgot to rebase my branch before sending.  Disregard
this series of emails.

Thanks,
Jon

On Fri, Aug 22, 2025 at 9:18 AM Jon Mason via lists.yoctoproject.org
<jon.mason=arm.com@lists.yoctoproject.org> wrote:
>
> From: Norbert Kocsis <norbert.kocsis@arm.com>
>
> Use UNPACKDIR instead of relative paths.
>
> Signed-off-by: Norbert Kocsis <norbert.kocsis@arm.com>
> Signed-off-by: Jon Mason <jon.mason@arm.com>
> ---
>  .../trusted-services/trusted-services-src.inc        | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
> index e9235cf721d7..50e111172539 100644
> --- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
> +++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
> @@ -24,32 +24,32 @@ UPSTREAM_CHECK_COMMITS = "1"
>  # DTC, tag "v1.6.1"
>  SRC_URI += "git://github.com/dgibson/dtc;name=dtc;protocol=https;branch=main;destsuffix=dtc"
>  SRCREV_dtc = "b6910bec11614980a21e46fbccc35934b671bd81"
> -LIC_FILES_CHKSUM += "file://../dtc/README.license;md5=a1eb22e37f09df5b5511b8a278992d0e"
> +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/dtc/README.license;md5=a1eb22e37f09df5b5511b8a278992d0e"
>
>  # MbedTLS, tag "v3.6.0"
>  SRC_URI += "gitsm://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;branch=master;destsuffix=mbedtls"
>  SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206"
> -LIC_FILES_CHKSUM += "file://../mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
> +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
>
>  # Nanopb, tag "nanopb-0.4.8" plus some further fixes
>  SRC_URI += "git://github.com/nanopb/nanopb.git;name=nanopb;protocol=https;branch=master;destsuffix=nanopb"
>  SRCREV_nanopb = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e"
> -LIC_FILES_CHKSUM += "file://../nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
> +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
>
>  # qcbor, tag "v1.0.0"
>  SRC_URI += "git://github.com/laurencelundblade/QCBOR.git;name=qcbor;protocol=https;branch=master;destsuffix=qcbor"
>  SRCREV_qcbor = "56b17bf9f74096774944bcac0829adcd887d391e"
> -LIC_FILES_CHKSUM += "file://../qcbor/README.md;md5=e8ff2e88a722cdc55eddd0bb9aeca002"
> +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/qcbor/README.md;md5=e8ff2e88a722cdc55eddd0bb9aeca002"
>
>  # T_Cose
>  SRC_URI += "git://github.com/laurencelundblade/t_cose.git;name=tcose;protocol=https;branch=master;destsuffix=tcose"
>  SRCREV_tcose = "fc3a4b2c7196ff582e8242de8bd4a1bc4eec577f"
> -LIC_FILES_CHKSUM += "file://../tcose/LICENSE;md5=b2ebdbfb82602b97aa628f64cf4b65ad"
> +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/tcose/LICENSE;md5=b2ebdbfb82602b97aa628f64cf4b65ad"
>
>  # CppUTest,  tag "v3.8"
>  SRC_URI += "git://github.com/cpputest/cpputest.git;name=cpputest;protocol=https;branch=master;destsuffix=cpputest"
>  SRCREV_cpputest = "e25097614e1c4856036366877a02346c4b36bb5b"
> -LIC_FILES_CHKSUM += "file://../cpputest/COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177"
> +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/cpputest/COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177"
>
>  SRCREV_FORMAT = "trusted-services_dtc_mbedtls_nanopb_qcbor_tcose_cpputest"
>
> --
> 2.39.5 (Apple Git-154)
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#6674): https://lists.yoctoproject.org/g/meta-arm/message/6674
> Mute This Topic: https://lists.yoctoproject.org/mt/114834935/3616920
> Group Owner: meta-arm+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [jdmason@kudzu.us]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Jon Mason Aug. 22, 2025, 3:58 p.m. UTC | #2
On Fri, 22 Aug 2025 09:18:08 -0400, Jon Mason wrote:
> Use UNPACKDIR instead of relative paths.
> 
> 

Applied, thanks!

[1/6] arm/trusted-services: Fix trusted-service license file paths
      commit: 9e6671a222acf1a3c9ff736fbcc784f092c624a1
[2/6] arm/gn: disable uninitialized variable warning
      commit: d8f0ab517b8bfe47a9e6d011711013877413cc4e
[3/6] arm/gn: update to the latest SHA
      commit: 6ec4a039a35c9f0947b82873b577b8a148473242
[4/6] arm/arch-armv9*: Fix PACKAGE_EXTRA_ARCHS reference
      commit: 05b2de0e7a9b71e61c16f7607546b846fb87648c
[5/6] arm-bsp/fvp-base: remove console workaround
      commit: 5442973e13df30e4cde0fab23b2dbafd03a3407d
[6/6] arm/optee-os: remove CFG_CORE_BTI from EXTRA_OEMAKE
      commit: e517e47d2ed44c79ecbdff2a0ef43fc62783b05f

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
index e9235cf721d7..50e111172539 100644
--- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
+++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
@@ -24,32 +24,32 @@  UPSTREAM_CHECK_COMMITS = "1"
 # DTC, tag "v1.6.1"
 SRC_URI += "git://github.com/dgibson/dtc;name=dtc;protocol=https;branch=main;destsuffix=dtc"
 SRCREV_dtc = "b6910bec11614980a21e46fbccc35934b671bd81"
-LIC_FILES_CHKSUM += "file://../dtc/README.license;md5=a1eb22e37f09df5b5511b8a278992d0e"
+LIC_FILES_CHKSUM += "file://${UNPACKDIR}/dtc/README.license;md5=a1eb22e37f09df5b5511b8a278992d0e"
 
 # MbedTLS, tag "v3.6.0"
 SRC_URI += "gitsm://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;branch=master;destsuffix=mbedtls"
 SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206"
-LIC_FILES_CHKSUM += "file://../mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
+LIC_FILES_CHKSUM += "file://${UNPACKDIR}/mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
 
 # Nanopb, tag "nanopb-0.4.8" plus some further fixes
 SRC_URI += "git://github.com/nanopb/nanopb.git;name=nanopb;protocol=https;branch=master;destsuffix=nanopb"
 SRCREV_nanopb = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e"
-LIC_FILES_CHKSUM += "file://../nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
+LIC_FILES_CHKSUM += "file://${UNPACKDIR}/nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
 
 # qcbor, tag "v1.0.0"
 SRC_URI += "git://github.com/laurencelundblade/QCBOR.git;name=qcbor;protocol=https;branch=master;destsuffix=qcbor"
 SRCREV_qcbor = "56b17bf9f74096774944bcac0829adcd887d391e"
-LIC_FILES_CHKSUM += "file://../qcbor/README.md;md5=e8ff2e88a722cdc55eddd0bb9aeca002"
+LIC_FILES_CHKSUM += "file://${UNPACKDIR}/qcbor/README.md;md5=e8ff2e88a722cdc55eddd0bb9aeca002"
 
 # T_Cose
 SRC_URI += "git://github.com/laurencelundblade/t_cose.git;name=tcose;protocol=https;branch=master;destsuffix=tcose"
 SRCREV_tcose = "fc3a4b2c7196ff582e8242de8bd4a1bc4eec577f"
-LIC_FILES_CHKSUM += "file://../tcose/LICENSE;md5=b2ebdbfb82602b97aa628f64cf4b65ad"
+LIC_FILES_CHKSUM += "file://${UNPACKDIR}/tcose/LICENSE;md5=b2ebdbfb82602b97aa628f64cf4b65ad"
 
 # CppUTest,  tag "v3.8"
 SRC_URI += "git://github.com/cpputest/cpputest.git;name=cpputest;protocol=https;branch=master;destsuffix=cpputest"
 SRCREV_cpputest = "e25097614e1c4856036366877a02346c4b36bb5b"
-LIC_FILES_CHKSUM += "file://../cpputest/COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177"
+LIC_FILES_CHKSUM += "file://${UNPACKDIR}/cpputest/COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177"
 
 SRCREV_FORMAT = "trusted-services_dtc_mbedtls_nanopb_qcbor_tcose_cpputest"