From 33888458e5486bb6eaae0f7439fb230e2eff45e8 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 28 Nov 2016 11:58:57 +0000 Subject: [PATCH] Fix build failure in toybox build with one argument Signed-off-by: Justin Cormack --- Dockerfile.media | 2 +- alpine/base/alpine-build-toybox/build.sh | 2 +- alpine/base/toybox-media/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.media b/Dockerfile.media index 1ca59a939..09b0686b1 100644 --- a/Dockerfile.media +++ b/Dockerfile.media @@ -1,4 +1,4 @@ -FROM mobylinux/toybox-media:d476c196534464ca0dd93f8c765002c13d880a1a +FROM mobylinux/toybox-media:e22a41942621b5655bd952b7715d695eaed32647 ADD \ alpine/initrd.img \ diff --git a/alpine/base/alpine-build-toybox/build.sh b/alpine/base/alpine-build-toybox/build.sh index 1b459286a..d6b16fd58 100755 --- a/alpine/base/alpine-build-toybox/build.sh +++ b/alpine/base/alpine-build-toybox/build.sh @@ -2,7 +2,7 @@ FILES=$@ make $FILES > /dev/null -[ $# -eq 1 ] && FILES=toybox +[ $# -eq 0 ] && FILES=toybox # TODO symlinks if just use toybox mkdir -p /out/bin mv $FILES /out/bin diff --git a/alpine/base/toybox-media/Makefile b/alpine/base/toybox-media/Makefile index 63a85e8ae..b88f06fd2 100644 --- a/alpine/base/toybox-media/Makefile +++ b/alpine/base/toybox-media/Makefile @@ -1,12 +1,12 @@ .PHONY: tag push +BASE=mobylinux/alpine-build-toybox:21d65671879b26ba76d606da625d821455035253 IMAGE=toybox-media default: push hash: - docker run mobylinux/alpine-build-toybox:9d6a5b75d2c5ba1686f23c333b59cbb56bfc4ccf \ - ls tar sh find sha1sum | \ + docker run $(BASE) ls tar sh find sha1sum | \ docker build -q -t $(IMAGE):build - docker run $(IMAGE):build tar cf - bin | docker run -i $(IMAGE):build sha1sum -b - > hash