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

bootspec.bbclass: Refactoring, Fixes and Documentation #138

Merged
merged 5 commits into from
Jun 7, 2024
Merged

bootspec.bbclass: Refactoring, Fixes and Documentation #138

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c383b9
bootspec.bbclass: unify variable expansion
ejoerns Jun 6, 2024
c9680f2
bootspec.bbclass: add bootspec variables to do_rootfs[vardeps]
ejoerns Jun 6, 2024
834e85c
bootspec.bbclass: no need to initialize 'option' variable outside
ejoerns Jun 6, 2024
c8950ed
bootspec.bbclass: add a bit of documentation to header
ejoerns Jun 6, 2024
07214e7
bootspec.bbclass: refactor bootspec options code
ejoerns Jun 6, 2024
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
33 changes: 23 additions & 10 deletions classes-recipe/bootspec.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
# Adds boot spec entry for first FSTYPE found
# Class for adding a basic bootloader specification file to rootfs images
#
# For more information, see:
# https://uapi-group.org/specifications/specs/boot_loader_specification/
#
# To use the class in your image recipe, simply add
#
# inherit bootspec
#
# This will create a bootspec entry for each devicetree found in
# KERNEL_DEVICETREE and EXTERNAL_KERNEL_DEVICETREE.
# For machines not using devicetree, it will create a single default.conf.
#
# The bootspec lines generated can be customized with the BOOTSPEC_TITLE,
# BOOTSPEC_VERSION, BOOTSPEC_OPTIONS and BOOTSPEC_EXTRALINE variables.

BOOTSPEC_TITLE ?= "${SUMMARY}"
BOOTSPEC_TITLE[doc] = "Content of the boot spec entry 'title' line"
Expand All @@ -12,28 +26,27 @@ BOOTSPEC_OPTIONS_squashfs-xz = "rootfstype=squashfs"
BOOTSPEC_VERSION ?= "${PV}"
BOOTSPEC_VERSION[doc] ?= "Content of the bootspec version entry"

BOOTSPEC_OPTIONS_DEFAULT = ""

python () {
option = ""

# Search in IMAGE_FSTYPES for a type we have a default for
def bootspec_default_option(d):
for type in (d.getVar('IMAGE_FSTYPES') or "").split():
option = d.getVar('BOOTSPEC_OPTIONS_%s' % type)
if option:
d.setVar('BOOTSPEC_OPTIONS_DEFAULT', option)
break;
return option

python () {
if d.getVar('PREFERRED_PROVIDER_virtual/dtb'):
d.appendVarFlag('do_rootfs', 'depends', ' virtual/dtb:do_populate_sysroot')
d.setVar('EXTERNAL_KERNEL_DEVICETREE', '${RECIPE_SYSROOT}/boot/devicetree')
}

BOOTSPEC_OPTIONS ?= "${BOOTSPEC_OPTIONS_DEFAULT}"
BOOTSPEC_OPTIONS ?= "${@bootspec_default_option(d)}"
BOOTSPEC_OPTIONS[doc] = "Content of the boot spec entry 'options' line"

BOOTSPEC_EXTRALINE ?= ""
BOOTSPEC_EXTRALINE[doc] = "Allows to add extra content to bootspec entries, lines must be terminated with a newline"

do_rootfs[vardeps] += "BOOTSPEC_TITLE BOOTSPEC_VERSION BOOTSPEC_OPTIONS BOOTSPEC_EXTRALINE"

python create_bootspec() {
dtbs = (d.getVar('KERNEL_DEVICETREE') or '').split()
ext_dtbs = os.listdir(d.getVar('EXTERNAL_KERNEL_DEVICETREE')) if d.getVar('EXTERNAL_KERNEL_DEVICETREE') else []
Expand All @@ -56,7 +69,7 @@ python create_bootspec() {

bootspecfile.write('title %s\n' % d.getVar('BOOTSPEC_TITLE'))
bootspecfile.write('version %s\n' % d.getVar('BOOTSPEC_VERSION'))
bootspecfile.write('options %s\n' % d.expand('${BOOTSPEC_OPTIONS}'))
bootspecfile.write('options %s\n' % d.getVar('BOOTSPEC_OPTIONS'))
bootspecfile.write(d.getVar('BOOTSPEC_EXTRALINE').replace(r'\n', '\n'))
bootspecfile.write('linux %s\n' % d.expand('/boot/${KERNEL_IMAGETYPE}'))
if x != "default":
Expand Down
Loading