Fix cargo-build-bpf

3 files changed, 5 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be2b34ec1304..562128e1adc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = solana
 	pkgdesc = A fast, secure, and censorship resistant blockchain.
 	pkgver = 1.13.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.solana.com
 	install = solana.install
 	arch = x86_64
@@ -17,7 +17,7 @@ pkgbase = solana
 	source = solana-1.13.0.tar.gz::https://github.com/solana-labs/solana/archive/v1.13.0.tar.gz
 	source = spl-token-cli-2.0.17.tar.gz::https://github.com/solana-labs/solana-program-library/archive/refs/tags/token-cli-v2.0.17.tar.gz
 	source = perf-libs-0.19.3.tar.gz::https://github.com/solana-labs/solana-perf-libs/releases/download/v0.19.3/solana-perf.tgz
-	sha256sums = 9aa39d566ffcd248c6061b62cd9d32c21e9d5e3b644f3247b98675fc7bd8ca22
+	sha256sums = 94bdd2014eea655a3576a0c67e2a56db33cb957636ca72186711be75615c1cf5
 	sha256sums = ce2c7ae830bbf79bce81d2267a7267651a58d3a4dade0269533bf023ecd7c578
 	sha256sums = c17d42533fb666392cd577ecbc67eddad950ab8b911fa8e82e9c03dceaf37862
 	sha256sums = 5850dc8ba63017cdb0c97357cc0e26e60f445abc1ef3c95a61b88e59afae71a4
diff --git a/PKGBUILD b/PKGBUILD
index 7cc2ce97a4f8..b9bf99e690bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgver=1.13.0
 _tokenver=2.0.17
 _perflibsver=0.19.3
 _rustver=1.59.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast, secure, and censorship resistant blockchain."
 url="https://www.solana.com"
 arch=('x86_64')
@@ -18,7 +18,7 @@ source=("cargo-build-bpf"
 	"$pkgname-$pkgver.tar.gz::https://github.com/solana-labs/$pkgname/archive/v$pkgver.tar.gz"
         "spl-token-cli-$_tokenver.tar.gz::https://github.com/solana-labs/solana-program-library/archive/refs/tags/token-cli-v$_tokenver.tar.gz"
         "perf-libs-$_perflibsver.tar.gz::https://github.com/solana-labs/solana-perf-libs/releases/download/v$_perflibsver/solana-perf.tgz")
-sha256sums=('9aa39d566ffcd248c6061b62cd9d32c21e9d5e3b644f3247b98675fc7bd8ca22'
+sha256sums=('94bdd2014eea655a3576a0c67e2a56db33cb957636ca72186711be75615c1cf5'
             'ce2c7ae830bbf79bce81d2267a7267651a58d3a4dade0269533bf023ecd7c578'
             'c17d42533fb666392cd577ecbc67eddad950ab8b911fa8e82e9c03dceaf37862'
             '5850dc8ba63017cdb0c97357cc0e26e60f445abc1ef3c95a61b88e59afae71a4')
@@ -27,8 +27,6 @@ noextract=("perf-libs-$_perflibsver.tar.gz")
 prepare() {
   mkdir -p "$srcdir/$pkgname-$pkgver/target/perf-libs"
   tar -x -f "$srcdir/perf-libs-$_perflibsver.tar.gz" -C "$srcdir/$pkgname-$pkgver/target/perf-libs"
-#  sed -i '43a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .parent()\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .expect("Unable to get parent directory")' $srcdir/$pkgname-$pkgver/sdk/cargo-build-bpf/src/main.rs
-#  sed -i '46a \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .join("lib")\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ .join("solana")' $srcdir/$pkgname-$pkgver/sdk/cargo-build-bpf/src/main.rs
   rustup toolchain install $_rustver
   cd "$srcdir/$pkgname-$pkgver"
   cargo +$_rustver fetch --locked --target "$CARCH-unknown-linux-gnu"
diff --git a/cargo-build-bpf b/cargo-build-bpf
index 0ec222070023..75e3ab3aade3 100755
--- a/cargo-build-bpf
+++ b/cargo-build-bpf
@@ -1,5 +1,2 @@
 #!/bin/sh
-
-pushd /usr/lib/solana/
-./cargo-build-bpf "$@"
-popd
\ No newline at end of file
+/usr/lib/solana/cargo-build-bpf "$@"