Skip to content

Commit

Permalink
rpm: skip qubes-mgmt-salt-dom0-update dependency in VM
Browse files Browse the repository at this point in the history
Currently there is no way to run a Salt state system-wide from a VM,
so applying updates from qui-updates widget wont work. We need a
solution for that, but until then, exclude the dependency.

Keep the widget included anyway, as the update notification is still a
useful thing to have.

QubesOS/qubes-issues#4186
  • Loading branch information
marmarek committed May 20, 2021
1 parent 536bd59 commit 78bf15c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Makefile.builder
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
RPM_SPEC_FILES := \
rpm_spec/qubes-desktop-linux-manager.spec
DEBIAN_BUILD_DIRS := debian
RPM_BUILD_DEFINES.vm = --define "vm_package 1"
RPM_BUILD_DEFINES += $(RPM_BUILD_DEFINES.$(PACKAGE_SET))
3 changes: 3 additions & 0 deletions rpm_spec/qubes-desktop-linux-manager.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ Requires: libappindicator-gtk3
Requires: python%{python3_pkgversion}-systemd
Requires: gtk3
Requires: python%{python3_pkgversion}-qubesadmin >= 4.1.8
%if !0%{?vm_package}
# FIXME: we need some way for applying updates from GUI VM
Requires: qubes-mgmt-salt-dom0-update >= 4.0.5
%endif
Requires: qubes-artwork >= 4.1.5

Provides: qui = %{version}-%{release}
Expand Down

0 comments on commit 78bf15c

Please sign in to comment.