Skip to content

Commit

Permalink
Split dom0-updates handling into subpackage
Browse files Browse the repository at this point in the history
In Fedora it makes little sense, but in Debian it allows to avoid a lot
of dependencies. So split in both, to keep it simple.

QubesOS/qubes-issues#2771
  • Loading branch information
marmarek committed Jun 7, 2017
1 parent f9fd7a1 commit 72b9f38
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 11 deletions.
16 changes: 12 additions & 4 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Architecture: any
Depends:
dmsetup,
ethtool,
fakeroot,
gawk,
imagemagick,
init-system-helpers,
Expand Down Expand Up @@ -73,9 +72,7 @@ Recommends:
system-config-printer,
tinyproxy,
qubes-nautilus,
xsettingsd,
yum,
yum-utils
xsettingsd
Provides: ${diverted-files}
Conflicts: ${diverted-files}, qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit
Description: Qubes core agent
Expand All @@ -88,3 +85,14 @@ Description: Qubes integration for Nautilus
Nautilus addons for inter-VM file copy/move/open.
Depends:
python-nautilus,

Package: qubes-core-agent-dom0-updates
Architecture: any
Depends:
fakeroot,
yum,
yum-utils
Description: Scripts required to handle dom0 updates.
Scripts required to handle dom0 updates. This will allow to use the VM as
"Updates VM".

1 change: 1 addition & 0 deletions debian/qubes-core-agent-dom0-updates.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/qubes/qubes-download-dom0-updates.sh
1 change: 0 additions & 1 deletion debian/qubes-core-agent.install
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ usr/lib/qubes/qrexec-agent
usr/lib/qubes/qrexec-client-vm
usr/lib/qubes/qrexec_client_vm
usr/lib/qubes/qrun-in-vm
usr/lib/qubes/qubes-download-dom0-updates.sh
usr/lib/qubes/qubes-fix-nm-conf.sh
usr/lib/qubes/qubes-rpc-multiplexer
usr/lib/qubes/qubes-setup-dnat-to-ns
Expand Down
21 changes: 15 additions & 6 deletions rpm_spec/core-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ Requires: python2-qubesdb
Requires: nftables
Requires: ImageMagick
Requires: librsvg2-tools
Requires: fakeroot
Requires: desktop-notification-daemon
# to show/hide nm-applet
Requires: dconf
Expand All @@ -166,6 +165,9 @@ BuildRequires: libX11-devel
BuildRequires: qubes-utils-devel >= 3.1.3
BuildRequires: qubes-libvchan-%{backend_vmm}-devel

%description
The Qubes core files for installation inside a Qubes VM.

%package -n python2-dnf-plugins-qubes-hooks
Summary: DNF plugin for Qubes specific post-installation actions
BuildRequires: python2-devel
Expand Down Expand Up @@ -194,13 +196,18 @@ Requires: nautilus-python
%description nautilus
Nautilus addons for inter-VM file copy/move/open.

%package dom0-updates
Summary: Scripts required to handle dom0 updates
Requires: qubes-core-agent
Requires: fakeroot

%description dom0-updates
Scripts required to handle dom0 updates.

%define _builddir %(pwd)

%define kde_service_dir /usr/share/kde4/services

%description
The Qubes core files for installation inside a Qubes VM.

%prep
# we operate on the current directory, so no need to unpack anything
# symlink is to generate useful debuginfo packages
Expand Down Expand Up @@ -411,7 +418,6 @@ rm -f %{name}-%{version}
%defattr(-,root,root,-)
%dir /var/lib/qubes
%dir /var/run/qubes
%dir %attr(0775,user,user) /var/lib/qubes/dom0-updates
%{kde_service_dir}/qvm-copy.desktop
%{kde_service_dir}/qvm-move.desktop
%{kde_service_dir}/qvm-dvm.desktop
Expand Down Expand Up @@ -506,7 +512,6 @@ rm -f %{name}-%{version}
%attr(4755,root,root) /usr/lib/qubes/qfile-unpacker
/usr/lib/qubes/qopen-in-vm
/usr/lib/qubes/qrun-in-vm
/usr/lib/qubes/qubes-download-dom0-updates.sh
/usr/lib/qubes/qubes-fix-nm-conf.sh
/usr/lib/qubes/qubes-setup-dnat-to-ns
/usr/lib/qubes/qubes-trigger-sync-appmenus.sh
Expand Down Expand Up @@ -564,6 +569,10 @@ rm -f %{name}-%{version}
/usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*

%files dom0-updates
%dir %attr(0775,user,user) /var/lib/qubes/dom0-updates
/usr/lib/qubes/qubes-download-dom0-updates.sh

%package sysvinit
Summary: Qubes unit files for SysV init style or upstart
License: GPL v2 only
Expand Down

0 comments on commit 72b9f38

Please sign in to comment.