Skip to content

Commit 139d3fb

Browse files
committed
1 parent 5d8df15 commit 139d3fb

4 files changed

Lines changed: 23 additions & 4 deletions

File tree

MODULE.bazel

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,9 @@ pip.parse(
163163
use_repo(pip, "score_lifecycle_pip")
164164

165165
bazel_dep(name = "score_itf", version = "0.5.0", dev_dependency = True)
166-
git_override(
166+
single_version_override(
167167
module_name = "score_itf",
168-
branch = "fix/qemu-pid",
169-
remote = "https://github.com/etas-contrib/score_itf.git",
168+
patches = ["//patches:itf.patch"],
170169
)
171170

172171
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci", dev_dependency = True)

MODULE.bazel.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

patches/BUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
exports_files(["hedron_compile_commands_env_vars.patch"])
1+
exports_files([
2+
"hedron_compile_commands_env_vars.patch",
3+
"itf.patch",
4+
])

patches/itf.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# https://github.com/eclipse-score/itf/pull/127
2+
3+
--- score/itf/plugins/qemu/qemu_target.py
4+
+++ score/itf/plugins/qemu/qemu_target.py
5+
@@ -173,9 +173,7 @@ def execute_async(self, binary_path, args=None, cwd="/", **kwargs) -> QemuAsyncP
6+
transport = ssh_ctx.get_paramiko_client().get_transport()
7+
channel = transport.open_session()
8+
channel.set_combine_stderr(True)
9+
- inner = (
10+
- f"[ -r /etc/profile ] && . /etc/profile >/dev/null 2>&1; echo $$; cd {shlex.quote(cwd)} && {command}"
11+
- )
12+
+ inner = f"[ -r /etc/profile ] && . /etc/profile >/dev/null 2>&1; echo $$; cd {shlex.quote(cwd)} && exec {command}"
13+
channel.exec_command(f"sh -lc {shlex.quote(inner)}")
14+
15+
# Read the PID from the first line of output.

0 commit comments

Comments
 (0)