Skip to content

refactor: adjust azurelinux macro (major version only)#17215

Merged
ddstreetmicrosoft merged 1 commit into
tomls/base/mainfrom
users/reubeno/azl-macro
May 15, 2026
Merged

refactor: adjust azurelinux macro (major version only)#17215
ddstreetmicrosoft merged 1 commit into
tomls/base/mainfrom
users/reubeno/azl-macro

Conversation

@reubeno
Copy link
Copy Markdown
Member

@reubeno reubeno commented May 14, 2026

For consistency with other distros' macros, we:

  • Change the definition of the azurelinux macro only to include major version (i.e. 4).
  • Remove the azl4 macro; we should use the azurelinux macro instead.

A compensating change is made to openssl.

--
Fixes: AB#19815

@reubeno reubeno force-pushed the users/reubeno/azl-macro branch from ae5e1cd to ea8f94e Compare May 14, 2026 06:04
@reubeno reubeno marked this pull request as ready for review May 14, 2026 09:34
Copilot AI review requested due to automatic review settings May 14, 2026 09:34
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR updates Azure Linux RPM distribution macros so %azurelinux represents only the major version and removes the %azl4 macro, with an OpenSSL overlay adjusted to use %azurelinux detection instead.

Changes:

  • Changes azurelinux-release macros.dist generation from %azurelinux 4.0 plus %azl4 to %azurelinux 4.
  • Updates OpenSSL overlay/rendered spec conditionals to use %{defined azurelinux}.
  • Refreshes related lock fingerprints and rendered OpenSSL release output.

Reviewed changes

Copilot reviewed 4 out of 6 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
base/comps/azurelinux-release/azurelinux-release.spec Source spec change for generated RPM macros.
specs/a/azurelinux-release/azurelinux-release.spec Rendered spec reflecting the macro definition change.
base/comps/openssl/openssl.comp.toml Updates OpenSSL overlay conditions/descriptions to use Azure Linux macro detection.
specs/o/openssl/openssl.spec Rendered OpenSSL spec with updated conditionals and release bump.
locks/azurelinux-release.lock Refreshes azurelinux-release component fingerprint.
locks/openssl.lock Refreshes OpenSSL component fingerprint.

Comment thread base/comps/azurelinux-release/azurelinux-release.spec
Copy link
Copy Markdown
Contributor

@ddstreetmicrosoft ddstreetmicrosoft left a comment

Choose a reason for hiding this comment

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

issue: looks like the azurelinux-release package needs a release bump

@reubeno
Copy link
Copy Markdown
Member Author

reubeno commented May 14, 2026

issue: looks like the azurelinux-release package needs a release bump

Oof, I've gotten spoiled on autorelease specs; thanks for catching it. I'll fix that.

(We should enable autorelease, but in a separate change.)

@reubeno reubeno force-pushed the users/reubeno/azl-macro branch from ea8f94e to 63ba18a Compare May 14, 2026 15:21
@reubeno reubeno requested a review from ddstreetmicrosoft May 14, 2026 15:21
Copy link
Copy Markdown
Contributor

@ddstreetmicrosoft ddstreetmicrosoft left a comment

Choose a reason for hiding this comment

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

Looks ok other than removing %azl4, are you sure we should really remove it?

Comment thread base/comps/azurelinux-release/azurelinux-release.spec
@reubeno reubeno force-pushed the users/reubeno/azl-macro branch from 63ba18a to 50e7ad1 Compare May 14, 2026 21:02
For consistency with other distros' macros, we change the definition
of the azurelinux macro only to include major version (i.e. 4).

A change is also made to openssl to use azurelinux instead of azl4.
@reubeno reubeno force-pushed the users/reubeno/azl-macro branch from 50e7ad1 to bb943ef Compare May 14, 2026 21:08
@reubeno reubeno requested a review from ddstreetmicrosoft May 14, 2026 21:09
@ddstreetmicrosoft ddstreetmicrosoft merged commit bebddc3 into tomls/base/main May 15, 2026
10 checks passed
@ddstreetmicrosoft ddstreetmicrosoft deleted the users/reubeno/azl-macro branch May 15, 2026 11:36
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