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

pkgdep/git: Remove cherry-picks for 22.05 release

Browse Source 
Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: I2c7b0c450f76057af31c9501c1b9ac843e0e1ee8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14828
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Michal Berger 2022-10-03 11:06:01 +02:00 committed by Tomasz Zawadzki
parent 0fa568b302
commit 458e1dc71f
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,12 +50,7 @@ function install_refspdk() {
release=${release#v} release=${release#v}
if ((gcc_version >= 11)) && eq "$release" 22.05.0; then if ((gcc_version >= 12)) && eq "$release" 22.01.1; then
# https://review.spdk.io/gerrit/c/spdk/spdk/+/13404
cherry_picks+=("713506d5da4676b9f900ae59963f6eb50ecdba36")
fi
if ((gcc_version >= 12)); then
# https://review.spdk.io/gerrit/c/spdk/spdk/+/13405 # https://review.spdk.io/gerrit/c/spdk/spdk/+/13405
cherry_picks+=("8c532ae0322edc71003db3e4d3ece138f0f47ef7") cherry_picks+=("8c532ae0322edc71003db3e4d3ece138f0f47ef7")
# https://review.spdk.io/gerrit/c/spdk/spdk/+/13412 # https://review.spdk.io/gerrit/c/spdk/spdk/+/13412
@ -72,8 +67,7 @@ function install_refspdk() {
# https://review.spdk.io/gerrit/c/spdk/spdk/+/13484 - master # https://review.spdk.io/gerrit/c/spdk/spdk/+/13484 - master
# https://review.spdk.io/gerrit/c/spdk/spdk/+/13541 - LTS.x # https://review.spdk.io/gerrit/c/spdk/spdk/+/13541 - LTS.x
case "$version" in case "$version" in
latest) eq "$release" 22.05.0 && cherry_picks+=("a83dc0546f838905dbe96605e99811b2f62c0eb5") ;; LTS) eq "$release" 22.01.1 && cherry_picks+=("1d1248bd1b0e11896ed5e3fa5ce4a8b94c3d5fd0") ;;
LTS ) eq "$release" 22.01.1 && cherry_picks+=("1d1248bd1b0e11896ed5e3fa5ce4a8b94c3d5fd0") ;;
esac esac
fi fi
@ -95,11 +89,9 @@ function install_refspdk() {
# the LTS, however, we can cherry-pick target commit directly into the submodule. # the LTS, however, we can cherry-pick target commit directly into the submodule.
git -C "$output_dir/libvfio-user" cherry-pick b52bff72d4eb646a453d19e19ddbd13ed6111a09 git -C "$output_dir/libvfio-user" cherry-pick b52bff72d4eb646a453d19e19ddbd13ed6111a09
fi fi
if ((gcc_version >= 12)); then if ((gcc_version >= 12)) && eq "$release" 22.01.1; then
if eq "$release" 22.01.1 || eq "$release" 22.05.0; then # https://review.spdk.io/gerrit/c/spdk/dpdk/+/13411
# https://review.spdk.io/gerrit/c/spdk/dpdk/+/13411 git -C "$output_dir/dpdk" cherry-pick 66866df9602b024541b7071f5c4142ce47c9f640
git -C "$output_dir/dpdk" cherry-pick 66866df9602b024541b7071f5c4142ce47c9f640
fi
fi fi
cat > $HOME/autorun-spdk.conf <<- EOF cat > $HOME/autorun-spdk.conf <<- EOF