diff -Nru lxd-2.7/debian/changelog lxd-2.7/debian/changelog --- lxd-2.7/debian/changelog 2016-12-21 05:26:09.000000000 +0000 +++ lxd-2.7/debian/changelog 2016-12-21 08:47:38.000000000 +0000 @@ -1,3 +1,12 @@ +lxd (2.7-0ubuntu2) zesty; urgency=medium + + * Cherry-pick upstream fix: + - tests: Fix shellcheck being confused by cd + * Add lxc-to-lxd to lxd-tools. + * Re-enable Go shared libraries. + + -- Stéphane Graber Wed, 21 Dec 2016 03:28:42 -0500 + lxd (2.7-0ubuntu1) zesty; urgency=medium * New upstream release (2.7): diff -Nru lxd-2.7/debian/control lxd-2.7/debian/control --- lxd-2.7/debian/control 2016-12-21 05:21:03.000000000 +0000 +++ lxd-2.7/debian/control 2016-12-21 08:42:08.000000000 +0000 @@ -33,7 +33,7 @@ libsqlite3-dev, lxc-dev (>= 1.1.0~), pkg-config, - protobuf-compiler + python3-lxc Package: lxd-client Architecture: any @@ -86,7 +86,7 @@ Package: lxd-tools Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, python3, python3-lxc Built-Using: ${misc:Built-Using} Description: Container hypervisor based on LXC - extra tools LXD offers a REST API to remotely manage containers over the network, @@ -94,6 +94,7 @@ . This package contains extra tools provided with LXD. - fuidshift - A tool to map/unmap filesystem uids/gids + - lxc-to-lxd - A tool to migrate LXC containers to LXD Package: golang-github-lxc-lxd-dev Architecture: all diff -Nru lxd-2.7/debian/.git-dpm lxd-2.7/debian/.git-dpm --- lxd-2.7/debian/.git-dpm 2016-12-21 05:21:03.000000000 +0000 +++ lxd-2.7/debian/.git-dpm 2016-12-21 08:47:38.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -307876fb50559741d36cf024f3e0e4f0fe656f69 -307876fb50559741d36cf024f3e0e4f0fe656f69 +5b259e3fcb914db70c68a2381ef11bbef6637382 +5b259e3fcb914db70c68a2381ef11bbef6637382 307876fb50559741d36cf024f3e0e4f0fe656f69 307876fb50559741d36cf024f3e0e4f0fe656f69 lxd_2.7.orig.tar.gz diff -Nru lxd-2.7/debian/lxd-tools.install lxd-2.7/debian/lxd-tools.install --- lxd-2.7/debian/lxd-tools.install 2016-12-21 05:21:03.000000000 +0000 +++ lxd-2.7/debian/lxd-tools.install 2016-12-21 08:42:08.000000000 +0000 @@ -1,2 +1,5 @@ usr/bin/fuidshift usr/share/man/man1/fuidshift.1 + +usr/bin/lxc-to-lxd +usr/share/man/man1/lxc-to-lxd.1 diff -Nru lxd-2.7/debian/patches/0001-tests-Fix-shellcheck-being-confused-by-cd.patch lxd-2.7/debian/patches/0001-tests-Fix-shellcheck-being-confused-by-cd.patch --- lxd-2.7/debian/patches/0001-tests-Fix-shellcheck-being-confused-by-cd.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxd-2.7/debian/patches/0001-tests-Fix-shellcheck-being-confused-by-cd.patch 2016-12-21 08:47:38.000000000 +0000 @@ -0,0 +1,26 @@ +From 5b259e3fcb914db70c68a2381ef11bbef6637382 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= +Date: Wed, 21 Dec 2016 03:26:54 -0500 +Subject: tests: Fix shellcheck being confused by cd +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Stéphane Graber +--- + test/suites/filemanip.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/suites/filemanip.sh b/test/suites/filemanip.sh +index 9f970e3..ab7ade6 100644 +--- a/test/suites/filemanip.sh ++++ b/test/suites/filemanip.sh +@@ -1,6 +1,8 @@ + #!/bin/sh + + test_filemanip() { ++ # Workaround for shellcheck getting confused by "cd" ++ set -e + ensure_import_testimage + ensure_has_localhost_remote "${LXD_ADDR}" + diff -Nru lxd-2.7/debian/patches/series lxd-2.7/debian/patches/series --- lxd-2.7/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ lxd-2.7/debian/patches/series 2016-12-21 08:47:38.000000000 +0000 @@ -0,0 +1 @@ +0001-tests-Fix-shellcheck-being-confused-by-cd.patch diff -Nru lxd-2.7/debian/rules lxd-2.7/debian/rules --- lxd-2.7/debian/rules 2016-12-21 05:21:03.000000000 +0000 +++ lxd-2.7/debian/rules 2016-12-21 08:47:38.000000000 +0000 @@ -5,14 +5,14 @@ #export DH_VERBOSE=1 PKGDIR=debian/tmp -VERSION=$(shell grep "var Version" $(CURDIR)/shared/flex.go | cut -d'"' -f2) +VERSION=$(shell grep "var Version" $(CURDIR)/shared/version/flex.go | cut -d'"' -f2) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # temporary build path (see http://golang.org/doc/code.html#GOPATH) export DH_GOPKG := github.com/lxc/lxd export GOPATH := $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE) export USE_EMBEDDED := false -export USE_SHLIBS := false +export USE_SHLIBS := true ifeq ($(USE_SHLIBS), true) export DH_GOLANG_LINK_SHARED := 1 @@ -84,12 +84,17 @@ mv ${GOPATH}/lxd.tmp ${GOPATH}/src/github.com/lxc/lxd override_dh_install: + # Install lxc-to-lxd + cp scripts/lxc-to-lxd $(PKGDIR)/usr/bin/lxc-to-lxd + # Install the manpages mkdir -p $(PKGDIR)/usr/share/man/man1/ help2man $(PKGDIR)/usr/bin/fuidshift -n "uid/gid shifter" --no-info > $(PKGDIR)/usr/share/man/man1/fuidshift.1 help2man $(PKGDIR)/usr/bin/lxc -n "The container hypervisor - client" --no-info > $(PKGDIR)/usr/share/man/man1/lxc.1 + help2man $(PKGDIR)/usr/bin/lxc-to-lxd -n "Convert LXC containers to LXD" --no-info --version-string=$(VERSION) > $(PKGDIR)/usr/share/man/man1/lxc-to-lxd.1 help2man $(PKGDIR)/usr/bin/lxd -n "The container hypervisor - daemon" --no-info > $(PKGDIR)/usr/share/man/man1/lxd.1 + # Install bash completion scripts mkdir -p $(PKGDIR)/usr/share/bash-completion/completions/ cp config/bash/lxd-client $(PKGDIR)/usr/share/bash-completion/completions/lxc @@ -99,7 +104,7 @@ cp -RL ${GOPATH}/src/github.com/lxc/lxd $(PKGDIR)/usr/share/gocode/src/github.com/lxc/ rm -Rf $(PKGDIR)/usr/share/gocode/src/github.com/lxc/lxd/dist - # copy dnsmasq configuration + # Copy dnsmasq configuration mkdir -p $(PKGDIR)/etc/dnsmasq.d-available cp debian/lxd.dnsmasq $(PKGDIR)/etc/dnsmasq.d-available/lxd