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

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

Browse Source 
* origin/pr/213:
  archlinux/PKGBUILD: remove python2
  fix https://github.com/QubesOS/qubes-issues/issues/5619
This commit is contained in:
Marek Marczykowski-Górecki 2020-02-06 23:18:02 +01:00
commit f1b60dbe13
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archlinux/PKGBUILD
View File

@ -10,7 +10,7 @@ arch=("x86_64")
url="http://qubes-os.org/" url="http://qubes-os.org/"
license=('GPL') license=('GPL')
groups=() groups=()
makedepends=(gcc make pkg-config "qubes-vm-utils>=3.1.3" qubes-libvchan qubes-db-vm qubes-vm-xen libx11 python2 python3 lsb-release pandoc) makedepends=(gcc make pkg-config "qubes-vm-utils>=3.1.3" qubes-libvchan qubes-db-vm qubes-vm-xen libx11 python lsb-release pandoc)
checkdepends=() checkdepends=()
provides=() provides=()
conflicts=() conflicts=()
@ -60,13 +60,13 @@ build() {
# * core systemd services and drop-ins # * core systemd services and drop-ins
# * basic network functionality (setting IP address, DNS, default gateway) # * basic network functionality (setting IP address, DNS, default gateway)
package_qubes-vm-core() { package_qubes-vm-core() {
depends=("qubes-vm-utils>=3.1.3" python2 python3-xdg ethtool ntp net-tools depends=("qubes-vm-utils>=3.1.3" python-xdg ethtool ntp net-tools
gnome-packagekit imagemagick fakeroot notification-daemon dconf gnome-packagekit imagemagick fakeroot notification-daemon dconf
zenity qubes-libvchan "qubes-db-vm>=3.2.1" haveged python3-gobject zenity qubes-libvchan "qubes-db-vm>=3.2.1" haveged python-gobject
python3-dbus xdg-utils notification-daemon gawk sed procps-ng librsvg python-dbus xdg-utils notification-daemon gawk sed procps-ng librsvg
socat socat
) )
optdepends=(gnome-keyring gnome-settings-daemon python2-nautilus gpk-update-viewer qubes-vm-networking qubes-vm-keyring) optdepends=(gnome-keyring gnome-settings-daemon python-nautilus gpk-update-viewer qubes-vm-networking qubes-vm-keyring)
install=PKGBUILD.install install=PKGBUILD.install
# Note: Archlinux removed use of directory such as /sbin /bin /usr/sbin (https://mailman.archlinux.org/pipermail/arch-dev-public/2012-March/022625.html) # Note: Archlinux removed use of directory such as /sbin /bin /usr/sbin (https://mailman.archlinux.org/pipermail/arch-dev-public/2012-March/022625.html)
@ -125,7 +125,7 @@ EOF
# #
package_qubes-vm-networking() { package_qubes-vm-networking() {
pkgdesc="Qubes OS tools allowing to use a Qubes VM as a NetVM/ProxyVM" pkgdesc="Qubes OS tools allowing to use a Qubes VM as a NetVM/ProxyVM"
depends=(qubes-vm-core "qubes-vm-utils>=3.1.3" python3 ethtool net-tools depends=(qubes-vm-core "qubes-vm-utils>=3.1.3" python ethtool net-tools
"qubes-db-vm>=3.2.1" networkmanager iptables tinyproxy nftables "qubes-db-vm>=3.2.1" networkmanager iptables tinyproxy nftables
) )
install=PKGBUILD-networking.install install=PKGBUILD-networking.install