Skip to content

chore(comps): annotate backport overlays with category metadata #17727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liunan-ms wants to merge 2 commits into
base: 4.0
Choose a base branch
from
+1,252 −650
Open

chore(comps): annotate backport overlays with category metadata #17727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9124d4
chore(azldev): pin to 35d8fae and regenerate schema
liunan-ms Jun 30, 2026
7db736c
chore(comps): annotate and migrate backport overlays to per-file layout
liunan-ms Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azldev-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0256227f5434d9e00d7c8501b16848efa400a72b
35d8fae562980db7bda057d79322cc51ddad8d62
14 changes: 2 additions & 12 deletions base/comps/ant/ant.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
[components.ant]

# Backport of upstream Fedora rawhide commit 4ca7a3b: remove openjdk21 binding.
# https://src.fedoraproject.org/rpms/ant/c/4ca7a3b
# AZL only ships java-25-openjdk; there is no java-21-openjdk, so the
# ant-openjdk21 subpackage has an unsatisfiable dependency.

[[components.ant.overlays]]
description = "Remove openjdk21 JDK binding lines — AZL does not ship java-21-openjdk"
type = "spec-search-replace"
section = "%install"
regex = '.*openjdk21.*'
replacement = ''
# Overlays live as one-logical-change-per-file under ./overlays/, discovered via
# the project-wide default `overlay-files = ["overlays/*.overlay.toml"]`.
14 changes: 14 additions & 0 deletions base/comps/ant/overlays/0001-remove-openjdk21-jdk-binding.overlay.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Backport of upstream Fedora rawhide commit 4ca7a3b: remove openjdk21 binding.
# AZL only ships java-25-openjdk; there is no java-21-openjdk, so the
# ant-openjdk21 subpackage has an unsatisfiable dependency.
[metadata]
category = "backport-dist-git"
upstreamable = false
commits = ["https://src.fedoraproject.org/rpms/ant/c/4ca7a3b"]

[[overlays]]
description = "Remove openjdk21 JDK binding lines — AZL does not ship java-21-openjdk"
type = "spec-search-replace"
section = "%install"
regex = '.*openjdk21.*'
replacement = ''
20 changes: 2 additions & 18 deletions base/comps/apache-ivy/apache-ivy.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
[components.apache-ivy]
overlays = [
{ type = "file-add", file = "IMPROVEMENT-use-Apache-Commons-Compress-for-pack200-.patch", source = "IMPROVEMENT-use-Apache-Commons-Compress-for-pack200-.patch" },
{ type = "spec-add-tag", tag = "Source4", value = "IMPROVEMENT-use-Apache-Commons-Compress-for-pack200-.patch" },

{ type = "file-add", file = "remove-Pack200Packing-java.patch", source = "remove-Pack200Packing-java.patch" },
{ type = "spec-add-tag", tag = "Source5", value = "remove-Pack200Packing-java.patch" },

{ type = "spec-search-replace", regex = "dos2unix src/java/org/apache/ivy/ant/IvyAntSettings.java", replacement = "dos2unix src/java/org/apache/ivy/ant/IvyAntSettings.java asciidoc/release-notes.adoc ivy.xml optional.patterns src/java/org/apache/ivy/core/pack/PackagingManager.java src/java/org/apache/ivy/core/pack/PackingRegistry.java src/java/org/apache/ivy/core/settings/IvySettings.java src/java/org/apache/ivy/core/pack/ArchivePacking.java src/java/org/apache/ivy/core/pack/OsgiBundlePacking.java src/java/org/apache/ivy/core/pack/Pack200Packing.java src/java/org/apache/ivy/core/pack/StreamPacking.java src/java/org/apache/ivy/core/pack/ZipPacking.java src/java/org/apache/ivy/util/FileUtil.java test/java/org/apache/ivy/core/retrieve/RetrieveTest.java test/java/org/apache/ivy/core/pack/ZipPackingTest.java version.properties" },

{ type = "spec-search-replace", regex = "patch -p1 -l < %{SOURCE3}", replacement = "patch -p1 -l < %{SOURCE3}\npatch -p1 -l < %{SOURCE4}\npatch -p1 -l < %{SOURCE5}" },

# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
# upstream references to ant-openjdk21 and java-21-openjdk are
# unsatisfiable. Retarget to the openjdk25 variant.
{ description = "Remove BuildRequires on ant-openjdk21 — AZL does not ship java-21-openjdk", type = "spec-remove-tag", tag = "BuildRequires", value = "ant-openjdk21" },
{ description = "Add BuildRequires on ant-openjdk25 in place of ant-openjdk21", type = "spec-add-tag", tag = "BuildRequires", value = "ant-openjdk25" },
{ description = "Retarget JAVA_HOME from java-21-openjdk to java-25-openjdk in %build", type = "spec-search-replace", section = "%build", regex = "java-21-openjdk", replacement = "java-25-openjdk" },
]
# Overlays live as one-logical-change-per-file under ./overlays/, discovered via
# the project-wide default `overlay-files = ["overlays/*.overlay.toml"]`.
43 changes: 43 additions & 0 deletions base/comps/apache-ivy/overlays/0001-pack200-commons-compress.overlay.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Use Apache Commons Compress for pack200 support: stage two downstream patches
# (Source4/Source5), wire them into %prep, and dos2unix the touched files.
# Backport of upstream Apache Ivy commit d772841 (IVY-1652).
[metadata]
category = "backport-dist-git"
upstreamable = false
commits = ["https://github.com/apache/ant-ivy/commit/d77284167b6695903b80c72afed57469ffab5cc3"]

[[overlays]]
description = "Stage the Apache Commons Compress pack200 backport patch (downstream Source4)"
type = "file-add"
file = "IMPROVEMENT-use-Apache-Commons-Compress-for-pack200-.patch"
source = "../IMPROVEMENT-use-Apache-Commons-Compress-for-pack200-.patch"
Comment thread
liunan-ms marked this conversation as resolved.
Comment thread
liunan-ms marked this conversation as resolved.
Comment thread
liunan-ms marked this conversation as resolved.

[[overlays]]
description = "Register the Commons Compress pack200 patch as Source4"
type = "spec-add-tag"
tag = "Source4"
value = "IMPROVEMENT-use-Apache-Commons-Compress-for-pack200-.patch"

[[overlays]]
description = "Stage the Pack200Packing.java removal patch (downstream Source5)"
type = "file-add"
file = "remove-Pack200Packing-java.patch"
source = "../remove-Pack200Packing-java.patch"

[[overlays]]
description = "Register the Pack200Packing.java removal patch as Source5"
type = "spec-add-tag"
tag = "Source5"
value = "remove-Pack200Packing-java.patch"

[[overlays]]
description = "Extend the dos2unix invocation to cover every file touched by the pack200 backport"
type = "spec-search-replace"
regex = "dos2unix src/java/org/apache/ivy/ant/IvyAntSettings.java"
replacement = "dos2unix src/java/org/apache/ivy/ant/IvyAntSettings.java asciidoc/release-notes.adoc ivy.xml optional.patterns src/java/org/apache/ivy/core/pack/PackagingManager.java src/java/org/apache/ivy/core/pack/PackingRegistry.java src/java/org/apache/ivy/core/settings/IvySettings.java src/java/org/apache/ivy/core/pack/ArchivePacking.java src/java/org/apache/ivy/core/pack/OsgiBundlePacking.java src/java/org/apache/ivy/core/pack/Pack200Packing.java src/java/org/apache/ivy/core/pack/StreamPacking.java src/java/org/apache/ivy/core/pack/ZipPacking.java src/java/org/apache/ivy/util/FileUtil.java test/java/org/apache/ivy/core/retrieve/RetrieveTest.java test/java/org/apache/ivy/core/pack/ZipPackingTest.java version.properties"

[[overlays]]
description = "Apply the staged Source4/Source5 patches in %prep alongside the existing Source3 patch"
type = "spec-search-replace"
regex = "patch -p1 -l < %{SOURCE3}"
replacement = "patch -p1 -l < %{SOURCE3}\npatch -p1 -l < %{SOURCE4}\npatch -p1 -l < %{SOURCE5}"
25 changes: 25 additions & 0 deletions base/comps/apache-ivy/overlays/0002-remove-buildrequires-ant-openjdk21.overlay.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
# upstream references to ant-openjdk21 and java-21-openjdk are
# unsatisfiable. Retarget to the openjdk25 variant.
[metadata]
category = "azl-pruning"
upstreamable = false

[[overlays]]
description = "Remove BuildRequires on ant-openjdk21 — AZL does not ship java-21-openjdk"
type = "spec-remove-tag"
tag = "BuildRequires"
value = "ant-openjdk21"

[[overlays]]
description = "Add BuildRequires on ant-openjdk25 in place of ant-openjdk21"
type = "spec-add-tag"
tag = "BuildRequires"
value = "ant-openjdk25"

[[overlays]]
description = "Retarget JAVA_HOME from java-21-openjdk to java-25-openjdk in %build"
type = "spec-search-replace"
section = "%build"
regex = "java-21-openjdk"
replacement = "java-25-openjdk"
14 changes: 2 additions & 12 deletions base/comps/atlas/atlas.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
[components.atlas]

# Fedora's lapack-static 3.12.0-10 dropped the separate liblapack_pic.a file
# (it was redundant since static libs are now built with -fPIC by default).
# The spec references the old name in %prep when building a pruned LAPACK archive.
# Fixed upstream in atlas-3.10.3-33 (rawhide):
# https://src.fedoraproject.org/rpms/atlas/c/f253f3a2d6c1 (rhbz#2433875)
# This overlay can be removed once we import from a Fedora version that includes the fix.
[[components.atlas.overlays]]
description = "Fix liblapack_pic.a reference — renamed to liblapack.a in lapack-static 3.12.0-10"
type = "spec-search-replace"
regex = 'liblapack_pic\.a'
replacement = "liblapack.a"
# Overlays live as one-logical-change-per-file under ./overlays/, discovered via
# the project-wide default `overlay-files = ["overlays/*.overlay.toml"]`.
15 changes: 15 additions & 0 deletions base/comps/atlas/overlays/0001-fix-liblapack-pic-reference.overlay.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Fedora's lapack-static 3.12.0-10 dropped the separate liblapack_pic.a file
# (it was redundant since static libs are now built with -fPIC by default).
# The spec references the old name in %prep when building a pruned LAPACK archive.
# Fixed upstream in atlas-3.10.3-33 (rawhide), rhbz#2433875.
# This overlay can be removed once we import from a Fedora version that includes the fix.
[metadata]
category = "backport-dist-git"
upstreamable = false
commits = ["https://src.fedoraproject.org/rpms/atlas/c/f253f3a2d6c1"]

[[overlays]]
description = "Fix liblapack_pic.a reference — renamed to liblapack.a in lapack-static 3.12.0-10"
type = "spec-search-replace"
regex = 'liblapack_pic\.a'
replacement = "liblapack.a"
159 changes: 2 additions & 157 deletions base/comps/cloud-init/cloud-init.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,158 +1,3 @@
[components.cloud-init]

[[components.cloud-init.overlays]]
description = "Workaround CPE parsing bug in cloud-init 25.2"
type = "spec-add-tag"
tag = "Patch"
value = "fix-avoid-incorrect-CPE-parsing-on-Azure-Linux.patch"

[[components.cloud-init.overlays]]
description = "Add the CPE parsing bug fix patch file"
type = "file-add"
source = "fix-avoid-incorrect-CPE-parsing-on-Azure-Linux.patch"
file = "fix-avoid-incorrect-CPE-parsing-on-Azure-Linux.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0001-fix-azurelinux-remove-some-config-excluded-only-from.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0001-fix-azurelinux-remove-some-config-excluded-only-from.patch"
file = "0001-fix-azurelinux-remove-some-config-excluded-only-from.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0002-fix-azurelinux-remove-custom-azurelinux-group-config.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0002-fix-azurelinux-remove-custom-azurelinux-group-config.patch"
file = "0002-fix-azurelinux-remove-custom-azurelinux-group-config.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0003-fix-azurelinux-set-azurelinux-default-username-to-az.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0003-fix-azurelinux-set-azurelinux-default-username-to-az.patch"
file = "0003-fix-azurelinux-set-azurelinux-default-username-to-az.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0004-fix-azurelinux-include-azurelinux-in-distro-group-wi.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0004-fix-azurelinux-include-azurelinux-in-distro-group-wi.patch"
file = "0004-fix-azurelinux-include-azurelinux-in-distro-group-wi.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0005-fix-azurelinux-Set-specific-list-of-network-renderer.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0005-fix-azurelinux-Set-specific-list-of-network-renderer.patch"
file = "0005-fix-azurelinux-Set-specific-list-of-network-renderer.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0006-fix-azurelinux-use-libexec-path-for-ds-identify-6874.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0006-fix-azurelinux-use-libexec-path-for-ds-identify-6874.patch"
file = "0006-fix-azurelinux-use-libexec-path-for-ds-identify-6874.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0007-fix-azurelinux-remove-overridden-package_command-met.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0007-fix-azurelinux-remove-overridden-package_command-met.patch"
file = "0007-fix-azurelinux-remove-overridden-package_command-met.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0008-fix-azurelinux-remove-use_lib_exec-property-override.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0008-fix-azurelinux-remove-use_lib_exec-property-override.patch"
file = "0008-fix-azurelinux-remove-use_lib_exec-property-override.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0009-fix-azurelinux-update-systemd-cloud-init-.service-te.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0009-fix-azurelinux-update-systemd-cloud-init-.service-te.patch"
file = "0009-fix-azurelinux-update-systemd-cloud-init-.service-te.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0010-fix-azurelinux-update-hosts.azurelinux.tmpl-6874.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0010-fix-azurelinux-update-hosts.azurelinux.tmpl-6874.patch"
file = "0010-fix-azurelinux-update-hosts.azurelinux.tmpl-6874.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "spec-add-tag"
tag = "Patch"
value = "0011-fix-azurelinux-update-test_util-with-Azure-Linux-4-o.patch"

[[components.cloud-init.overlays]]
description = "Apply patches from upstream cloud-init azl4 pr"
type = "file-add"
source = "0011-fix-azurelinux-update-test_util-with-Azure-Linux-4-o.patch"
file = "0011-fix-azurelinux-update-test_util-with-Azure-Linux-4-o.patch"

[[components.cloud-init.overlays]]
description = "Set distro to azurelinux"
type = "spec-search-replace"
section = "%install"
regex = '%py3_install -- --init-system=systemd'
replacement = '%py3_install -- --init-system=systemd --distro=azurelinux'

[[components.cloud-init.overlays]]
description = "Set variant to azurelinux"
type = "spec-search-replace"
regex = 'python3 tools/render-template --variant %{\?rhel:rhel}%{!\?rhel:fedora}'
replacement = "python3 tools/render-template --variant azurelinux"
# Overlays live as one-logical-change-per-file under ./overlays/, discovered via
# the project-wide default `overlay-files = ["overlays/*.overlay.toml"]`.
16 changes: 16 additions & 0 deletions base/comps/cloud-init/overlays/0001-workaround-cpe-parsing-bug.overlay.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Workaround CPE parsing bug in cloud-init 25.2.
[metadata]
category = "azl-compatibility"
upstreamable = false

[[overlays]]
description = "Workaround CPE parsing bug in cloud-init 25.2"
type = "spec-add-tag"
tag = "Patch"
value = "fix-avoid-incorrect-CPE-parsing-on-Azure-Linux.patch"

[[overlays]]
description = "Add the CPE parsing bug fix patch file"
type = "file-add"
source = "../fix-avoid-incorrect-CPE-parsing-on-Azure-Linux.patch"
file = "fix-avoid-incorrect-CPE-parsing-on-Azure-Linux.patch"
Loading
Loading