aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean <seanmcavoy@gmail.com>2021-09-11 09:54:17 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2021-09-12 16:45:56 +0000
commit1dec9540b7d5d5576c9ee8e3b01e4ed5030c584d (patch)
tree89b72d3e7e54b2464b069d64ab19c3c556ca7666
parentb5d5a2bc3ec6ae7abea68b4d4a35c99f68bae0b5 (diff)
downloadaports-1dec9540b7d5d5576c9ee8e3b01e4ed5030c584d.tar.gz
aports-1dec9540b7d5d5576c9ee8e3b01e4ed5030c584d.tar.bz2
aports-1dec9540b7d5d5576c9ee8e3b01e4ed5030c584d.tar.xz
testing/lxd: update to 4.18
-rw-r--r--testing/lxd/APKBUILD27
-rw-r--r--testing/lxd/add-missing-includes.patch14
-rw-r--r--testing/lxd/lxd-dont-go-get.patch98
3 files changed, 9 insertions, 130 deletions
diff --git a/testing/lxd/APKBUILD b/testing/lxd/APKBUILD
index c12c3d5846..f1f36d224f 100644
--- a/testing/lxd/APKBUILD
+++ b/testing/lxd/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=lxd
-pkgver=4.17
-pkgrel=2
+pkgver=4.18
+pkgrel=0
pkgdesc="a container hypervisor and a new user experience for LXC"
url="https://linuxcontainers.org/lxd/"
arch="all !mips !mips64"
@@ -10,14 +10,13 @@ license="Apache-2.0"
pkggroups="$pkgname"
depends="
acl
+ attr
netcat-openbsd
cgmanager
squashfs-tools
rsync
dqlite
- sqlite-replication
shadow-uidmap
- lxc
ip6tables
dnsmasq
ca-certificates
@@ -47,7 +46,6 @@ makedepends="
dqlite-dev
dqlite-static
lz4-dev
- sqlite-replication-dev
sqlite-dev
sqlite-static
raft-dev
@@ -65,24 +63,19 @@ subpackages="
"
install="$pkgname.pre-install"
options="!check"
-source="https://linuxcontainers.org/downloads/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://linuxcontainers.org/downloads/lxd/lxd-$pkgver.tar.gz
$pkgname.confd
$pkgname.initd
- add-missing-includes.patch
- lxd-dont-go-get.patch
"
ldpath="/usr/lib/lxd"
sonameprefix="$pkgname:"
-_project="github.com/lxc/lxd"
-
build() {
export GOPATH="$builddir/_dist"
- export GOFLAGS="-buildmode=pie -trimpath"
- export CGO_CFLAGS="$CFLAGS -I/usr/include/sqlite-replication"
- export CGO_LDFLAGS="-lintl $LDFLAGS -L/usr/lib/sqlite-replication -Wl,-R/usr/lib/sqlite-replication"
+ export GOFLAGS="$GOFLAGS -buildmode=pie -trimpath"
+ export CGO_LDFLAGS="-lintl $LDFLAGS"
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
- export GO111MODULE=off
+ export GO111MODULE=on
mkdir -p bin
go build -v -tags "netgo" -ldflags '-extldflags "-static -lm -ldl -lz -lpthread -lz -lintl -lraft -ldqlite -luv -lseccomp -lcap"' -o bin/ ./lxd-p2c/...
@@ -108,7 +101,7 @@ package() {
"$pkgdir"/etc/conf.d/lxd
mkdir -p "$pkgdir"/var/lib/lxd
- chmod 755 "$pkgdir"/var/lib/lxd
+ chmod 755 "$pkgdir"/var/lib/lxd
chgrp $pkggroups "$pkgdir"/var/lib/lxd
mkdir -p "$pkgdir/usr/share/doc/$pkgname"
@@ -138,9 +131,7 @@ scripts() {
}
sha512sums="
-c7570c6ba0b7c8f0025dcc185fa2a073b28b5d5589d49cb3340b8bd25d99d3bf0e5a9887e212e5ca88caf9c744052a038f7d2399f1386ebf6f0050a189c391b9 lxd-4.17.tar.gz
+b3bb2987e3351d55fba4c09d3c462e45025dee3482f51035889cf4d9354184646742e7afe3cd00ba34f2518e23f817b520040f4c94abeaf844753fac58a4f0ca lxd-4.18.tar.gz
5af20408f4bbbcd20b60c610c26d9aa52798d4f970ef649ea1d3b14bdbb0ee87ab52166551a4fcf724a6641d4afdcdb07ef4d6da4a0b49448d2673e27b1b2f40 lxd.confd
94de0c0d5ab63463a929a4151359950b1117d0ada5ccf0944311cc70c6b6d4c437ccb4158734ab35db67bfb4abc437074c3f3515be4531f63adc74da21fefb5b lxd.initd
-c9291e7df7e7d62324d6f31460268b138eaeb7928b2aceb9e1763bc123c4410557a887847e441c03efb92642a6c39c8db6557e2af6a738ac46a9df93b5ac1d3b add-missing-includes.patch
-d66a8e66b82b0ffff492ef4f8e89f17d5207046a9c387f86447b58ebe4324ea23c842c6c3352156730bc446859d14c5f944b00db50bc6ad08eee997d3e786f47 lxd-dont-go-get.patch
"
diff --git a/testing/lxd/add-missing-includes.patch b/testing/lxd/add-missing-includes.patch
deleted file mode 100644
index fce3c9621c..0000000000
--- a/testing/lxd/add-missing-includes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/_dist/deps/dqlite/src/vfs.c b/_dist/deps/dqlite/src/vfs.c
-index 31e138c..c5f9e9c 100644
---- a/_dist/deps/dqlite/src/vfs.c
-+++ b/_dist/deps/dqlite/src/vfs.c
-@@ -2,6 +2,9 @@
- #include <sys/time.h>
- #include <errno.h>
-
-+#include <pthread.h>
-+#include <sys/types.h>
-+
- #include <raft.h>
-
- #include <sqlite3.h>
diff --git a/testing/lxd/lxd-dont-go-get.patch b/testing/lxd/lxd-dont-go-get.patch
deleted file mode 100644
index ef57670923..0000000000
--- a/testing/lxd/lxd-dont-go-get.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 67485b0..6e057de 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,15 +8,11 @@ ARCHIVE=lxd-$(VERSION).tar
- HASH := \#
- TAG_SQLITE3=$(shell printf "$(HASH)include <dqlite.h>\nvoid main(){dqlite_node_id n = 1;}" | $(CC) ${CGO_CFLAGS} -o /dev/null -xc - >/dev/null 2>&1 && echo "libsqlite3")
- GOPATH ?= $(HOME)/go
--CGO_LDFLAGS_ALLOW ?= (-Wl,-wrap,pthread_create)|(-Wl,-z,now)
-+CGO_LDFLAGS_ALLOW ?= (-Wl,-wrap,pthread_create)
- export GO111MODULE=off
-
- .PHONY: default
--default: get build
--
--.PHONY: get
--get:
-- go get -t -v -d ./...
-+default: build
-
- .PHONY: build
- build:
-@@ -32,7 +28,6 @@ endif
-
- .PHONY: client
- client:
-- go get -t -v -d ./...
- go install -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
-@@ -89,7 +84,6 @@ deps:
-
- .PHONY: update
- update:
-- go get -t -v -d -u ./...
- @echo "Dependencies updated"
-
- .PHONY: update-protobuf
-@@ -107,7 +101,6 @@ update-schema:
-
- .PHONY: update-api
- update-api:
-- GO111MODULE=on go get -v -x github.com/go-swagger/go-swagger/cmd/swagger
- swagger generate spec -o doc/rest-api.yaml -w ./lxd -m
-
- .PHONY: debug
-@@ -117,7 +110,6 @@ ifeq ($(TAG_SQLITE3),)
- exit 1
- endif
-
-- go get -t -v -d ./...
- CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -v -tags "$(TAG_SQLITE3) logdebug" $(DEBUG) ./...
- CGO_ENABLED=0 go install -v -tags "netgo,logdebug" ./lxd-p2c
- CGO_ENABLED=0 go install -v -tags "agent,netgo,logdebug" ./lxd-agent
-@@ -130,7 +122,6 @@ ifeq ($(TAG_SQLITE3),)
- exit 1
- endif
-
-- go get -t -v -d ./...
- CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -a -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./...
- CGO_ENABLED=0 go install -a -v -tags netgo ./lxd-p2c
- CGO_ENABLED=0 go install -a -v -tags agent,netgo ./lxd-agent
-@@ -142,7 +133,6 @@ ifeq ($(TAG_SQLITE3),)
- exit 1
- endif
-
-- go get -t -v -d ./...
- CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -race -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./...
- CGO_ENABLED=0 go install -v -tags netgo ./lxd-p2c
- CGO_ENABLED=0 go install -v -tags agent,netgo ./lxd-agent
-@@ -150,9 +140,6 @@ endif
-
- .PHONY: check
- check: default
-- go get -v -x github.com/rogpeppe/godeps
-- go get -v -x github.com/tsenart/deadcode
-- go get -v -x golang.org/x/lint/golint
- CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go test -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./...
- cd test && ./main.sh
-
-@@ -167,9 +154,6 @@ dist:
- mkdir -p $(TMP)/_dist/src/github.com/lxc
- ln -s ../../../../lxd-$(VERSION) $(TMP)/_dist/src/github.com/lxc/lxd
-
-- # Download dependencies
-- cd $(TMP)/lxd-$(VERSION) && GOPATH=$(TMP)/_dist go get -t -v -d ./...
--
- # Download the cluster-enabled sqlite/dqlite
- mkdir $(TMP)/_dist/deps/
- git clone --depth=1 https://github.com/canonical/dqlite $(TMP)/_dist/deps/dqlite
-@@ -203,7 +187,6 @@ update-po:
- done
-
- update-pot:
-- go get -v -x github.com/snapcore/snapd/i18n/xgettext-go/
- xgettext-go -o po/$(DOMAIN).pot --add-comments-tag=TRANSLATORS: --sort-output --package-name=$(DOMAIN) --msgid-bugs-address=lxc-devel@lists.linuxcontainers.org --keyword=i18n.G --keyword-plural=i18n.NG lxc/*.go lxc/*/*.go
-
- build-mo: $(MOFILES)