sig_core/rocky-release
7
0
Fork 0
mirror of https://git.rockylinux.org/staging/src/rocky-release.git synced 2024-12-22 08:38:31 +00:00
Code Issues Projects Releases Wiki Activity

bump to .3

Browse Source
This commit is contained in:
nazunalika 2022-02-08 17:35:47 -07:00
parent a75aa21e98
commit cbe3c14aba
Signed by: label
GPG Key ID: 6735C0E1BD65D048
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -30,5 +30,16 @@ which makes it easier to make sure everything "stays in line" for the most part.
### What about after the five year mark?
LookAhead will no longer be produced as the major version will then me in
LookAhead will no longer be produced as the major version will then be in
maintenance only mode.
### What is the rloverride macro?
This simply sets the dist tag to `.el%{major}.override` and changes the ID="..."
tag in `/etc/os-release` to read as `rhel` rather than `rocky`. This helps us
perform very specific builds that cannot otherwise be debranded properly, eg
dotnet. This should also change the initial macros to only provide `%rhel` and
not CentOS or any other derivative macro name, as some packages specifically
look for these macros being set as well and *also* applies to those packages
that cannot be properly debranded or when debranding has not visual or
functional benefit.

1
SOURCES/90-default-user.preset
View File

@ -17,5 +17,6 @@ enable pipewire-pulse.socket
# https://bugzilla.redhat.com/show_bug.cgi?id=1976006
enable pipewire-media-session.service
# https://bugzilla.redhat.com/show_bug.cgi?id=2022717
enable wireplumber.service

7
SOURCES/90-default.preset
View File

@ -199,6 +199,10 @@ enable iscsid.socket
enable iscsiuio.socket
enable iscsi-onboot.service
# Enable logrotate.timer
# https://bugzilla.redhat.com/show_bug.cgi?id=1977865
enable logrotate.timer
# Enable greenboot
# https://bugzilla.redhat.com/show_bug.cgi?id=2005552
enable greenboot-grub2-set-counter.service
@ -212,3 +216,6 @@ enable redboot-task-runner.service
# https://bugzilla.redhat.com/show_bug.cgi?id=2013299
enable low-memory-monitor.service
# https://bugzilla.redhat.com/show_bug.cgi?id=2049627
enable switcheroo-control.service

19
SPECS/rocky-release.spec
View File

@ -16,7 +16,7 @@
%define distro_code Blue Onyx
%define major 9
%define minor 0
%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.2}
%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.3}
%define rpm_license BSD-3-Clause
%define dist .el%{major}
@ -51,6 +51,18 @@
# End Rocky Beta Section
################################################################################
################################################################################
# Rocky Override Section
#
# Resets only the dist tag for the override package. All this does is ensure
# that only the rhel macros and settings are provided - This is useful in the
# case of a build that cannot be properly debranded (eg dotnet).
%if 0%{?rloverride}
%define dist .el%{major}.override
%endif
# End Rocky Override Section
################################################################################
%define base_release_version %{major}
%define dist_release_version %{major}
%define full_release_version %{major}.%{minor}
@ -207,7 +219,7 @@ install -d -m 0755 %{buildroot}%{_prefix}/lib
cat > %{buildroot}%{_prefix}/lib/os-release << EOF
NAME="%{distro_name}"
VERSION="%{full_release_version} (%{distro_code})"
ID="rocky"
ID="%{?rloverride:rhel}%{!?rloverride:rocky}"
ID_LIKE="rhel centos fedora"
VERSION_ID="%{full_release_version}"
PLATFORM_ID="platform:el%{major}"
@ -391,8 +403,9 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
%{_datadir}/pki/sb-certs/*.crt
%changelog
* Thu Jan 27 2022 Louis Abel <label@rockylinux.org> - 9.0-1.2
* Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.3
- Backport current SB certs for now
- Add logrotate timer and switcheroo
* Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1
- Add LOGO to /etc/os-release