From 1b4c49715cd408788edda6f394034f220d48c6bc Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 24 Jun 2020 13:14:55 -0700
Subject: [PATCH] tox.ini, build/bin/write-dockerfile.sh: Add raspbian-buster

---
 build/bin/write-dockerfile.sh | 5 +++++
 tox.ini                       | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh
index e82d1ea8a5a..32cd5a045d9 100755
--- a/build/bin/write-dockerfile.sh
+++ b/build/bin/write-dockerfile.sh
@@ -43,6 +43,11 @@ case $SYSTEM in
 ARG BASE_IMAGE=ubuntu:latest
 FROM \${BASE_IMAGE} as with-system-packages
 EOF
+        if [ -n "$DIST_UPGRADE" ]; then
+            cat <<EOF
+RUN sed -i.bak $DIST_UPGRADE /etc/apt/sources.list && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
+EOF
+        fi
         EXISTS="2>/dev/null >/dev/null apt-cache show"
         UPDATE="apt-get update &&"
         INSTALL="DEBIAN_FRONTEND=noninteractive apt-get install -qqq --no-install-recommends --yes"
diff --git a/tox.ini b/tox.ini
index dca633fb504..0f645ae0bdd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -241,8 +241,13 @@ setenv =
     #
     raspbian:         SYSTEM=debian
     raspbian:         ARCH_IMAGE_PREFIX=
+    raspbian:                                  IGNORE_MISSING_SYSTEM_PACKAGES=yes
     raspbian-jessie:  BASE_IMAGE=raspbian/jessie
     raspbian-stretch: BASE_IMAGE=raspbian/stretch
+    # As of 2020-06, there is no raspbian/buster image, so we dist-upgrade from stretch.
+    # https://www.raspberrypi.org/blog/buster-the-new-version-of-raspbian/
+    raspbian-buster:  BASE_IMAGE=raspbian/stretch
+    raspbian-buster:      DIST_UPGRADE=s/stretch/buster/g
     #
     # https://hub.docker.com/u/linuxmintd
     #