From 6bac44ed92536531809492994ee277e8a1c29dc6 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 23 Oct 2020 21:39:41 +0000
Subject: [PATCH] Move bpf sdk packaging from publish-tarball to
 cargo-install-all (#13117)

(cherry picked from commit 965ea97b56a0e32cfabd012c9256c1b3d21c7119)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 ci/publish-tarball.sh        | 3 ---
 scripts/cargo-install-all.sh | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh
index e22c533c1f..395938d876 100755
--- a/ci/publish-tarball.sh
+++ b/ci/publish-tarball.sh
@@ -85,9 +85,6 @@ echo --- Creating release tarball
   source ci/rust-version.sh stable
   scripts/cargo-install-all.sh +"$rust_stable" "${RELEASE_BASENAME}"
 
-  mkdir -p "${RELEASE_BASENAME}"/bin/sdk/bpf
-  cp -a sdk/bpf/* "${RELEASE_BASENAME}"/bin/sdk/bpf
-
   tar cvf "${TARBALL_BASENAME}"-$TARGET.tar "${RELEASE_BASENAME}"
   bzip2 "${TARBALL_BASENAME}"-$TARGET.tar
   cp "${RELEASE_BASENAME}"/bin/solana-install-init solana-install-init-$TARGET
diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index 22a6906be2..8990f8761e 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -125,6 +125,9 @@ if [[ -d target/perf-libs ]]; then
   cp -a target/perf-libs "$installDir"/bin/perf-libs
 fi
 
+mkdir -p "$installDir"/bin/sdk/bpf
+cp -a sdk/bpf/* "$installDir"/bin/sdk/bpf
+
 (
   set -x
   # deps dir can be empty