Skip to content

Drop support for Xorg #158

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

Draft
M4rtinK wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Drop support for Xorg #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1904a5
Drop support for X Window Managers
M4rtinK Sep 2, 2025
c46be2b
Also remove the Xorg WM support script
M4rtinK Sep 2, 2025
c8b2775
Remove the gui-xorg sub-package.
M4rtinK Sep 2, 2025
ae4208d
Remove the firstboot-windowmanager script
M4rtinK Sep 2, 2025
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
31 changes: 1 addition & 30 deletions initial-setup.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Enable X11 for RHEL 9 and older only
%bcond x11 %[0%{?rhel} && 0%{?rhel} < 10]


Name: initial-setup
Summary: Initial system configuration utility
Expand Down Expand Up @@ -110,28 +109,6 @@ RemovePathPostfixes: .guiweston

# --------------------------------------------------------------------------

%if %{with x11}
%package gui-xorg
Summary: Run the initial-setup GUI in Xorg
Requires: %{name}-gui = %{version}-%{release}
Requires: xorg-x11-xinit
Requires: xorg-x11-server-Xorg
Requires: firstboot(windowmanager)

Provides: firstboot(gui-backend)
Conflicts: firstboot(gui-backend)
RemovePathPostfixes: .guixorg

%description gui-xorg
%{summary}.

%files gui-xorg
%{_libexecdir}/%{name}/run-gui-backend.guixorg
%{_libexecdir}/%{name}/firstboot-windowmanager
%endif

# --------------------------------------------------------------------------

%prep
%autosetup -p 1

Expand All @@ -147,12 +124,6 @@ rm -rf *.egg-info
# Remove the default link, provide subpackages for alternatives
rm %{buildroot}%{_libexecdir}/%{name}/run-gui-backend

%if ! %{with x11}
# We do not want to ship X11 support anymore
rm -v %{buildroot}%{_libexecdir}/%{name}/run-gui-backend.guixorg
rm -v %{buildroot}%{_libexecdir}/%{name}/firstboot-windowmanager
%endif

%find_lang %{name}

%changelog
Expand Down
70 changes: 0 additions & 70 deletions scripts/firstboot-windowmanager
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions scripts/run-gui-backend.guixorg
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
('/etc/initial-setup/conf.d', glob('data/*.conf')),
('/etc/pam.d', glob('pam/*')),
('/usr/libexec/initial-setup/',
["scripts/run-initial-setup", "scripts/firstboot-windowmanager",
["scripts/run-initial-setup",
"scripts/initial-setup-text", "scripts/initial-setup-graphical",
"scripts/run-gui-backend.guixorg", "scripts/run-gui-backend.guiweston",
"scripts/run-gui-backend.guiweston",
"scripts/run-gui-backend", # symlink to the default backend
"scripts/reconfiguration-mode-enabled"]),
('/usr/share/doc/initial-setup/', ["ChangeLog"])]
Expand Down