chore(comps): annotate azl-pruning overlays with metadata #17886
+3,367
−2,449
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 35d8fae562980db7bda057d79322cc51ddad8d62 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1 @@ | ||
| [components.GraphicsMagick] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # 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" | ||
| upstreamable = false | ||
|
|
||
| [[overlays]] | ||
| description = "Drop libheif build dependency ahead of libheif removal from Azure Linux 4.0" | ||
| type = "spec-remove-tag" | ||
| tag = "BuildRequires" | ||
| value = "libheif-devel" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,15 +4,3 @@ | |
|
|
||
| [components.SDL2_image] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| [metadata] | ||
| category = "azl-pruning" | ||
|
|
||
| [[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" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| [metadata] | ||
| category = "azl-pruning" | ||
|
|
||
| [[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" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1 @@ | ||
| [components.anaconda] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # 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" | ||
| upstreamable = false | ||
|
|
||
| [[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" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| [metadata] | ||
| category = "azl-dep-missing-workaround" | ||
| upstreamable = true | ||
|
|
||
| [[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" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1 @@ | ||
| [components.coin-or-Cbc] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # 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" | ||
| upstreamable = false | ||
|
|
||
| [[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 = " \\" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,2 @@ | ||
| [components.curl] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| [metadata] | ||
| category = "azl-pruning" | ||
| upstreamable = false | ||
|
|
||
| [[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" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # 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" | ||
| upstreamable = false | ||
|
|
||
| [[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)" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,3 @@ | ||
| [components.dogtag-pki] | ||
| # Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} | ||
| release = { calculation = "manual" } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| upstreamable = false | ||
|
|
||
| [[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" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1 @@ | ||
| [components.dtc] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # 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. | ||
|
|
||
| [metadata] | ||
| category = "azl-pruning" | ||
| upstreamable = false | ||
|
Member
There was a problem hiding this comment. How do we express that the upstreamable thing here is to turn the Ditto for other similar instances.
Contributor
Author
There was a problem hiding this comment. The current expression with |
||
|
|
||
| [[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" | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This does seem upstreamable.