Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 conf/machine/genericx86-64.extra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ OMNECT_BOOTLOADER_RECIPE_PATH = "${LAYERDIR_core}/recipes-bsp/grub/grub-efi_2.12
# OMNECT_BOOTLOADER_CHECKSUM_EXPTECTED:pn-bootloader-versioned - build will fail, if the
# computed checksum is different to this; set to <oldchecksum> when
# OMNECT_BOOTLOADER_CHECKSUM_COMPATIBLE:pn-bootloader-versioned is set
OMNECT_BOOTLOADER_CHECKSUM_EXPECTED:pn-bootloader-versioned = "873ba6cc0ab55772dfd1aa17af204c2a263a2ef154b724a96ce4ceebcda7e275"
OMNECT_BOOTLOADER_CHECKSUM_EXPECTED:pn-bootloader-versioned = "0b8f95386e03f432a4e04151dee14447d6c2a2de9811f2223e3fe904b3fe3876"
Copy link
Contributor Author

@mlilien mlilien Mar 10, 2026

Choose a reason for hiding this comment

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

meta-efi-secure patches changed -> thus bootloader update

#OMNECT_BOOTLOADER_CHECKSUM_COMPATIBLE:pn-bootloader-versioned = ""
5 changes: 2 additions & 3 deletions conf/machine/include/phytec-imx8mm.inc
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ MACHINE_FEATURES:append = " \
pstore \
"

OMNECT_BOOTLOADER_RECIPE_PATH = "${LAYERDIR_phytec}/recipes-bsp/u-boot/u-boot-phytec-imx_2024.04-2.2.0-phy23.bb"
OMNECT_BOOTLOADER_RECIPE_PATH = "${LAYERDIR_phytec}/recipes-bsp/u-boot/u-boot-phytec-imx_2024.04-2.2.0-phy24.bb"

# force bootloader version checksum to be old, when sure it's 100% binary compatible
# OMNECT_BOOTLOADER_CHECKSUM_COMPATIBLE:pn-bootloader-versioned = "<newchecksum> <oldchecksum>"
Expand All @@ -106,5 +106,4 @@ OMNECT_BOOTLOADER_RECIPE_PATH = "${LAYERDIR_phytec}/recipes-bsp/u-boot/u-boot-ph
# OMNECT_BOOTLOADER_CHECKSUM_EXPTECTED:pn-bootloader-versioned - build will fail, if the
# computed checksum is different to this; set to <oldchecksum> when
# OMNECT_BOOTLOADER_CHECKSUM_COMPATIBLE:pn-bootloader-versioned is set
OMNECT_BOOTLOADER_CHECKSUM_EXPECTED:pn-bootloader-versioned = "faa4ee371d68bc291465422c1e8713cd2b5e0954c7feb354b76217652c3b07df"
OMNECT_BOOTLOADER_CHECKSUM_COMPATIBLE:pn-bootloader-versioned = "eef7efcb1878fbf7a86996cf9e228b9f69fafca1ed8c0d6acd4e86fd760e88a5 faa4ee371d68bc291465422c1e8713cd2b5e0954c7feb354b76217652c3b07df"
OMNECT_BOOTLOADER_CHECKSUM_EXPECTED:pn-bootloader-versioned = "86b6a5a4848f875bd29aff7c5c09e720f19d6464891c9b6c22977803eccec374"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

bootloader changed: phytec/meta-phytec@6655cd0

10 changes: 5 additions & 5 deletions kas/distro/oe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ repos:
ext/bitbake:
url: "https://git.openembedded.org/bitbake"
branch: "2.8"
# tag yocto-5.0.15
commit: "8dcf084522b9c66a6639b5f117f554fde9b6b45a"
# tag yocto-5.0.16
commit: "10118785e4a670bce4980e1044c0888a8b6e84af"
layers:
.: 0
ext/_openembedded-core: #_ prefixed because of layer order with same prio e.g. meta-openembedded
url: "https://git.openembedded.org/openembedded-core"
branch: "scarthgap"
# tag yocto-5.0.15
commit: "6988157ad983978ffd6b12bcefedd4deaffdbbd1"
# tag yocto-5.0.16
commit: "a1f4ae4e569bc0e36c27c1e4651e502e54d63b28"
layers:
meta:
patches:
p001:
repo: "meta-omnect"
path: "kas/patches/oe.patch"
env:
OE_VERSION: "5.0.15"
OE_VERSION: "5.0.16"
6 changes: 3 additions & 3 deletions kas/distro/omnect-os.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
ext/meta-openembedded:
url: "https://github.com/openembedded/meta-openembedded.git"
branch: "scarthgap"
commit: "2759d8870ea387b76c902070bed8a6649ff47b56"
commit: "4d3e2639dec542b58708244662d5ce36810fc510"
layers:
# meta-multimedia is used by qemu_8.2.2.imx.bb (tauri) ToDo: possible to handle that in the machine specific kas file?
meta-multimedia:
Expand All @@ -34,11 +34,11 @@ repos:
ext/meta-swupdate:
url: "https://github.com/sbabic/meta-swupdate.git"
branch: "scarthgap"
commit: "226701adf0f7c8ed08d4d6a7783e88d34ef2d5e9"
commit: "db16b9aa3e39bc35ced39c526606102c9a466b81"
ext/meta-virtualization:
url: "https://git.yoctoproject.org/meta-virtualization"
branch: "scarthgap"
commit: "f92518e20530edfebca45e4170e11460949a5303"
commit: "3dd635f613f7299d986a8ab6bc9f584370f8ed1d"
patches:
p001:
repo: "meta-omnect"
Expand Down
2 changes: 1 addition & 1 deletion kas/machine/phytec/phytec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repos:
ext/meta-phytec:
url: "https://github.com/phytec/meta-phytec"
branch: "scarthgap"
commit: "951384d6a847a5cfcb9c34e31e2e47c15a91437f"
commit: "de7005117bf83b93fbe47ec054f8a9ddd0d6a382"
patches:
p001:
repo: "meta-omnect"
Expand Down
6 changes: 3 additions & 3 deletions kas/machine/x86_64/genericx86-64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ repos:
ext/meta-secure-core:
url: "https://github.com/Wind-River/meta-secure-core.git"
branch: "scarthgap"
commit: "48fab8c5706e4805995b69855f919e2a50889da0"
commit: "bd17305b2c2186f4b70f732a0aed9b60795d9720"
layers:
meta-efi-secure-boot:
meta-secure-core-common:
meta-signing-key:
patches:
p001:
repo: "meta-omnect"
path: "kas/patches/meta-efi-secure-boot.patch"
path: "kas/patches/meta-efi-secure-boot_layerdir.patch"
ext/meta-perl:
url: "https://github.com/openembedded/meta-openembedded.git"
branch: "scarthgap"
commit: "2759d8870ea387b76c902070bed8a6649ff47b56"
commit: "4d3e2639dec542b58708244662d5ce36810fc510"
layers:
meta-perl:

Expand Down
86 changes: 0 additions & 86 deletions kas/patches/meta-efi-secure-boot.patch

This file was deleted.

77 changes: 0 additions & 77 deletions kas/patches/meta-efi-secure-boot_grub.patch

This file was deleted.

Loading