Merge remote-tracking branch 'origin/deploy' into deploy.universe

* origin/deploy:
  etc/sbuild.conf.in: Keep failed build trees for diagnostics.

diff --git a/etc/ccache.conf b/etc/ccache.conf
index a76ac4116df2e457071b9ac6cb725578ea47a4f1..abb1750c89fe36d6ab3efa78331c79ff3fd72198 100644 (file)
--- a/etc/ccache.conf
+++ b/etc/ccache.conf
@@ -1,3 +1,3 @@
 ### -*-conf-*-
 
-max_size = 256Mi
+max_size = 2Gi

diff --git a/local.mk b/local.mk
index e9039171d423531353df16b5285be70e6a925e38..6e4134909e3845ff87de3a6b58e987a45da7dbee 100644 (file)
--- a/local.mk
+++ b/local.mk
@@ -1,5 +1,7 @@
 ### -*-makefile-*-
 
+VG = vg-build
+
 APTSRC = etc/aptsrc.site.conf etc/aptsrc.local.conf
 TOOLSARCH = amd64