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

Merge remote-tracking branch 'origin/pr/59'

Browse Source 
* origin/pr/59:
  archlinux: Added python{2,3} as dependency. Solved python22 bug.
This commit is contained in:
Marek Marczykowski-Górecki 2016-01-06 02:29:21 +01:00
commit bd68fb973b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archlinux/PKGBUILD
View File

@ -13,8 +13,8 @@ arch=("x86_64")
url="http://qubes-os.org/" url="http://qubes-os.org/"
license=('GPL') license=('GPL')
groups=() groups=()
depends=("qubes-vm-utils>=3.1.3" python2-xdg ethtool ntp net-tools gnome-packagekit imagemagick fakeroot notification-daemon dconf pygtk zenity qubes-libvchan qubes-db-vm haveged python2-gobject python2-dbus xdg-utils notification-daemon) depends=("qubes-vm-utils>=3.1.3" python2 python3 python2-xdg ethtool ntp net-tools gnome-packagekit imagemagick fakeroot notification-daemon dconf pygtk zenity qubes-libvchan qubes-db-vm haveged python2-gobject python2-dbus xdg-utils notification-daemon)
makedepends=("qubes-vm-utils>=3.1.3" qubes-libvchan qubes-db-vm qubes-vm-xen libx11) makedepends=("qubes-vm-utils>=3.1.3" qubes-libvchan qubes-db-vm qubes-vm-xen libx11 python2 python3)
checkdepends=() checkdepends=()
optdepends=(gnome-keyring gnome-settings-daemon networkmanager iptables tinyproxy python2-nautilus gpk-update-viewer) optdepends=(gnome-keyring gnome-settings-daemon networkmanager iptables tinyproxy python2-nautilus gpk-update-viewer)
provides=() provides=()
@ -37,10 +37,6 @@ for source in autostart-dropins qubes-rpc qrexec misc Makefile vm-init.d vm-syst
(ln -s $srcdir/../$source $srcdir/$source) (ln -s $srcdir/../$source $srcdir/$source)
done done
# Fix for building with python2
export PYTHON=python2
sed 's:python:python2:g' -i misc/Makefile
# Fix for network tools paths # Fix for network tools paths
sed 's:/sbin/ifconfig:ifconfig:g' -i network/* sed 's:/sbin/ifconfig:ifconfig:g' -i network/*
sed 's:/sbin/route:route:g' -i network/* sed 's:/sbin/route:route:g' -i network/*