| Message ID | 20240624141557.34033-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm-toolchain: fix for WORKDIR changes | expand |
On Mon, 24 Jun 2024 10:15:57 -0400, Jon Mason wrote: > Fallout from the upstream WORKDIR changes. do_copy_locale expects > SUPPORTED to be in WORKDIR, but recent changes have made it so that the > source/unpack location is no longer WORKDIR and cannot be pointed to > be such. So, do this copy manually here. > > Applied, thanks! [1/1] arm-toolchain: fix for WORKDIR changes commit: 751e4817c97539a625b6a0b015b47b42bf9fdcac Best regards,
diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb index 49ad74427010..1e8c1116e834 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb @@ -56,8 +56,16 @@ PV = "${EAT_VER_MAIN}" BINV = "${EAT_VER_GCC}" SRC_URI = "file://SUPPORTED" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { + # do_copy_locale expects SUPPORTED to be in WORKDIR, but recent + # changes have made it so that the source/unpack location is no + # longer WORKDIR and cannot be pointed to be such. So, do this + # copy manually here + install -m 0644 ${UNPACKDIR}/SUPPORTED ${WORKDIR}/SUPPORTED + # Add stubs for files OE-core expects install -d ${S}/nscd/ touch ${S}/nscd/nscd.init
Fallout from the upstream WORKDIR changes. do_copy_locale expects SUPPORTED to be in WORKDIR, but recent changes have made it so that the source/unpack location is no longer WORKDIR and cannot be pointed to be such. So, do this copy manually here. Signed-off-by: Jon Mason <jon.mason@arm.com> --- .../external-arm-toolchain/external-arm-toolchain.bb | 8 ++++++++ 1 file changed, 8 insertions(+)