Commit 458e1dc7 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: Remove cherry-picks for 22.05 release 



Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Change-Id: I2c7b0c450f76057af31c9501c1b9ac843e0e1ee8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14828


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 0fa568b3

test/common/config/pkgdep/git

+5 −13
Original line number Diff line number Diff line
@@ -50,12 +50,7 @@ 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 ((gcc_version >= 12)); then

	if ((gcc_version >= 12)) && eq "$release" 22.01.1; then

		# https://review.spdk.io/gerrit/c/spdk/spdk/+/13405

		cherry_picks+=("8c532ae0322edc71003db3e4d3ece138f0f47ef7")

		# https://review.spdk.io/gerrit/c/spdk/spdk/+/13412
@@ -72,7 +67,6 @@ function install_refspdk() { 
		# 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
@@ -95,12 +89,10 @@ function install_refspdk() { 
		# the LTS, however, we can cherry-pick target commit directly into the submodule.

		git -C "$output_dir/libvfio-user" cherry-pick b52bff72d4eb646a453d19e19ddbd13ed6111a09

	fi

	if ((gcc_version >= 12)); then

		if eq "$release" 22.01.1 || eq "$release" 22.05.0; then

	if ((gcc_version >= 12)) && eq "$release" 22.01.1; then

		# https://review.spdk.io/gerrit/c/spdk/dpdk/+/13411

		git -C "$output_dir/dpdk" cherry-pick 66866df9602b024541b7071f5c4142ce47c9f640

	fi

	fi



	cat > $HOME/autorun-spdk.conf <<- EOF

		SPDK_BUILD_SHARED_OBJECT=1