Skip to content

next: switch to scarthgap#190

Merged
jklare merged 7 commits intonextfrom
jogo_scarthgap
Aug 5, 2025
Merged

next: switch to scarthgap#190
jklare merged 7 commits intonextfrom
jogo_scarthgap

Conversation

@KanjiMonster
Copy link
Collaborator

Update this layer to scarthap (5.0), which mostly involves updating our kernel recipes.

We are targeting now scarthgap.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
It looks like the GCC in scarthgap enables a few more warnings as
errors, which break the build with it.

While fixing these issues would be best, the fixes aren't always
trivial, so ignore them for now.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
@KanjiMonster KanjiMonster requested a review from jklare July 28, 2025 07:27
@KanjiMonster KanjiMonster marked this pull request as ready for review July 28, 2025 07:28
Copy link

@jklare jklare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, one question in comments

Yocto added the taskstats feature for qemuall builds with 351f82b99181
("linux-yocto: Enable kernel-sample features for runtime tests") [1],
which triggers a config warning:

WARNING: linux-yocto-onl-6.6.100+git-r0 do_kernel_configcheck: [kernel config]: specified values did not make it into the kernel's final configuration:

    [NOTE]: 'CONFIG_SCHED_INFO' last val (n) and .config val (y) do not match
    [INFO]: CONFIG_SCHED_INFO : y ## .config: 4438 :configs//bsp/armel-iproc/armel-iproc.cfg (n)
    [INFO]: raw config text:

        config SCHED_INFO
        	bool
        	default n

    [INFO]: config 'CONFIG_SCHED_INFO' was set, but it wasn't assignable, check (parent) dependencies

    [INFO]: selection details for 'CONFIG_SCHED_INFO':
        Symbols currently y-selecting this symbol:
          - TASK_DELAY_ACCT

        Symbols currently n-selecting this symbol (no effect):
          - SCHEDSTATS

Since this features seems to be only needed for using qemu to run the
image, and our kernel is hardware-specific so cannot be run in qemu,
let's remove the feature for now.

[1] openembedded/openembedded-core@351f82b

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Scarthgap targets linux 6.6, so meta-virtualization provides its own
include. On the other hand, there is no include for 5.15 anymore, so
move our include there.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Instead of replacing the upstream virtio.cfg, make it a (revert) patch.
The build system has special handling for patches for kernel-meta, so
patching it works as expected.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
When using virtualization on scarthgap, it uses a separate kernel-meta
checkout for the virtualization fragments, so any changes we do in the
main kernel-meta are ineffective.

Therefore make sure we also patch the second checkout from
meta-virtualization.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
It looks like newer runc(?) versions are confused if seccomp support is
disabled in docker/runc, but the kernel supports it, and fails to start
up:

fatal: [agema-ag7648-1.switch-testing.bisdn.de]: FAILED! => {"changed": false, "msg": "Error starting container 999f195b40f104fa4e1b5e45002c415c466dce6021daec841cc41d2eea184487: 500 Server Error for http+docker://localhost/v1.44/containers/999f195b40f104fa4e1b5e45002c415c466dce6021daec841cc41d2eea184487/start: Internal Server Error (\"failed to create task for container: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: seccomp: config provided but seccomp not supported: unknown\")"}

Work around this by disabling seccomp in the kernel for x86-64 like it
is disabled for armel-iproc.

We may still decide to enable seccomp again at a later time, but for now
let's keep the changes minimal.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
@KanjiMonster KanjiMonster requested a review from jklare July 29, 2025 09:36
@jklare jklare removed their request for review July 31, 2025 09:45
@jklare jklare merged commit 601fe7b into next Aug 5, 2025
1 check passed
@jklare jklare deleted the jogo_scarthgap branch August 5, 2025 08:28
@KanjiMonster KanjiMonster added this to the BISDN Linux 6.0 milestone Oct 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants