diff options
| author | Shulhan <ms@kilabit.info> | 2025-05-18 09:57:08 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2025-05-18 12:33:14 +0700 |
| commit | abe93f71e3f2f608c72db37b21f5c42460088250 (patch) | |
| tree | 24b9f965fae59faaf1af3378ae2a5cd142979a30 | |
| parent | d8c85bf1963fe4135b9e62f5d0933a7df2b4ea36 (diff) | |
| download | google-cloud-ops-agent-git-abe93f71e3f2f608c72db37b21f5c42460088250.tar.xz | |
all: fix building otel due to fixed go binary path
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0002-builds_otel.sh.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 5 |
3 files changed, 29 insertions, 2 deletions
@@ -1,6 +1,6 @@ pkgbase = google-cloud-ops-agent-git pkgdesc = Ops Agents that are part of the Google Cloud Operations product suite (specifically Cloud Logging and Cloud Monitoring) - pkgver = 2.50.0.r4.g3c3db61cd + pkgver = 2.56.1.r4.g3239f98dc pkgrel = 1 url = https://github.com/GoogleCloudPlatform/ops-agent arch = x86_64 @@ -23,10 +23,12 @@ pkgbase = google-cloud-ops-agent-git source = opentelemetry-operations-collector::git+https://github.com/GoogleCloudPlatform/opentelemetry-operations-collector.git source = opentelemetry-java-contrib::git+https://github.com/open-telemetry/opentelemetry-java-contrib.git source = 0001-build-sh.patch + source = 0002-builds_otel.sh.patch sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98 + sha256sums = 0e663cc6bbfdb5af962001b4645c3c154f715874fb910adfb3b3293564383f14 pkgname = google-cloud-ops-agent-git diff --git a/0002-builds_otel.sh.patch b/0002-builds_otel.sh.patch new file mode 100644 index 0000000..72bc5e6 --- /dev/null +++ b/0002-builds_otel.sh.patch @@ -0,0 +1,22 @@ +diff --git a/builds/otel.sh b/builds/otel.sh +index bcb48744f..53eb8cd3d 100755 +--- a/builds/otel.sh ++++ b/builds/otel.sh +@@ -48,8 +48,8 @@ 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" \ +diff --git a/submodules/opentelemetry-operations-collector b/submodules/opentelemetry-operations-collector +index 01c0ad26a..4024ba501 160000 +--- a/submodules/opentelemetry-operations-collector ++++ b/submodules/opentelemetry-operations-collector +@@ -1 +1 @@ +-Subproject commit 01c0ad26ae5cc512632d1a6f8908dcd69aa5f840 ++Subproject commit 4024ba501448a4b312932fb213fc562f4388d1f0 @@ -1,7 +1,7 @@ # Maintainer: shulhan <ms@kilabit.info> pkgname=google-cloud-ops-agent-git -pkgver=2.50.0.r4.g3c3db61cd +pkgver=2.56.1.r4.g3239f98dc pkgrel=1 pkgdesc="Ops Agents that are part of the Google Cloud Operations product suite (specifically Cloud Logging and Cloud Monitoring)" @@ -37,6 +37,7 @@ source=( "opentelemetry-operations-collector::git+https://github.com/GoogleCloudPlatform/opentelemetry-operations-collector.git" "opentelemetry-java-contrib::git+https://github.com/open-telemetry/opentelemetry-java-contrib.git" "0001-build-sh.patch" + "0002-builds_otel.sh.patch" ) sha256sums=( 'SKIP' @@ -44,6 +45,7 @@ sha256sums=( 'SKIP' 'SKIP' 'ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98' + '0e663cc6bbfdb5af962001b4645c3c154f715874fb910adfb3b3293564383f14' ) pkgver() { @@ -73,6 +75,7 @@ build() { echo "--- Applying patches ..." cd "${pkgname}" git apply "${srcdir}/0001-build-sh.patch" + git apply "${srcdir}/0002-builds_otel.sh.patch" echo "--- Building otel ..." CGO_ENABLED=1 ./builds/otel.sh "$_destdir" |