Skip to content

Commit 4151c7b

Browse files
authored
packaging/aix: remove hardcoded build tag list from stage 04 (#49906)
### What does this PR do? Removes the hardcoded build tag lists from the comments in `04-agent.sh`. Build tags for both the agent and trace-agent are computed by `inv agent.build` / `inv trace-agent.build` from `tasks/build_tags.py` — listing them again in the stage script is redundant and will silently drift out of date when `build_tags.py` changes. ### Motivation Avoid stale documentation that duplicates authoritative information already in `tasks/build_tags.py`. ### Describe how you validated your changes Comment-only change, no functional impact. ### Additional Notes N/A Co-authored-by: pierre.gimalac <pierre.gimalac@datadoghq.com>
1 parent be24f60 commit 4151c7b

1 file changed

Lines changed: 5 additions & 11 deletions

File tree

packaging/aix/stages/04-agent.sh

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,11 @@ log "Building agent version $AGENT_VERSION at commit $COMMIT"
102102

103103
# ─── Step 4: Build the agent binary ───────────────────────────────────────────
104104
#
105-
# Build tags come from tasks/build_tags.py AIX_AGENT_TAGS + COMMON_TAGS:
106-
# python, otlp, osusergo, datadog.no_waf, zstd
107-
# + grpcnotrace, retrynotrace, no_dynamic_plugins, trivy_no_javadb (COMMON_TAGS)
105+
# Build tags and ldflags are determined by inv agent.build (tasks/build_tags.py).
108106
#
109-
# Note: pythonHome3 must be set explicitly here.
110-
# The agent binary computes Python home as filepath.Join(executableFolder, "../../embedded").
111-
# On Linux (standard omnibus), the binary lives at bin/agent/agent so "../../embedded"
112-
# correctly resolves to /opt/datadog-agent/embedded.
113-
# On AIX we place the binary at bin/agent (one level shallower) so the relative path
114-
# would resolve to /opt/embedded — which does not exist.
115-
# Setting pythonHome3 via -ldflags overrides the relative calculation.
107+
# --python-home-3 must be set explicitly because on AIX the binary lives at
108+
# bin/agent (one level shallower than bin/agent/agent on Linux), so the default
109+
# relative path calculation resolves to /opt/embedded which does not exist.
116110

117111
log "Building agent binary via inv agent.build"
118112
cd /opt/datadog-agent
@@ -131,7 +125,7 @@ log "agent binary build complete: $STAGING/opt/datadog-agent/bin/agent"
131125

132126
# ─── Step 5: Build the trace-agent binary ─────────────────────────────────────
133127
#
134-
# Build tags come from tasks/build_tags.py AGENT_TAGS minus AIX_EXCLUDE_TAGS, plus COMMON_TAGS.
128+
# Build tags are determined by inv trace-agent.build (tasks/build_tags.py).
135129

136130
log "Building trace-agent binary via inv trace-agent.build"
137131
cd /opt/datadog-agent

0 commit comments

Comments
 (0)