aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2020-12-14 09:08:28 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2020-12-14 09:08:35 +0000
commit75bbc3195fafa4fd3c2e5b15f91c98a72a09df2c (patch)
treee8c282809ce660d3378e65bf20102ca51239cd74
parentfae0e216f6b899cbc8b9388ffe6854d3a77d14db (diff)
downloadaports-75bbc3195fafa4fd3c2e5b15f91c98a72a09df2c.tar.gz
aports-75bbc3195fafa4fd3c2e5b15f91c98a72a09df2c.tar.bz2
aports-75bbc3195fafa4fd3c2e5b15f91c98a72a09df2c.tar.xz
testing/lxd: upgrade to 4.9
-rw-r--r--testing/lxd/APKBUILD6
-rw-r--r--testing/lxd/lxd-dont-go-get.patch20
2 files changed, 12 insertions, 14 deletions
diff --git a/testing/lxd/APKBUILD b/testing/lxd/APKBUILD
index 7a626387ea..d19aee5ab3 100644
--- a/testing/lxd/APKBUILD
+++ b/testing/lxd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=lxd
-pkgver=4.8
+pkgver=4.9
pkgrel=0
pkgdesc="a container hypervisor and a new user experience for LXC"
url="https://linuxcontainers.org/lxd/"
@@ -126,8 +126,8 @@ scripts() {
install -Dm755 scripts/empty-lxd.sh "$subpkgdir"/usr/bin/empty-lxd.sh
}
-sha512sums="668c3122c84173713a61bf4eee7ac25b835cb537026f215f69eb5671d0efe2f6e4788e25f5c21e971a8ca74edf34f1b89a61e77041d0604bbb400f5f8f45de37 lxd-4.8.tar.gz
+sha512sums="30f48d9beea725052ce091f4624745f17c2c022b49024ec6f2116458a08c0042531a954d85c1292e32a77a9b666fa01f30b2e96cbdd71e7b7933eb8b2c778a5a lxd-4.9.tar.gz
bc32c71f2ce10f508433e1e4651c08c18e8a17e9419a7ce391c0f127fc7cf378c665178926b35eae8813e290d9c5eab3ceb605679fd32efdf2cf98a57cee4127 lxd.confd
94de0c0d5ab63463a929a4151359950b1117d0ada5ccf0944311cc70c6b6d4c437ccb4158734ab35db67bfb4abc437074c3f3515be4531f63adc74da21fefb5b lxd.initd
-1c54a68cb07c16919dd748223b2359955a97764b279a1810129d9c3db64d7c5f82d92739256be78592abaf371705000c6752b0352a310f2fa74427f0656e5618 lxd-dont-go-get.patch
+58bcdde8b6d845ea70b0e81973ecc42e62a912b995684692a7f7fd2eb99e258381f33ba588033963d0d371f5c7849e0777a6b27304d80d31da7c8146e27a6139 lxd-dont-go-get.patch
c9291e7df7e7d62324d6f31460268b138eaeb7928b2aceb9e1763bc123c4410557a887847e441c03efb92642a6c39c8db6557e2af6a738ac46a9df93b5ac1d3b add-missing-includes.patch"
diff --git a/testing/lxd/lxd-dont-go-get.patch b/testing/lxd/lxd-dont-go-get.patch
index 64332a4010..375ed7c229 100644
--- a/testing/lxd/lxd-dont-go-get.patch
+++ b/testing/lxd/lxd-dont-go-get.patch
@@ -1,7 +1,5 @@
-LXD's tarball includes sources for Go dependencies, so all `go get` steps can
-safely be skipped.
diff --git a/Makefile b/Makefile
-index c4f605a6b..fe52b5293 100644
+index 592ada9..964086c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ ifeq ($(TAG_SQLITE3),)
@@ -20,7 +18,7 @@ index c4f605a6b..fe52b5293 100644
go install -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./lxc
@echo "LXD client built successfully"
-@@ -111,7 +109,6 @@ deps:
+@@ -81,7 +79,6 @@ deps:
.PHONY: update
update:
@@ -28,7 +26,7 @@ index c4f605a6b..fe52b5293 100644
@echo "Dependencies updated"
.PHONY: update-protobuf
-@@ -132,7 +129,6 @@ ifeq ($(TAG_SQLITE3),)
+@@ -102,7 +99,6 @@ ifeq ($(TAG_SQLITE3),)
exit 1
endif
@@ -36,7 +34,7 @@ index c4f605a6b..fe52b5293 100644
CC=$(CC) 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
-@@ -145,7 +141,6 @@ ifeq ($(TAG_SQLITE3),)
+@@ -115,7 +111,6 @@ ifeq ($(TAG_SQLITE3),)
exit 1
endif
@@ -44,7 +42,7 @@ index c4f605a6b..fe52b5293 100644
CC=$(CC) 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
-@@ -157,7 +152,6 @@ ifeq ($(TAG_SQLITE3),)
+@@ -127,7 +122,6 @@ ifeq ($(TAG_SQLITE3),)
exit 1
endif
@@ -52,17 +50,17 @@ index c4f605a6b..fe52b5293 100644
CC=$(CC) 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
-@@ -165,9 +159,6 @@ endif
+@@ -135,9 +129,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 github.com/golang/lint/golint
+- go get -v -x golang.org/x/lint/golint
go test -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./...
cd test && ./main.sh
-@@ -182,9 +173,6 @@ dist:
+@@ -152,9 +143,6 @@ dist:
mkdir -p $(TMP)/_dist/src/github.com/lxc
ln -s ../../../../lxd-$(VERSION) $(TMP)/_dist/src/github.com/lxc/lxd
@@ -72,7 +70,7 @@ index c4f605a6b..fe52b5293 100644
# Download the cluster-enabled sqlite/dqlite
mkdir $(TMP)/_dist/deps/
git clone --depth=1 https://github.com/canonical/dqlite $(TMP)/_dist/deps/dqlite
-@@ -222,7 +210,6 @@ update-po:
+@@ -188,7 +176,6 @@ update-po:
done
update-pot: