| Message ID | 20230517081422.3778147-1-mikko.rapeli@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-arm] optee-os optee-test: switch from SRC_URI:append to SRC_URI += | expand |
On Wed, 17 May 2023 11:14:22 +0300, mikko.rapeli@linaro.org wrote: > It is more difficult to update optee recipes to bleeding edge > 3.21 when patches are added to SRC_URI via :append and thus they > need to be explicitly removed with :remove and name of the patch file. > For our boards we know 3.21 will work without patches but we still want > to keep using meta-arm side base recipe and just update the SRC_URI > to remove patches and update SRCREV and PV. > > [...] Applied, thanks! [1/1] optee-os optee-test: switch from SRC_URI:append to SRC_URI += commit: c4f30dbd5ce905d511df513cb0cce0bc5c052c97 Best regards,
diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index bb6974b2..06b9c987 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -16,7 +16,7 @@ DEPENDS:append:toolchain-clang = " compiler-rt" SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https" -SRC_URI:append = " \ +SRC_URI += " \ file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ file://0002-optee-enable-clang-support.patch \ file://0003-core-link-add-no-warn-rwx-segments.patch \ diff --git a/meta-arm/recipes-security/optee/optee-os_3.18.0.bb b/meta-arm/recipes-security/optee/optee-os_3.18.0.bb index 41b65c2b..7a54dca5 100644 --- a/meta-arm/recipes-security/optee/optee-os_3.18.0.bb +++ b/meta-arm/recipes-security/optee/optee-os_3.18.0.bb @@ -5,7 +5,7 @@ DEPENDS += "dtc-native" FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-3.18.0:" SRCREV = "1ee647035939e073a2e8dddb727c0f019cc035f1" -SRC_URI:append = " \ +SRC_URI += " \ file://0004-core-Define-section-attributes-for-clang.patch \ file://0005-core-ldelf-link-add-z-execstack.patch \ file://0006-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \ diff --git a/meta-arm/recipes-security/optee/optee-os_3.20.0.bb b/meta-arm/recipes-security/optee/optee-os_3.20.0.bb index 5f4b066a..c870c3bf 100644 --- a/meta-arm/recipes-security/optee/optee-os_3.20.0.bb +++ b/meta-arm/recipes-security/optee/optee-os_3.20.0.bb @@ -5,6 +5,6 @@ DEPENDS += "dtc-native" FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-3.20.0:" SRCREV = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" -SRC_URI:append = " \ +SRC_URI += " \ file://0004-core-Define-section-attributes-for-clang.patch \ " diff --git a/meta-arm/recipes-security/optee/optee-test_3.18.0.bb b/meta-arm/recipes-security/optee/optee-test_3.18.0.bb index 05706876..76cf2e17 100644 --- a/meta-arm/recipes-security/optee/optee-test_3.18.0.bb +++ b/meta-arm/recipes-security/optee/optee-test_3.18.0.bb @@ -1,6 +1,6 @@ require optee-test.inc -SRC_URI:append = " \ +SRC_URI += " \ file://musl-workaround.patch \ " SRCREV = "da5282a011b40621a2cf7a296c11a35c833ed91b" diff --git a/meta-arm/recipes-security/optee/optee-test_3.20.0.bb b/meta-arm/recipes-security/optee/optee-test_3.20.0.bb index 95452b6a..911ac31e 100644 --- a/meta-arm/recipes-security/optee/optee-test_3.20.0.bb +++ b/meta-arm/recipes-security/optee/optee-test_3.20.0.bb @@ -1,6 +1,6 @@ require optee-test.inc -SRC_URI:append = " \ +SRC_URI += " \ file://musl-workaround.patch \ " SRCREV = "5db8ab4c733d5b2f4afac3e9aef0a26634c4b444"