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

pkgdep/git: cherry-pick dpdk fixes to release and LTS checkouts

Browse Source 
This brings commit targeting fixes for the pu macros usage under
latest freebsd (13.x).

Also, group cherry-picks into cherry_picks() and apply them
together before the build starts.

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: Id49aa3d6eb065d8bb92f48402304c4f11f3c047f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13544
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
This commit is contained in:
Michal Berger 2022-07-04 15:29:21 +02:00 committed by Tomasz Zawadzki
parent f4e0fc096e
commit 0a25fa3b31
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,8 @@ function install_refspdk() {
local config_params local config_params
local rootdir local rootdir
local version local version
# Note to keep cherry-pick'ed commits in proper order
local cherry_picks=()
version=$1 version=$1
@ -43,13 +45,36 @@ function install_refspdk() {
git -C "$output_dir" checkout "$release" git -C "$output_dir" checkout "$release"
git -C "$output_dir" submodule update --init git -C "$output_dir" submodule update --init
if ((gcc_version >= 11)) && le "${release#v}" 21.04; then
git -C "$output_dir" config --global user.name "spdk" git -C "$output_dir" config --global user.name "spdk"
git -C "$output_dir" config --global user.email "hotpatch@spdk.io" git -C "$output_dir" config --global user.email "hotpatch@spdk.io"
git -C "$output_dir" cherry-pick 36b5a69bb0699694b53a2f08a13cc0de620450a9
git -C "$output_dir" cherry-pick 2ac152158116a17b863270a4731977d9ddedf50d release=${release#v}
if ((gcc_version >= 11)) && le "$release" 21.04; then
cherry_picks+=("36b5a69bb0699694b53a2f08a13cc0de620450a9")
cherry_picks+=("2ac152158116a17b863270a4731977d9ddedf50d")
fi fi
if [[ $OSID == "freebsd" ]]; then
# Fetch all the branches
git -C "$output_dir" fetch origin '+refs/heads/v*:refs/remotes/origin/v*'
# Slurp commit from the master and the LTS branch to address changes in the
# use of cpu macros under latest freebsd releases (13.x).
# https://review.spdk.io/gerrit/c/spdk/spdk/+/13484 - master
# https://review.spdk.io/gerrit/c/spdk/spdk/+/13541 - LTS.x
case "$version" in
latest) eq "$release" 22.05.0 && cherry_picks+=("a83dc0546f838905dbe96605e99811b2f62c0eb5") ;;
LTS ) eq "$release" 22.01.1 && cherry_picks+=("1d1248bd1b0e11896ed5e3fa5ce4a8b94c3d5fd0") ;;
esac
fi
for cherry in "${cherry_picks[@]}"; do
git -C "$output_dir" cherry-pick "$cherry"
done
# Make sure submodules point at proper commits after cherry-picks are applied
git -C "$output_dir" submodule update
cat > $HOME/autorun-spdk.conf <<- EOF cat > $HOME/autorun-spdk.conf <<- EOF
SPDK_BUILD_SHARED_OBJECT=1 SPDK_BUILD_SHARED_OBJECT=1
SPDK_TEST_AUTOBUILD=1 SPDK_TEST_AUTOBUILD=1