Add .cfg for net modules, modules are needed as otherwise Yocto build fails due to ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel directory not existing.
This corner case was fixed upstream [1] but not backported to kirkstone.
[1] https://github.com/yoctoproject/poky/commit/5533d33d1e3b9be299230530c8e6ac6d...
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-kernel/linux/files/netfilter.cfg | 15 +++++++++++++++ .../recipes-kernel/linux/linux-morello.inc | 7 +++---- ...orello-1.7.bb => linux-morello_morello-1.8.bb} | 7 +++---- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 meta-morello/recipes-kernel/linux/files/netfilter.cfg rename meta-morello/recipes-kernel/linux/{linux-morello_morello-1.7.bb => linux-morello_morello-1.8.bb} (55%)
diff --git a/meta-morello/recipes-kernel/linux/files/netfilter.cfg b/meta-morello/recipes-kernel/linux/files/netfilter.cfg new file mode 100644 index 0000000..ba81642 --- /dev/null +++ b/meta-morello/recipes-kernel/linux/files/netfilter.cfg @@ -0,0 +1,15 @@ +# +# QoS and/or fair queueing +# +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_CSZ=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_INGRESS=m diff --git a/meta-morello/recipes-kernel/linux/linux-morello.inc b/meta-morello/recipes-kernel/linux/linux-morello.inc index 1822096..1c0a034 100644 --- a/meta-morello/recipes-kernel/linux/linux-morello.inc +++ b/meta-morello/recipes-kernel/linux/linux-morello.inc @@ -18,6 +18,7 @@ RDEPENDS:${PN}:remove:toolchain-llvm-morello = " musl"
SRC_URI = " \ git://git.morello-project.org/morello/kernel/linux;protocol=https;nobranch=1 \ + file://netfilter.cfg \ "
PV = "${LINUX_VERSION}+git${SRCPV}" @@ -39,16 +40,14 @@ KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
KBUILD_DEFCONFIG = "morello_transitional_pcuabi_defconfig"
+KCONFIG_MODE = "--alldefconfig" + do_kernel_configcheck[noexec] = "1" do_kernel_configme[depends] += "llvm-morello-native:do_populate_sysroot"
FILES:${KERNEL_PACKAGE_NAME} += "${PURECAP_SYSROOT_DIR}${prefix}/src/linux-headers-morello/include" SYSROOT_DIRS += "${PURECAP_SYSROOT_DIR}${prefix}/src/linux-headers-morello/include"
-do_configure:prepend(){ - rm -f ${B}/.config -} - do_install:append() { install -d ${D}${PURECAP_SYSROOT_DIR}${prefix}/src/linux-headers-morello oe_runmake headers_install ARCH=arm64 INSTALL_HDR_PATH=${D}${PURECAP_SYSROOT_DIR}${prefix}/src/linux-headers-morello diff --git a/meta-morello/recipes-kernel/linux/linux-morello_morello-1.7.bb b/meta-morello/recipes-kernel/linux/linux-morello_morello-1.8.bb similarity index 55% rename from meta-morello/recipes-kernel/linux/linux-morello_morello-1.7.bb rename to meta-morello/recipes-kernel/linux/linux-morello_morello-1.8.bb index 91b75d4..78929f6 100644 --- a/meta-morello/recipes-kernel/linux/linux-morello_morello-1.7.bb +++ b/meta-morello/recipes-kernel/linux/linux-morello_morello-1.8.bb @@ -2,10 +2,9 @@ require linux-morello.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRCREV = "661ebe4f81e2840e5d706c24c36af63bdbc01b3e" +SRCREV = "fa6de65a2f2c6f3ef778e4dd46d1509591585221"
-LINUX_VERSION = "6.4" +LINUX_VERSION = "6.7" LINUX_VERSION_EXTENSION = "-yocto-purecap"
-COMPATIBLE_MACHINE = "morello" - +COMPATIBLE_MACHINE = "morello" \ No newline at end of file