Skip to content

Restore 'Microsoft' and full version number in azurelinux-release #8296

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

Merged
anphel31 merged 2 commits into from
Mar 10, 2024
Merged

Restore 'Microsoft' and full version number in azurelinux-release #8296

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c7100f
update azurelinux-release
anphel31 Mar 7, 2024
f05d5fa
remove timestamp from version
anphel31 Mar 8, 2024
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
21 changes: 13 additions & 8 deletions SPECS/azurelinux-release/azurelinux-release.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@

%define dist_version 3
%define distro_release_version_no_time %(echo %{distro_release_version} | cut -d. -f 1-3)

Summary: Azure Linux release files
Name: azurelinux-release
Version: %{dist_version}.0
Release: 4%{?dist}
Release: 5%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -35,24 +36,24 @@ install -d %{buildroot}%{_rpmmacrodir}

cat <<-"EOF" > %{buildroot}%{_libdir}/azurelinux-release
%{distribution} %{version}
AZURELINUX_BUILD_NUMBER=%{mariner_build_number}
AZURELINUX_BUILD_NUMBER=%{distro_release_version_no_time}
EOF
ln -sv ..%{_libdir}/azurelinux-release %{buildroot}%{_sysconfdir}/azurelinux-release

cat <<-"EOF" > %{buildroot}%{_libdir}/lsb-release
DISTRIB_ID="azurelinux"
DISTRIB_RELEASE="%{version}"
DISTRIB_RELEASE="%{distro_release_version_no_time}"
DISTRIB_CODENAME=AzureLinux
DISTRIB_DESCRIPTION="%{distribution} %{version}"
EOF
ln -sv ..%{_libdir}/lsb-release %{buildroot}%{_sysconfdir}/lsb-release

cat <<-"EOF" > %{buildroot}%{_libdir}/os-release
NAME="%{distribution}"
VERSION="%{version}"
NAME="Microsoft %{distribution}"
VERSION="%{distro_release_version_no_time}"
ID=azurelinux
VERSION_ID="%{version}"
PRETTY_NAME="%{distribution} %{version}"
PRETTY_NAME="Microsoft %{distribution} %{version}"
ANSI_COLOR="1;34"
HOME_URL="%{url}"
BUG_REPORT_URL="%{url}"
Expand All @@ -61,12 +62,12 @@ EOF
ln -sv ..%{_libdir}/os-release %{buildroot}%{_sysconfdir}/os-release

cat <<-"EOF" > %{buildroot}%{_libdir}/issue
Welcome to %{distribution} %{version} (%{_arch}) - (\l)
Welcome to Microsoft %{distribution} %{version} (%{_arch}) - (\l)
EOF
ln -sv ..%{_libdir}/issue %{buildroot}%{_sysconfdir}/issue

cat <<-"EOF" > %{buildroot}%{_libdir}/issue.net
Welcome to %{distribution} %{version} (%{_arch})
Welcome to Microsoft %{distribution} %{version} (%{_arch})
EOF
ln -sv ..%{_libdir}/issue.net %{buildroot}%{_sysconfdir}/issue.net

Expand Down Expand Up @@ -112,6 +113,10 @@ install -Dm0644 %{SOURCE3} -t %{buildroot}%{_userpresetdir}/
%{_userpresetdir}/*.preset

%changelog
* Thu Mar 07 2024 Andrew Phelps <anphel@microsoft.com> - 3.0-5
- Add 'Microsoft' to names in release files and welcome message
- Restore full version number in release files

* Thu Feb 22 2024 Dan Streetman <ddstreet@microsoft.com> - 3.0-4
- remove %%config(noreplace) from *-release files
- define dist_version and use local macros
Expand Down