diff options
Diffstat (limited to 'testing/lxd/APKBUILD')
| -rw-r--r-- | testing/lxd/APKBUILD | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/testing/lxd/APKBUILD b/testing/lxd/APKBUILD index 2a70ed86fd..0fef740d72 100644 --- a/testing/lxd/APKBUILD +++ b/testing/lxd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=lxd -pkgver=3.15 -pkgrel=1 +pkgver=3.16 +pkgrel=0 pkgdesc="a container hypervisor and a new user experience for LXC" url="https://linuxcontainers.org/lxd/" arch="all !aarch64" @@ -51,7 +51,6 @@ source="https://linuxcontainers.org/downloads/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.confd $pkgname.initd lxd-dont-go-get.patch - error-h-not-avail.patch " # avoid conflict with system libsqlite3.so.0 by adding a soname prefix. # this makes lxd-libs provide so:lxd:libsqlite3.so.0 and lxd depend on @@ -62,31 +61,31 @@ sonameprefix="$pkgname:" _project="github.com/lxc/lxd" prepare() { - export GOPATH="$builddir/dist" + export GOPATH="$builddir/_dist" default_prepare update_config_guess for p in raft sqlite dqlite; do - cd "$GOPATH"/$p + cd "$GOPATH"/deps/$p autoreconf -i done } build() { - export GOPATH="$builddir/dist" - export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/libco/ -I${GOPATH}/raft/include/ -I${GOPATH}/dqlite/include/" - export CGO_LDFLAGS="$CGO_LDFLAGS -L${GOPATH}/sqlite/.libs/ -L${GOPATH}/libco/ -L${GOPATH}/raft/.libs -L${GOPATH}/dqlite/.libs/ -lintl" - export LD_LIBRARY_PATH="$ldpath ${GOPATH}/sqlite/.libs/:${GOPATH}/libco/:${GOPATH}/raft/.libs/:${GOPATH}/dqlite/.libs/" + export GOPATH="$builddir/_dist" + export CGO_CFLAGS="-I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/libco/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/dqlite/include/" + export CGO_LDFLAGS="$CGO_LDFLAGS -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/libco/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/dqlite/.libs/ -lintl" + export LD_LIBRARY_PATH="$ldpath ${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/libco/:${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/" - cd "$GOPATH"/raft - PKG_CONFIG_PATH="${GOPATH}/raft/" ./configure \ + cd "$GOPATH"/deps/raft + PKG_CONFIG_PATH="${GOPATH}/deps/raft/" ./configure \ --prefix=/usr \ --libdir=/usr/lib/lxd make - cd "$GOPATH"/libco + cd "$GOPATH"/deps/libco make - cd "$GOPATH"/sqlite + cd "$GOPATH"/deps/sqlite ./configure \ --prefix=/usr \ --enable-replication \ @@ -95,29 +94,28 @@ build() { --libdir=/usr/lib/lxd make - cd "$GOPATH"/dqlite - PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/" ./configure \ + cd "$GOPATH"/deps/dqlite + PKG_CONFIG_PATH="${GOPATH}/deps/sqlite/:${GOPATH}/deps/libco/:${GOPATH}/deps/raft/" ./configure \ --prefix=/usr \ --libdir=/usr/lib/lxd - make CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/libco/ -I${GOPATH}/raft/include/" LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/libco/ -L${GOPATH}/raft/.libs/" + make CFLAGS="-I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/libco/ -I${GOPATH}/deps/raft/include/" LDFLAGS="-L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/libco/ -L${GOPATH}/deps/raft/.libs/" cd "$builddir" - go install -v -x $_project/lxc go install -v -x -tags libsqlite3 $_project/lxd - for tool in fuidshift lxc-to-lxd lxd-benchmark lxd-p2c; do - go install -v -x $_project/$tool + for bin in lxc fuidshift lxc-to-lxd lxd-benchmark lxd-p2c; do + go install -v -x $_project/$bin done } package() { for r in sqlite dqlite; do - cd "$GOPATH"/$r + cd "$GOPATH"/deps/$r make DESTDIR="$pkgdir" install done - cp ${GOPATH}/libco/libco.so* "$pkgdir"/usr/lib/lxd - cp ${GOPATH}/raft/.libs/libraft.so* "$pkgdir"/usr/lib/lxd + cp ${GOPATH}/deps/libco/libco.so* "$pkgdir"/usr/lib/lxd + cp ${GOPATH}/deps/raft/.libs/libraft.so* "$pkgdir"/usr/lib/lxd rm $pkgdir/usr/bin/sqlite3 rm -r $pkgdir/usr/include @@ -148,27 +146,27 @@ scripts() { pkgdesc="LXD scripts" depends="$pkgname py3-lxc" - export GOPATH="$builddir/dist" + export GOPATH="$builddir/_dist" cd $GOPATH for tool in fuidshift lxc-to-lxd lxd-benchmark lxd-p2c; do install -Dm755 bin/$tool "$subpkgdir"/usr/bin/$tool done + install -Dm755 ../scripts/empty-lxd.sh "$subpkgdir"/usr/bin/empty-lxd.sh } libs() { pkgdesc="LXD bundled libraries" - depends= mkdir -p "$subpkgdir"/usr mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ patchelf --set-rpath "/usr/lib/lxd" "${subpkgdir}/usr/lib/lxd/libdqlite.so" patchelf --set-rpath "/usr/lib/lxd" "${subpkgdir}/usr/lib/lxd/libsqlite3.so" rm -rf "$subpkgdir"/usr/lib/lxd/pkgconfig \ "$subpkgdir"/usr/lib/lxd/*.a + rm -r "$pkgdir"/etc } -sha512sums="de7ad00c8827d13513eb7d01469441bce6b64554939b6cc8c2a106d457b1b959ff21dbc81d28b13551c121f74b2d4c3a5024926fa28f82d2e3f1de670f23250f lxd-3.15.tar.gz +sha512sums="11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9 lxd-3.16.tar.gz bc32c71f2ce10f508433e1e4651c08c18e8a17e9419a7ce391c0f127fc7cf378c665178926b35eae8813e290d9c5eab3ceb605679fd32efdf2cf98a57cee4127 lxd.confd 94de0c0d5ab63463a929a4151359950b1117d0ada5ccf0944311cc70c6b6d4c437ccb4158734ab35db67bfb4abc437074c3f3515be4531f63adc74da21fefb5b lxd.initd -a77a74950110c94727956457843cd3f64c0db901fb05b95ab0edaa966f7fe76a993d86c8a51d14724a11846a69261199594f683dfefa1db633f4ca35c7f23607 lxd-dont-go-get.patch -64d0cb8c3555bcf4fec106d86262ec5075b813df12b5ae59808b4d7776abf73380eddfef1504c975fe44aaed8b637cb8a9323b914e564306e97494d213986db3 error-h-not-avail.patch" +7453a02f003b2b3ccc2695649ca6b39157f1bd30070815e6addaacb280ea935d79bc5d265925aeec379a16f0235387d8333c3f25519c959b980fe15ad2d5728c lxd-dont-go-get.patch" |