[OE-core] [PATCH] u-boot-fw-utils: Allow replacement of fw_env.config

Otavio Salvador otavio at ossystems.com.br
Tue Jun 20 22:15:12 UTC 2017


If a fw_env.config file is found in workdir, this is preferred over
the U-Boot example.

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---

 meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb
index c2e8f0fb84..0682f9274b 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb
@@ -19,7 +19,14 @@ do_install () {
 	install -d ${D}${sysconfdir}
 	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
 	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
-	install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
+
+	# If a specific file is added in a .bbappend, this is used instead
+	# of the generic one
+	if [ -e ${WORKDIR}/fw_env.config ]; then
+		install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+	else
+		install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config.example
+	fi
 }
 
 do_install_class-cross () {
-- 
2.13.1




More information about the Openembedded-core mailing list