Clean up install-native-programs.sh usage
This commit is contained in:
parent
088bab61a4
commit
5c396c222a
|
@ -147,7 +147,6 @@ build() {
|
|||
set -ex
|
||||
export NDEBUG=1
|
||||
scripts/cargo-install-all.sh --features=$cargoFeatures --root farf
|
||||
mkdir -p farf/bin/deps/
|
||||
scripts/install-native-programs.sh farf/bin/deps/ release
|
||||
"
|
||||
)
|
||||
|
|
|
@ -21,9 +21,9 @@ rm -rf usr/
|
|||
../../ci/docker-run.sh solanalabs/rust:1.31.0 bash -c "
|
||||
set -ex
|
||||
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
|
||||
../../scripts/install-native-programs.sh usr/bin/deps/ release
|
||||
|
||||
docker build -t solanalabs/solana:$CHANNEL .
|
||||
|
||||
|
|
|
@ -92,10 +92,7 @@ parts:
|
|||
override-build: |
|
||||
# Build/install all programs
|
||||
scripts/cargo-install-all.sh --root $SNAPCRAFT_PART_INSTALL --bins
|
||||
|
||||
# Install native programs
|
||||
mkdir -p $SNAPCRAFT_PART_INSTALL/bin/deps/
|
||||
./scripts/install-native-programs.sh $SNAPCRAFT_PART_INSTALL/bin/deps/ release
|
||||
scripts/install-native-programs.sh $SNAPCRAFT_PART_INSTALL/bin/deps/ release
|
||||
|
||||
# Install multinode-demo/
|
||||
mkdir -p $SNAPCRAFT_PART_INSTALL/multinode-demo/
|
||||
|
|
Loading…
Reference in New Issue