Commit 866007ae authored by Kamil Godzwon's avatar Kamil Godzwon Committed by Tomasz Zawadzki
Browse files

pkgdep/git: use an unreleased version of the bpftrace 

According to the current SPDK tests results, bpftrace under
the F37 is struggling with segmentation fault issues with
the newest versions (0.15.0/0.16.0).
See: https://github.com/iovisor/bpftrace/issues/2420

Fixes are in master branch. Waiting for the next
bpftrace release.

Linked to: https://github.com/spdk/spdk/issues/2833



Also, the bcc has been removed as we can use build-libs.sh
script that prepares necessary libraries built in the
bpftrace tree. Bpftrace has bcc as submodule that points
to version later than 6dac27d9, which we needed to use
previously.

Signed-off-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Change-Id: I3de292cc0050dc32592076280c5e72be5e879cbe
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16024


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent b0df03c5

test/common/config/pkgdep/git

+8 −11
Original line number Diff line number Diff line
@@ -532,20 +532,18 @@ function install_lcov() { 


function install_bpftrace() {

	install llvm-devel clang-devel cereal-devel gtest-devel gmock-devel cmake

	rm -rf $GIT_REPOS/bcc

	rm -rf $GIT_REPOS/bpftrace

	git clone --recursive $GIT_REPO_BCC $GIT_REPOS/bcc

	git -C $GIT_REPOS/bcc checkout $BCC_BRANCH

	git clone --recursive $GIT_REPO_BPFTRACE --branch $BPFTRACE_VERSION $GIT_REPOS/bpftrace

	mkdir -p $GIT_REPOS/bcc/build $GIT_REPOS/bpftrace/build



	cmake -DCMAKE_BUILD_TYPE=Release -B $GIT_REPOS/bcc/build -S $GIT_REPOS/bcc

	make -C $GIT_REPOS/bcc/build -j$(nproc)

	make -C $GIT_REPOS/bcc/build install

	git clone $GIT_REPO_BPFTRACE $GIT_REPOS/bpftrace --recurse-submodules

	git -C $GIT_REPOS/bpftrace checkout $BPFTRACE_VERSION

	mkdir -p $GIT_REPOS/bpftrace/build



	# Use build-libs.sh to build necessary libraries in the bpftrace tree

	(cd $GIT_REPOS/bpftrace/build && ../build-libs.sh)



	cmake -DCMAKE_BUILD_TYPE=Release -B $GIT_REPOS/bpftrace/build -S $GIT_REPOS/bpftrace

	make -C $GIT_REPOS/bpftrace/build -j$(nproc)

	make -C $GIT_REPOS/bpftrace/build install

	sudo make -C $GIT_REPOS/bpftrace/build install

}



function install_sources() {
@@ -608,11 +606,10 @@ function install_sources() { 
GIT_VERSION=2.25.1

IRDMA_VERSION=1.7.72

ICE_VERSION=1.8.8

BPFTRACE_VERSION=v0.15.0



BPFTRACE_VERSION=${BPFTRACE_VERSION:-36414d9}

VFIO_QEMU_BRANCH=${VFIO_QEMU_BRANCH:-vfio-user-irqmask2}

VANILLA_QEMU_BRANCH=${VANILLA_QEMU_BRANCH:-v7.0.0}

BCC_BRANCH=${BCC_BRANCH:-6dac27d9}



: ${GIT_REPO_SPDK=https://github.com/spdk/spdk.git}

export GIT_REPO_SPDK