LM
/
coreos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(linux-yocto): move distro settings from BSP to distro layer

This commit is contained in:
Sam Dolt 2024-03-25 16:48:15 +01:00
parent cc9a93d4a6
commit 70ed96f8d9
8 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
View File

@ -1,2 +0,0 @@
# Set kernel config needed by secure-storage
SRC_URI += "file://secure-storage.cfg"

7
layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend
View File

@ -4,7 +4,7 @@ COMPATIBLE_MACHINE:vm-x64 = "vm-x64"
# Enable some kernel features related to virtualiuzation # Enable some kernel features related to virtualiuzation
KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc"
SRC_URI:append:vm-x64 = " file://hyperv.cfg"
KMACHINE:eagle40-03 ?= "common-pc-64" KMACHINE:eagle40-03 ?= "common-pc-64"
KBRANCH:eagle40-03 = "v5.15/standard/base" KBRANCH:eagle40-03 = "v5.15/standard/base"
@ -18,8 +18,3 @@ KMACHINE:beaglebone ?= "beaglebone"
SRCREV_machine:beaglebone ?= "9aabbaa89fcb21af7028e814c1f5b61171314d5a" SRCREV_machine:beaglebone ?= "9aabbaa89fcb21af7028e814c1f5b61171314d5a"
COMPATIBLE_MACHINE:beaglebone = "beaglebone" COMPATIBLE_MACHINE:beaglebone = "beaglebone"
LINUX_VERSION:beaglebone = "5.15.54" LINUX_VERSION:beaglebone = "5.15.54"
require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)}
SRC_URI += " file://k3s_kernel_adaptions.cfg"
SRC_URI:append:vm-x64 = " file://hyperv.cfg"

2
layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
View File

@ -11,6 +11,4 @@ COMPATIBLE_MACHINE:vm-x64 = "vm-x64"
KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc"
SRC_URI:append:vm-x64 = " file://hyperv.cfg" SRC_URI:append:vm-x64 = " file://hyperv.cfg"
require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)}
SRC_URI += " file://eagle40-03.cfg" SRC_URI += " file://eagle40-03.cfg"

0
layers/meta-belden-coreos-bsp/recipes-kernel/linux/files/secure-storage.cfg → layers/meta-belden-coreos/recipes-kernel/linux/files/secure-storage.cfg
View File

12
layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto-coreos-efi.inc → layers/meta-belden-coreos/recipes-kernel/linux/linux-yocto-coreos.inc
View File

@ -1,9 +1,16 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
# Secure Storage
# ==============================================================================
SRC_URI += "file://secure-storage.cfg"
# EFI Support
# ==============================================================================
inherit coreos-efi-sbsign inherit coreos-efi-sbsign
require conf/image-uefi.conf require conf/image-uefi.conf
# Ensure EFI STUB is enabled # Ensure EFI STUB is enabled
KERNEL_FEATURES:append = " cfg/efi.scc cfg/efi-ext.scc" KERNEL_FEATURES += "cfg/efi.scc cfg/efi-ext.scc"
# By default we use a Unified Kernel Image that contain the kernel, the # By default we use a Unified Kernel Image that contain the kernel, the
# kernel command line and some device tree, so we don't need to sign the output # kernel command line and some device tree, so we don't need to sign the output
@ -19,5 +26,4 @@ kernel_do_deploy:append() {
coreos_efi_secureboot_sign_app "$deployDir/$baseName${KERNEL_IMAGE_BIN_EXT}" coreos_efi_secureboot_sign_app "$deployDir/$baseName${KERNEL_IMAGE_BIN_EXT}"
done done
fi fi
} }

6
layers/meta-belden-coreos/recipes-kernel/linux/linux-yocto_%.bbappend Normal file
View File

@ -0,0 +1,6 @@
# Add CoreOS distro settings to the linux-yocto recipes
LINUX_YOCTO_COREOS_REQUIRE ?= ""
LINUX_YOCTO_COREOS_REQUIRE:coreos = "linux-yocto-coreos.inc"
require ${LINUX_YOCTO_COREOS_REQUIRE}

2
layers/meta-belden-marvell-bsp/recipes-kernel/linux/linux-netmodule_git-5.15-solidrun.bb
View File

@ -32,4 +32,4 @@ do_configure:append(){
fi fi
} }
require recipes-kernel/linux/linux-yocto-coreos-efi.inc require recipes-kernel/linux/linux-yocto-coreos.inc

2
layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb
View File

@ -23,4 +23,4 @@ do_configure:append(){
fi fi
} }
require recipes-kernel/linux/linux-yocto-coreos-efi.inc require recipes-kernel/linux/linux-yocto-coreos.inc