Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "firewall: switch to python 3"

Browse Source 
This reverts commit 5dfcf06ef4.

python3-daemon isn't widespread enough yet - for Debian jessie available
only in packports.

In addition to the revert itself, adjust packaging for this change
(mostly for Debian).
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-21 01:55:00 +02:00
parent 5047fd9288
commit 33da315e17
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -171,7 +171,7 @@ install-common:
install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab
# force /usr/bin before /bin to have /usr/bin/python instead of /bin/python # force /usr/bin before /bin to have /usr/bin/python instead of /bin/python
PATH="/usr/bin:$(PATH)" python3 setup.py install $(PYTHON_PREFIX_ARG) -O1 --root $(DESTDIR) PATH="/usr/bin:$(PATH)" python setup.py install $(PYTHON_PREFIX_ARG) -O1 --root $(DESTDIR)
mkdir -p $(DESTDIR)$(SBINDIR) mkdir -p $(DESTDIR)$(SBINDIR)
mv $(DESTDIR)/usr/bin/qubes-firewall $(DESTDIR)$(SBINDIR)/qubes-firewall mv $(DESTDIR)/usr/bin/qubes-firewall $(DESTDIR)$(SBINDIR)/qubes-firewall

3
debian/control vendored
View File

@ -7,12 +7,12 @@ Build-Depends:
libqubes-rpc-filecopy-dev (>= 3.1.3), libqubes-rpc-filecopy-dev (>= 3.1.3),
libvchan-xen-dev, libvchan-xen-dev,
python, python,
python3-setuptools,
debhelper, debhelper,
quilt, quilt,
libxen-dev, libxen-dev,
pkg-config, pkg-config,
dh-systemd (>= 1.5), dh-systemd (>= 1.5),
dh-python,
lsb-release, lsb-release,
xserver-xorg-dev, xserver-xorg-dev,
config-package-dev config-package-dev
@ -54,6 +54,7 @@ Depends:
xenstore-utils, xenstore-utils,
xinit, xinit,
xserver-xorg-core, xserver-xorg-core,
${python:Depends},
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Recommends: Recommends:

4
debian/qubes-core-agent.install vendored
View File

@ -101,8 +101,8 @@ usr/bin/qvm-run
usr/bin/xenstore-watch-qubes usr/bin/xenstore-watch-qubes
usr/lib/NetworkManager/conf.d/30-qubes.conf usr/lib/NetworkManager/conf.d/30-qubes.conf
usr/lib/python2.7/dist-packages/qubesxdg.py usr/lib/python2.7/dist-packages/qubesxdg.py
usr/lib/python3/dist-packages/qubesagent-*.egg-info/* usr/lib/python2.7/dist-packages/qubesagent-*.egg-info/*
usr/lib/python3/dist-packages/qubesagent/* usr/lib/python2.7/dist-packages/qubesagent/*
usr/lib/qubes-bind-dirs.d/30_cron.conf usr/lib/qubes-bind-dirs.d/30_cron.conf
usr/lib/qubes/close-window usr/lib/qubes/close-window
usr/lib/qubes/dispvm-prerun.sh usr/lib/qubes/dispvm-prerun.sh

2
debian/rules vendored
View File

@ -9,7 +9,7 @@ include /usr/share/dpkg/default.mk
export DESTDIR=$(shell pwd)/debian/tmp export DESTDIR=$(shell pwd)/debian/tmp
%: %:
dh $@ --with systemd,python3 --with=config-package dh $@ --with systemd,python2 --with=config-package
override_dh_auto_build: override_dh_auto_build:
make all make all

15
rpm_spec/core-vm.spec
View File

@ -157,7 +157,6 @@ Requires: python2-dnf-plugins-qubes-hooks
Obsoletes: qubes-core-vm-kernel-placeholder <= 1.0 Obsoletes: qubes-core-vm-kernel-placeholder <= 1.0
Obsoletes: qubes-upgrade-vm < 3.2 Obsoletes: qubes-upgrade-vm < 3.2
BuildRequires: xen-devel BuildRequires: xen-devel
BuildRequires: python3-devel
BuildRequires: libX11-devel 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
@ -528,14 +527,12 @@ rm -f %{name}-%{version}
/usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override /usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override
/usr/share/glib-2.0/schemas/20_org.gnome.desktop.wm.preferences.qubes.gschema.override /usr/share/glib-2.0/schemas/20_org.gnome.desktop.wm.preferences.qubes.gschema.override
%dir %{python3_sitelib}/qubesagent-*.egg-info %dir %{python_sitelib}/qubesagent-*-py2.7.egg-info
%{python3_sitelib}/qubesagent-*.egg-info/* %{python_sitelib}/qubesagent-*-py2.7.egg-info/*
%dir %{python3_sitelib}/qubesagent %dir %{python_sitelib}/qubesagent
%dir %{python3_sitelib}/qubesagent/__pycache__ %{python_sitelib}/qubesagent/__init__.py*
%{python3_sitelib}/qubesagent/__pycache__/* %{python_sitelib}/qubesagent/firewall.py*
%{python3_sitelib}/qubesagent/__init__.py %{python_sitelib}/qubesagent/test_firewall.py*
%{python3_sitelib}/qubesagent/firewall.py
%{python3_sitelib}/qubesagent/test_firewall.py
/usr/share/qubes/mime-override/globs /usr/share/qubes/mime-override/globs
/usr/share/qubes/qubes-master-key.asc /usr/share/qubes/qubes-master-key.asc