Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use specific version of poky #56

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use specific version of poky #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/configs/release/imx8qxp-mek-scarthgap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ repos:
meta-pantavisor:
poky:
url: https://github.com/yoctoproject/poky.git
commit: scarthgap-5.0.4
path: layers/poky
layers:
meta:
Expand Down
1 change: 1 addition & 0 deletions kas/scarthgap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ defaults:
branch: scarthgap
repos:
poky:
commit: scarthgap-5.0.4
patches:
fit-image-multiconfig:
repo: meta-pantavisor
Expand Down
29 changes: 15 additions & 14 deletions patches/poky/0001-fit-image-multiconfig.scarthgap.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
From a349edef5358194b626f92f7dbe1f6ec342ed91f Mon Sep 17 00:00:00 2001
From: Alexander Sack <asac@pantacor.com>
Date: Thu, 3 Oct 2024 10:27:52 +0000
From e70e8ed4429dcb046ae4241a8af613bee20d8970 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@gmail.com>
Date: Fri, 25 Oct 2024 09:10:45 +0200
Subject: [PATCH] kernel-fitimage.bbclass: support multiconfig

Signed-off-by: Marek Belisko <[email protected]>
---
meta/classes-recipe/kernel-fitimage.bbclass | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass
index 18ab17bd2c..5c93a1cebb 100644
index 4b74ddc201..eaa8f02b5d 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -6,6 +6,9 @@
Expand All @@ -21,25 +22,25 @@ index 18ab17bd2c..5c93a1cebb 100644
def get_fit_replacement_type(d):
kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
replacementtype = ""
@@ -38,7 +41,8 @@ python __anonymous () {
@@ -42,7 +45,8 @@ python __anonymous () {

image = d.getVar('INITRAMFS_IMAGE')
if image:
- d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
+ d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', '${@oe.utils.conditional("INITRAMFS_MULTICONFIG", "", "${INITRAMFS_IMAGE}:do_image_complete", "", d) }')
+ d.appendVarFlag('do_assemble_fitimage_initramfs', 'mcdepends', '${@oe.utils.conditional("INITRAMFS_MULTICONFIG", "", "", "mc:${BB_CURRENT_MC}:${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete", d) }')
ubootenv = d.getVar('UBOOT_ENV')
if ubootenv:
- d.appendVarFlag('do_assemble_fitimage', 'depends', ' virtual/bootloader:do_populate_sysroot')
+ d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', '${@oe.utils.conditional("INITRAMFS_MULTICONFIG", "", "${INITRAMFS_IMAGE}:do_image_complete", "", d) }')
+ d.appendVarFlag('do_assemble_fitimage_initramfs', 'mcdepends', '${@oe.utils.conditional("INITRAMFS_MULTICONFIG", "", "", "mc:${BB_CURRENT_MC}:${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete", d) }')

ubootenv = d.getVar('UBOOT_ENV')
if ubootenv:
#check if there are any dtb providers
providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb")
@@ -683,7 +687,7 @@ fitimage_assemble() {
# Find and use the first initramfs image archive type we find
found=
for img in ${FIT_SUPPORTED_INITRAMFS_FSTYPES}; do
- initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img"
+ initramfs_path="${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img"
+ initramfs_path="${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img"
if [ -e "$initramfs_path" ]; then
bbnote "Found initramfs image: $initramfs_path"
found=true
--
2.34.1
2.25.1

Loading