From f6b356da4a12d907525463dee1d7ddd286c46022 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 6 Oct 2021 11:58:02 +0200 Subject: [PATCH] pkgdep/git: cherry-pick instead of curl'ing the SPDK patches We clone entire repo and then checkout into a proper tag so there's no need to extra fetch the patches since they are already part of the repo. Signed-off-by: Michal Berger Change-Id: I38155a33506e373c129a02442b77bc48def23121 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9755 Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins --- test/common/config/pkgdep/git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index 2d34536f6..1b745da69 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -43,8 +43,8 @@ function install_refspdk() { 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.email "hotpatch@spdk.io" - curl -s https://github.com/spdk/spdk/commit/36b5a69bb0699694b53a2f08a13cc0de620450a9.patch | git -C "$output_dir" am - curl -s https://github.com/spdk/spdk/commit/2ac152158116a17b863270a4731977d9ddedf50d.patch | git -C "$output_dir" am + git -C "$output_dir" cherry-pick 36b5a69bb0699694b53a2f08a13cc0de620450a9 + git -C "$output_dir" cherry-pick 2ac152158116a17b863270a4731977d9ddedf50d fi cat > $HOME/autorun-spdk.conf <<- EOF