diff --git a/conf/machine/genericx86-64.extra.conf b/conf/machine/genericx86-64.extra.conf index 82a4f139..0dce6d0f 100644 --- a/conf/machine/genericx86-64.extra.conf +++ b/conf/machine/genericx86-64.extra.conf @@ -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 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" #OMNECT_BOOTLOADER_CHECKSUM_COMPATIBLE:pn-bootloader-versioned = "" diff --git a/conf/machine/include/phytec-imx8mm.inc b/conf/machine/include/phytec-imx8mm.inc index 0320e050..51f7c30d 100644 --- a/conf/machine/include/phytec-imx8mm.inc +++ b/conf/machine/include/phytec-imx8mm.inc @@ -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 = " " @@ -106,5 +106,7 @@ 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 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" + +#DONT commit +SRCREV:pn-linux-phytec-imx = "a9bae1735c91db819c75d761c8fae32cc67cde91" \ No newline at end of file diff --git a/kas/distro/oe.yaml b/kas/distro/oe.yaml index bcc90e2f..4347a445 100644 --- a/kas/distro/oe.yaml +++ b/kas/distro/oe.yaml @@ -6,15 +6,15 @@ 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: @@ -22,4 +22,4 @@ repos: repo: "meta-omnect" path: "kas/patches/oe.patch" env: - OE_VERSION: "5.0.15" + OE_VERSION: "5.0.16" diff --git a/kas/distro/omnect-os.yaml b/kas/distro/omnect-os.yaml index 9cb38568..c317295f 100644 --- a/kas/distro/omnect-os.yaml +++ b/kas/distro/omnect-os.yaml @@ -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: @@ -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" diff --git a/kas/machine/phytec/phytec.yaml b/kas/machine/phytec/phytec.yaml index 3ad56d51..59ec2fe6 100644 --- a/kas/machine/phytec/phytec.yaml +++ b/kas/machine/phytec/phytec.yaml @@ -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" diff --git a/kas/machine/x86_64/genericx86-64.yaml b/kas/machine/x86_64/genericx86-64.yaml index b4a768ac..f2532225 100644 --- a/kas/machine/x86_64/genericx86-64.yaml +++ b/kas/machine/x86_64/genericx86-64.yaml @@ -13,7 +13,7 @@ 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: @@ -21,11 +21,11 @@ repos: 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: diff --git a/kas/patches/meta-efi-secure-boot.patch b/kas/patches/meta-efi-secure-boot.patch deleted file mode 100644 index 0833f8ed..00000000 --- a/kas/patches/meta-efi-secure-boot.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0003-mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0003-mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch -index 18d937b..328509e 100644 ---- a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0003-mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch -+++ b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0003-mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch -@@ -1,4 +1,4 @@ --From db890f512844a23b9e8621d466b39ada9b9e740d Mon Sep 17 00:00:00 2001 -+From 560291b9cdf1398da4e8ab8bd8602910158853aa Mon Sep 17 00:00:00 2001 - From: Lans Zhang - Date: Wed, 12 Jul 2017 16:02:13 +0800 - Subject: [PATCH] mok2verify: support to verify non-PE file with PKCS#7 -@@ -51,11 +51,11 @@ Signed-off-by: Yi Zhao - grub-core/lib/efi/mok2verify.c | 182 +++++++++++++++++++++++++++++++++ - grub-core/loader/i386/linux.c | 60 +++++++++++ - grub-core/loader/linux.c | 27 ++++- -- grub-core/normal/main.c | 53 +++++++++- -+ grub-core/normal/main.c | 56 +++++++++- - grub-core/normal/menu.c | 31 ++++-- - grub-core/normal/menu_text.c | 33 ++++-- - include/grub/efi/mok2verify.h | 48 +++++++++ -- 10 files changed, 463 insertions(+), 30 deletions(-) -+ 10 files changed, 466 insertions(+), 30 deletions(-) - create mode 100644 grub-core/lib/efi/mok2verify.c - create mode 100644 include/grub/efi/mok2verify.h - -@@ -507,7 +507,7 @@ index 56bc1be..09ce5c1 100644 - + return err; - } - diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c --index 5ce76ab..f754609 100644 -+index 4690243..33cc96e 100644 - --- a/grub-core/normal/main.c - +++ b/grub-core/normal/main.c - @@ -34,6 +34,9 @@ -@@ -611,20 +611,28 @@ index 5ce76ab..f754609 100644 - return 0; - } - --@@ -547,8 +589,11 @@ GRUB_MOD_INIT(normal) -+@@ -547,7 +589,10 @@ GRUB_MOD_INIT(normal) - /* Register a command "normal" for the rescue mode. */ -- grub_register_command ("normal", grub_cmd_normal, -- 0, N_("Enter normal mode.")); --- grub_register_command ("normal_exit", grub_cmd_normal_exit, --- 0, N_("Exit from normal mode.")); -+ cmd_normal = grub_register_command ("normal", grub_cmd_normal, -+ 0, N_("Enter normal mode.")); -+- cmd_normal_exit = grub_register_command ("normal_exit", grub_cmd_normal_exit, - +#ifdef GRUB_MACHINE_EFI - + if (grub_is_secured () == 0) - +#endif --+ grub_register_command ("normal_exit", grub_cmd_normal_exit, --+ 0, N_("Exit from normal mode.")); -++ cmd_normal_exit = grub_register_command ("normal_exit", grub_cmd_normal_exit, -+ 0, N_("Exit from normal mode.")); - - /* Reload terminal colors when these variables are written to. */ -- grub_register_variable_hook ("color_normal", NULL, grub_env_write_color_normal); -+@@ -591,5 +636,8 @@ GRUB_MOD_FINI(normal) -+ grub_fs_autoload_hook = 0; -+ grub_unregister_command (cmd_clear); -+ grub_unregister_command (cmd_normal); -+- grub_unregister_command (cmd_normal_exit); -++#ifdef GRUB_MACHINE_EFI -++ if (grub_is_secured () == 0) -++#endif -++ grub_unregister_command (cmd_normal_exit); -+ } - diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c - index 6a90e09..17eadf3 100644 - --- a/grub-core/normal/menu.c -@@ -796,5 +804,5 @@ index 0000000..98ef2d4 - + - +#endif /* ! GRUB_EFI_MOK2_VERIFY_HEADER */ - -- --2.25.1 -+2.34.1 - -diff --git a/meta-efi-secure-boot/conf/layer.conf b/meta-efi-secure-boot/conf/layer.conf -index 0efef32..1ebddf7 100644 ---- a/meta-efi-secure-boot/conf/layer.conf -+++ b/meta-efi-secure-boot/conf/layer.conf -@@ -20,3 +20,4 @@ LAYERDEPENDS_efi-secure-boot = "\ - " - - LAYERSERIES_COMPAT_efi-secure-boot = "scarthgap" -+LAYERDIR_efi-secure-boot = "${LAYERDIR}" diff --git a/kas/patches/meta-efi-secure-boot_grub.patch b/kas/patches/meta-efi-secure-boot_grub.patch deleted file mode 100644 index e44d2e4f..00000000 --- a/kas/patches/meta-efi-secure-boot_grub.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0003-mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0003-mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch -index 18d937b..328509e 100644 ---- a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0003-mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch -+++ b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0003-mok2verify-support-to-verify-non-PE-file-with-PKCS-7.patch -@@ -1,4 +1,4 @@ --From db890f512844a23b9e8621d466b39ada9b9e740d Mon Sep 17 00:00:00 2001 -+From 560291b9cdf1398da4e8ab8bd8602910158853aa Mon Sep 17 00:00:00 2001 - From: Lans Zhang - Date: Wed, 12 Jul 2017 16:02:13 +0800 - Subject: [PATCH] mok2verify: support to verify non-PE file with PKCS#7 -@@ -51,11 +51,11 @@ Signed-off-by: Yi Zhao - grub-core/lib/efi/mok2verify.c | 182 +++++++++++++++++++++++++++++++++ - grub-core/loader/i386/linux.c | 60 +++++++++++ - grub-core/loader/linux.c | 27 ++++- -- grub-core/normal/main.c | 53 +++++++++- -+ grub-core/normal/main.c | 56 +++++++++- - grub-core/normal/menu.c | 31 ++++-- - grub-core/normal/menu_text.c | 33 ++++-- - include/grub/efi/mok2verify.h | 48 +++++++++ -- 10 files changed, 463 insertions(+), 30 deletions(-) -+ 10 files changed, 466 insertions(+), 30 deletions(-) - create mode 100644 grub-core/lib/efi/mok2verify.c - create mode 100644 include/grub/efi/mok2verify.h - -@@ -507,7 +507,7 @@ index 56bc1be..09ce5c1 100644 - + return err; - } - diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c --index 5ce76ab..f754609 100644 -+index 4690243..33cc96e 100644 - --- a/grub-core/normal/main.c - +++ b/grub-core/normal/main.c - @@ -34,6 +34,9 @@ -@@ -611,20 +611,28 @@ index 5ce76ab..f754609 100644 - return 0; - } - --@@ -547,8 +589,11 @@ GRUB_MOD_INIT(normal) -+@@ -547,7 +589,10 @@ GRUB_MOD_INIT(normal) - /* Register a command "normal" for the rescue mode. */ -- grub_register_command ("normal", grub_cmd_normal, -- 0, N_("Enter normal mode.")); --- grub_register_command ("normal_exit", grub_cmd_normal_exit, --- 0, N_("Exit from normal mode.")); -+ cmd_normal = grub_register_command ("normal", grub_cmd_normal, -+ 0, N_("Enter normal mode.")); -+- cmd_normal_exit = grub_register_command ("normal_exit", grub_cmd_normal_exit, - +#ifdef GRUB_MACHINE_EFI - + if (grub_is_secured () == 0) - +#endif --+ grub_register_command ("normal_exit", grub_cmd_normal_exit, --+ 0, N_("Exit from normal mode.")); -++ cmd_normal_exit = grub_register_command ("normal_exit", grub_cmd_normal_exit, -+ 0, N_("Exit from normal mode.")); - - /* Reload terminal colors when these variables are written to. */ -- grub_register_variable_hook ("color_normal", NULL, grub_env_write_color_normal); -+@@ -591,5 +636,8 @@ GRUB_MOD_FINI(normal) -+ grub_fs_autoload_hook = 0; -+ grub_unregister_command (cmd_clear); -+ grub_unregister_command (cmd_normal); -+- grub_unregister_command (cmd_normal_exit); -++#ifdef GRUB_MACHINE_EFI -++ if (grub_is_secured () == 0) -++#endif -++ grub_unregister_command (cmd_normal_exit); -+ } - diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c - index 6a90e09..17eadf3 100644 - --- a/grub-core/normal/menu.c -@@ -796,5 +804,5 @@ index 0000000..98ef2d4 - + - +#endif /* ! GRUB_EFI_MOK2_VERIFY_HEADER */ - -- --2.25.1 -+2.34.1 -