Skip to contentSkip to conversation

arm-toolchain: fix for WORKDIR changes

PATCH Applied Jon Mason 2 participants 2 messages Jun 24, 2024 – Jun 26, 2024

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm-toolchain: fix for WORKDIR changes

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.

---
 .../external-arm-toolchain/external-arm-toolchain.bb      | 8 ++++++++
 1 file changed, 8 insertions(+)
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb +8 -0
index 49ad74427010..1e8c1116e834 100644
@@ -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
Signature · 1 line
2.39.3 (Apple Git-146)
Applied
#1 lore raw
Quoted 6 lines · Jon Mason

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,

Signature · 1 line
Jon Mason <[email protected]>