ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pgkdep/git: cherry-pick patches for libvfio-user

Browse Source 
This attempts to fix builds under f35 where newer kernel requires
the https://review.spdk.io/gerrit/c/spdk/spdk/+/13404 patch to
be present in both the release and LTS build.

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: Ie2a70ae9cb9ca6d2d495ea2cf5729fcffb60d593
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13646
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
This commit is contained in:
Michal Berger 2022-07-12 14:19:40 +02:00 committed by Konrad Sztyber
parent 7fbda6d916
commit b846c8a385
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/common/config/pkgdep/git
View File

@ -50,6 +50,11 @@ function install_refspdk() {
release=${release#v}
if ((gcc_version >= 11)) && eq "$release" 22.05.0; then
# https://review.spdk.io/gerrit/c/spdk/spdk/+/13404
cherry_picks+=("713506d5da4676b9f900ae59963f6eb50ecdba36")
fi
if [[ $OSID == "freebsd" ]]; then
# Fetch all the branches
git -C "$output_dir" fetch origin '+refs/heads/v*:refs/remotes/origin/v*'
@ -70,6 +75,12 @@ function install_refspdk() {
# Make sure submodules point at proper commits after cherry-picks are applied
git -C "$output_dir" submodule update
if ((gcc_version >= 11)) && eq "$release" 22.01.1; then
# HACK: We can't apply https://review.spdk.io/gerrit/c/spdk/spdk/+/13506 cleanly under
# the LTS, however, we can cherry-pick target commit directly into the submodule.
git -C "$output_dir/libvfio-user" cherry-pick b52bff72d4eb646a453d19e19ddbd13ed6111a09
fi
cat > $HOME/autorun-spdk.conf <<- EOF
SPDK_BUILD_SHARED_OBJECT=1
SPDK_TEST_AUTOBUILD=1