Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ BBFILE_COLLECTIONS += "open-network-linux"
BBFILE_PATTERN_open-network-linux = "^${LAYERDIR}/"
BBFILE_PRIORITY_open-network-linux = "6"

LAYERSERIES_COMPAT_open-network-linux = "kirkstone"
LAYERSERIES_COMPAT_open-network-linux = "scarthgap"

PREFERRED_VERSION_linux-libc-headers ?= "6.6%"
2 changes: 1 addition & 1 deletion conf/machine/generic-armel-iproc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require conf/machine/include/onl.inc
MACHINE_FEATURES += "pcbios"
MACHINE_FEATURES:remove = "alsa"

KERNEL_FEATURES:remove = "features/debug/printk.scc features/kernel-sample/kernel-sample.scc"
KERNEL_FEATURES:remove = "features/debug/printk.scc features/kernel-sample/kernel-sample.scc features/taskstats/taskstats.scc"

# https://git.yoctoproject.org/poky/tree/meta/classes/kernel-fitimage.bbclass
KERNEL_CLASSES += "kernel-fitimage"
Expand Down
2 changes: 1 addition & 1 deletion recipes-extended/onl/onl.inc
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ EXTRA_OEMAKE = "\
'BUILDER_MODULE_MANIFEST=${BUILDER_MODULE_MANIFEST}' \
'MODULEMANIFEST=${MODULEMANIFEST}' \
'GCC=${CC}' \
'GCC_FLAGS=${CFLAGS} -DONLPLIB_CONFIG_I2C_USE_CUSTOM_HEADER=0 -Wno-error=unused-result' \
'GCC_FLAGS=${CFLAGS} -DONLPLIB_CONFIG_I2C_USE_CUSTOM_HEADER=0 -Wno-error=unused-result -Wno-error=address -Wno-error=pointer-to-int-cast' \
'MODULEMANIFEST=${MODULEMANIFEST}' \
'NO_USE_GCC_VERSION_TOOL=${NO_USE_GCC_VERSION_TOOL}' \
'ONL=${ONL}' \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ CONFIG_X86_UMIP=y
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_EFI=y
# CONFIG_EFI_STUB is not set
CONFIG_SECCOMP=y
# CONFIG_SECCOMP is not set
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
Expand Down Expand Up @@ -605,7 +605,6 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_ARCH_STACKLEAK=y
CONFIG_HAVE_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR=y
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 4f66bc6e58d52c6b03787439aa96ce8b0c5e01b9 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <[email protected]>
Date: Thu, 22 May 2025 15:50:44 +0200
Subject: [PATCH] Revert "virtio: Add prereqs for tiny"

This enables DRM, and we have headless systems, so DRM just needlessly
increases code size and attack surface.

This reverts commit 26ae60b03262f71c03a2685aa649493b86369c1d.
---
cfg/virtio.cfg | 7 -------
1 file changed, 7 deletions(-)

diff --git a/cfg/virtio.cfg b/cfg/virtio.cfg
index 0ef99c6b8bb0..938d2da51e8c 100644
--- a/cfg/virtio.cfg
+++ b/cfg/virtio.cfg
@@ -1,23 +1,16 @@
# SPDX-License-Identifier: MIT
CONFIG_VIRTIO=y
-CONFIG_VIRTIO_MENU=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_BALLOON=y
-CONFIG_NET=y
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_BLK=y
-CONFIG_BLK_MQ_VIRTIO=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_INPUT=m
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_VIRTIO=y
-CONFIG_SCSI=y
-CONFIG_SCSI_LOWLEVEL=y
CONFIG_SCSI_VIRTIO=y
-CONFIG_CRYPTO=y
CONFIG_CRYPTO_DEV_VIRTIO=y
-CONFIG_DRM=y
CONFIG_DRM_VIRTIO_GPU=y
CONFIG_VSOCKETS=y
CONFIG_VSOCKETS_DIAG=y
--
2.49.0

Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ CONFIG_X86_UMIP=y
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_EFI=y
# CONFIG_EFI_STUB is not set
CONFIG_SECCOMP=y
# CONFIG_SECCOMP is not set
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
Expand Down Expand Up @@ -589,7 +589,6 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_ARCH_STACKLEAK=y
CONFIG_HAVE_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR=y
Expand Down

This file was deleted.

4 changes: 4 additions & 0 deletions recipes-kernel/linux/linux-yocto-onl_5.15.bb
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,7 @@ module_conf_i2c-ismt = "blacklist i2c-ismt"
# Blacklist i2c-i801 and only load it as needed.
KERNEL_MODULE_PROBECONF:append:x86-64 = " i2c-i801"
module_conf_i2c-i801 = "blacklist i2c-i801"

# meta-virtualization does not provide a linux-yocto_5.15_virtualization.inc,
# so we need to include it directly.
include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'recipes-kernel/linux/linux-yocto_virtualization.inc', '', d)}
6 changes: 1 addition & 5 deletions recipes-kernel/linux/linux-yocto-onl_6.6.bb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ SRC_URI += "\
# We cannot use patches for that since patches are applied after parsing meta,
# so the next best thing is copying a pre-commit version of the file.
SRC_URI += "\
file://kernel-meta;type=kmeta;name=kernel-meta;destsuffix=kernel-meta \
file://0001-Revert-virtio-Add-prereqs-for-tiny.patch;patchdir=kernel-meta \
"

DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
Expand All @@ -45,7 +45,3 @@ module_conf_i2c-ismt = "blacklist i2c-ismt"
# Blacklist i2c-i801 and only load it as needed.
KERNEL_MODULE_PROBECONF:append:x86-64 = " i2c-i801"
module_conf_i2c-i801 = "blacklist i2c-i801"

# meta-virtualization does not provide a linux-yocto_6.6_virtualization.inc,
# so we need to include it directly.
include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'recipes-kernel/linux/linux-yocto_virtualization.inc', '', d)}
7 changes: 7 additions & 0 deletions recipes-kernel/linux/yocto-cfg-fragments.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-onl-linux-${LINUX_VERSION}.y:"
# "Revert" 917043019b46 ("virtio: Add prereqs for tiny") from yocto-kernel-cache
# as it forces several subsystems like DRM on, which we do not need since none
# of our devices have a GPU.
SRC_URI += "\
file://0001-Revert-virtio-Add-prereqs-for-tiny.patch \
"