Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix conflicting boot.scr if UBOOT_ENV is set #1310

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix conflicting boot.scr if UBOOT_ENV is set #1310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes-bsp/u-boot/u-boot_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SRC_URI:append:rpi = " \

SRC_URI:append:rpi = " file://0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch"

DEPENDS:append:rpi = " u-boot-default-script"
DEPENDS:append:rpi = " ${@oe.utils.conditional('UBOOT_ENV', '', 'u-boot-default-script', '', d)}"
asac marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think its better to tweak u-boot-default-scripts recipe via a bbappend in such a distro. This is introducing a variable that wont be used elsewhere.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @kraj UBOOT_ENV is not a new variable invented by us. From what I read in the code it's the "official" core way of adding a boot.scr in a standardized manner ... https://github.com/openembedded/openembedded-core/blob/master/meta/classes-recipe/uboot-config.bbclass#L61 ... the u-boot_%.bbappend of meta-raspberrypi breaks that behaviour right now.

Maybe we should also check if template support for this in openembedded-core would be ok.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right I did not check that the variable is already in core layer. However, this variable is relevant for deploy tasks. the logic is still twisted. IMO this change seems more appropriate in u-boot-defaults-script recipe for meta-rpi since this recipe provides the UBOOT_ENV expected file.


do_install:append:rpi () {
install -d ${D}${sysconfdir}
Expand Down