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

firewall: switch to python 3

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-20 13:19:51 +02:00
parent 87efe51be0
commit 5dfcf06ef4
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -146,7 +146,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)" python setup.py install -O1 --root $(DESTDIR) PATH="/usr/bin:$(PATH)" python3 setup.py install -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

1
debian/control vendored
View File

@ -7,6 +7,7 @@ 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,

15
rpm_spec/core-vm.spec
View File

@ -78,6 +78,7 @@ 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
@ -440,12 +441,14 @@ 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*
%dir %{python_sitelib}/qubesagent-*-py2.7.egg-info %dir %{python3_sitelib}/qubesagent-*.egg-info
%{python_sitelib}/qubesagent-*-py2.7.egg-info/* %{python3_sitelib}/qubesagent-*.egg-info/*
%dir %{python_sitelib}/qubesagent %dir %{python3_sitelib}/qubesagent
%{python_sitelib}/qubesagent/__init__.py* %dir %{python3_sitelib}/qubesagent/__pycache__
%{python_sitelib}/qubesagent/firewall.py* %{python3_sitelib}/qubesagent/__pycache__/*
%{python_sitelib}/qubesagent/test_firewall.py* %{python3_sitelib}/qubesagent/__init__.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