[lxc-devel] [lxd/master] More README tweaks

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180813/2f5a5a45/attachment.bin>
-------------- next part --------------
From 5bf19419b1ff4557077659e913cb4684ae0d79f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 13 Aug 2018 15:02:08 -0400
Subject: [PATCH 1/2] doc: Add tcl to README
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/index.md b/doc/index.md
index b025af10b..eecd6f8f6 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -33,7 +33,7 @@ later to work. On ubuntu, you can get those with:
 
 ```bash
 sudo apt update
-sudo apt install acl autoconf dnsmasq-base git golang libacl1-dev libcap-dev liblxc1 liblxc-dev libtool libuv1-dev make pkg-config rsync squashfs-tools tar xz-utils
+sudo apt install acl autoconf dnsmasq-base git golang libacl1-dev libcap-dev liblxc1 liblxc-dev libtool libuv1-dev make pkg-config rsync squashfs-tools tar tcl xz-utils
 ```
 
 Note that when building LXC yourself, ensure to build it with the appropriate
@@ -190,7 +190,7 @@ Live migration requires a tool installed on both hosts called
 [CRIU](http://criu.org), which is available in Ubuntu via:
 
 ```bash
-sudo apt-get install criu
+sudo apt install criu
 ```
 
 Then, launch your container with the following,

From b82a4c2adbff4803558eedca02415702f5509d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 13 Aug 2018 15:02:52 -0400
Subject: [PATCH 2/2] Makefile: Tweak sqlite build flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6b60d1b89..25cf33543 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ deps:
 	fi
 
 	cd "$(GOPATH)/deps/sqlite" && \
-		./configure --enable-replication && \
+		./configure --enable-replication --disable-amalgamation --disable-tcl && \
 		git log -1 --format="format:%ci%n" | sed -e 's/ [-+].*$$//;s/ /T/;s/^/D /' > manifest && \
 		git log -1 --format="format:%H" > manifest.uuid && \
 		make