* [PATCH][gatesgarth 1/2] CI: remove redundant interruptiple assignment
@ 2021-09-13 15:35 Ross Burton
2021-09-13 15:35 ` [PATCH][gatesgarth 2/2] external-arm-toolchain: Misc. fixup for GCC 10.2 support Ross Burton
0 siblings, 1 reply; 2+ messages in thread
From: Ross Burton @ 2021-09-13 15:35 UTC (permalink / raw)
To: meta-arm
Change-Id: I2e95cb1bf88cf77a59b54cb529dad4d471b6eb06
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e421a34b..a2cd68d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,6 @@ stages:
# Generalised fragment to do a Kas build
.build:
extends: .setup
- interruptible: true
script:
- KASFILES=$(./ci/jobs-to-kas $CI_JOB_NAME)
- kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH][gatesgarth 2/2] external-arm-toolchain: Misc. fixup for GCC 10.2 support
2021-09-13 15:35 [PATCH][gatesgarth 1/2] CI: remove redundant interruptiple assignment Ross Burton
@ 2021-09-13 15:35 ` Ross Burton
0 siblings, 0 replies; 2+ messages in thread
From: Ross Burton @ 2021-09-13 15:35 UTC (permalink / raw)
To: meta-arm
From: Sumit Garg <sumit.garg@linaro.org>
Arm GCC 10.2 prebuilt toolchain comes with ldd and tzselect scripts
which uses "/usr/bin/bash", so replace this with "/bin/sh" as the
default shell.
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
.../external-arm-toolchain/external-arm-toolchain.bb | 2 ++
1 file changed, 2 insertions(+)
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 b44fd2f4..c506c419 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
@@ -115,6 +115,8 @@ do_install() {
rm -rf ${D}${bindir}/gdbserver
sed -i -e 's#/arm/tools/gnu/bash/4.2/rhe6-x86_64##' ${D}${bindir}/tzselect
sed -i -e 's#/arm/tools/gnu/bash/4.2/rhe6-x86_64##' ${D}${bindir}/ldd
+ sed -i -e 's#/usr/bin/bash#/bin/sh#' ${D}${bindir}/tzselect
+ sed -i -e 's#/usr/bin/bash#/bin/sh#' ${D}${bindir}/ldd
sed -i -e 's#/bin/bash#/bin/sh#' ${D}${bindir}/tzselect
sed -i -e 's#/bin/bash#/bin/sh#' ${D}${bindir}/ldd
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-13 15:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-13 15:35 [PATCH][gatesgarth 1/2] CI: remove redundant interruptiple assignment Ross Burton
2021-09-13 15:35 ` [PATCH][gatesgarth 2/2] external-arm-toolchain: Misc. fixup for GCC 10.2 support Ross Burton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).