Split dom0-updates handling into subpackage

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
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-29 03:40:33 +02:00
parent f9fd7a1673
commit 72b9f389b2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 28 additions and 11 deletions

16
debian/control vendored
View File

@ -26,7 +26,6 @@ Architecture: any
Depends: Depends:
dmsetup, dmsetup,
ethtool, ethtool,
fakeroot,
gawk, gawk,
imagemagick, imagemagick,
init-system-helpers, init-system-helpers,
@ -73,9 +72,7 @@ Recommends:
system-config-printer, system-config-printer,
tinyproxy, tinyproxy,
qubes-nautilus, qubes-nautilus,
xsettingsd, xsettingsd
yum,
yum-utils
Provides: ${diverted-files} Provides: ${diverted-files}
Conflicts: ${diverted-files}, qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit Conflicts: ${diverted-files}, qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit
Description: Qubes core agent Description: Qubes core agent
@ -88,3 +85,14 @@ Description: Qubes integration for Nautilus
Nautilus addons for inter-VM file copy/move/open. Nautilus addons for inter-VM file copy/move/open.
Depends: Depends:
python-nautilus, 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".

View File

@ -0,0 +1 @@
usr/lib/qubes/qubes-download-dom0-updates.sh

View File

@ -138,7 +138,6 @@ usr/lib/qubes/qrexec-agent
usr/lib/qubes/qrexec-client-vm usr/lib/qubes/qrexec-client-vm
usr/lib/qubes/qrexec_client_vm usr/lib/qubes/qrexec_client_vm
usr/lib/qubes/qrun-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-fix-nm-conf.sh
usr/lib/qubes/qubes-rpc-multiplexer usr/lib/qubes/qubes-rpc-multiplexer
usr/lib/qubes/qubes-setup-dnat-to-ns usr/lib/qubes/qubes-setup-dnat-to-ns

View File

@ -145,7 +145,6 @@ Requires: python2-qubesdb
Requires: nftables Requires: nftables
Requires: ImageMagick Requires: ImageMagick
Requires: librsvg2-tools Requires: librsvg2-tools
Requires: fakeroot
Requires: desktop-notification-daemon Requires: desktop-notification-daemon
# to show/hide nm-applet # to show/hide nm-applet
Requires: dconf Requires: dconf
@ -166,6 +165,9 @@ BuildRequires: libX11-devel
BuildRequires: qubes-utils-devel >= 3.1.3 BuildRequires: qubes-utils-devel >= 3.1.3
BuildRequires: qubes-libvchan-%{backend_vmm}-devel BuildRequires: qubes-libvchan-%{backend_vmm}-devel
%description
The Qubes core files for installation inside a Qubes VM.
%package -n python2-dnf-plugins-qubes-hooks %package -n python2-dnf-plugins-qubes-hooks
Summary: DNF plugin for Qubes specific post-installation actions Summary: DNF plugin for Qubes specific post-installation actions
BuildRequires: python2-devel BuildRequires: python2-devel
@ -194,13 +196,18 @@ Requires: nautilus-python
%description nautilus %description nautilus
Nautilus addons for inter-VM file copy/move/open. 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 _builddir %(pwd)
%define kde_service_dir /usr/share/kde4/services %define kde_service_dir /usr/share/kde4/services
%description
The Qubes core files for installation inside a Qubes VM.
%prep %prep
# we operate on the current directory, so no need to unpack anything # we operate on the current directory, so no need to unpack anything
# symlink is to generate useful debuginfo packages # symlink is to generate useful debuginfo packages
@ -411,7 +418,6 @@ rm -f %{name}-%{version}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir /var/lib/qubes %dir /var/lib/qubes
%dir /var/run/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-copy.desktop
%{kde_service_dir}/qvm-move.desktop %{kde_service_dir}/qvm-move.desktop
%{kde_service_dir}/qvm-dvm.desktop %{kde_service_dir}/qvm-dvm.desktop
@ -506,7 +512,6 @@ rm -f %{name}-%{version}
%attr(4755,root,root) /usr/lib/qubes/qfile-unpacker %attr(4755,root,root) /usr/lib/qubes/qfile-unpacker
/usr/lib/qubes/qopen-in-vm /usr/lib/qubes/qopen-in-vm
/usr/lib/qubes/qrun-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-fix-nm-conf.sh
/usr/lib/qubes/qubes-setup-dnat-to-ns /usr/lib/qubes/qubes-setup-dnat-to-ns
/usr/lib/qubes/qubes-trigger-sync-appmenus.sh /usr/lib/qubes/qubes-trigger-sync-appmenus.sh
@ -564,6 +569,10 @@ rm -f %{name}-%{version}
/usr/share/nautilus-python/extensions/qvm_move_nautilus.py* /usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_dvm_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 %package sysvinit
Summary: Qubes unit files for SysV init style or upstart Summary: Qubes unit files for SysV init style or upstart
License: GPL v2 only License: GPL v2 only