aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2019-02-11 16:26:42 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2019-02-17 19:22:39 +0100
commit9a5a10eb6924efa519e1d9e27b61dc254876f9ec (patch)
treef983901a1996ac16a7d286e17dc42a42e1cb48cd
parent5d11672d077a14b9c44f3d3c35dd16a6c3af3566 (diff)
downloadupstream-9a5a10eb6924efa519e1d9e27b61dc254876f9ec.tar.gz
upstream-9a5a10eb6924efa519e1d9e27b61dc254876f9ec.tar.bz2
upstream-9a5a10eb6924efa519e1d9e27b61dc254876f9ec.zip
build: Accept BIN_DIR parameter for legacy-images
BIN_DIR can be set to overwrite the output path for new images. This is an advertised feature for the imagebuilder and is used by systems like LibreMesh's chef. The legacy images are build using a new sub-make which doesn't receive the variable overwrites of the parent make process. As result, the BIN_DIR is automatically defined to the default value from rules.mk. The images will therefore not be placed in the output path which was selected by the user. Providing BIN_DIR as an explicit variable override to the sub-make works around this problem. Fixes: 26c771452cd8 ("image.mk: add LegacyDevice wrapper to allow legacy image building code to be used for device profiles") Reported-by: Paul Spooren <mail@aparcar.org> Signed-off-by: Sven Eckelmann <sven@narfation.org>
-rw-r--r--include/image.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk
index 5d93a42c62..8f31409025 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -607,7 +607,7 @@ define BuildImage
$(call Image/Prepare)
legacy-images-prepare-make: image_prepare
- $(MAKE) legacy-images-prepare
+ $(MAKE) legacy-images-prepare BIN_DIR="$(BIN_DIR)"
else
image_prepare:
@@ -631,7 +631,7 @@ define BuildImage
legacy-images-make: install-images
$(call Image/mkfs/ubifs/legacy)
- $(MAKE) legacy-images
+ $(MAKE) legacy-images BIN_DIR="$(BIN_DIR)"
install: install-images
$(call Image/Manifest)