aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2019-02-11 16:26:42 +0100
committerChristian Lamparter <chunkeey@gmail.com>2019-02-20 18:41:37 +0100
commit405840631c87d7d5c3381e82d61504b318c8a555 (patch)
tree9488e08ac746080c4633fd9f75546d003ed2ccf4
parentbc3eb970abc4d666735866c72951813d49d2a07f (diff)
downloadupstream-405840631c87d7d5c3381e82d61504b318c8a555.tar.gz
upstream-405840631c87d7d5c3381e82d61504b318c8a555.tar.bz2
upstream-405840631c87d7d5c3381e82d61504b318c8a555.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> (cherry picked from commit 9a5a10eb6924efa519e1d9e27b61dc254876f9ec)
-rw-r--r--include/image.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk
index a2b106d909..b01cd2bf68 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -581,7 +581,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:
@@ -605,7 +605,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)