Remove Subscription Manager's autostart patch

This commit is contained in:
Andrew Lukoshko 2025-11-11 08:53:26 +00:00 committed by root
commit 18badb2fc9
2 changed files with 68 additions and 2 deletions

View File

@ -0,0 +1,53 @@
From 5b150e8c9bd99cf5026a06999be4273b2d53188d Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 6 May 2020 13:45:50 -0400
Subject: [PATCH] main: only log check-accelerated errors when debugging
enabled
The journal currently gets spammed with messages like:
gnome-session: gnome-session-check-accelerated: GL Helper exited with code 512
gnome-session: libEGL warning: DRI2: failed to authenticate
gnome-session: gnome-session-check-accelerated: GLES Helper exited with code 512
if a the machine lacks accelerated graphics. But lacking accelerated
graphics isn't actually an error (many servers do).
This commit changes the messages to only show when debugging is enabled.
---
gnome-session/main.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnome-session/main.c b/gnome-session/main.c
index 384ffee7..57091a54 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -233,6 +233,8 @@ static gboolean
check_gl (GError **error)
{
int status;
+ g_autofree char *error_output = NULL;
+
char *argv[] = { LIBEXECDIR "/gnome-session-check-accelerated", NULL };
if (getenv ("DISPLAY") == NULL) {
@@ -240,11 +242,15 @@ check_gl (GError **error)
return TRUE;
}
- if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &gl_renderer, NULL,
+ if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &gl_renderer, &error_output,
&status, error)) {
return FALSE;
}
+ if (error_output != NULL) {
+ g_debug ("%s", error_output);
+ }
+
#if GLIB_CHECK_VERSION(2, 70, 0)
return g_spawn_check_wait_status (status, error);
#else
--
2.49.0

View File

@ -2,7 +2,7 @@
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 8;
release_number = 10;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}.alma.1
@ -36,6 +36,8 @@ Patch: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch
Patch: 0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
# https://issues.redhat.com/browse/RHEL-86871
Patch: 0001-systemd-Drop-blocking-inhibitors-before-shutdown.patch
# https://issues.redhat.com/browse/RHEL-88009
Patch: 0001-main-only-log-check-accelerated-errors-when-debuggin.patch
BuildRequires: meson
@ -100,6 +102,11 @@ Desktop file to add GNOME on wayland to display manager session menu.
%prep
%autosetup -p1 -n %{name}-%{tarball_version}
# Do not start gnome-settings-daemon subman plugin on CentOS
%if 0%{?centos}
patch -p1 -R < %{_sourcedir}/subscription-manager.patch
%endif
%build
%meson \
%if 0%{?with_session_selector}
@ -140,10 +147,16 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/xsessions
%{_userunitdir}/gnome-launched-.scope.d/
%changelog
* Wed May 28 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 46.0-8.alma.1
* Tue Nov 11 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 46.0-10.alma.1
- Remove Subscription Manager's autostart patch
## START: Generated by rpmautospec
* Wed May 28 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 46.0-10
- Do not start gnome-settings-daemon subman plugin on CentOS
* Fri Apr 25 2025 Adrian Vovk <adrianvovk@gmail.com> - 46.0-9
- Silence noisy GL-check warnings
* Mon Apr 14 2025 Adrian Vovk <adrianvovk@gmail.com> - 46.0-8
- Fix systemd v257+ inhibitors