diff --git a/net/net.sh b/net/net.sh index d1749033e0..9113063255 100755 --- a/net/net.sh +++ b/net/net.sh @@ -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 " ) diff --git a/sdk/docker-solana/build.sh b/sdk/docker-solana/build.sh index 06369f332f..5bf6ac59ff 100755 --- a/sdk/docker-solana/build.sh +++ b/sdk/docker-solana/build.sh @@ -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 . diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e1c80ac5bd..e81ce53a96 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -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/