mirrors/openwrt
0
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-11-23 18:05:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: Accept BIN_DIR parameter for legacy-images

Browse Source 
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: 26c771452c ("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 9a5a10eb69)
This commit is contained in:
Sven Eckelmann 2019-02-11 16:26:42 +01:00 committed by Christian Lamparter
parent bc3eb970ab
commit 405840631c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/image.mk
View File

@ -581,7 +581,7 @@ define BuildImage
$(call Image/Prepare) $(call Image/Prepare)
legacy-images-prepare-make: image_prepare legacy-images-prepare-make: image_prepare
$(MAKE) legacy-images-prepare $(MAKE) legacy-images-prepare BIN_DIR="$(BIN_DIR)"
else else
image_prepare: image_prepare:
@ -605,7 +605,7 @@ define BuildImage
legacy-images-make: install-images legacy-images-make: install-images
$(call Image/mkfs/ubifs/legacy) $(call Image/mkfs/ubifs/legacy)
$(MAKE) legacy-images $(MAKE) legacy-images BIN_DIR="$(BIN_DIR)"
install: install-images install: install-images
$(call Image/Manifest) $(call Image/Manifest)