MIRRORS/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

u-boot: Move fw_env.config to u-boot append

Browse Source 
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 <fabio.berton@ossystems.com.br>
This commit is contained in:
Fabio Berton 2020-07-16 12:18:41 -03:00 committed by Andrei Gherzan
parent 8258e733ea
commit 671ae4ab48
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
recipes-bsp/u-boot/libubootenv_%.bbappend
View File

@ -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
}

11
recipes-bsp/u-boot/u-boot_%.bbappend
View File

@ -1 +1,12 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI_append_rpi = " \
file://fw_env.config \
"
DEPENDS_append_rpi = " u-boot-default-script" DEPENDS_append_rpi = " u-boot-default-script"
do_install_append_rpi () {
install -d ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
}