fs/ubi: expose BINARIES_DIR to ubinize.cfg
PATCH 1/1 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 for BR2_ROOTFS_UBIFS_PATH, replace BINARIES_DIR when copying the file.
--- fs/ubi/ubi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ubi/ubi.mk +1 -1
@@ -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
Signature · 1 line
2.26.2
PATCH 1/1 fs/ubi: expose BINARIES_DIR to ubinize.cfg
Alexandre, All,
On 2020-06-06 12:50 +0200, Alexandre Belloni spake thusly:
Quoted 7 lines
It is often necessary to refer to other images that are present in
BINARIES_DIRfrom a custom ubinize configuration e.g. to include the kernel in a UBI volume.As for
BR2_ROOTFS_UBIFS_PATH, replaceBINARIES_DIRwhen copying the file.Signed-off-by Alexandre Belloni <[email protected]>
You forgot to update the help text to also mention this replacement, so I did add a blurb there, and applied to master (with a rewrpaeed commit log, too). Thanks.
Regards,
Yann E. MORIN.
Quoted 24 lines
--- fs/ubi/ubi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/ubi/ubi.mk +1
-1@@ -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.cfgSignature · 6 lines
2.26.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 fs/ubi: expose BINARIES_DIR to ubinize.cfg
In reply to Alexandre BelloniQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexandre" == Alexandre Belloni <[email protected]> writes:
It is often necessary to refer to other images that are present in
BINARIES_DIRfrom a custom ubinize configuration e.g. to include the kernel in a UBI volume.As for
BR2_ROOTFS_UBIFS_PATH, replaceBINARIES_DIRwhen copying the file.Signed-off-by Alexandre Belloni <[email protected]>
While not strictly a bugfix, it seems pretty simple and a sensible thing to do, so committed to 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard