feat: Add azurelinux-logos branding package#16950
Open
WithEnoughCoffee wants to merge 1 commit intomicrosoft:tomls/base/mainfrom
Open
feat: Add azurelinux-logos branding package#16950WithEnoughCoffee wants to merge 1 commit intomicrosoft:tomls/base/mainfrom
WithEnoughCoffee wants to merge 1 commit intomicrosoft:tomls/base/mainfrom
Conversation
WithEnoughCoffee
force-pushed
the
tomls/base/main
branch
from
cc10dda to
a445cc8
Compare
📄❌ Rendered specs are out of date🚧🚧🚧🚧🚧 Warning Disregard this comment. Spec rendering is still under development and checked-in specs 🚧🚧🚧🚧🚧 FIX: — run this and commit the result: azldev component render -a --clean-staleOr download the fix patch and apply it: gh run download 25224681749 -R microsoft/azurelinux -n rendered-specs-patch
git apply rendered-specs.patch
Content diffs`specs/3/389-ds-base/389-ds-base.spec`--- committed/specs/3/389-ds-base/389-ds-base.spec
+++ rendered/specs/3/389-ds-base/389-ds-base.spec
@@ -1123,8 +1123,8 @@
%changelog
## START: Generated by rpmautospec
-* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 3.1.4-8
-- test: add initial lock files
+* Fri May 01 2026 Unknown User <please-configure-git-user@example.com> - 3.1.4-8
+- Uncommitted changes
* Fri Feb 13 2026 Viktor Ashirov <vashirov@redhat.com> - 3.1.4-7
- Issue 7253 - ipa-backup broken with python3-libs-3.14.3-1.fc43
`specs/7/7zip/7zip.spec`--- committed/specs/7/7zip/7zip.spec
+++ rendered/specs/7/7zip/7zip.spec
@@ -138,8 +138,8 @@
%changelog
## START: Generated by rpmautospec
-* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 25.01-2
-- test: add initial lock files
+* Fri May 01 2026 Unknown User <please-configure-git-user@example.com> - 25.01-2
+- Uncommitted changes
* Wed Nov 26 2025 Michel Lind <salimma@fedoraproject.org> - 25.01-1
- Update to 25.01
`specs/a/AMF/AMF.spec`--- committed/specs/a/AMF/AMF.spec
+++ rendered/specs/a/AMF/AMF.spec
@@ -87,8 +87,8 @@
%changelog
## START: Generated by rpmautospec
-* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 1:1.5.0-2
-- test: add initial lock files
+* Fri May 01 2026 Unknown User <please-configure-git-user@example.com> - 1:1.5.0-2
+- Uncommitted changes
* Fri Oct 31 2025 Simone Caronni <negativo17@gmail.com> - 1:1.5.0-1
- Update to 1.5.0
`specs/a/a52dec/a52dec.spec`--- committed/specs/a/a52dec/a52dec.spec
+++ rendered/specs/a/a52dec/a52dec.spec
@@ -4,7 +4,7 @@
Summary: Small test program for liba52
Name: a52dec
Version: 0.7.4
-Release: 52%{?dist}
+Release: 51%{?dist}
License: GPL-2.0-only
URL: http://liba52.sourceforge.net
Source0: %{url}/files/%{name}-%{version}.tar.gz
`specs/a/aalib/aalib.spec`--- committed/specs/a/aalib/aalib.spec
+++ rendered/specs/a/aalib/aalib.spec
@@ -7,7 +7,7 @@
Summary: ASCII art library
Name: aalib
Version: 1.4.0
-Release: 1.56.%{rc_subver}%{?dist}
+Release: 0.56.%{rc_subver}%{?dist}
License: LGPL-2.1-or-later
URL: http://aa-project.sourceforge.net/aalib/
Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz
`specs/a/aardvark-dns/aardvark-dns.spec`--- committed/specs/a/aardvark-dns/aardvark-dns.spec
+++ rendered/specs/a/aardvark-dns/aardvark-dns.spec
@@ -130,8 +130,8 @@
%changelog
## START: Generated by rpmautospec
-* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 2:1.17.0-2
-- test: add initial lock files
+* Fri May 01 2026 Unknown User <please-configure-git-user@example.com> - 2:1.17.0-2
+- Uncommitted changes
* Wed Nov 12 2025 Packit <hello@packit.dev> - 2:1.17.0-1
- Update to 1.17.0 upstream release
`specs/a/abattis-cantarell-fonts/abattis-cantarell-fonts.spec`--- committed/specs/a/abattis-cantarell-fonts/abattis-cantarell-fonts.spec
+++ rendered/specs/a/abattis-cantarell-fonts/abattis-cantarell-fonts.spec
@@ -2,7 +2,7 @@
# Do not edit manually; changes may be overwritten.
Version: 0.301
-Release: 16%{?dist}
+Release: 15%{?dist}
URL: https://gitlab.gnome.org/GNOME/cantarell-fonts/
%global common_description %{expand:
`specs/a/abseil-cpp/abseil-cpp.spec`--- committed/specs/a/abseil-cpp/abseil-cpp.spec
+++ rendered/specs/a/abseil-cpp/abseil-cpp.spec
@@ -267,8 +267,8 @@
%changelog
## START: Generated by rpmautospec
-* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 20250814.1-2
-- test: add initial lock files
+* Fri May 01 2026 Unknown User <please-configure-git-user@example.com> - 20250814.1-2
+- Uncommitted changes
* Tue Sep 23 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 20250814.1-1
- Update to 20250814.1 (close RHBZ#2397466)
`specs/a/accel-config/accel-config.spec`--- committed/specs/a/accel-config/accel-config.spec
+++ rendered/specs/a/accel-config/accel-config.spec
@@ -5,7 +5,7 @@
Name: accel-config
Version: 4.1.8
-Release: 12%{?dist}
+Release: 11%{?dist}
Summary: Configure accelerator subsystem devices
License: GPL-2.0-only
URL: https://github.com/intel/%{project_name}
`specs/a/accountsservice/accountsservice.spec`--- committed/specs/a/accountsservice/accountsservice.spec
+++ rendered/specs/a/accountsservice/accountsservice.spec
@@ -130,8 +130,8 @@
%changelog
## START: Generated by rpmautospec
-* Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 23.13.9-15
-- test: add initial lock files
+* Fri May 01 2026 Unknown User <please-configure-git-user@example.com> - 23.13.9-15
+- Uncommitted changes
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 23.13.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
… and 7539 more file(s). Run the remediation command above to see all changes. Files to addThese files are produced by
Files to removeThese files are in your branch but are not produced by render. Remove them.
… and 264 more file(s). |
WithEnoughCoffee
force-pushed
the
tomls/base/main
branch
3 times, most recently
from
91dd0ee to
14c8ce9
Compare
reubeno
reviewed
Apr 30, 2026
Member
reubeno
left a comment
reubeno
left a comment
There was a problem hiding this comment.
Please also leave notes on how you produced some of the image variants that we didn't receive as input sources.
| @@ -0,0 +1,189 @@ | |||
| Name: azurelinux-icons | |||
Member
There was a problem hiding this comment.
We should stick to the naming that fedora uses and call this azurelinux-logos.
Author
There was a problem hiding this comment.
Great suggestion I will implement that
| %{_datadir}/pixmaps/azurelinux-logo.png | ||
| %{_datadir}/pixmaps/system-logo-white.png | ||
| %{_datadir}/pixmaps/fedora-gdm-logo.png | ||
| %{_datadir}/pixmaps/fedora-logo.png |
Member
There was a problem hiding this comment.
Why are there still references to images that have fedora in their name?
Author
There was a problem hiding this comment.
These are compatibility symlinks, not actual Fedora images. They resolve to our
Azure Linux assets
Author
There was a problem hiding this comment.
example: fedora-gdm-logo.png → azurelinux-logo.png (GDM hardcodes this filename)
| mkdir -p %{buildroot}%{_sysconfdir} | ||
| ln -s %{_datadir}/icons/hicolor/16x16/apps/azurelinux-logo-icon.png %{buildroot}%{_sysconfdir}/favicon.png | ||
|
|
||
| # === Bootloader (Apple EFI / rEFInd) === |
Member
There was a problem hiding this comment.
Why are we referencing Apple? This is only ever Linux.
Author
There was a problem hiding this comment.
Fedora does this and I was trying to keep with what fedora offers It was a low effort match
| @@ -0,0 +1,21 @@ | |||
| MIT License | |||
Member
There was a problem hiding this comment.
Please follow up with Kavya (me as CC) on what notices we need. If you share what the fedora package has as a comparison, it will help.
Comment on lines
+35
to
+37
| Provides: redhat-logos = %{version}-%{release} | ||
| Provides: gnome-logos = %{version}-%{release} | ||
| Obsoletes: generic-logos < 19.0.0 |
Member
There was a problem hiding this comment.
What's this for? Why obsolete generic-logos?
| Obsoletes: generic-logos < 19.0.0 | ||
| Obsoletes: redhat-logos | ||
| Conflicts: fedora-logos | ||
| Conflicts: generic-logos >= 19.0.0 |
Member
There was a problem hiding this comment.
Why limit conflicts with generic-logos to a certain range? Why not always conflict?
Author
There was a problem hiding this comment.
The split is intentional:
-Obsoletes: generic-logos < 19.0.0 — tells DNF to auto-remove the existing 18.x and replace with this
package (smooth upgrade)
- Conflicts: generic-logos >= 19.0.0 — blocks any hypothetical future version from coexisting.
I could do them all as ConflictsConflicts: generic-logosbut I worry that if RPM evaluates
the Conflict before processing the Obsolete in the same transaction, it could
refuse to install instead of doing the auto-replacement. The versioned split
avoids that edge case and is self-documenting.
| Conflicts: fedora-logos | ||
| Conflicts: generic-logos >= 19.0.0 | ||
|
|
||
| Requires(post): coreutils |
Member
There was a problem hiding this comment.
Can you go through and re-review that this spec aligns with the f43 upstream version of fedora-logos; I see the postinstall scripts, for example, that aren't upstream.
Author
There was a problem hiding this comment.
I used both the generic logo and fedora logo as an example not realizing fedora logo is the more update way to go about it so now I have matched f43 fedora-logo package.
WithEnoughCoffee
force-pushed
the
tomls/base/main
branch
from
14c8ce9 to
f3461ce
Compare
WithEnoughCoffee
requested review from
christopherco and
ddstreetmicrosoft
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a new Azure Linux branding component (azurelinux-icons) as a locally maintained RPM, intended to replace generic-logos by shipping branded desktop icons, pixmaps, bootloader assets, and Plymouth images (plus an -httpd subpackage).
Changes:
- Introduces a new local component definition and spec for
azurelinux-icons(plusazurelinux-icons-httpd) with bundled binary/logo assets. - Checks in rendered spec output and sources under
specs/a/azurelinux-icons/for downstream build consumption. - Adds the new RPM names to the base package publish manifest.
Reviewed changes
Copilot reviewed 6 out of 32 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| base/packages/base.packages.toml | Publishes azurelinux-icons and azurelinux-icons-httpd in the base manifest. |
| base/comps/azurelinux-icons/azurelinux-icons.comp.toml | Declares a new local component pointing at the local spec. |
| base/comps/azurelinux-icons/azurelinux-icons.spec | Source spec defining packaging/Provides/Obsoletes and installing all assets. |
| base/comps/azurelinux-icons/LICENSE | License text shipped as Source0 and installed into %{_datadir}/licenses. |
| base/comps/azurelinux-icons/azurelinux-logo.svg | Scalable desktop/pixmap logo source. |
| base/comps/azurelinux-icons/azurelinux-logo-16.png | 16×16 icon PNG source. |
| base/comps/azurelinux-icons/azurelinux-logo-22.png | 22×22 icon PNG source. |
| base/comps/azurelinux-icons/azurelinux-logo-24.png | 24×24 icon PNG source. |
| base/comps/azurelinux-icons/azurelinux-logo-32.png | 32×32 icon PNG source. |
| base/comps/azurelinux-icons/azurelinux-logo-48.png | 48×48 icon PNG source (also reused for pixmaps/poweredby in spec). |
| base/comps/azurelinux-icons/azurelinux-logo-96.png | 96×96 icon PNG source. |
| base/comps/azurelinux-icons/azurelinux-logo-256.png | 256×256 icon PNG source. |
| base/comps/azurelinux-icons/azurelinux-watermark.png | Plymouth spinner watermark source. |
| base/comps/azurelinux-icons/azurelinux-charge-logo.png | Plymouth charge theme logo source. |
| base/comps/azurelinux-icons/azurelinux.icns | Apple EFI / rEFInd icon source. |
| base/comps/azurelinux-icons/azurelinux.vol | Apple EFI volume icon source. |
| base/comps/azurelinux-icons/azurelinux-media.vol | Apple EFI media volume icon source. |
| specs/a/azurelinux-icons/azurelinux-icons.spec | Rendered spec output for downstream consumption. |
| specs/a/azurelinux-icons/LICENSE | Rendered-sources copy of the license file. |
| specs/a/azurelinux-icons/azurelinux-logo.svg | Rendered-sources copy of scalable logo. |
| specs/a/azurelinux-icons/azurelinux-logo-16.png | Rendered-sources copy of 16×16 PNG. |
| specs/a/azurelinux-icons/azurelinux-logo-22.png | Rendered-sources copy of 22×22 PNG. |
| specs/a/azurelinux-icons/azurelinux-logo-24.png | Rendered-sources copy of 24×24 PNG. |
| specs/a/azurelinux-icons/azurelinux-logo-32.png | Rendered-sources copy of 32×32 PNG. |
| specs/a/azurelinux-icons/azurelinux-logo-48.png | Rendered-sources copy of 48×48 PNG. |
| specs/a/azurelinux-icons/azurelinux-logo-96.png | Rendered-sources copy of 96×96 PNG. |
| specs/a/azurelinux-icons/azurelinux-logo-256.png | Rendered-sources copy of 256×256 PNG. |
| specs/a/azurelinux-icons/azurelinux-watermark.png | Rendered-sources copy of Plymouth watermark PNG. |
| specs/a/azurelinux-icons/azurelinux-charge-logo.png | Rendered-sources copy of Plymouth charge logo PNG. |
| specs/a/azurelinux-icons/azurelinux.icns | Rendered-sources copy of Apple EFI / rEFInd icon. |
| specs/a/azurelinux-icons/azurelinux.vol | Rendered-sources copy of Apple EFI volume icon. |
| specs/a/azurelinux-icons/azurelinux-media.vol | Rendered-sources copy of Apple EFI media volume icon. |
Comment on lines
+51
to
+66
| %package httpd | ||
| Summary: Azure Linux icons for httpd and web servers | ||
| Provides: system-logos-httpd = %{version}-%{release} | ||
| Provides: system-logos(httpd-logo-ng) | ||
| Obsoletes: generic-logos-httpd < 19.0.0 | ||
| Conflicts: fedora-logos-httpd | ||
| Conflicts: generic-logos-httpd >= 19.0.0 | ||
| BuildArch: noarch | ||
|
|
||
| %description httpd | ||
| The azurelinux-icons-httpd package contains the "Powered by Azure Linux" | ||
| image used by httpd, nginx, and other web servers. The azurelinux-icons-httpd | ||
| The Azure Linux icon package contains images and files that may not be | ||
| distributed with anything but unmodified packages from Azure Linux. | ||
|
|
||
| %prep |
There was a problem hiding this comment.
The PR description says the httpd subpackage ships a branded test page at /usr/share/testpage/index.html, but the spec does not include any Source for this file, does not install it in %install, and does not list it in %files httpd. Either add/install/package the testpage content, or update the PR description to match what the RPM actually ships.
Comment on lines
+33
to
+40
| # Replace generic-logos as the system branding package | ||
| Provides: system-logos = %{version}-%{release} | ||
| Provides: redhat-logos = %{version}-%{release} | ||
| Provides: gnome-logos = %{version}-%{release} | ||
| Obsoletes: generic-logos < 19.0.0 | ||
| Obsoletes: redhat-logos | ||
| Conflicts: fedora-logos | ||
| Conflicts: generic-logos >= 19.0.0 |
There was a problem hiding this comment.
The PR description claims this package provides compatibility virtual packages like fedora-logos, fedora-logos-classic, and distribution-logos, but the spec only Provides system-logos/redhat-logos/gnome-logos. If consumers really need those additional provides, add them here; otherwise the PR description should be corrected to avoid overstating compatibility.
Comment on lines
+62
to
+64
| image used by httpd, nginx, and other web servers. The azurelinux-icons-httpd | ||
| The Azure Linux icon package contains images and files that may not be | ||
| distributed with anything but unmodified packages from Azure Linux. |
There was a problem hiding this comment.
The httpd subpackage description has a duplicated fragment ("The azurelinux-icons-httpd" repeated) and reads as an incomplete sentence. Please clean this up so the subpackage description is grammatically correct and not repetitive.
Suggested change
| image used by httpd, nginx, and other web servers. The azurelinux-icons-httpd | |
| The Azure Linux icon package contains images and files that may not be | |
| distributed with anything but unmodified packages from Azure Linux. | |
| image used by httpd, nginx, and other web servers. It contains images | |
| and files that may not be distributed with anything but unmodified | |
| packages from Azure Linux. |
| Source10: azurelinux-logo.svg | ||
|
|
||
| # Desktop icon assets — sized PNGs (generated from Azure Linux brand icon) | ||
| #We dont have a 36x36 icon we dont have any current customers that consume this size. |
There was a problem hiding this comment.
Spelling/formatting in this comment: add a space after "#" and change "dont" to "don't".
Suggested change
| #We dont have a 36x36 icon we dont have any current customers that consume this size. | |
| # We don't have a 36x36 icon we don't have any current customers that consume this size. |
WithEnoughCoffee
force-pushed
the
tomls/base/main
branch
from
f3461ce to
e2f4157
Compare
Add new azurelinux-logos RPM providing Azure Linux brand icons, bootloader graphics, Plymouth boot splash assets, and httpd branding. This replaces generic-logos as the system branding package. Package structure: - azurelinux-logos: Desktop icons (hicolor theme, scalable SVG + sized PNGs), bootloader assets (Apple EFI .icns/.vol), Plymouth theme assets (spinner watermark, charge logo), system pixmaps, and compatibility symlinks for consumers expecting fedora-logos/generic-logos filenames. - azurelinux-logos-httpd: 'Powered by Azure Linux' web server image. Provides: system-logos, redhat-logos, gnome-logos, system-logos-httpd Obsoletes: generic-logos < 19.0.0, redhat-logos Conflicts: fedora-logos, generic-logos >= 19.0.0 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
🔒❌ Lock files are out of date🚧🚧🚧🚧🚧 Warning Disregard this comment. Lock-file generation is still under development and checked-in 🚧🚧🚧🚧🚧 FIX: — run this and commit the result: azldev component update -aOr download the fix patch and apply it: gh run download 25224681749 -R microsoft/azurelinux -n locks-patch
git apply locks.patchChanged components (7581)
… and 7531 more component(s). |
WithEnoughCoffee
changed the title
WithEnoughCoffee
force-pushed
the
tomls/base/main
branch
from
e2f4157 to
7a06a23
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Add a new
azurelinux-logosRPM package for AZL4 that provides Azure Linux branded icons, logos, bootloader assets, Plymouth boot splash, and an httpd subpackage. This is a drop-in replacement forgeneric-logos.What's included
Base package (
azurelinux-logos)start-heresymlinks.icns,.vol) for rEFInd/Mac boot menushttpd subpackage (
azurelinux-logos-httpd)poweredby.pngfor httpd/nginxCompatibility
Provides (satisfies all known AZL4 consumers):
system-logos,redhat-logos,gnome-logossystem-logos-httpd,system-logos(httpd-logo-ng)Obsoletes:
generic-logos < 19.0.0,generic-logos-httpd < 19.0.0,redhat-logosConflicts:
fedora-logos,generic-logos >= 19.0.0Testing
azldev comp build- both SRPM and binary RPMs pass