aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Henning Becker <43133967+beckerhe@users.noreply.github.com>2020-09-03 19:01:42 +0200
committerGravatar GitHub <noreply@github.com>2020-09-03 10:01:42 -0700
commitbaf2672672acc6c99fa7339c14133a0a7007b267 (patch)
treeb2b81c6bb46e68b7db3eb6fea75526f7558b309c
parent1070d8fd12c4b79112aadc98307d99a0daa14497 (diff)
[orbit] Fix build bugs for Orbit (#4408)
I added the wrong header in the last commit. This will be fixed by this commit. Furthermore it seems to run as a different user in ClusterFuzz. So this is fixed as well.
-rw-r--r--projects/orbit/Dockerfile2
-rwxr-xr-xprojects/orbit/build.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/projects/orbit/Dockerfile b/projects/orbit/Dockerfile
index 58bb1702..7d4481fb 100644
--- a/projects/orbit/Dockerfile
+++ b/projects/orbit/Dockerfile
@@ -28,4 +28,4 @@ COPY build.sh $SRC/
# That's a hack. The service needs to have a more recent kernel than what the
# container provides. But this code is not going to be called from the fuzz-
# tests, so we should be fine here.
-ADD https://raw.githubusercontent.com/torvalds/linux/v5.7/include/linux/perf_event.h /usr/include/linux/perf_event.h
+ADD https://raw.githubusercontent.com/torvalds/linux/v5.7/include/uapi/linux/perf_event.h /usr/include/linux/perf_event.h
diff --git a/projects/orbit/build.sh b/projects/orbit/build.sh
index 794551ec..4bf97eb2 100755
--- a/projects/orbit/build.sh
+++ b/projects/orbit/build.sh
@@ -16,7 +16,7 @@
################################################################################
#builds project
-export PATH="/root/.local/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"
$SRC/orbit/bootstrap-orbit.sh --force-public-remotes --dont-compile --ignore-system-requirements
conan profile new default --detect