summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2021-05-26 16:21:11 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2021-05-28 09:34:51 +0200
commit8955c6aa5b1ca96ef53bc6fb8b904cd4f6a2d2ca (patch)
tree1c63ffcfe9847896b5522e96f08fd0c252f289bf
parent5d08f177d5b6b5e06c36c016b6686b0b9a2c6c2b (diff)
downloadmeta-nfv-access-bsp-x86-8955c6aa5b1ca96ef53bc6fb8b904cd4f6a2d2ca.tar.gz
linux-intel: Allow BSPs to add patches (w/o AUFS)
- allow BSP and scc files included in the BSP to add kernel source patches ("features"), not only kernel configuration fragments; - aufs patches in [1] are not yet rebased on top of [2], so until that happens upstream (aufs has been rebased and reworked on the master branch of yocto-kernel-cache for kernel 5.11) just remove the patches (we can't do that by patching kernel-meta with a patch file, as support is also broken upstream; handle it via a prepend); [1] http://git.yoctoproject.org/cgit.cgi/yocto-kernel-cache/log/\ features/aufs?h=yocto-5.10 [2] https://github.com/intel/linux-intel-lts/commit/26dc6581 Change-Id: I60b03451b3a812e21dd0a2d313e59ba19b249225 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--recipes-kernel/linux/linux-intel.inc14
1 files changed, 14 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 366d57d..dbc9808 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -11,6 +11,20 @@ SRCREV_metaenea = "52d45bac8f69340d4677a9271a0f967fc087c44a"
11KENEABRANCH = "intel-5.10" 11KENEABRANCH = "intel-5.10"
12SRC_URI_append = " git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-meta" 12SRC_URI_append = " git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-meta"
13 13
14# Upstream BSPs include aufs support (by patching the kernel source + enabling it in kernel config).
15# However, our current kernel version contains a backported commit that conflicts with aufs patches.
16# Until aufs patches are rebased in yocto-kernel-cache, disable aufs kernel source patching, since
17# we don't enable it via kernel config anyway.
18do_kernel_metadata_prepend() {
19 ## ENEA_start ##
20 # kernel-meta patching via patch files added to SRC_URI is currently broken, handle it here
21 sed -i -E 's/^(include features.aufs.*)$/# \1/g' ${WORKDIR}/kernel-meta/ktypes/standard/standard.scc
22 ## ENEA_end ##
23}
24
25# Allow BSPs to supply patches without explicitly adding the scc files to SRC_URI/KERNEL_FEATURES
26KMETA_EXTERNAL_BSPS = "t"
27
14# KERNEL CONFIG DEFAULT CHECK LEVELS: 28# KERNEL CONFIG DEFAULT CHECK LEVELS:
15# 0: no reporting 29# 0: no reporting
16# 1: report options that are specified, but not in the final config 30# 1: report options that are specified, but not in the final config