Skip to contentSkip to conversation

Isar and kernel updates

PATCH New Jan Kiszka 1 participant 5 messages Dec 15, 2025

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

cover Isar and kernel updates

Nothing spectacular, see patches.

Jan

Jan Kiszka (4):
linux-cip: Update to 5.10.247-cip67 and 6.1.159-cip49
swupdate: Drop redundant template class inheritance Update isar revision
Migrate all classes to classes-recipe

 .../delta-update.bbclass                      |   0
 .../deploy-firmware.bbclass                   |   0
 .../efibootguard.bbclass                      |   0
 {classes => classes-recipe}/erofs.bbclass     |   0
 .../image_uuid.bbclass                        |   0
 {classes => classes-recipe}/qemu-emmc.bbclass |   0
 .../read-only-rootfs.bbclass                  |   0
 {classes => classes-recipe}/swupdate.bbclass  |   2 -
 {classes => classes-recipe}/verity.bbclass    |   0
 ...custom-built-image-name-to-standard-.patch | 134 ++++++++++++++++++
 ...ling-of-initrd-generation-if-there-i.patch |  39 -----
 ...revious-naming-scheme-in-INITRD_DEPL.patch |  32 -----
 kas-cip.yml                                   |   7 +-
 .../optee-os/optee-os-qemu-arm64_4.8.0.bb     |   3 +-
 .../optee-os-tadevkit-qemu-arm64_4.8.0.bb     |   3 +-
 .../optee-os/optee-os-tadevkit-ti-k3_4.8.0.bb |   3 +-
 recipes-bsp/optee-os/optee-os-ti-k3_4.8.0.bb  |   3 +-
 .../trusted-firmware-a-qemu-arm64_2.13.0.bb   |   3 +-
 .../trusted-firmware-a-ti-k3_2.13.bb          |   2 +-
 recipes-bsp/u-boot/u-boot-common-2025.07.inc  |   2 +-
 .../initramfs-abrootfs-hook_0.3.bb            |   2 +-
 .../initramfs-crypt-hook_0.10.bb              |   2 +-
 .../initramfs-erofs-hook_0.2.bb               |   2 +-
 .../initramfs-factory-reset-hook_0.2.bb       |   3 +-
 .../initramfs-overlay-hook_0.4.bb             |   2 +-
 .../initramfs-squashfs-hook_0.2.bb            |   2 +-
 .../initramfs-verity-hook_0.3.bb              |   2 +-
 recipes-kernel/linux/linux-cip-common.inc     |   3 +-
 ...6-cip66.bb => linux-cip_5.10.247-cip67.bb} |   2 +-
 ...57-cip48.bb => linux-cip_6.1.159-cip49.bb} |   2 +-
 30 files changed, 159 insertions(+), 96 deletions(-)
 rename {classes => classes-recipe}/delta-update.bbclass (100%)
 rename {classes => classes-recipe}/deploy-firmware.bbclass (100%)
 rename {classes => classes-recipe}/efibootguard.bbclass (100%)
 rename {classes => classes-recipe}/erofs.bbclass (100%)
 rename {classes => classes-recipe}/image_uuid.bbclass (100%)
 rename {classes => classes-recipe}/qemu-emmc.bbclass (100%)
 rename {classes => classes-recipe}/read-only-rootfs.bbclass (100%)
 rename {classes => classes-recipe}/swupdate.bbclass (99%)
 rename {classes => classes-recipe}/verity.bbclass (100%)
 create mode 100644 isar-patches/0001-initramfs-Align-custom-built-image-name-to-standard-.patch
 delete mode 100644 isar-patches/0001-rootfs-Fix-disabling-of-initrd-generation-if-there-i.patch
 delete mode 100644 isar-patches/0002-rootfs-Restore-previous-naming-scheme-in-INITRD_DEPL.patch
 rename recipes-kernel/linux/{linux-cip_5.10.246-cip66.bb => linux-cip_5.10.247-cip67.bb} (68%)
 rename recipes-kernel/linux/{linux-cip_6.1.157-cip48.bb => linux-cip_6.1.159-cip49.bb} (59%)
Signature · 1 line
2.51.0
author
#1 lore raw

PATCH 1/4 linux-cip: Update to 5.10.247-cip67 and 6.1.159-cip49

From: Jan Kiszka <[email protected]>

---
 ...{linux-cip_5.10.246-cip66.bb => linux-cip_5.10.247-cip67.bb} | 2 +-
 .../{linux-cip_6.1.157-cip48.bb => linux-cip_6.1.159-cip49.bb}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename recipes-kernel/linux/{linux-cip_5.10.246-cip66.bb => linux-cip_5.10.247-cip67.bb} (68%)
 rename recipes-kernel/linux/{linux-cip_6.1.157-cip48.bb => linux-cip_6.1.159-cip49.bb} (59%)
recipes-kernel/linux/linux-cip_5.10.247-cip67.bb renamed from recipes-kernel/linux/linux-cip_5.10.246-cip66.bb +1 -1
similarity index 68%
rename from recipes-kernel/linux/linux-cip_5.10.246-cip66.bb
rename to recipes-kernel/linux/linux-cip_5.10.247-cip67.bb
index 7e02ce32..872af231 100644
@@ -11,4 +11,4 @@
 
 require linux-cip-release.inc
 
-SRC_URI[sha256sum] = "776dc35c07830ef54756328b47c72b81f4af58117a9321683eb788be6dc82258"
+SRC_URI[sha256sum] = "04e1a12d68bbc64079d6c3aabc833844e91932cdfb1a91154c24711469c63a60"
recipes-kernel/linux/linux-cip_6.1.159-cip49.bb renamed from recipes-kernel/linux/linux-cip_6.1.157-cip48.bb +1 -1
similarity index 59%
rename from recipes-kernel/linux/linux-cip_6.1.157-cip48.bb
rename to recipes-kernel/linux/linux-cip_6.1.159-cip49.bb
index 185d56ed..1b0b0f75 100644
@@ -7,4 +7,4 @@
 
 require linux-cip-release.inc
 
-SRC_URI[sha256sum] = "7d4cf60253c1a57745d1dfd56c92a4a7e2d71ba71f1d3f488d5c37c435fea141"
+SRC_URI[sha256sum] = "7e968abceb8c949d2b7e8cf3885293dc18f367da5d95d466105851fbbc77a41e"
Signature · 1 line
2.51.0
author
#2 lore raw

PATCH 2/4 swupdate: Drop redundant template class inheritance

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

This is pulled by the INHERIT'ed base class already. Upstream isar migrated it to classes-global, and bitbake will no longer find it when trying to inherit it directly.

---
 classes/swupdate.bbclass | 2 --
 1 file changed, 2 deletions(-)
classes/swupdate.bbclass +0 -2
index 64ae58ae..21d881d6 100644
@@ -10,8 +10,6 @@
 #
 # SPDX-License-Identifier: MIT
 
-inherit template
-
 RO_ROOTFS_TYPE ??= "squashfs"
 SWU_ROOTFS_TYPE ?= "${RO_ROOTFS_TYPE}"
 SWU_ROOTFS_NAME ?= "${IMAGE_FULLNAME}"
Signature · 1 line
2.51.0
author
#3 lore raw

PATCH 3/4 Update isar revision

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Switching to the latest revision allows to drop one patch. The remaining one is updated to a version that is currently under second review.

Isar switched several recipe includes to classes, and we adopt the affected recipes accordingly to avoid deprecation warnings.

---
 ...custom-built-image-name-to-standard-.patch | 134 ++++++++++++++++++
 ...ling-of-initrd-generation-if-there-i.patch |  39 -----
 ...revious-naming-scheme-in-INITRD_DEPL.patch |  32 -----
 kas-cip.yml                                   |   7 +-
 .../optee-os/optee-os-qemu-arm64_4.8.0.bb     |   3 +-
 .../optee-os-tadevkit-qemu-arm64_4.8.0.bb     |   3 +-
 .../optee-os/optee-os-tadevkit-ti-k3_4.8.0.bb |   3 +-
 recipes-bsp/optee-os/optee-os-ti-k3_4.8.0.bb  |   3 +-
 .../trusted-firmware-a-qemu-arm64_2.13.0.bb   |   3 +-
 .../trusted-firmware-a-ti-k3_2.13.bb          |   2 +-
 recipes-bsp/u-boot/u-boot-common-2025.07.inc  |   2 +-
 .../initramfs-abrootfs-hook_0.3.bb            |   2 +-
 .../initramfs-crypt-hook_0.10.bb              |   2 +-
 .../initramfs-erofs-hook_0.2.bb               |   2 +-
 .../initramfs-factory-reset-hook_0.2.bb       |   3 +-
 .../initramfs-overlay-hook_0.4.bb             |   2 +-
 .../initramfs-squashfs-hook_0.2.bb            |   2 +-
 .../initramfs-verity-hook_0.3.bb              |   2 +-
 recipes-kernel/linux/linux-cip-common.inc     |   3 +-
 19 files changed, 157 insertions(+), 92 deletions(-)
 create mode 100644 isar-patches/0001-initramfs-Align-custom-built-image-name-to-standard-.patch
 delete mode 100644 isar-patches/0001-rootfs-Fix-disabling-of-initrd-generation-if-there-i.patch
 delete mode 100644 isar-patches/0002-rootfs-Restore-previous-naming-scheme-in-INITRD_DEPL.patch
isar-patches/0001-initramfs-Align-custom-built-image-name-to-standard-.patch new file +134 -0
new file mode 100644
index 00000000..58618a5c
@@ -0,0 +1,134 @@
+From e52be3bd18187191418ea8b2fdd407e1265b462a Mon Sep 17 00:00:00 2001
+From: Jan Kiszka <[email protected]>
+Date: Fri, 12 Dec 2025 17:10:49 +0100
+Subject: [PATCH 1/2] initramfs: Align custom built image name to standard one
+
+As now both standard initramfs as well as custom ones define their
+deployment name via INITRD_DEPLOY_FILE, they also need to use the same
+naming pattern, or things are falling apart, e.g. in downstream layers
+that actually use INITRAMFS_IMAGE_NAME as image name source.
+
+Update the testsuite as well, even in places where the image name is
+self-defined, just to avoid confusion.
+
+Fixes: c3c4e72cbfc4 ("image: introduce IMAGE_INITRD, deprecate INITRD_IMAGE")
+Fixes: 8dbffe075b15 ("RECIPE-API-CHANGELOG: Fix entry for IMAGE_INITRD")
+Signed-off-by: Jan Kiszka <[email protected]>
+---
+ RECIPE-API-CHANGELOG.md                              | 10 +++++++++-
+ meta-isar/recipes-initramfs/images/isar-dracut.bb    |  2 +-
+ meta-isar/recipes-initramfs/images/isar-initramfs.bb |  2 +-
+ meta/classes-recipe/image.bbclass                    |  2 +-
+ meta/classes-recipe/initramfs.bbclass                |  2 +-
+ testsuite/citest.py                                  |  6 +++---
+ 6 files changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
+index 6d7c56b9..caeeb6e3 100644
+--- a/RECIPE-API-CHANGELOG.md
++++ b/RECIPE-API-CHANGELOG.md
+@@ -843,7 +843,7 @@ ROOTFS_FEATURE += "no-generate-initrd"
+ 
+ INITRD_IMAGE could be set to the full name of an initrd image to be found in
+ DEPLOY_DIR_IMAGE. Downstream layers had to assume how Isar names its image
+-artifacts (presently adding a ${DISTRO}-${IMAGE}.initrd.img suffix to initrd
++artifacts (presently adding a ${DISTRO}-${IMAGE}-initrd.img suffix to initrd
+ images) and insert the build of their initramfs recipe into the image build
+ pipeline.
+ 
+@@ -919,3 +919,11 @@ The following includes were considered internal and are no longer available:
+ The other original includes still exist and inherit the corresponding new
+ class. However, they issue a warning to perform the recommended conversion
+ because these transitional includes will eventually be dropped.
++
++### Align custom initramfs deployment name to standard initramfs
++
++While `INITRAMFS_IMAGE_NAME` ended on `.initrd.img`, standard initramfs where
++deployed as `-initrd.img`. This caused confusion and is now even breaking at
++several points as `INITRD_DEPLOY_FILE` is supposed to be used as canonical
++source of the filename. Therefore, switch `INITRAMFS_IMAGE_NAME` to the
++`-initrd.img` suffix as well.
+diff --git a/meta-isar/recipes-initramfs/images/isar-dracut.bb b/meta-isar/recipes-initramfs/images/isar-dracut.bb
+index aa55e360..cafffc47 100644
+--- a/meta-isar/recipes-initramfs/images/isar-dracut.bb
++++ b/meta-isar/recipes-initramfs/images/isar-dracut.bb
+@@ -1,6 +1,6 @@
+ # Example of a custom initramfs image recipe.  The image will be deployed to
+ #
+-#   build/tmp/deploy/images/${MACHINE}/isar-initramfs-${DISTRO}-${MACHINE}.initrd.img
++#   build/tmp/deploy/images/${MACHINE}/isar-initramfs-${DISTRO}-${MACHINE}-initrd.img
+ #
+ # This software is a part of ISAR.
+ 
+diff --git a/meta-isar/recipes-initramfs/images/isar-initramfs.bb b/meta-isar/recipes-initramfs/images/isar-initramfs.bb
+index d2a946f7..3d7aa203 100644
+--- a/meta-isar/recipes-initramfs/images/isar-initramfs.bb
++++ b/meta-isar/recipes-initramfs/images/isar-initramfs.bb
+@@ -1,6 +1,6 @@
+ # Example of a custom initramfs image recipe.  The image will be deployed to
+ #
+-#   build/tmp/deploy/images/${MACHINE}/isar-initramfs-${DISTRO}-${MACHINE}.initrd.img
++#   build/tmp/deploy/images/${MACHINE}/isar-initramfs-${DISTRO}-${MACHINE}-initrd.img
+ #
+ # This software is a part of ISAR.
+ 
+diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass
+index 34e40465..e605bc80 100644
+--- a/meta/classes-recipe/image.bbclass
++++ b/meta/classes-recipe/image.bbclass
+@@ -21,7 +21,7 @@ IMAGE_INSTALL += "${KERNEL_IMAGE_PKG}"
+ # Name of the image including distro&machine names
+ IMAGE_FULLNAME = "${PN}-${DISTRO}-${MACHINE}"
+ 
+-# Deprecated; this would be set to e.g. "${INITRAMFS_RECIPE}-${DISTRO}-${MACHINE}.initrd.img"
++# Deprecated; this would be set to e.g. "${INITRAMFS_RECIPE}-${DISTRO}-${MACHINE}-initrd.img"
+ INITRD_IMAGE ?= ""
+ 
+ # IMAGE_INITRD should be used instead (variables consumed by this image class should
+diff --git a/meta/classes-recipe/initramfs.bbclass b/meta/classes-recipe/initramfs.bbclass
+index cd32899d..04a18d0c 100644
+--- a/meta/classes-recipe/initramfs.bbclass
++++ b/meta/classes-recipe/initramfs.bbclass
+@@ -9,7 +9,7 @@ STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*"
+ INITRAMFS_INSTALL ?= ""
+ INITRAMFS_PREINSTALL ?= ""
+ INITRAMFS_ROOTFS ?= "${WORKDIR}/rootfs"
+-INITRAMFS_IMAGE_NAME = "${INITRAMFS_FULLNAME}.initrd.img"
++INITRAMFS_IMAGE_NAME = "${INITRAMFS_FULLNAME}-initrd.img"
+ INITRAMFS_GENERATOR_PKG ??= "initramfs-tools"
+ INITRD_DEPLOY_FILE = "${INITRAMFS_IMAGE_NAME}"
+ 
+diff --git a/testsuite/citest.py b/testsuite/citest.py
+index 27cc9ff6..76a3df69 100755
+--- a/testsuite/citest.py
++++ b/testsuite/citest.py
+@@ -332,7 +332,7 @@ class InitRdBaseTest(CIBaseTest):
+                                           lines='',
+                                           bb_should_fail=False):
+         mc = f'mc:{machine}-{distro.removeprefix("debian-")}'
+-        initrd_image = f'{initrd}-{distro}-{machine}.initrd.img'
++        initrd_image = f'{initrd}-{distro}-{machine}-initrd.img'
+         initrd_path = os.path.join(self.deploy_dir_image(machine), initrd_image)
+ 
+         # cleansstate if the initrd image was already built/deployed to verify
+@@ -387,7 +387,7 @@ class InitRdTest(InitRdBaseTest):
+         machine = 'qemuamd64'
+ 
+         lines = [
+-            f"INITRD_IMAGE = '{initrd}-{distro}-{machine}.initrd.img'",
++            f"INITRD_IMAGE = '{initrd}-{distro}-{machine}-initrd.img'",
+             f"do_image[depends] += '{initrd}:do_build'"
+         ]
+ 
+@@ -413,7 +413,7 @@ class InitRdTest(InitRdBaseTest):
+         # by specifying an invalid recipe name: bitbake should fail.
+         lines = [
+             "IMAGE_INITRD = 'not-a-valid-initrd-recipe'",
+-            f"INITRD_IMAGE = '{initrd}-debian-bookworm-qemuamd64.initrd.img'"
++            f"INITRD_IMAGE = '{initrd}-debian-bookworm-qemuamd64-initrd.img'"
+         ]
+         self.build_image_with_dependent_initrd('isar-image-ci', initrd, lines=lines,
+                                                bb_should_fail=True)
+-- 
+2.51.0
+
isar-patches/0001-rootfs-Fix-disabling-of-initrd-generation-if-there-i.patch deleted +0 -39
deleted file mode 100644
index 9b8e7a67..00000000
@@ -1,39 +0,0 @@
-From 1d31b8e84b8d802b7d2028112b10c7130f671fba Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <[email protected]>
-Date: Sat, 29 Nov 2025 15:12:20 +0100
-Subject: [PATCH 1/2] rootfs: Fix disabling of initrd generation if there is a
- custom one
-
-The variable is now called IMAGE_INITRD.
-
-Fixes: c3c4e72cbfc4 ("image: introduce IMAGE_INITRD, deprecate INITRD_IMAGE")
-Signed-off-by: Jan Kiszka <[email protected]>
----
- meta/classes/rootfs.bbclass | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
-index 70d4bfb8..eb5645af 100644
---- a/meta/classes/rootfs.bbclass
-+++ b/meta/classes/rootfs.bbclass
-@@ -23,7 +23,7 @@ ROOTFS_INITRAMFS_GENERATOR_CMD = "${@ d.getVar('ROOTFS_INITRAMFS_GENERATOR_CMDLI
- ROOTFS_INITRAMFS_GENERATOR_CMDLINE = "${@ initramfs_generator_cmdline(d)}"
- ROOTFS_BASE_DISTRO ?= "${BASE_DISTRO}"
- 
--INITRD_IMAGE ?= ""
-+IMAGE_INITRD ?= ""
- 
- # Features of the rootfs creation:
- # available features are:
-@@ -33,7 +33,7 @@ INITRD_IMAGE ?= ""
- # 'clean-log-files' - delete log files that are not owned by packages
- # 'populate-systemd-preset' - enable systemd units according to systemd presets
- # 'generate-initrd' - generate debian default initrd
--ROOTFS_FEATURES += "${@ 'generate-initrd' if d.getVar('INITRD_IMAGE') == '' else ''}"
-+ROOTFS_FEATURES += "${@ 'generate-initrd' if d.getVar('IMAGE_INITRD') == '' else ''}"
- 
- ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes"
- 
--- 
-2.51.0
-
isar-patches/0002-rootfs-Restore-previous-naming-scheme-in-INITRD_DEPL.patch deleted +0 -32
deleted file mode 100644
index 9570597f..00000000
@@ -1,32 +0,0 @@
-From 9e64d1bfadc310540be73b08b58db67eef207c66 Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <[email protected]>
-Date: Sat, 29 Nov 2025 16:03:24 +0100
-Subject: [PATCH 2/2] rootfs: Restore previous naming scheme in
- INITRD_DEPLOY_FILE
-
-Might have been accidentally changed, specifically as initramfs.bbclass
-was not updated as well, and that broke downstream users of
-INITRD_DEPLOY_FILE via wic.
-
-Fixes: c3c4e72cbfc4 ("image: introduce IMAGE_INITRD, deprecate INITRD_IMAGE")
-Signed-off-by: Jan Kiszka <[email protected]>
----
- meta/classes/image.bbclass | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
-index b030024f..d367d8c7 100644
---- a/meta/classes/image.bbclass
-+++ b/meta/classes/image.bbclass
-@@ -29,7 +29,7 @@ INITRD_IMAGE ?= ""
- IMAGE_INITRD ?= ""
- 
- # Name of the deployed initrd image
--INITRD_DEPLOY_FILE = "${@ d.getVar('IMAGE_INITRD') or '${PN}' }-${DISTRO}-${MACHINE}-initrd.img"
-+INITRD_DEPLOY_FILE = "${@ d.getVar('IMAGE_INITRD') or '${PN}' }-${DISTRO}-${MACHINE}.initrd.img"
- 
- # Make sure dependent initramfs recipe is built
- do_image[depends] += "${@ '${IMAGE_INITRD}:do_build' if '${IMAGE_INITRD}' else '' }"
--- 
-2.51.0
-
kas-cip.yml +2 -5
index 8e26d89b..c3bde909 100644
@@ -22,16 +22,13 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: 2efd5d4ca3b4abf2386fe0089594029becdf2801
+    commit: 0174bd2260f1dec2b40deffa89f8028fca7b1557
     layers:
       meta:
     patches:
       p1:
         repo: cip-core
-        path: isar-patches/0001-rootfs-Fix-disabling-of-initrd-generation-if-there-i.patch
-      p2:
-        repo: cip-core
-        path: isar-patches/0002-rootfs-Restore-previous-naming-scheme-in-INITRD_DEPL.patch
+        path: isar-patches/0001-initramfs-Align-custom-built-image-name-to-standard-.patch
 
 bblayers_conf_header:
   standard: |
recipes-bsp/optee-os/optee-os-qemu-arm64_4.8.0.bb +2 -1
index 18eec20b..881cbc77 100644
@@ -9,5 +9,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-bsp/optee-os/optee-os-custom.inc
+inherit optee-os
+
 require optee-os-qemu-arm64_${PV}.inc
recipes-bsp/optee-os/optee-os-tadevkit-qemu-arm64_4.8.0.bb +2 -1
index 252e7bc4..0bd7c22c 100644
@@ -9,7 +9,8 @@
 # SPDX-License-Identifier: MIT
 #
 
+inherit optee-os-tadevkit
+
 OPTEE_ENABLE_APPS = "0"
 
-require recipes-bsp/optee-os/optee-os-tadevkit-custom.inc
 require optee-os-qemu-arm64_${PV}.inc
recipes-bsp/optee-os/optee-os-tadevkit-ti-k3_4.8.0.bb +2 -1
index 6e396fab..158030aa 100644
@@ -7,7 +7,8 @@
 # SPDX-License-Identifier: MIT
 #
 
+inherit optee-os-tadevkit
+
 OPTEE_ENABLE_APPS = "0"
 
-require recipes-bsp/optee-os/optee-os-tadevkit-custom.inc
 require optee-os-ti-k3_${PV}.inc
recipes-bsp/optee-os/optee-os-ti-k3_4.8.0.bb +2 -1
index e73a7bf9..82fbd53a 100644
@@ -7,7 +7,8 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-bsp/optee-os/optee-os-custom.inc
+inherit optee-os
+
 require optee-os-ti-k3_${PV}.inc
 
 # StMM integration, required by UEFI auth variable management
recipes-bsp/trusted-firmware-a/trusted-firmware-a-qemu-arm64_2.13.0.bb +1 -2
index f2ee44ba..a65f2ac1 100644
@@ -10,8 +10,7 @@
 #
 
 inherit deploy-firmware
-
-require recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc
+inherit trusted-firmware-a
 
 SRC_URI += "https://github.com/TrustedFirmware-A/trusted-firmware-a/archive/refs/tags/v${PV}.tar.gz;downloadfilename=trusted-firmware-a-v${PV}.tar.gz"
 SRC_URI[sha256sum] = "28bc15daeeed000ecd30819ecc4851bf9ffc2d33e1d4553a71985c17f47a999e"
recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti-k3_2.13.bb +1 -1
index 070b9a5f..89728ec1 100644
@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc
+inherit trusted-firmware-a
 
 SRC_URI += "https://github.com/ARM-software/arm-trusted-firmware/archive/v${PV}.tar.gz;downloadfilename=arm-trusted-firmware-${PV}.tar.gz"
 SRC_URI[sha256sum] = "68333c8be57830e7430d7dd39064826729923d86d6bb7af38d713d4e9d15dcf9"
recipes-bsp/u-boot/u-boot-common-2025.07.inc +1 -1
index 4f0b7d24..ed44bad0 100644
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-bsp/u-boot/u-boot-custom.inc
+inherit u-boot
 
 FILESPATH:append := ":${FILE_DIRNAME}/files"
 
recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.3.bb +1 -1
index c3ac22e2..3538bcfa 100644
@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-require recipes-initramfs/initramfs-hook/hook.inc
+inherit initramfs-hook
 
 RDEPENDS += "initramfs-cip-functions"
 DEBIAN_DEPENDS .= ", util-linux, initramfs-cip-functions"
recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.10.bb +1 -1
index 9aaa03b0..e132b9ea 100644
@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-require recipes-initramfs/initramfs-hook/hook.inc
+inherit initramfs-hook
 
 RDEPENDS += "initramfs-cip-functions"
 
recipes-initramfs/initramfs-erofs-hook/initramfs-erofs-hook_0.2.bb +1 -1
index a7dbb673..e4232486 100644
@@ -9,6 +9,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-initramfs/initramfs-hook/hook.inc
+inherit initramfs-hook
 
 HOOK_ADD_MODULES = "erofs"
recipes-initramfs/initramfs-factory-reset-hook/initramfs-factory-reset-hook_0.2.bb +2 -1
index 2b343506..30ceb235 100644
@@ -8,7 +8,8 @@
 #
 # SPDX-License-Identifier: MIT
 
-require recipes-initramfs/initramfs-hook/hook.inc
+inherit initramfs-hook
+
 DESCRIPTION = "Delete the content of the given Devices"
 
 # list of partitions by label
recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.4.bb +1 -1
index 35f847b3..4ec382c0 100644
@@ -10,7 +10,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-initramfs/initramfs-hook/hook.inc
+inherit initramfs-hook
 
 INITRAMFS_OVERLAY_RECOVERY_SCRIPT ??= "overlay_recovery_action.script"
 
recipes-initramfs/initramfs-squashfs-hook/initramfs-squashfs-hook_0.2.bb +1 -1
index 4b199834..1f5decce 100644
@@ -9,6 +9,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-initramfs/initramfs-hook/hook.inc
+inherit initramfs-hook
 
 HOOK_ADD_MODULES = "squashfs"
recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.3.bb +1 -1
index 37781c9d..a0ee803d 100644
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-require recipes-initramfs/initramfs-hook/hook.inc
+inherit initramfs-hook
 
 SRC_URI += " \
     file://hook \
recipes-kernel/linux/linux-cip-common.inc +2 -1
index 8200c617..b96adbe6 100644
@@ -11,7 +11,8 @@
 
 FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:"
 
-require recipes-kernel/linux/linux-custom.inc
+inherit linux-kernel
+
 require recipes-kernel/linux/cip-kernel-config.inc
 
 SRC_URI += "${@'file://preempt-rt.cfg' if d.getVar('KERNEL_NAME') == 'cip-rt' else ''}"
Signature · 1 line
2.51.0
author
#4 lore raw

PATCH 4/4 Migrate all classes to classes-recipe

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

This follows the class types description of yocto and recent adoption of it in isar upstream. It has no noticeable impact on users.

---
 {classes => classes-recipe}/delta-update.bbclass     | 0
 {classes => classes-recipe}/deploy-firmware.bbclass  | 0
 {classes => classes-recipe}/efibootguard.bbclass     | 0
 {classes => classes-recipe}/erofs.bbclass            | 0
 {classes => classes-recipe}/image_uuid.bbclass       | 0
 {classes => classes-recipe}/qemu-emmc.bbclass        | 0
 {classes => classes-recipe}/read-only-rootfs.bbclass | 0
 {classes => classes-recipe}/swupdate.bbclass         | 0
 {classes => classes-recipe}/verity.bbclass           | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename {classes => classes-recipe}/delta-update.bbclass (100%)
 rename {classes => classes-recipe}/deploy-firmware.bbclass (100%)
 rename {classes => classes-recipe}/efibootguard.bbclass (100%)
 rename {classes => classes-recipe}/erofs.bbclass (100%)
 rename {classes => classes-recipe}/image_uuid.bbclass (100%)
 rename {classes => classes-recipe}/qemu-emmc.bbclass (100%)
 rename {classes => classes-recipe}/read-only-rootfs.bbclass (100%)
 rename {classes => classes-recipe}/swupdate.bbclass (100%)
 rename {classes => classes-recipe}/verity.bbclass (100%)
classes-recipe/delta-update.bbclass renamed from classes/delta-update.bbclass +0 -0
similarity index 100%
rename from classes/delta-update.bbclass
rename to classes-recipe/delta-update.bbclass
classes-recipe/deploy-firmware.bbclass renamed from classes/deploy-firmware.bbclass +0 -0
similarity index 100%
rename from classes/deploy-firmware.bbclass
rename to classes-recipe/deploy-firmware.bbclass
classes-recipe/efibootguard.bbclass renamed from classes/efibootguard.bbclass +0 -0
similarity index 100%
rename from classes/efibootguard.bbclass
rename to classes-recipe/efibootguard.bbclass
classes-recipe/erofs.bbclass renamed from classes/erofs.bbclass +0 -0
similarity index 100%
rename from classes/erofs.bbclass
rename to classes-recipe/erofs.bbclass
classes-recipe/image_uuid.bbclass renamed from classes/image_uuid.bbclass +0 -0
similarity index 100%
rename from classes/image_uuid.bbclass
rename to classes-recipe/image_uuid.bbclass
classes-recipe/qemu-emmc.bbclass renamed from classes/qemu-emmc.bbclass +0 -0
similarity index 100%
rename from classes/qemu-emmc.bbclass
rename to classes-recipe/qemu-emmc.bbclass
classes-recipe/read-only-rootfs.bbclass renamed from classes/read-only-rootfs.bbclass +0 -0
similarity index 100%
rename from classes/read-only-rootfs.bbclass
rename to classes-recipe/read-only-rootfs.bbclass
classes-recipe/swupdate.bbclass renamed from classes/swupdate.bbclass +0 -0
similarity index 100%
rename from classes/swupdate.bbclass
rename to classes-recipe/swupdate.bbclass
classes-recipe/verity.bbclass renamed from classes/verity.bbclass +0 -0
similarity index 100%
rename from classes/verity.bbclass
rename to classes-recipe/verity.bbclass
Signature · 1 line
2.51.0