From f2c9a9320cd403138020e9c067e201fbe498dccb Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Thu, 30 Jul 2015 15:54:41 +0200 Subject: [PATCH] archlinux: ensure python2 is used for all scripts and fix dependencies for qubes-desktop-run --- archlinux/PKGBUILD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 9084bf2..4042b3a 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -6,18 +6,17 @@ # Maintainer: Olivier Medoc pkgname=qubes-vm-core pkgver=`cat version` -pkgrel=2 +pkgrel=3 epoch= pkgdesc="The Qubes core files for installation inside a Qubes VM." arch=("x86_64") url="http://qubes-os.org/" license=('GPL') groups=() -depends=(ethtool ntp net-tools qubes-vm-utils gnome-packagekit imagemagick fakeroot notification-daemon pygtk zenity qubes-libvchan qubes-db-vm haveged) +depends=(ethtool ntp net-tools qubes-vm-utils gnome-packagekit imagemagick fakeroot notification-daemon pygtk zenity qubes-libvchan qubes-db-vm haveged python2-gobject) makedepends=(qubes-vm-utils qubes-libvchan-xen) checkdepends=() optdepends=(gnome-keyring gnome-settings-daemon networkmanager iptables tinyproxy python2-nautilus gpk-update-viewer) -# Unknown deps: pygobject3-base (for qubes-desktop-run) provides=() conflicts=() replaces=() @@ -49,6 +48,10 @@ sed 's:/sbin/ethtool:ethtool:g' -i network/* sed 's:/sbin/ip:ip:g' -i network/* sed 's:/bin/grep:grep:g' -i network/* +# Fix for running with python2 +sed 's:#!/usr/bin/python:#!/usr/bin/python2:' -i misc/* +sed 's:#!/usr/bin/python:#!/usr/bin/python2:' -i qubes-rpc/* + # Fix for archlinux sbindir sed 's:/usr/sbin/ntpdate:/usr/bin/ntpdate:g' -i qubes-rpc/sync-ntp-clock sed 's:/usr/sbin/qubes-netwatcher:/usr/bin/qubes-netwatcher:g' -i vm-systemd/qubes-netwatcher.service