Skip to content

Commit a823725

Browse files
committed
Fix installing files with unified sbin
Fedora 42 merges /usr/bin and /usr/sbin, adjust package %install section accordingly. Related change link: https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin QubesOS/qubes-issues#9807
1 parent 30783de commit a823725

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

kernel-modules/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CFLAGS += $(shell pkg-config --cflags ext2fs com_err) \
55
-fno-delete-null-pointer-checks -fno-strict-aliasing -Wall -Wextra \
66
-Werror=format-security -pedantic-errors -Wformat=2 -Wmaybe-uninitialized \
77
-Wshadow -g3
8+
SBINDIR ?= /usr/sbin
89

910
all: genfs
1011

@@ -14,8 +15,8 @@ genfs: genfs.c
1415
install: install-scripts install-genfs
1516

1617
install-scripts:
17-
install -d $(DESTDIR)/usr/sbin
18-
install qubes-prepare-vm-kernel $(DESTDIR)/usr/sbin
18+
install -d $(DESTDIR)$(SBINDIR)
19+
install qubes-prepare-vm-kernel $(DESTDIR)$(SBINDIR)
1920

2021
install-genfs:
2122
install -d $(DESTDIR)/usr/lib/qubes

rpm_spec/qubes-kernel-vm-support.spec.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ make -C kernel-modules all
5858
make gptfixer/gpt
5959

6060
%install
61-
make install-fedora-kernel-support DESTDIR=%{buildroot}
61+
make install-fedora-kernel-support DESTDIR=%{buildroot} SBINDIR=%{_sbindir}
6262
make install-gptfix SBINDIR=%_sbindir DESTDIR=%{buildroot}
6363

6464
%files

rpm_spec/qubes-utils.spec.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ make -C qrexec-lib check-table-up-to-date NO_REBUILD_TABLE=1
104104
%endif
105105

106106
%install
107-
make install install-selinux DESTDIR=%{buildroot} PYTHON=%{__python3} NO_REBUILD_TABLE=1
107+
make install install-selinux DESTDIR=%{buildroot} PYTHON=%{__python3} NO_REBUILD_TABLE=1 SBINDIR=%{_sbindir}
108108

109109
%post
110110
# dom0

0 commit comments

Comments
 (0)