aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2019-04-27 20:33:43 +0000
committerRob Austein <sra@hactrn.net>2019-04-27 20:33:43 +0000
commitcd57b6fa764c2c9c71446d2aefeb43a8822a2bd8 (patch)
tree2ee19d7552c4601e1bb34ebdc189e11c8d5b3e7f
parent0f233fceeb8b2c9fb46393a696994a83488f9bce (diff)
Update to Stretch
-rw-r--r--Dockerfile14
-rw-r--r--Makefile2
2 files changed, 5 insertions, 11 deletions
diff --git a/Dockerfile b/Dockerfile
index 284d3f8..7d02887 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,5 @@
FROM cryptech-builder:base
-# Should conditionalize the "jessie-backports" stuff on --build-env=DEBIAN_RELEASE
-# from Makefile. Later.
-
-RUN echo 'deb http://deb.debian.org/debian jessie-backports main' \
- > /etc/apt/sources.list.d/backports.list
-
# Stuff we need we need to build firmware and client packages. This
# stuff is much more likely to change than the XiLinx tools, so we put
# it at the end of the build where we can use normal Docker tooling.
@@ -14,18 +8,18 @@ RUN apt-get update && \
apt-get install -y \
avr-libc \
binutils-avr \
+ debootstrap \
+ distro-info-data \
gcc-arm-none-eabi \
gcc-avr \
git \
+ pbuilder \
python-crypto \
python-serial \
python-yaml \
reprepro \
ubuntu-archive-keyring \
- ubuntu-dev-tools \
- pbuilder && \
- apt-get -t jessie-backports install -y \
- debootstrap distro-info-data
+ ubuntu-dev-tools
USER builder
WORKDIR /home/builder
diff --git a/Makefile b/Makefile
index e93d30f..5c5cf84 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DEBIAN_RELEASE := jessie
+DEBIAN_RELEASE := stretch
XILINX_TARBALL := Xilinx_ISE_DS_Lin_14.7_1015_1.tar
XILINX_LICENSE := Xilinx.lic