From fc494a35b513b05860c5a813239274017f1ef934 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 16 Jul 2020 12:18:41 -0300 Subject: u-boot: Move fw_env.config to u-boot append The u-boot-env is provided by u-boot recipe and not by libubootenv, so right recipe to append is the u-boot. Adding the rpi-u-boot-scr in DEPENDS variable is wrong because it is forcing rpi-u-boot-scr to be a dependency, but it'll fail if I have another recipe that provides bootscript, once both recipes provide the same file. The default value of u-boot-default-script is rpi-u-boot-scr, so right way is to use u-boot-default-script and change the PREFERRED_PROVIDER_u-boot-default-script if needed. Signed-off-by: Fabio Berton (cherry picked from commit fc72c061411ea78515a670b63b0d44c13451cb78) --- recipes-bsp/u-boot/libubootenv_%.bbappend | 12 ------------ recipes-bsp/u-boot/u-boot_%.bbappend | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 recipes-bsp/u-boot/libubootenv_%.bbappend diff --git a/recipes-bsp/u-boot/libubootenv_%.bbappend b/recipes-bsp/u-boot/libubootenv_%.bbappend deleted file mode 100644 index 22d1bdc..0000000 --- a/recipes-bsp/u-boot/libubootenv_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_append_rpi = " \ - file://fw_env.config \ -" - -DEPENDS_append_rpi = " rpi-u-boot-scr" - -do_install_append_rpi () { - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config -} diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 40b4fc0..2442dfc 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,5 +1,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI_append_rpi = " \ + file://fw_env.config \ +" + DEPENDS_append_rpi = " u-boot-default-script" SRC_URI_append_raspberrypi-cm3 = " file://0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch" +do_install_append_rpi () { + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config +} -- cgit v1.2.3-54-g00ecf