Skip to content

fix(avahi): keep normal dist tag - #18317

Merged
tobiasb-ms merged 1 commit into
microsoft:4.0from
reubeno:avahi-dist-tag
Aug 4, 2026
Merged

fix(avahi): keep normal dist tag#18317
tobiasb-ms merged 1 commit into
microsoft:4.0from
reubeno:avahi-dist-tag

Conversation

@reubeno

@reubeno reubeno commented Aug 4, 2026

Copy link
Copy Markdown
Member

We forced enable the bootstrap bcond on avahi for AZL4 -- because it allows us a low-maintenance way of minimizing dependencies for building and running avahi. We're not using it for traditional bootstrapping purposes.

However, because bootstrap ends up set to 1, that triggers the dist tag for the package to include %{__bootstrap}, which is centrally defined in RPM macros to add ~bootstrap. (Note that this is visible in PROD but masked in the DEV environment, which has a legacy koji configuration that forces the dist tag to .azl4. That configuration setting was not propagated to the PROD environment.)

We intentionally override __bootstrap while retaining the bootstrap bcond in order to maintain the reduced-feature builds but also get the standard Azure Linux dist tag.

Validation

  • Local azldev build
  • PROD stage2 scratch build
  • DEV stage2 scratch build (in progress via this PR)

Override __bootstrap while retaining the bootstrap bcond so reduced-feature builds use the standard Azure Linux dist tag.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings August 4, 2026 22:05
@reubeno

reubeno commented Aug 4, 2026

Copy link
Copy Markdown
Member Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
2 pipeline(s) were filtered out due to trigger conditions.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Ensures Avahi keeps its reduced bootstrap feature set without adding ~bootstrap to the Azure Linux dist tag.

Changes:

  • Overrides %__bootstrap with an empty macro.
  • Refreshes generated spec release and component lock.

Reviewed changes

Copilot reviewed 3 out of 4 changed files in this pull request and generated no comments.

File Description
base/comps/avahi/avahi.comp.toml Defines the bootstrap suffix override.
specs/a/avahi/avahi.azl.macros Renders the empty macro override.
specs/a/avahi/avahi.spec Bumps the package release.
locks/avahi.lock Refreshes the input fingerprint.

@reubeno
reubeno marked this pull request as ready for review August 4, 2026 22:17
@reubeno
reubeno requested a review from a team as a code owner August 4, 2026 22:17
Comment thread base/comps/avahi/avahi.comp.toml
@tobiasb-ms
tobiasb-ms merged commit dbbaea4 into microsoft:4.0 Aug 4, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants