From 4cdff71e05e0f2f49ecef0e204b4ec4d4bd55eed Mon Sep 17 00:00:00 2001 From: Dennis Chen Date: Mon, 17 Jul 2017 07:03:27 +0000 Subject: [PATCH] tools: Fix the order sequence issue in Makefile tools/qemu and toos/go-compile define the IMAGE after the package.mk, which result in below error if 'make ORG=other_org': ... invalid argument "other_org/:2c6d9e1d9c52167f4f2b7a8fd235eda318175c99"for t: invalid reference format See 'docker build --help'. ../../pkg/package.mk:47: recipe for target 'tag' failed make: *** [tag] Error 125 This because '../../pkg/package.mk' need to use IMAGE variable first. Signed-off-by: Dennis Chen --- tools/go-compile/Makefile | 5 +++-- tools/qemu/Makefile | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/go-compile/Makefile b/tools/go-compile/Makefile index 3caba19e1..4d5e39964 100644 --- a/tools/go-compile/Makefile +++ b/tools/go-compile/Makefile @@ -1,4 +1,5 @@ -include ../../pkg/package.mk - IMAGE=go-compile DEPS=compile.sh + +include ../../pkg/package.mk + diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile index b52fa7214..438aaaba6 100644 --- a/tools/qemu/Makefile +++ b/tools/qemu/Makefile @@ -1,3 +1,4 @@ +IMAGE=qemu + include ../../pkg/package.mk -IMAGE=qemu