From 5f390a0114938eb23c4e34aa6a69b9bbc2b2c3cb Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 18 May 2021 13:32:37 -0400 Subject: [PATCH] jjb: lttng-ivc: urcu is now handled by lttng-ivc Signed-off-by: Jonathan Rajotte --- jobs/lttng-ivc.yaml | 12 ------------ scripts/lttng-ivc/build.sh | 11 ----------- 2 files changed, 23 deletions(-) diff --git a/jobs/lttng-ivc.yaml b/jobs/lttng-ivc.yaml index 053e095..4f2db2f 100644 --- a/jobs/lttng-ivc.yaml +++ b/jobs/lttng-ivc.yaml @@ -51,12 +51,6 @@ values: '{obj:liburcu_version}' builders: - - copyartifact: - project: liburcu_${{liburcu_version}}_build/arch=${{arch}},conf=std,build=std - which-build: last-successful - stable: false - filter: 'build/**' - target: 'deps/liburcu' - shell: !include-raw-escape: scripts/lttng-ivc/build.sh @@ -111,12 +105,6 @@ values: '{obj:liburcu_version}' builders: - - copyartifact: - project: liburcu_${{liburcu_version}}_build/arch=${{arch}},conf=std,build=std - which-build: last-successful - stable: false - filter: 'build/**' - target: 'deps/liburcu' - shell: !include-raw-escape: scripts/lttng-ivc/build.sh diff --git a/scripts/lttng-ivc/build.sh b/scripts/lttng-ivc/build.sh index 75e4311..08f6b9b 100644 --- a/scripts/lttng-ivc/build.sh +++ b/scripts/lttng-ivc/build.sh @@ -18,20 +18,9 @@ PYTHON3="python3" P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])") -URCU_INCS=${WORKSPACE}/deps/liburcu/build/include -URCU_LIBS=${WORKSPACE}/deps/liburcu/build/lib -URCU_PKG_CONFIG=${URCU_LIBS}/pkgconfig - -# Get liburcu setup -export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}" -export CPPFLAGS="${CPPFLAGS:-} -I$URCU_INCS" -export LDFLAGS="${LDFLAGS:-} -L$URCU_LIBS" -export PKG_CONFIG_PATH="$URCU_PKG_CONFIG:${PKG_CONFIG_PATH:-}" - # Tox does not support long path venv for whatever reason. PYENV_HOME=$(mktemp -d) - # Create virtualenv and install necessary packages virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME" -- 2.34.1