On Thu, Mar 30, 2023 at 08:01:42PM -0400, Denys Dmytriyenko wrote: > On Thu, Mar 30, 2023 at 04:24:40PM -0500, Ryan Eatmon via > lists.yoctoproject.org wrote: > > While we are mirgrating to kernel v6.1 and u-boot 2023.04, we want to > > keep kernel 5.10 and u-boot 2021.01 "working" for anyone looking at > > kirkstone. > > > > One of the changes we are looking at changing is the signing of entries > > in the fitImage. > > You might want to rephrase this one :) > > > > To try and acheive a limited parity with dunfell while we work on the > > migration, this creates a class that implements the logic that was in > > dunfell and applies that class to the 5.10 kernel. > > Maybe mention falling back to using SECDEV tooling for now instead of > uboot-sign class, with the plan to get back and clean it up later? > > > > Signed-off-by: Ryan Eatmon <[email protected]>
The comments are minor and can be addressed while merging w/o resending a new revision, so: Reviewed-by: Denys Dmytriyenko <[email protected]> > > --- > > .../classes/kernel-fitimage-ti-u-boot.bbclass | 214 ++++++++++++++++++ > > .../linux/linux-ti-staging_5.10.bb | 2 + > > 2 files changed, 216 insertions(+) > > create mode 100644 meta-ti-bsp/classes/kernel-fitimage-ti-u-boot.bbclass > > > > diff --git a/meta-ti-bsp/classes/kernel-fitimage-ti-u-boot.bbclass > > b/meta-ti-bsp/classes/kernel-fitimage-ti-u-boot.bbclass > > new file mode 100644 > > index 00000000..503c6d25 > > --- /dev/null > > +++ b/meta-ti-bsp/classes/kernel-fitimage-ti-u-boot.bbclass > > @@ -0,0 +1,214 @@ > > + > > +inherit ti-secdev > > + > > +# The TI u-boot requires that the kernel image is signed. To not overload > > the > > +# entire kernel-fitimage.bbclass from oe-core, we just overwrite one > > function > > +# and do the signing in there. > > I'm wondering how the inherit ordering is handled in this case and whether > there are any chances of a race - which fitimage_assemble will be used? > > > > +# > > +# Assemble fitImage > > +# > > +# $1 ... .its filename > > +# $2 ... fitImage name > > +# $3 ... include ramdisk > > +fitimage_assemble() { > > + kernelcount=1 > > + dtbcount="" > > + DTBS="" > > + ramdiskcount=$3 > > + setupcount="" > > + bootscr_id="" > > + rm -f $1 arch/${ARCH}/boot/$2 > > + > > + if [ -n "${UBOOT_SIGN_IMG_KEYNAME}" -a "${UBOOT_SIGN_KEYNAME}" = > > "${UBOOT_SIGN_IMG_KEYNAME}" ]; then > > + bbfatal "Keys used to sign images and configuration nodes must > > be different." > > + fi > > <snip> > > > > +} > > + > > +fitimage_ti_secure() { > > + if test -n "${TI_SECURE_DEV_PKG}"; then > > + export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} > > + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh $1 $2 > > + else > > + cp $1 $2 > > + fi > > +} > > + > > diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb > > b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb > > index cc67188a..f3793baf 100644 > > --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb > > +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb > > @@ -3,6 +3,8 @@ SUMMARY = "Linux kernel for TI devices" > > LICENSE = "GPL-2.0-only" > > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" > > > > +KERNEL_CLASSES += "${@bb.utils.contains('TFA_PLATFORM', 'k3', > > 'kernel-fitimage-ti-u-boot', '', d)}" > > "contains" does a substring search, a bit faster to use "conditional" here: > > KERNEL_CLASSES += "${@oe.utils.cconditional('TFA_PLATFORM', 'k3', > 'kernel-fitimage-ti-u-boot', '', d)}" > > or even a simple Python if-else directly: > > KERNEL_CLASSES += "${@ 'kernel-fitimage-ti-u-boot' if > d.getVar('TFA_PLATFORM') == 'k3' else ''}" > > > > + > > inherit kernel > > > > DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh" > > -- > > 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16271): https://lists.yoctoproject.org/g/meta-ti/message/16271 Mute This Topic: https://lists.yoctoproject.org/mt/97960833/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
