From 9f92427473f3c2680bf14174114a040845a6f346 Mon Sep 17 00:00:00 2001 From: Rafa Couto Date: Wed, 21 Dec 2016 22:30:46 +0100 Subject: [PATCH] Toolchain ready. --- Dockerfile | 14 +++++++------- {config => configs}/rpi-3.diff | 0 {config => configs}/rpi-zero.diff | 0 {config => configs}/x64.diff | 0 scripts/build.sh | 4 +++- 5 files changed, 10 insertions(+), 8 deletions(-) rename {config => configs}/rpi-3.diff (100%) rename {config => configs}/rpi-zero.diff (100%) rename {config => configs}/x64.diff (100%) diff --git a/Dockerfile b/Dockerfile index 4fa2fce..b4143de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,18 +11,18 @@ RUN apt-get update \ ENV OPENWRT_RELEASE=v15.05.1 \ OPENWRT_TARGET=rpi3 \ - WORKDIR=/usr/src/openwrt + WORKDIR=/usr/local/openwrt -VOLUME ["$WORKDIR"] +VOLUME ["$WORKDIR/src"] -ADD config $WORKDIR/target-configs -ADD scripts/* $WORKDIR/docker-scripts +ADD configs $WORKDIR/configs +ADD scripts/* $WORKDIR/scripts RUN git clone --branch $OPENWRT_RELEASE \ - https://github.com/openwrt/openwrt.git $WORKDIR + https://github.com/openwrt/openwrt.git $WORKDIR/src -WORKDIR $WORKDIR +WORKDIR $WORKDIR/src -CMD ["$WORKDIR/docker-scripts/build.sh", "$OPENWRT_TARGET"] +CMD ["$WORKDIR/scripts/build.sh", "$OPENWRT_TARGET"] diff --git a/config/rpi-3.diff b/configs/rpi-3.diff similarity index 100% rename from config/rpi-3.diff rename to configs/rpi-3.diff diff --git a/config/rpi-zero.diff b/configs/rpi-zero.diff similarity index 100% rename from config/rpi-zero.diff rename to configs/rpi-zero.diff diff --git a/config/x64.diff b/configs/x64.diff similarity index 100% rename from config/x64.diff rename to configs/x64.diff diff --git a/scripts/build.sh b/scripts/build.sh index d40eaeb..76ea97a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,7 +2,9 @@ # ToDo: show target options -# ToDo: test target config +# ToDo +echo 'ToDo: examine targets from env vars...' +exit 0 cp "$WORKDIR/target-configs/$OPENWRT_TARGET.diff" \ "$WORKDIR/.config" && exit 1