aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorGravatar Alexandre Belloni <alexandre.belloni@bootlin.com>2020-06-06 12:50:15 +0200
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2020-06-06 13:43:43 +0200
commit145ee99bc95f99bd6b8aa0ed4a0220173ca7ec25 (patch)
treeb26eaa50b3b4346b5e3c74ba12ded45fbf15891e /fs
parent0eef19ec87e6805fec5d02972ad72aa47c453690 (diff)
downloadbuildroot-145ee99bc95f99bd6b8aa0ed4a0220173ca7ec25.tar.gz
buildroot-145ee99bc95f99bd6b8aa0ed4a0220173ca7ec25.tar.bz2
fs/ubi: expose BINARIES_DIR to ubinize.cfg
It is often necessary to refer to other images that are present in BINARIES_DIR from a custom ubinize configuration e.g. to include the kernel in a UBI volume. As we do for BR2_ROOTFS_UBIFS_PATH, replace BINARIES_DIR when copying the file. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> [yann.morin.1998@free.fr: - add the blurb in the help text - rewrap commit log ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubi/Config.in5
-rw-r--r--fs/ubi/ubi.mk2
2 files changed, 6 insertions, 1 deletions
diff --git a/fs/ubi/Config.in b/fs/ubi/Config.in
index 85b1c56bb0..3427ea0518 100644
--- a/fs/ubi/Config.in
+++ b/fs/ubi/Config.in
@@ -38,6 +38,11 @@ config BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG
So the volume defined for the root filesystem can specify the
image path as: image=BR2_ROOTFS_UBIFS_PATH
+ Buildroot also replaces the string "BINARIES_DIR" with the
+ value of $(BINARIES_DIR), so that it is possible to reference
+ other build artefacts (e.g. to include the kernel in a UBI
+ volume).
+
config BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE
string "Configuration file path"
depends on BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG
diff --git a/fs/ubi/ubi.mk b/fs/ubi/ubi.mk
index d848f8b23a..54bb81ea08 100644
--- a/fs/ubi/ubi.mk
+++ b/fs/ubi/ubi.mk
@@ -23,7 +23,7 @@ endif
# don't use sed -i as it misbehaves on systems with SELinux enabled when this is
# executed through fakeroot (see #9386)
define ROOTFS_UBI_CMD
- sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \
+ sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;;s;BINARIES_DIR;$(BINARIES_DIR);' \
$(UBI_UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg
$(HOST_DIR)/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
rm $(BUILD_DIR)/ubinize.cfg