Clean up install-native-programs.sh usage

This commit is contained in:
Michael Vines 2018-12-11 22:54:50 -08:00 committed by Grimes
parent 088bab61a4
commit 5c396c222a
3 changed files with 2 additions and 6 deletions

View File

@ -147,7 +147,6 @@ build() {
set -ex set -ex
export NDEBUG=1 export NDEBUG=1
scripts/cargo-install-all.sh --features=$cargoFeatures --root farf scripts/cargo-install-all.sh --features=$cargoFeatures --root farf
mkdir -p farf/bin/deps/
scripts/install-native-programs.sh farf/bin/deps/ release scripts/install-native-programs.sh farf/bin/deps/ release
" "
) )

View File

@ -21,9 +21,9 @@ rm -rf usr/
../../ci/docker-run.sh solanalabs/rust:1.31.0 bash -c " ../../ci/docker-run.sh solanalabs/rust:1.31.0 bash -c "
set -ex set -ex
scripts/cargo-install-all.sh --root sdk/docker-solana/usr scripts/cargo-install-all.sh --root sdk/docker-solana/usr
scripts/install-native-programs.sh sdk/docker-solana/usr/bin/deps/ release
" "
cp -f entrypoint.sh usr/bin/solana-entrypoint.sh cp -f entrypoint.sh usr/bin/solana-entrypoint.sh
../../scripts/install-native-programs.sh usr/bin/deps/ release
docker build -t solanalabs/solana:$CHANNEL . docker build -t solanalabs/solana:$CHANNEL .

View File

@ -92,10 +92,7 @@ parts:
override-build: | override-build: |
# Build/install all programs # Build/install all programs
scripts/cargo-install-all.sh --root $SNAPCRAFT_PART_INSTALL --bins scripts/cargo-install-all.sh --root $SNAPCRAFT_PART_INSTALL --bins
scripts/install-native-programs.sh $SNAPCRAFT_PART_INSTALL/bin/deps/ release
# Install native programs
mkdir -p $SNAPCRAFT_PART_INSTALL/bin/deps/
./scripts/install-native-programs.sh $SNAPCRAFT_PART_INSTALL/bin/deps/ release
# Install multinode-demo/ # Install multinode-demo/
mkdir -p $SNAPCRAFT_PART_INSTALL/multinode-demo/ mkdir -p $SNAPCRAFT_PART_INSTALL/multinode-demo/