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

Move 'qubesxdg' into qubesagent python package

Browse Source 
Since we have proper python package, use it instead of hacky one-file
package. This will ease installation and packaging, including switching
to python3.
This commit is contained in:
Marek Marczykowski-Górecki 2018-03-05 23:32:19 +01:00
parent 0ef6297bfc
commit 4a7c668549
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
7 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -298,16 +298,6 @@ endif
install -D -m 0755 misc/qubes-desktop-run $(DESTDIR)$(BINDIR)/qubes-desktop-run
mkdir -p $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/
ifeq ($(shell lsb_release -is), Debian)
install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
else ifeq ($(shell lsb_release -is), Ubuntu)
install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
else
install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/
endif
install -d $(DESTDIR)/mnt/removable
install -D -m 0644 misc/xorg-preload-apps.conf $(DESTDIR)/etc/X11/xorg-preload-apps.conf

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

@ -102,7 +102,6 @@ usr/bin/qvm-open-in-vm
usr/bin/qvm-run-vm
usr/bin/qvm-sync-clock
usr/bin/xenstore-watch-qubes
usr/lib/python2.7/dist-packages/qubesxdg.py
usr/lib/python2.7/dist-packages/qubesagent-*.egg-info/*
usr/lib/python2.7/dist-packages/qubesagent/*
usr/lib/qubes-bind-dirs.d/30_cron.conf

2
misc/Makefile
View File

@ -23,7 +23,7 @@ python2:
python3:
rm -rf py3
mkdir -p py3
cp dnf-qubes-hooks.py qubesxdg.py py3/
cp dnf-qubes-hooks.py py3/
python3 -m compileall py3
python3 -O -m compileall py3

2
misc/qubes-desktop-run
View File

@ -1,6 +1,6 @@
#!/usr/bin/python
from qubesxdg import launch
from qubesagent.xdg import launch
import sys
if __name__ == '__main__':

2
misc/qubes-session-autostart
View File

@ -25,7 +25,7 @@ import subprocess
import sys
from xdg.DesktopEntry import DesktopEntry
from qubesxdg import launch
from qubesagent.xdg import launch
import xdg.BaseDirectory
import os

0
misc/qubesxdg.py → qubesagent/xdg.py
View File

2
rpm_spec/core-agent.spec
View File

@ -664,7 +664,6 @@ rm -f %{name}-%{version}
/usr/lib/qubes/init/functions
%dir /usr/lib/qubes-bind-dirs.d
/usr/lib/qubes-bind-dirs.d/30_cron.conf
/usr/lib/python2.7/site-packages/qubesxdg.py*
/usr/share/qubes/serial.conf
/usr/share/glib-2.0/schemas/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override
/usr/share/glib-2.0/schemas/20_org.gnome.nautilus.qubes.gschema.override
@ -678,6 +677,7 @@ rm -f %{name}-%{version}
%{python_sitelib}/qubesagent/__init__.py*
%{python_sitelib}/qubesagent/firewall.py*
%{python_sitelib}/qubesagent/test_firewall.py*
%{python_sitelib}/qubesagent/xdg.py*
/usr/share/qubes/mime-override/globs
/usr/share/qubes/qubes-master-key.asc