Rob Austein 5 rokov pred
rodič
commit
cd57b6fa76
2 zmenil súbory, kde vykonal 5 pridanie a 11 odobranie
  1. 4 10
      Dockerfile
  2. 1 1
      Makefile

+ 4 - 10
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

+ 1 - 1
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