Commit d2d55a03 authored by Michal Berger's avatar Michal Berger Committed by Jim Harris
Browse files

autobuild: Use patch instead of git am 

It's more forgiving in case of small changes that force some fuzzing
like formatting changes. For instance, this change is currently breaking
our vs-dpdk builds:

https://github.com/dpdk/dpdk/commit/f88b0b892204d071a46a629b00424a8d47055ba4



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 4cd97383

autobuild.sh

+2 −2
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ function build_native_dpdk() { 
		git config --local user.name "spdk"

		git config --local user.email "nomail@all.com"

		if [[ -f dpdk-pci.patch ]]; then

			git am dpdk-pci.patch

			patch -p1 < dpdk-pci.patch

		fi

		git am dpdk-qat.patch

		patch -p1 < dpdk-qat.patch

	fi



	meson build-tmp --prefix="$external_dpdk_dir" --libdir lib \