From d2d55a0359a75e94bf1c81ba79b47c8749c0465d Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Fri, 5 Nov 2021 12:17:25 +0100
Subject: [PATCH] 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: Michal Berger <michalx.berger@intel.com>
Change-Id: I8816ad59f930fa61ec081ac13e35129060f6cb86
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10135
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
---
 autobuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.sh b/autobuild.sh
index eb3caa7c4..90aa855e3 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -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 \