diff options
| author | Shulhan <ms@kilabit.info> | 2025-11-20 13:57:41 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2025-11-20 13:57:41 +0700 |
| commit | 1bc3d7c064fd6a5c3d2d06bdd507129d6a4d823b (patch) | |
| tree | 4dd4c2cc7b101bfbafa082a21328e0dce7429b34 | |
| parent | e928f991121abb3a52e9c0cc11a04d28b87ef5ea (diff) | |
| download | google-cloud-ops-agent-git-1bc3d7c064fd6a5c3d2d06bdd507129d6a4d823b.tar.xz | |
all: fix package build using java-environment=17
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | 0002-builds_otel.sh.patch | 7 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
3 files changed, 7 insertions, 11 deletions
@@ -10,12 +10,13 @@ pkgbase = google-cloud-ops-agent-git makedepends = git makedepends = go makedepends = gradle - makedepends = jdk17-openjdk + makedepends = java-environment=17 makedepends = pkg-config makedepends = rsync makedepends = unzip makedepends = zip depends = libyaml + depends = java-runtime-headless provides = google-cloud-ops-agent conflicts = stackdriver-collectd source = google-cloud-ops-agent-git::git+https://github.com/GoogleCloudPlatform/ops-agent.git @@ -29,6 +30,6 @@ pkgbase = google-cloud-ops-agent-git sha256sums = SKIP sha256sums = SKIP sha256sums = ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98 - sha256sums = 0e663cc6bbfdb5af962001b4645c3c154f715874fb910adfb3b3293564383f14 + sha256sums = 9e4a033b122620fdcbe8181246f450e9e4009e1774b3ba2173d9e6a70494d984 pkgname = google-cloud-ops-agent-git diff --git a/0002-builds_otel.sh.patch b/0002-builds_otel.sh.patch index 72bc5e6..8f0cdfa 100644 --- a/0002-builds_otel.sh.patch +++ b/0002-builds_otel.sh.patch @@ -13,10 +13,3 @@ index bcb48744f..53eb8cd3d 100755 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 @@ -12,13 +12,14 @@ groups=() depends=( 'libyaml' + 'java-runtime-headless' ) makedepends=( 'cmake' 'git' 'go' 'gradle' - 'jdk17-openjdk' + 'java-environment=17' 'pkg-config' 'rsync' 'unzip' @@ -45,7 +46,7 @@ sha256sums=( 'SKIP' 'SKIP' 'ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98' - '0e663cc6bbfdb5af962001b4645c3c154f715874fb910adfb3b3293564383f14' + '9e4a033b122620fdcbe8181246f450e9e4009e1774b3ba2173d9e6a70494d984' ) pkgver() { @@ -78,6 +79,7 @@ build() { git apply "${srcdir}/0002-builds_otel.sh.patch" echo "--- Building otel ..." + java --version CGO_ENABLED=1 ./builds/otel.sh "$_destdir" echo "--- Building fluent_bit ..." |