Skip to content

update main to next major BISDN Linux version#326

Merged
ideaship merged 12 commits intomainfrom
next
Mar 10, 2026
Merged

update main to next major BISDN Linux version#326
ideaship merged 12 commits intomainfrom
next

Conversation

@KanjiMonster
Copy link
Copy Markdown
Contributor

@KanjiMonster KanjiMonster commented Jul 29, 2025

Pull request to collect all next major BISDN Linux changes. Will be rebased from time to time.

Contains:

@KanjiMonster
Copy link
Copy Markdown
Contributor Author

Not sure what I did there ... .

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Newer Yocto versions include ${IMAGE_SUFFIX} in ${IMAGE_LINK_NAME} (aka
".rootfs")[1], aligning the link names with their target files.

Since ${INSTALL_ROOTFS} is targeting the link of the rootfs, switch it
to use ${IMAGE_LINK_NAME} instead of constructing it manually. This way
it works regardless of the change.

At roughtly the same time, ${IMAGE_NAME} was changed to use
${IMAGE_LINK_NAME}[2], thus now also include the .rootfs suffix.

Changing ${IMAGE_NAME} in our recipe would drop it from the any other
generated artifacts, so instead define our own ${ONIEIMAGE_{LINK}_NAME}
variables and use them.

[1] [OE-Core rev: 26d97acc71379ab6702fa54a23b6542a3f51779c]
[2] [OE-Core rev: 6e82c394e98d57a2fe73e547922477cd6b0620f9]

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Some ptests require a ptest user and group (e.g. bash), so provide
static ids for them

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Yocto Scarthgap ships grpc 1.60.1, so rebuild our patch. Since
googletest is now provided in the recipe, we don't need to add it
ourselves anymore, simplifying the bbappend.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Yocto scarthgap ships keepalive 2.2.8, so rebase our changes and update
the bbappend accordingly.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Yocto scarthgap ships systemd 255, so replace our custom backport
patches with versions sent upstream which now apply cleanly, and update
the bbappend.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
easy_install::get_script_args() was removed in python 3.12, so drop the
hook replacement.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Add motd and profile to SRC_URI so they get copied in scarthgap. It
looks like it magically worked without it in kirkstone, but newer Yocto
versions seem to enforce this.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Rust in scarthgap now properly disables neon, so we do not need to
handle it anymore ourselves.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
abseil-cpp in scarthgap now properly disables neon, so we do not need
to handle it anymore ourselves.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Something is broken in scarthgap's python3-eventlet 0.36.1, causing
errors on startup of ryu:

Jun 25 13:30:19 accton-as4610-54 systemd[1]: Started ryu-manager.
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]: Traceback (most recent call last):
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:   File "/usr/bin/ryu-manager", line 6, in <module>
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:     from ryu.cmd.manager import main
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:   File "/usr/lib/python3.12/site-packages/ryu/cmd/manager.py", line 22, in <module>
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:     from ryu.lib import hub
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:   File "/usr/lib/python3.12/site-packages/ryu/lib/hub.py", line 30, in <module>
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:     import eventlet
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:   File "/usr/lib/python3.12/site-packages/eventlet/__init__.py", line 6, in <module>
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:     from eventlet import convenience
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:   File "/usr/lib/python3.12/site-packages/eventlet/convenience.py", line 4, in <module>
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:     from eventlet import greenpool
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:   File "/usr/lib/python3.12/site-packages/eventlet/greenpool.py", line 4, in <module>
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:     from eventlet import queue
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:   File "/usr/lib/python3.12/site-packages/eventlet/queue.py", line 48, in <module>
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:     from eventlet.event import Event
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:   File "/usr/lib/python3.12/site-packages/eventlet/event.py", line 1, in <module>
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]:     from eventlet import hubs
Jun 25 13:30:20 accton-as4610-54 ryu-manager[2594]: ImportError: cannot import name 'hubs' from partially initialized module 'eventlet' (most likely due to a circular import) (/usr/lib/python3.12/site-packages/eventlet/__init__.py)
Jun 25 13:30:20 accton-as4610-54 systemd[1]: ryu-manager.service: Main process exited, code=exited, status=1/FAILURE

Fix this by updating eventlet to 0.37.0, which seems to fix the issue.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
The keepalived sample configurations were moved into a separate package.
Without it, /etc/keepalived does not exist, which breaks our own tests.

While we do not use any of the sample configurations, add the package
for now to keep the difference to kirkstone minimal.

Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
@ideaship ideaship merged commit e030e9f into main Mar 10, 2026
1 check passed
@ideaship ideaship deleted the next branch March 10, 2026 09:30
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