From: Mark Wooding Date: Sat, 21 Sep 2019 21:38:14 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/deploy' into deploy.universe X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-chroot/commitdiff_plain/eda09dbe0b0d62e2ccd579ebfa17a22aeaeefa08?hp=023dbf291d462662eaadd8c2976f38c4d2b7f95e 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 a76ac41..abb1750 100644 --- 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 e903917..6e41349 100644 --- 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