Skip to content

rpm: adjust BR for directory ownership check in openSUSE #37

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
merged 4 commits into from
Apr 6, 2025
Merged

rpm: adjust BR for directory ownership check in openSUSE #37

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
9625ec0
rpm: adjust BR for directory ownership check in openSUSE
marmarek Mar 29, 2025
4264fd9
Move files from /lib to /usr/lib
marmarek Mar 29, 2025
3960b37
Do not install dom0 files in openSUSE VM package
marmarek Mar 29, 2025
07bf11f
rpm: add BR: sudo for directory ownership
marmarek Mar 29, 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
4 changes: 2 additions & 2 deletions debian/qubes-input-proxy-receiver.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
/etc/qubes-rpc/qubes.InputMouse
/etc/qubes-rpc/qubes.InputKeyboard
/etc/qubes-rpc/qubes.InputTablet
/lib/udev/rules.d/90-qubes-uinput.rules
/lib/modules-load.d/qubes-uinput.conf
/usr/lib/udev/rules.d/90-qubes-uinput.rules
/usr/lib/modules-load.d/qubes-uinput.conf
10 changes: 5 additions & 5 deletions debian/qubes-input-proxy-sender.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
/usr/bin/qubes-input-trigger
/etc/xdg/autostart/qubes-input-trigger.desktop
/etc/sudoers.d/qubes-input-trigger
/lib/udev/rules.d/90-qubes-input-proxy.rules
/lib/systemd/system/qubes-input-sender-tablet@.service
/lib/systemd/system/qubes-input-sender-mouse@.service
/lib/systemd/system/qubes-input-sender-keyboard@.service
/lib/systemd/system/qubes-input-sender-keyboard-mouse@.service
/usr/lib/udev/rules.d/90-qubes-input-proxy.rules
/usr/lib/systemd/system/qubes-input-sender-tablet@.service
/usr/lib/systemd/system/qubes-input-sender-mouse@.service
/usr/lib/systemd/system/qubes-input-sender-keyboard@.service
/usr/lib/systemd/system/qubes-input-sender-keyboard-mouse@.service
2 changes: 1 addition & 1 deletion debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ include /usr/share/dpkg/default.mk
# -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)

override_dh_auto_install:
make install-vm DESTDIR=$(PWD)/debian/tmp USRLIBDIR=/lib
make install-vm DESTDIR=$(PWD)/debian/tmp

override_dh_missing:
dh_missing --fail-missing
8 changes: 4 additions & 4 deletions qubes-rpc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ install-vm:
qubes-input-sender-mouse@.service \
qubes-input-sender-tablet@.service \
$(DESTDIR)$(USRLIBDIR)/systemd/system
install -d $(DESTDIR)$(LIBDIR)/udev/rules.d
install -d $(DESTDIR)$(USRLIBDIR)/udev/rules.d
install -m 0644 qubes-input-proxy.rules \
$(DESTDIR)$(LIBDIR)/udev/rules.d/90-qubes-input-proxy.rules
$(DESTDIR)$(USRLIBDIR)/udev/rules.d/90-qubes-input-proxy.rules
install -m 0644 qubes-uinput.rules \
$(DESTDIR)$(LIBDIR)/udev/rules.d/90-qubes-uinput.rules
$(DESTDIR)$(USRLIBDIR)/udev/rules.d/90-qubes-uinput.rules
install -m 0644 -D qubes-uinput.modules \
$(DESTDIR)$(LIBDIR)/modules-load.d/qubes-uinput.conf
$(DESTDIR)$(USRLIBDIR)/modules-load.d/qubes-uinput.conf
install -d $(DESTDIR)/etc/qubes-rpc
install qubes.InputMouse $(DESTDIR)/etc/qubes-rpc
install qubes.InputKeyboard $(DESTDIR)/etc/qubes-rpc
Expand Down
16 changes: 11 additions & 5 deletions rpm_spec/input-proxy.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ BuildRequires: gcc
BuildRequires: kernel-headers
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-devel
%if 0%{?is_opensuse}
# for directory ownership
BuildRequires: qubes-core-qrexec
BuildRequires: sudo
%endif

Requires: %{name}-receiver

Expand Down Expand Up @@ -54,7 +59,7 @@ make %{?_smp_mflags} all
make install DESTDIR=%{buildroot} PYTHON=%{__python3}

# this really means Qubes > 4.1
%if 0%{?fedora} > 32
%if 0%{?fedora} > 32 || !0%{?fedora}
rm -rf %{buildroot}/etc/qubes-rpc/policy
%endif

Expand All @@ -65,7 +70,7 @@ rm -rf %{buildroot}/etc/qubes-rpc/policy
%{python3_sitelib}/qubesinputproxy-*.egg-info/*
%{python3_sitelib}/qubesinputproxy
# this really means Qubes <= 4.1
%if 0%{?fedora} <= 32
%if 0%{?fedora} && 0%{?fedora} <= 32
%attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.InputMouse
%attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.InputKeyboard
%attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.InputTablet
Expand All @@ -79,7 +84,7 @@ rm -rf %{buildroot}/etc/qubes-rpc/policy
/usr/bin/qubes-input-sender
/usr/bin/qubes-input-trigger
%config(noreplace) /etc/xdg/autostart/qubes-input-trigger.desktop
/lib/udev/rules.d/90-qubes-input-proxy.rules
/usr/lib/udev/rules.d/90-qubes-input-proxy.rules
%{_unitdir}/qubes-input-sender-tablet@.service
%{_unitdir}/qubes-input-sender-mouse@.service
%{_unitdir}/qubes-input-sender-keyboard@.service
Expand All @@ -92,8 +97,9 @@ rm -rf %{buildroot}/etc/qubes-rpc/policy
/etc/qubes-rpc/qubes.InputMouse
/etc/qubes-rpc/qubes.InputKeyboard
/etc/qubes-rpc/qubes.InputTablet
/lib/udev/rules.d/90-qubes-uinput.rules
/lib/modules-load.d/qubes-uinput.conf
/usr/lib/udev/rules.d/90-qubes-uinput.rules
%dir /usr/lib/modules-load.d
/usr/lib/modules-load.d/qubes-uinput.conf

%changelog
@CHANGELOG@