diff options
| author | Asterios Dimitriou | 2020-01-22 14:32:03 +0200 |
|---|---|---|
| committer | Asterios Dimitriou | 2020-01-23 12:09:38 +0200 |
| commit | 94deb30dd61d641f2a844ab4c3f55d293b4e9cc0 (patch) | |
| tree | 02649aac06a57bdd38116dfaba3c49789161957f | |
| parent | e843baad956bdef16678ba9336484b181f3cb2a2 (diff) | |
| download | aur-94deb30dd61d641f2a844ab4c3f55d293b4e9cc0.tar.gz | |
Add new cgo flags
Optional support for virtual machines
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | lxd.service | 1 |
3 files changed, 17 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = lxd-git pkgdesc = Daemon based on liblxc offering a REST API to manage containers - pkgver = 3.14.r151.4f54c17ea - pkgrel = 2 + pkgver = 3.19.r174.4e607231d + pkgrel = 1 url = https://github.com/lxc/lxd arch = x86_64 license = APACHE @@ -10,6 +10,7 @@ pkgbase = lxd-git makedepends = tcl makedepends = patchelf depends = lxc + depends = lxcfs depends = squashfs-tools depends = dnsmasq depends = libuv @@ -18,6 +19,9 @@ pkgbase = lxd-git optdepends = btrfs-progs: for btrfs storage driver support optdepends = ceph: for ceph storage driver support optdepends = jq: needed by empty-lxd.sh script + optdepends = qemu: needed for virtual machine support + optdepends = ovmf: needed for virtual machine support + optdepends = mkisolinux: needed for virtual machine support provides = lxd conflicts = lxd conflicts = lxd-lts @@ -27,7 +31,7 @@ pkgbase = lxd-git source = lxd.service source = lxd.socket md5sums = SKIP - md5sums = ad8ad313898fac0487fcf9a3b9b926ea + md5sums = 5b7032b4b6adc4c4b80d9a919b9cd8a2 md5sums = 1fb28d8dfe82af71d0675c8e9a0a7293 pkgname = lxd-git @@ -5,21 +5,24 @@ pkgname=lxd-git _pkgname=lxd -pkgver=3.14.r151.4f54c17ea -pkgrel=2 +pkgver=3.19.r157.5e6963a91 +pkgrel=1 pkgdesc="Daemon based on liblxc offering a REST API to manage containers" arch=('x86_64') url="https://github.com/lxc/lxd" license=('APACHE') conflicts=('lxd' 'lxd-lts') provides=('lxd') -depends=('lxc' 'squashfs-tools' 'dnsmasq' 'libuv') +depends=('lxc' 'lxcfs' 'squashfs-tools' 'dnsmasq' 'libuv') makedepends=('go' 'git' 'tcl' 'patchelf') optdepends=('lvm2: for lvm2 support' 'thin-provisioning-tools: for thin provisioning support' 'btrfs-progs: for btrfs storage driver support' 'ceph: for ceph storage driver support' 'jq: needed by empty-lxd.sh script' + 'qemu: needed for virtual machine support' + 'ovmf: needed for virtual machine support' + 'mkisolinux: needed for virtual machine support' ) options=('!strip' '!emptydirs') source=("git+https://github.com/lxc/lxd.git" @@ -27,9 +30,8 @@ source=("git+https://github.com/lxc/lxd.git" "lxd.socket" ) md5sums=('SKIP' - 'ad8ad313898fac0487fcf9a3b9b926ea' - '1fb28d8dfe82af71d0675c8e9a0a7293' -) + '5b7032b4b6adc4c4b80d9a919b9cd8a2' + '1fb28d8dfe82af71d0675c8e9a0a7293') _lxd=github.com/lxc/lxd @@ -50,6 +52,7 @@ build() { export CGO_CFLAGS="-I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/libco/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/dqlite/include/" export CGO_LDFLAGS="-L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/libco/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/dqlite/.libs/" export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/libco/:${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/" + export CGO_LDFLAGS_ALLOW="-Wl,-wrap,pthread_create" make } diff --git a/lxd.service b/lxd.service index f038cc1fe143..51df6f5a0fe6 100644 --- a/lxd.service +++ b/lxd.service @@ -4,6 +4,7 @@ After=network.target [Service] Type=simple +Environment=LXD_OVMF_PATH=/usr/share/ovmf/x64 ExecStart=/usr/bin/lxd --group lxd ExecStop=/usr/bin/lxd shutdown KillMode=process |