chore(comps): annotate azl-pruning overlays with metadata

.azldev-version

@@ -1 +1 @@
-0256227f5434d9e00d7c8501b16848efa400a72b
+830e6fed79750f8e24ae17cd630248f50c90c8a9

base/comps/GraphicsMagick/GraphicsMagick.comp.toml

@@ -1,15 +1 @@
 [components.GraphicsMagick]
-
-# Disable HEIF support — libheif is being retired from Azure Linux 4.0.
-# Upstream spec has no explicit `--with-heif`/`--without-heif` flag in
-# `%configure`; the heif coder is auto-detected via pkg-config when
-# libheif-devel is present. Removing the BuildRequires causes configure
-# to skip heif, and no plugin file is produced (the GraphicsMagick %files
-# section globs `%{_libdir}/GraphicsMagick-*/modules-*/coders/`, so a
-# missing heif coder doesn't trigger an "unpackaged file" error).
-
-[[components.GraphicsMagick.overlays]]
-description = "Drop libheif build dependency ahead of libheif removal from Azure Linux 4.0"
-type = "spec-remove-tag"
-tag = "BuildRequires"
-value = "libheif-devel"

base/comps/GraphicsMagick/overlays/0001-drop-libheif-build-dependency.overlay.toml

@@ -0,0 +1,16 @@
+# Disable HEIF support — libheif is being retired from Azure Linux 4.0.
+# Upstream spec has no explicit `--with-heif`/`--without-heif` flag in
+# `%configure`; the heif coder is auto-detected via pkg-config when
+# libheif-devel is present. Removing the BuildRequires causes configure
+# to skip heif, and no plugin file is produced (the GraphicsMagick %files
+# section globs `%{_libdir}/GraphicsMagick-*/modules-*/coders/`, so a
+# missing heif coder doesn't trigger an "unpackaged file" error).
+
+[metadata]
+category = "azl-pruning"
+upstream-status = "inapplicable"
+[[overlays]]
+description = "Drop libheif build dependency ahead of libheif removal from Azure Linux 4.0"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "libheif-devel"

base/comps/SDL2_image/SDL2_image.comp.toml

@@ -4,15 +4,3 @@
 
 [components.SDL2_image]
 
-[[components.SDL2_image.overlays]]
-description = "Remove libavif-devel BuildRequires (libavif not available in AZL)"
-type = "spec-remove-tag"
-tag = "BuildRequires"
-value = "libavif-devel"
-
-[[components.SDL2_image.overlays]]
-description = "Disable avif support entirely instead of just disabling shared linking"
-type = "spec-search-replace"
-section = "%build"
-regex = '--disable-avif-shared'
-replacement = '--disable-avif'

base/comps/SDL2_image/overlays/0001-remove-libavif-devel-buildrequires.overlay.toml

@@ -0,0 +1,16 @@
+[metadata]
+category = "azl-pruning"
+upstream-status = "needs-upstream-hook"
+
+[[overlays]]
+description = "Remove libavif-devel BuildRequires (libavif not available in AZL)"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "libavif-devel"
+
+[[overlays]]
+description = "Disable avif support entirely instead of just disabling shared linking"
+type = "spec-search-replace"
+section = "%build"
+regex = "--disable-avif-shared"
+replacement = "--disable-avif"

base/comps/SDL3_image/SDL3_image.comp.toml

@@ -11,29 +11,3 @@
 [components.SDL3_image]
 spec = { type = "upstream", upstream-commit = "6b9cdf9cf3e3798c9443bf425017b152d78b9d65" }
 
-[[components.SDL3_image.overlays]]
-description = "Remove cmake(libavif) BuildRequires (libavif not available in AZL)"
-type = "spec-remove-tag"
-tag = "BuildRequires"
-value = "cmake(libavif)"
-
-[[components.SDL3_image.overlays]]
-description = "Disable avif support in cmake build flags"
-type = "spec-search-replace"
-section = "%build"
-regex = '-DSDLIMAGE_AVIF=ON'
-replacement = '-DSDLIMAGE_AVIF=OFF'
-
-[[components.SDL3_image.overlays]]
-description = "Disable avif save support in cmake build flags"
-type = "spec-search-replace"
-section = "%build"
-regex = '-DSDLIMAGE_AVIF_SAVE=ON'
-replacement = '-DSDLIMAGE_AVIF_SAVE=OFF'
-
-[[components.SDL3_image.overlays]]
-description = "Disable avif shared linking in cmake build flags"
-type = "spec-search-replace"
-section = "%build"
-regex = '-DSDLIMAGE_AVIF_SHARED=ON'
-replacement = '-DSDLIMAGE_AVIF_SHARED=OFF'

base/comps/SDL3_image/overlays/0001-remove-cmake-libavif-buildrequires.overlay.toml

@@ -0,0 +1,30 @@
+[metadata]
+category = "azl-pruning"
+upstream-status = "needs-upstream-hook"
+
+[[overlays]]
+description = "Remove cmake(libavif) BuildRequires (libavif not available in AZL)"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "cmake(libavif)"
+
+[[overlays]]
+description = "Disable avif support in cmake build flags"
+type = "spec-search-replace"
+section = "%build"
+regex = "-DSDLIMAGE_AVIF=ON"
+replacement = "-DSDLIMAGE_AVIF=OFF"
+
+[[overlays]]
+description = "Disable avif save support in cmake build flags"
+type = "spec-search-replace"
+section = "%build"
+regex = "-DSDLIMAGE_AVIF_SAVE=ON"
+replacement = "-DSDLIMAGE_AVIF_SAVE=OFF"
+
+[[overlays]]
+description = "Disable avif shared linking in cmake build flags"
+type = "spec-search-replace"
+section = "%build"
+regex = "-DSDLIMAGE_AVIF_SHARED=ON"
+replacement = "-DSDLIMAGE_AVIF_SHARED=OFF"

base/comps/anaconda/anaconda.comp.toml

@@ -1,26 +1 @@
 [components.anaconda]
-
-# Drop the flatpak Requires from anaconda-core. Anaconda's flatpak
-# source-type lets the installer install OCI/flatpak refs from a
-# CDROM at install time -- a desktop-installer feature that AZL
-# doesn't ship. Removing these Requires unhooks anaconda-core from
-# the flatpak chain so flatpak can be demoted to sdk.
-
-[[components.anaconda.overlays]]
-description = "Drop Requires: flatpak from anaconda-core (flatpak source-type unused on AZL)"
-type = "spec-remove-tag"
-tag = "Requires"
-value = "flatpak"
-package = "core"
-
-[[components.anaconda.overlays]]
-description = "Drop Requires: flatpak-libs from anaconda-core (flatpak source-type unused on AZL)"
-type = "spec-remove-tag"
-tag = "Requires"
-value = "flatpak-libs"
-package = "core"
-
-[[components.anaconda.overlays]]
-description = "Guard gi.require_version('Flatpak') so the module loads even without flatpak-libs typelib"
-type = "patch-add"
-source = "0001-flatpak_manager-guard-gi-import-for-missing-typelib.patch"

base/comps/anaconda/overlays/0001-drop-requires-flatpak-anaconda.overlay.toml

@@ -0,0 +1,22 @@
+# Drop the flatpak Requires from anaconda-core. Anaconda's flatpak
+# source-type lets the installer install OCI/flatpak refs from a
+# CDROM at install time -- a desktop-installer feature that AZL
+# doesn't ship. Removing these Requires unhooks anaconda-core from
+# the flatpak chain so flatpak can be demoted to sdk.
+
+[metadata]
+category = "azl-pruning"
+upstream-status = "inapplicable"
+[[overlays]]
+description = "Drop Requires: flatpak from anaconda-core (flatpak source-type unused on AZL)"
+type = "spec-remove-tag"
+tag = "Requires"
+value = "flatpak"
+package = "core"
+
+[[overlays]]
+description = "Drop Requires: flatpak-libs from anaconda-core (flatpak source-type unused on AZL)"
+type = "spec-remove-tag"
+tag = "Requires"
+value = "flatpak-libs"
+package = "core"

base/comps/anaconda/overlays/0002-guard-gi-require-version.overlay.toml

@@ -0,0 +1,7 @@
+[metadata]
+category = "azl-temp-workaround"
+upstream-status = "upstreamable"
+[[overlays]]
+description = "Guard gi.require_version('Flatpak') so the module loads even without flatpak-libs typelib"
+type = "patch-add"
+source = "../0001-flatpak_manager-guard-gi-import-for-missing-typelib.patch"

base/comps/coin-or-Cbc/coin-or-Cbc.comp.toml

@@ -1,25 +1 @@
 [components.coin-or-Cbc]
-
-# coin-or-HiGHS is not available in Azure Linux. Disable HiGHS support by
-# removing the HiGHS BuildRequires entry and stripping the configure flags.
-# HiGHS is an optional LP solver backend; Cbc's primary solver (Clp) is unaffected.
-
-[[components.coin-or-Cbc.overlays]]
-description = "Disable HiGHS BuildRequires — coin-or-HiGHS not available in Azure Linux"
-type = "spec-remove-tag"
-tag = "BuildRequires"
-value = "pkgconfig(highs)"
-
-[[components.coin-or-Cbc.overlays]]
-description = "Remove HiGHS --with-highs-incdir configure flag"
-type = "spec-search-replace"
-section = "%build"
-regex = '  --with-highs-incdir=%\{_includedir\}/highs \\'
-replacement = "  \\"
-
-[[components.coin-or-Cbc.overlays]]
-description = "Remove HiGHS --with-highs-lib configure flag"
-type = "spec-search-replace"
-section = "%build"
-regex = '  --with-highs-lib=-lhighs \\'
-replacement = "  \\"

base/comps/coin-or-Cbc/overlays/0001-disable-highs-buildrequires-coin.overlay.toml

@@ -0,0 +1,26 @@
+# coin-or-HiGHS is not available in Azure Linux. Disable HiGHS support by
+# removing the HiGHS BuildRequires entry and stripping the configure flags.
+# HiGHS is an optional LP solver backend; Cbc's primary solver (Clp) is unaffected.
+
+[metadata]
+category = "azl-pruning"
+upstream-status = "inapplicable"
+[[overlays]]
+description = "Disable HiGHS BuildRequires — coin-or-HiGHS not available in Azure Linux"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "pkgconfig(highs)"
+
+[[overlays]]
+description = "Remove HiGHS --with-highs-incdir configure flag"
+type = "spec-search-replace"
+section = "%build"
+regex = "  --with-highs-incdir=%\\{_includedir\\}/highs \\\\"
+replacement = "  \\"
+
+[[overlays]]
+description = "Remove HiGHS --with-highs-lib configure flag"
+type = "spec-search-replace"
+section = "%build"
+regex = "  --with-highs-lib=-lhighs \\\\"
+replacement = "  \\"

base/comps/components.toml

@@ -1,5 +1,15 @@
 includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-mingw-disablement.toml", "components-publish-channels.toml"]
 
+# Project-wide default: every component automatically discovers per-file overlay
+# documents under its own `overlays/` directory. The glob is resolved relative
+# to each concrete component's config file, so components without an `overlays/`
+# directory simply match nothing (non-matching globs are ignored). This lets
+# components keep their overlays as one-logical-change-per-file `*.overlay.toml`
+# documents without repeating `overlay-files` in every comp.toml.
+# See https://github.com/microsoft/azure-linux-dev-tools/blob/main/docs/user/reference/config/overlays.md#per-file-overlay-format
+[default-component-config]
+overlay-files = ["overlays/*.overlay.toml"]
+
 #
 # Components imported from Fedora with no per-component modifications.
 # Please keep this list sorted alphabetically for readability.

base/comps/curl/curl.comp.toml

@@ -1,16 +1,2 @@
 [components.curl]
 
-[[components.curl.overlays]]
-description = "Drop python3-impacket BuildRequires (only used by Fedora-gated upstream test 1451; python-impacket is not packaged for Azure Linux due to RPM-signing issues)"
-type = "spec-remove-tag"
-tag = "BuildRequires"
-value = "python3-impacket"
-
-# Update the now-stale comment in the (empty) `%if 0%{?fedora}` block left
-# behind by removing the BuildRequires above, so future readers know the
-# omission is intentional rather than an oversight.
-[[components.curl.overlays]]
-description = "Annotate the now-empty %if 0%{?fedora} block to make the AZL deviation explicit (avoid confusion with the original 'needed for upstream test 1451' comment)"
-type = "spec-search-replace"
-regex = '^# needed for upstream test 1451$'
-replacement = '# python3-impacket BuildRequires intentionally omitted in Azure Linux — see curl.comp.toml overlay (RPM signing blocker; test 1451 is Fedora-gated)'

base/comps/curl/overlays/0001-drop-python3-impacket-buildrequires.overlay.toml

@@ -0,0 +1,8 @@
+[metadata]
+category = "azl-pruning"
+upstream-status = "inapplicable"
+[[overlays]]
+description = "Drop python3-impacket BuildRequires (only used by Fedora-gated upstream test 1451; python-impacket is not packaged for Azure Linux due to RPM-signing issues)"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "python3-impacket"

base/comps/curl/overlays/0002-annotate-now-empty-if.overlay.toml

@@ -0,0 +1,12 @@
+# Update the now-stale comment in the (empty) `%if 0%{?fedora}` block left
+# behind by removing the BuildRequires above, so future readers know the
+# omission is intentional rather than an oversight.
+
+[metadata]
+category = "azl-disable-unsupported-tests"
+upstream-status = "inapplicable"
+[[overlays]]
+description = "Annotate the now-empty %if 0%{?fedora} block to make the AZL deviation explicit (avoid confusion with the original 'needed for upstream test 1451' comment)"
+type = "spec-search-replace"
+regex = "^# needed for upstream test 1451$"
+replacement = "# python3-impacket BuildRequires intentionally omitted in Azure Linux — see curl.comp.toml overlay (RPM signing blocker; test 1451 is Fedora-gated)"

base/comps/dogtag-pki/dogtag-pki.comp.toml

@@ -1,39 +1,3 @@
 [components.dogtag-pki]
 # Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 release = { calculation = "manual" }
-
-# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
-# upstream %else branch (taken when %fedora and %rhel are both unset, as
-# in AZL) references unsatisfiable openjdk21 packages. Retarget each
-# %define line individually so we don't accidentally rewrite historical
-# %changelog entries that mention these monikers (spec-search-replace
-# cannot be scoped to the preamble alone).
-[[components.dogtag-pki.overlays]]
-description = "Retarget java_runtime to java-25-openjdk"
-type = "spec-search-replace"
-regex = '^%define java_runtime java-21-openjdk$'
-replacement = "%define java_runtime java-25-openjdk"
-
-[[components.dogtag-pki.overlays]]
-description = "Retarget java_devel to java-25-openjdk-devel"
-type = "spec-search-replace"
-regex = '^%define java_devel java-21-openjdk-devel$'
-replacement = "%define java_devel java-25-openjdk-devel"
-
-[[components.dogtag-pki.overlays]]
-description = "Retarget java_headless to java-25-openjdk-headless"
-type = "spec-search-replace"
-regex = '^%define java_headless java-21-openjdk-headless$'
-replacement = "%define java_headless java-25-openjdk-headless"
-
-[[components.dogtag-pki.overlays]]
-description = "Retarget java_home to jre-25-openjdk"
-type = "spec-search-replace"
-regex = '^%define java_home %\{_jvmdir\}/jre-21-openjdk$'
-replacement = "%define java_home %{_jvmdir}/jre-25-openjdk"
-
-[[components.dogtag-pki.overlays]]
-description = "Retarget maven_local to maven-local-openjdk25"
-type = "spec-search-replace"
-regex = '^%define maven_local maven-local-openjdk21$'
-replacement = "%define maven_local maven-local-openjdk25"

base/comps/dogtag-pki/overlays/0001-retarget-java-runtime-java.overlay.toml

@@ -0,0 +1,40 @@
+# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
+# upstream %else branch (taken when %fedora and %rhel are both unset, as
+# in AZL) references unsatisfiable openjdk21 packages. Retarget each
+# %define line individually so we don't accidentally rewrite historical
+# %changelog entries that mention these monikers (spec-search-replace
+# cannot be scoped to the preamble alone).
+
+[metadata]
+category = "azl-pruning"
+upstream-status = "upstreamable"
+
+[[overlays]]
+description = "Retarget java_runtime to java-25-openjdk"
+type = "spec-search-replace"
+regex = "^%define java_runtime java-21-openjdk$"
+replacement = "%define java_runtime java-25-openjdk"
+
+[[overlays]]
+description = "Retarget java_devel to java-25-openjdk-devel"
+type = "spec-search-replace"
+regex = "^%define java_devel java-21-openjdk-devel$"
+replacement = "%define java_devel java-25-openjdk-devel"
+
+[[overlays]]
+description = "Retarget java_headless to java-25-openjdk-headless"
+type = "spec-search-replace"
+regex = "^%define java_headless java-21-openjdk-headless$"
+replacement = "%define java_headless java-25-openjdk-headless"
+
+[[overlays]]
+description = "Retarget java_home to jre-25-openjdk"
+type = "spec-search-replace"
+regex = "^%define java_home %\\{_jvmdir\\}/jre-21-openjdk$"
+replacement = "%define java_home %{_jvmdir}/jre-25-openjdk"
+
+[[overlays]]
+description = "Retarget maven_local to maven-local-openjdk25"
+type = "spec-search-replace"
+regex = "^%define maven_local maven-local-openjdk21$"
+replacement = "%define maven_local maven-local-openjdk25"

base/comps/dtc/dtc.comp.toml

@@ -1,12 +1 @@
 [components.dtc]
-
-# Azure Linux does not ship mingw cross-compilation toolchains.
-# The upstream spec hard-codes `%global with_mingw 1` whenever %fedora is
-# defined (true in our build environment) rather than gating on a %bcond, so
-# the standard `build.without = ["mingw"]` mechanism has no effect. Force it
-# off via spec overlay.
-[[components.dtc.overlays]]
-description = "Disable mingw sub-packages — Azure Linux does not ship mingw toolchains"
-type = "spec-search-replace"
-regex = '%global with_mingw 1'
-replacement = '%global with_mingw 0'