Port to Yocto scarthgap [Part3]

meta-lmp-base/classes/lmp.bbclass

@@ -201,23 +201,22 @@ IMAGE_CMD:ota-ext4:append () {
 		if [ -z "${OSTREE_OTA_EXT4_LUKS_PASSPHRASE}" ]; then
 			bbfatal "Unable to find passphrase for LUKS-based ota-ext4 (define OSTREE_OTA_EXT4_LUKS_PASSPHRASE)"
 		fi
-		cp ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4-orig
 
-		block_size=`dumpe2fs -h ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 | grep "^Block size" | cut -d ':' -f 2 | tr -d ' '`
-		block_count=`dumpe2fs -h ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 | grep "^Block count" | cut -d ':' -f 2 | tr -d ' '`
+		block_size=`dumpe2fs -h ${IMGDEPLOYDIR}/${IMAGE_NAME}.ota-ext4 | grep "^Block size" | cut -d ':' -f 2 | tr -d ' '`
+		block_count=`dumpe2fs -h ${IMGDEPLOYDIR}/${IMAGE_NAME}.ota-ext4 | grep "^Block count" | cut -d ':' -f 2 | tr -d ' '`
 		luks_size=33554432 # 32m
 		new_block_count=$(expr ${block_count} - $(expr ${luks_size} / ${block_size}))
 		bbdebug 1 "Rootfs: block size: $block_size, block count: $block_count"
 		bbdebug 1 "Resizing Rootfs: old block count: $block_count, new block count: $new_block_count"
-		resize2fs -p ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 ${new_block_count}
+		resize2fs -p ${IMGDEPLOYDIR}/${IMAGE_NAME}.ota-ext4 ${new_block_count}
 		# Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected)
-		fsck.ext4 -pvfD ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 || [ $? -le 3 ]
+		fsck.ext4 -pvfD ${IMGDEPLOYDIR}/${IMAGE_NAME}.ota-ext4 || [ $? -le 3 ]
 		# After resize2fs we need to make sure the file size (simulating the block device) stays the same
-		dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 seek=$ROOTFS_SIZE count=0 bs=1024
+		dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}.ota-ext4 seek=$ROOTFS_SIZE count=0 bs=1024
 
-		echo ${OSTREE_OTA_EXT4_LUKS_PASSPHRASE} | cryptsetup reencrypt --encrypt --key-slot 31 --pbkdf-memory ${OSTREE_OTA_EXT4_LUKS_PBKDF2_MEM} --disable-locks --reduce-device-size 32m ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4
-		cryptsetup config --label otaroot ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4
-		cryptsetup luksDump ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4
+		echo ${OSTREE_OTA_EXT4_LUKS_PASSPHRASE} | cryptsetup reencrypt --encrypt --key-slot 31 --pbkdf-memory ${OSTREE_OTA_EXT4_LUKS_PBKDF2_MEM} --disable-locks --reduce-device-size 32m ${IMGDEPLOYDIR}/${IMAGE_NAME}.ota-ext4
+		cryptsetup config --label otaroot ${IMGDEPLOYDIR}/${IMAGE_NAME}.ota-ext4
+		cryptsetup luksDump ${IMGDEPLOYDIR}/${IMAGE_NAME}.ota-ext4
 	fi
 }
 OSTREE_OTA_EXT4_LUKS ?= "0"

meta-lmp-base/classes/uboot-fitimage.bbclass

@@ -126,7 +126,7 @@ uboot_fitimage_assemble() {
 
 	# u-boot dtb location depends on sign enable
 	if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ]; then
-		uboot_dtb="${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}"
+		uboot_dtb="${UBOOT_DTB_SIGNED}"
 	else
 		uboot_dtb="u-boot.dtb"
 	fi

meta-lmp-base/conf/distro/include/lmp.inc

@@ -1,4 +1,4 @@
-DISTRO_VERSION = "4.0.20"
+DISTRO_VERSION = "5.0.4"
 
 # These default to 'oecore' and 'nodistro'
 SDK_NAME_PREFIX = "${DISTRO}"
@@ -65,6 +65,7 @@ PACKAGECONFIG:remove:pn-cryptsetup = "ssh-token"
 PACKAGECONFIG:append:pn-cryptsetup = " luks2"
 PACKAGECONFIG:append:pn-cryptsetup-native = " luks2"
 PACKAGECONFIG:pn-tpm2-tss = "policy"
+PACKAGECONFIG:append:pn-systemd = "${@bb.utils.contains('DISTRO_FEATURES', 'lmpdebug', ' coredump', '', d)}"
 
 # Alternatives used by nss-altfiles
 NSS_ALT_TYPES ?= "hosts,pwd,grp,spwd,sgrp"

meta-lmp-base/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware/0001-CryptoPkg-Increase-ScratchMemory-buffer-for-openssl-.patch

@@ -0,0 +1,41 @@
+From 46e407d9654d5c8986b0f7b61de3aa223b1df399 Mon Sep 17 00:00:00 2001
+From: Jorge Ramirez-Ortiz <[email protected]>
+Date: Thu, 31 Oct 2024 15:12:04 +0100
+Subject: [PATCH] CryptoPkg: Increase ScratchMemory buffer for openssl 3.0.15
+
+Openssl 3.0.15 has a larger memory footprint.
+
+Updating from EDK 2022.2 (openssl 1.1.j) to 2024.2 (openssl 3.0.15)
+causes our EFI provisioning application[1] to fail due to an out of
+memory condition.
+
+On inspection, at the time of that fault, 2022.2 had an additional 900
+pages. This is why this patch proposes the increase of the ScratchMemory
+buffer by that same ammount.
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
+
+Upstream-Status: Submitted [https://github.com/tianocore/edk2/pull/6394]
+
+Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
+Signed-off-by: Jose Quaresma <[email protected]>
+---
+ CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
+index 0d2ca604ea..bb066f0dd0 100644
+--- a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
++++ b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
+@@ -33,7 +33,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
+ #define RT_PAGE_FREE  0x00000000
+ #define RT_PAGE_USED  0x00000001
+
+-#define MIN_REQUIRED_BLOCKS  600
++#define MIN_REQUIRED_BLOCKS  1100
+
+ //
+ // Memory Page Table
+-- 
+2.25.1
+

meta-lmp-base/dynamic-layers/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend

@@ -1,5 +1,9 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
 do_install:append:qemuarm64-secureboot-ebbr() {
     install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/QEMU*.fd ${D}/firmware/
     # QEMU requires that the images be minimum of 64M in size
     truncate -s 64M ${D}/firmware/QEMU*.fd
 }
+
+SRC_URI += "file://0001-CryptoPkg-Increase-ScratchMemory-buffer-for-openssl-.patch"

meta-lmp-base/recipes-bsp/efitools/efitools/lockdown.conf

@@ -1,2 +1,3 @@
 title UEFI Secure Boot Provisioning
 efi /LockDown.efi
+sort-key 99

meta-lmp-base/recipes-bsp/efitools/efitools/unlock.conf

@@ -1,2 +1,3 @@
 title UEFI Secure Boot PK Clear
 efi /UnLock-signed.efi
+sort-key 99

meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-mfgtool/lmp-base-common.cfg

@@ -0,0 +1,106 @@
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_BOOTCOMMAND="reset"
+CONFIG_BOOTDELAY=-2
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
+# CONFIG_BOOTM_VXWORKS is not set
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_BMODE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_BOOTP is not set
+# CONFIG_CMD_BOOTZ is not set
+# CONFIG_CMD_DEKBLOB is not set
+# CONFIG_CMD_DFU is not set
+# CONFIG_CMD_DHCP is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_EXPORTENV is not set
+CONFIG_CMD_FIOVB=y
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_GETTIME is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMPORTENV is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_POWEROFF is not set
+# CONFIG_CMD_PXE is not set
+# CONFIG_CMD_RTC is not set
+# CONFIG_CMD_SATA is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_SNTP is not set
+# CONFIG_CMD_SYSBOOT is not set
+# CONFIG_CMD_TFTPBOOT is not set
+# CONFIG_CMD_TIME is not set
+# CONFIG_CMD_TIMER is not set
+# CONFIG_CMD_USB_MASS_STORAGE is not set
+CONFIG_CMD_XIMG=y
+# CONFIG_DFU is not set
+# CONFIG_DISTRO_DEFAULTS is not set
+# CONFIG_DM_SCSI is not set
+CONFIG_DM_USB=y
+# CONFIG_DM_VIDEO is not set
+# CONFIG_DWC_AHSATA is not set
+# CONFIG_EFI_LOADER is not set
+# CONFIG_ENV_IS_IN_MMC is not set
+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
+CONFIG_ENV_IS_NOWHERE=y
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_UUU_SUPPORT=y
+CONFIG_FIOVB=y
+CONFIG_FIT_SIGNATURE_STRICT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT=y
+CONFIG_FSL_FASTBOOT_BOOTLOADER2=y
+CONFIG_FSL_FASTBOOT_BOOTLOADER_SECONDARY=y
+CONFIG_HASH=y
+# CONFIG_WATCHDOG is not set
+# CONFIG_IMX_WATCHDOG is not set
+# CONFIG_LEGACY_IMAGE_FORMAT is not set
+# CONFIG_NET is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_OPTEE_LIB=y
+CONFIG_OPTEE=y
+CONFIG_PARTITION_UUIDS=y
+CONFIG_RSA=y
+# CONFIG_SATA is not set
+# CONFIG_SHA_HW_ACCEL is not set
+# CONFIG_SPL_BLK is not set
+CONFIG_SPL_CRYPTO=y
+# CONFIG_SPL_DM_USB is not set
+CONFIG_SPL_DM=y
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+# CONFIG_SPL_FIT_IMAGE_TINY is not set
+CONFIG_SPL_FIT_SIGNATURE_STRICT=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_FIT=y
+CONFIG_SPL_HASH=y
+# CONFIG_SPL_IMX_HAB is not set
+# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_LOAD_FIT=y
+# CONFIG_SPL_MMC is not set
+CONFIG_SPL_OF_CONTROL=y
+# CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_SPL_SHA256=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_TEE=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_MASS_STORAGE=y
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0152
+CONFIG_USB_GADGET_VENDOR_NUM=0x1fc9
+# CONFIG_USB_HOST_ETHER is not set
+# CONFIG_USB_KEYBOARD is not set
+# CONFIG_USB_STORAGE is not set
+CONFIG_USB=y
+CONFIG_USE_BOOTCOMMAND=y
+# CONFIG_VIDEO is not set
+# CONFIG_BOOTSTD is not set
+CONFIG_SHA256=y

meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-mfgtool_2023.04.bb → meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-mfgtool_2024.04.bb

@@ -2,7 +2,7 @@ SUMMARY = "Produces a Manufacturing Tool compatible U-Boot"
 DESCRIPTION = "U-Boot recipe that produces a Manufacturing Tool compatible \
 binary to be used in updater environment"
 
-require recipes-bsp/u-boot/u-boot-fio_2023.04.bb
+require recipes-bsp/u-boot/u-boot-fio_${PV}.bb
 
 # Environment config is not required for mfgtool
 SRC_URI:remove = "file://fw_env.config"

meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_2023.04.bb → meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_2024.04.bb

@@ -1,5 +1,5 @@
 require u-boot-fio-common.inc
 
-SRCREV = "349b9c93a6f7218d7988caab249f4ad1196f3c30"
-SRCBRANCH = "2023.04+fio"
+SRCREV = "30cd2b39fb4989dc0e4c69bc5c73b1f169951bf1"
+SRCBRANCH = "2024.04+fio"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"

meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_imx-2022.04.bb

@@ -1,5 +1,10 @@
 require u-boot-fio-common.inc
 
+UUU_BOOTLOADER = "uuu_bootloader_tag"
+UUU_BOOTLOADER:mx8-generic-bsp = ""
+UUU_BOOTLOADER:mx9-generic-bsp = ""
+inherit_defer ${UUU_BOOTLOADER}
+
 SRCREV = "605d0aa5c016915058c7b19051f76d592e103b32"
 SRCBRANCH = "2022.04+lf-6.1.1-1.0.0-fio"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"

meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_imx-2023.04.bb

@@ -1,5 +1,10 @@
 require u-boot-fio-common.inc
 
+UUU_BOOTLOADER = "uuu_bootloader_tag"
+UUU_BOOTLOADER:mx8-generic-bsp = ""
+UUU_BOOTLOADER:mx9-generic-bsp = ""
+inherit_defer ${UUU_BOOTLOADER}
+
 SRCREV = "d5bf13df210018527f8b0c136ce0b8be6b0d76f5"
 SRCBRANCH = "2023.04+lf-6.1.55-2.2.0-fio"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"

meta-lmp-base/recipes-core/systemd/systemd/systemd-networkd-wait-online.service.in-use-any-by-d.patch

@@ -1,4 +1,4 @@
-From 42a417bfb62227d83bbcc1232ced1d0ddb0431d6 Mon Sep 17 00:00:00 2001
+From cb1df2c39effacd4ec86a06b3b9fcafaceb38814 Mon Sep 17 00:00:00 2001
 From: Ricardo Salveti <[email protected]>
 Date: Tue, 2 Jul 2019 21:01:15 -0300
 Subject: [PATCH] systemd-networkd-wait-online.service.in: use --any by default
@@ -10,23 +10,24 @@ in the configured state.
 Upstream-Status: Inappropriate [lmp specific]
 
 Signed-off-by: Ricardo Salveti <[email protected]>
+Signed-off-by: Jose Quaresma <[email protected]>
 ---
  units/systemd-networkd-wait-online.service.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/units/systemd-networkd-wait-online.service.in b/units/systemd-networkd-wait-online.service.in
-index 10d8b08c8e..6dd5f79377 100644
+index 7768121f5f..7d26e04fe3 100644
 --- a/units/systemd-networkd-wait-online.service.in
 +++ b/units/systemd-networkd-wait-online.service.in
-@@ -18,7 +18,7 @@ Before=network-online.target shutdown.target
+@@ -19,7 +19,7 @@ Before=network-online.target shutdown.target
 
  [Service]
  Type=oneshot
--ExecStart={{ROOTLIBEXECDIR}}/systemd-networkd-wait-online
-+ExecStart={{ROOTLIBEXECDIR}}/systemd-networkd-wait-online --any
+-ExecStart={{LIBEXECDIR}}/systemd-networkd-wait-online
++ExecStart={{LIBEXECDIR}}/systemd-networkd-wait-online --any
  RemainAfterExit=yes
 
  [Install]
 -- 
-2.25.1
+2.47.0
 

meta-lmp-base/recipes-core/systemd/systemd_%.bbappend

@@ -55,7 +55,6 @@ EXTRA_OEMESON += ' \
 SRC_URI:append = " \
 	file://0001-tmpfiles-tmp.conf-reduce-cleanup-age-to-half.patch \
 	file://systemd-networkd-wait-online.service.in-use-any-by-d.patch \
-	file://systemd-timesyncd-update.service \
 "
 
 # Depend on systemd-boot as the efi payload is provided by a different recipe
@@ -76,10 +75,6 @@ do_install:append() {
 		(cd ${D}${localstatedir}; rmdir -v --parents log/journal)
 	fi
 
-	# Workaround for https://github.com/systemd/systemd/issues/11329
-	install -m 0644 ${WORKDIR}/systemd-timesyncd-update.service ${D}${systemd_system_unitdir}
-	ln -sf ../systemd-timesyncd-update.service ${D}${systemd_system_unitdir}/sysinit.target.wants/systemd-timesyncd-update.service
-
 	# Remove systemd-boot as it is provided by a separated recipe and we can't disable via pkgconfig
 	if ${@bb.utils.contains('PACKAGECONFIG', 'efi', 'true', 'false', d)}; then
 		rm -r ${D}${nonarch_libdir}/systemd/boot