6 files changed, 67 insertions, 6 deletions

diff --git a/recipes-kernel/linux/linux-yocto_6.6_virtualization.inc b/recipes-kernel/linux/linux-yocto_6.10_virtualization.inc
index 59311487..59311487 100644
--- a/recipes-kernel/linux/linux-yocto_6.6_virtualization.inc
+++ b/recipes-kernel/linux/linux-yocto_6.10_virtualization.inc
diff --git a/recipes-kernel/linux/linux-yocto_6.12_virtualization.inc b/recipes-kernel/linux/linux-yocto_6.12_virtualization.inc
new file mode 100644
index 00000000..59311487
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto_6.12_virtualization.inc
@@ -0,0 +1,4 @@
+# include the baseline meta virtualization configuration options
+# after this include, we can do version specific things
+
+include linux-yocto_virtualization.inc
diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc b/recipes-kernel/linux/linux-yocto_virtualization.inc
index 9a6554d1..bc2f4040 100644
--- a/recipes-kernel/linux/linux-yocto_virtualization.inc
+++ b/recipes-kernel/linux/linux-yocto_virtualization.inc
@@ -21,18 +21,30 @@ def kernel_cache_cond_feature(src_uri,feature):
     if kernel_cache:
        return feature
 
-    return "../recipe-sysroot-native/kcfg/" + feature
+    return "../../recipe-sysroot-native/kcfg/" + feature
 
 # no conditional, just use the yocto-kernel-cache addition, yes
 # the src_uri isn't used, but we may need to check it in the future
 def kernel_cache_feature(src_uri,feature):
-    return "../recipe-sysroot-native/kcfg/" + feature
+    return "../../recipe-sysroot-native/kcfg/" + feature
 
 def distro_cond_feature(feature_fragment,distro_feature,d):
     import bb
     feat = kernel_cache_feature("",feature_fragment)
     return bb.utils.contains('DISTRO_FEATURES', distro_feature, ' ' + feat, ' ', d)
 
+# kept as a reference if we go back to a dynamically calculated
+# fragment dependency.
+def kernel_meta_ver_depends(d):
+    yocto_enabled = bb.data.inherits_class('kernel-yocto', d)
+    if yocto_enabled:
+        pv = oe.utils.trim_version(d.getVar('PV'), 2)
+        return "yocto-cfg-fragments-%s-native:do_populate_sysroot" % pv
+    else:
+        return ""
+
+KERNEL_CFG_DEPENDS ?= "${@['', 'yocto-cfg-fragments-${LINUX_MAJOR}.${LINUX_MINOR}-native:do_populate_sysroot'][(bb.data.inherits_class('kernel-yocto', d))]}"
+
 KERNEL_CACHE_FEATURES ?= "${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/virtio.scc')} \
                           ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/xt-checksum.scc')} \
                           ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/vswitch.scc')} \
@@ -47,7 +59,13 @@ KERNEL_FEATURES:append = " ${KERNEL_CACHE_FEATURES}"
 # fragment merging suport at the moment, then add a dependency on the
 # configuration fragment repository. This allows us to be sure that our
 # features can be enabled via the fragments
-do_kernel_metadata[depends] += "${@['', 'yocto-cfg-fragments-native:do_populate_sysroot'][(bb.data.inherits_class('kernel-yocto', d))]}"
+do_kernel_metadata[depends] += "${KERNEL_CFG_DEPENDS}"
+
+# if externalsrc is enabled, do_kernel_metadata dependency on
+# yocto-cfg-fragments-native won't be run to populate
+# recipe-sysroot-native/kcfg because do_patch is not run.  Manully add
+# the dependency to do_kernel_configme for this special case
+do_kernel_configme[depends] += "${@['', d.getVar('PN') + ':do_kernel_metadata'][(bb.data.inherits_class('externalsrc', d))]}"
 
 # xen kernel support
 # SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}"
@@ -59,3 +77,5 @@ KERNEL_FEATURES:append = "${@distro_cond_feature('cfg/xen.scc', 'xen', d )}"
 KERNEL_FEATURES:append = "${@distro_cond_feature('cfg/kubernetes.scc', 'k8s', d )}"
 KERNEL_FEATURES:append = "${@distro_cond_feature('cfg/kubernetes.scc', 'k3s', d )}"
 
+# selinux
+KERNEL_FEATURES:append = "${@distro_cond_feature('cgl/features/selinux/selinux.cfg', 'selinux', d )}"
diff --git a/recipes-kernel/linux/yocto-cfg-fragments.bb b/recipes-kernel/linux/yocto-cfg-fragments-6.10.bb
index e6815715..ae3c3c15 100644
--- a/recipes-kernel/linux/yocto-cfg-fragments.bb
+++ b/recipes-kernel/linux/yocto-cfg-fragments-6.10.bb
@@ -12,10 +12,10 @@ do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 INHIBIT_DEFAULT_DEPS = "1"
 
-LINUX_VERSION ?= "6.6"
+LINUX_VERSION ?= "6.10"
 PV = "v${LINUX_VERSION}+git${SRCREV}"
 
-SRCREV = "eb283ea577df80542d48f0c498365960b4c4ecd9"
+SRCREV = "8650ed99a9e181fbb5a0e3718809f734564ea91f"
 SRC_URI = "\
         git://git.yoctoproject.org/yocto-kernel-cache;branch=yocto-${LINUX_VERSION} \
         "
diff --git a/recipes-kernel/linux/yocto-cfg-fragments-6.12.bb b/recipes-kernel/linux/yocto-cfg-fragments-6.12.bb
new file mode 100644
index 00000000..bffdca5c
--- /dev/null
+++ b/recipes-kernel/linux/yocto-cfg-fragments-6.12.bb
@@ -0,0 +1,37 @@
+HOMEPAGE = "https://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-cache/"
+SUMMARY = "Kernel configuration fragments"
+DESCRIPTION = "Typically used as part of a kernel clone, this is the standalone \
+fragment repository. Making it available to other fragment management schemes \
+"
+SECTION = "devel"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+INHIBIT_DEFAULT_DEPS = "1"
+
+LINUX_VERSION ?= "6.12"
+PV = "v${LINUX_VERSION}+git${SRCREV}"
+
+SRCREV = "722f1da424c10f7a7cd02646657bbc56b86c2c7b"
+SRC_URI = "\
+        git://git.yoctoproject.org/yocto-kernel-cache;branch=yocto-${LINUX_VERSION} \
+        "
+
+S = "${WORKDIR}/git"
+
+do_install() {
+    install -d ${D}${base_prefix}/kcfg
+
+    # copy the configuration fragments over to the native deploy
+    cp -r ${S}/* ${D}${base_prefix}/kcfg
+    # scripts bring in a bash dependency we don't want
+    rm -rf ${D}${base_prefix}/kcfg/scripts
+}
+
+FILES:${PN} += "kcfg/"
+SYSROOT_DIRS += "${base_prefix}/kcfg"
+BBCLASSEXTEND = "native nativesdk"
+
diff --git a/recipes-kernel/lopper/lopper_git.bb b/recipes-kernel/lopper/lopper_git.bb
index 5e2ca69a..2d1550d7 100644
--- a/recipes-kernel/lopper/lopper_git.bb
+++ b/recipes-kernel/lopper/lopper_git.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 SECTION = "bootloader"
 
 SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=https"
-SRCREV = "9159040dab25e2f1e7b447fcbfcd5397b1d618e8"
+SRCREV = "bd7deb3a6e491fe01b4dacc676aa21b1f129d03c"
 S = "${WORKDIR}/git"
 
 BASEVERSION = "1.0.2"