diff options
| author | Shulhan <ms@kilabit.info> | 2025-12-20 12:55:52 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2025-12-20 12:58:15 +0700 |
| commit | 89bfa01436e0476b3a9457067599a6f4250dc649 (patch) | |
| tree | faf162f0ea3317fb177d65f0a1f2bcbecf091fef | |
| parent | 3dd76a4b8eb80c32c0c19982028e618f649478b9 (diff) | |
| download | google-cloud-ops-agent-git-89bfa01436e0476b3a9457067599a6f4250dc649.tar.xz | |
all: fix the patch for builds/otel.sh
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | 0002-builds_otel.sh.patch | 18 | ||||
| -rw-r--r-- | PKGBUILD | 2 |
3 files changed, 10 insertions, 12 deletions
@@ -30,6 +30,6 @@ pkgbase = google-cloud-ops-agent-git sha256sums = SKIP sha256sums = SKIP sha256sums = ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98 - sha256sums = 9e4a033b122620fdcbe8181246f450e9e4009e1774b3ba2173d9e6a70494d984 + sha256sums = aa5e5b1a27980a22a3c879a095909a20632af9eab614060e8d0f809028911a5f pkgname = google-cloud-ops-agent-git diff --git a/0002-builds_otel.sh.patch b/0002-builds_otel.sh.patch index 8f0cdfa..725288d 100644 --- a/0002-builds_otel.sh.patch +++ b/0002-builds_otel.sh.patch @@ -1,15 +1,13 @@ diff --git a/builds/otel.sh b/builds/otel.sh -index bcb48744f..53eb8cd3d 100755 +index 2a02997e5d..cd12d5070f 100755 --- a/builds/otel.sh +++ b/builds/otel.sh -@@ -48,8 +48,8 @@ if [ "$SKIP_OTEL_JAVA" != "true" ]; then +@@ -48,7 +48,7 @@ if [ "$SKIP_OTEL_JAVA" != "true" ]; then fi - cd submodules/opentelemetry-operations-collector/otelopscol --ARCH=$(/usr/local/go/bin/go env GOARCH) --GO_BIN=/usr/local/go/bin/go \ -+ARCH=$(/usr/bin/go env GOARCH) -+GO_BIN=/usr/bin/go \ - BUILDARCH=$ARCH \ - TARGETARCH=$ARCH \ - COLLECTOR_LD_FLAGS="$LDFLAGS" \ + if [ -z "${GO_BIN}" ]; then +- GO_BIN=/usr/local/go/bin/go ++ GO_BIN=/usr/bin/go + fi + ARCH=$($GO_BIN env GOARCH) + @@ -46,7 +46,7 @@ sha256sums=( 'SKIP' 'SKIP' 'ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98' - '9e4a033b122620fdcbe8181246f450e9e4009e1774b3ba2173d9e6a70494d984' + 'aa5e5b1a27980a22a3c879a095909a20632af9eab614060e8d0f809028911a5f' ) pkgver() { |