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:f88b0b8922
Cherry-picked-from:d2d55a0359
Signed-off-by: Michal Berger <michalx.berger@intel.com> Signed-off-by: Michal Berger <michalx.berger@intel.com> Change-Id: I8816ad59f930fa61ec081ac13e35129060f6cb86 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10135 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10710 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
parent
d3796d7d3e
commit
024748c5c1
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user