oonf-olsrd2: reinstate and update to OONF master by parasew · Pull Request #1176 · openwrt/routing

parasew · 2026-06-04T14:18:33Z

Summary

Reinstates oonf-olsrd2 (and its oonf-init-scripts dependency), which were removed in #1145. The two issues that motivated the removal are both fixed in current OONF master, and I've verified a clean build.

Why this is safe now

The removal in #1145 cited three problems. Status of each:

GCC 14 -Wint-conversion (radio and proxy can not be compiled with GCC 14 (error: initialization of 'int' from 'void *' makes integer from pointer without a cast [-Wint-conversion]) OLSR/OONF#71): fixed upstream. The struct msghdr initializers in src/base/os_linux/os_system_linux.c now use designated initializers, which skip musl's padding fields. The fix existed on the develop branch and only reached master in the 2025-12 develop→master reconciliation, which is why the old 2022 pin never had it.
CMake 4.x minimum version: resolved. The root CMakeLists.txt now sets cmake_minimum_required(VERSION 3.10 FATAL_ERROR), above the 3.5 floor CMake 4.x enforces.
Stalled upstream / dead docs (Documentation not available OLSR/OONF#54): upstream is active again; the README now directs users back to the master branch (notice dated 2025-12-04).

What this PR changes

Bumps the source pin from the stale 2022-08-25 commit to master b2164126e12340f19ea33070e1e11eb469a051e5 (2025-12-04), with a refreshed PKG_MIRROR_HASH.
Bumps PKG_RELEASE.
Drops 100-enable-lan-import-plugin.patch. Upstream has absorbed it: add_subdirectory(lan_import) is already present in src/olsrv2/CMakeLists.txt, so the patch no longer applies and is redundant.

No source code changes and no plugin-list changes were needed.

Verification

Clean build and PKG_MIRROR_HASH verification with the OpenWrt x86-64
gcc-14.3.0_musl SDK (snapshots). x86-64 is 64-bit musl, the same ABI condition that triggered the original -Wint-conversion failure, so the build exercises the relevant code path. No -Wint-conversion and no CMake minimum-version error.

Scope

This PR covers oonf-olsrd2 only. The DLEP packages (oonf-dlep-radio,
oonf-dlep-proxy) were the actual subjects of OLSR/OONF#71 and remain removed; they can follow in a separate PR once each is build-tested individually.

@XDjackieXD noted intent to re-add the packages in #1145.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

BKPepe · 2026-06-05T09:44:37Z

Given that the package was removed nearly a year ago and we want to add it back, it basically needs a complete rebirth at this point. We should approach it and review it from scratch to ensure it’s clean and makes sense. If we don’t do it now, it’ll never happen.

I was hoping to convince Copilot to take a look at it, but apparently, it’s a no. :) We’ll see, maybe it’ll get moving. As a next step, I suggest we set up a quick review of the original requirements so we don't bring back any old technical debt.

BKPepe · 2026-06-05T09:46:57Z

+define Package/oonf-init-scripts
+	SECTION:=net
+	CATEGORY:=Network
+	MAINTAINER:=Henning Rogge <hrogge@gmail.com>


Does anyone know if this maintainer is still active?

I can't confirm whether Henning is still active on the packaging side. To avoid these going unmaintained again, I'm willing to take over maintenance of oonf-olsrd2 and oonf-init-scripts and have set PKG_MAINTAINER accordingly. I've also emailed Henning directly as a courtesy in case he'd like to stay on. I have several OpenWrt devices and will run olsrd2 on real hardware, not just the cross-compile and QEMU validation I did for this PR.

As far as I remember he does not maintain the package anymore. But maybe he responds.

I contacted Henning directly as a courtesy and phrased it so that he only needs to respond if he objects or would like to remain listed as maintainer. If he does, I’ll adjust accordingly. Otherwise, I’m happy to take over maintenance of these packages and keep them tested on real OpenWrt hardware.

Copilot

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 7 comments.

parasew · 2026-06-05T13:56:15Z

Agreed, let's treat it as a fresh package rather than a revert. I'll go through both Makefiles against current conventions and push a cleaned version. For the requirements review: the default plugin set is driven by Config.in (lan_import, route_modifier, mpr, etc. as compile-time options folded into the single static binary), oonf-init-scripts ships two sourced shell helpers to /lib/functions/, and oonf-olsrd2 carries the procd init + hotplug + a default UCI config. Happy to align on what the default-enabled plugin set should be before I resubmit, so we don't bring back anything stale.

parasew · 2026-06-05T20:37:48Z

Pushed a cleaned-up version treating this as a fresh package per your suggestion, rather than a revert. Summary of changes: dropped the PKG_BUILD_DIR override, kernel.mk include, redundant VERSION lines, and the oonf-git/template indirection; added SPDX headers, PKG_MAINTAINER, PKG_LICENSE; switched URLs to https; fixed install macros (INSTALL_DIR + INSTALL_CONF for the config file); reset PKG_RELEASE to 1; added dependencies. Replaced the test-version.sh skip with a real check. Fixed several pre-existing bugs in oonf_init.sh that Copilot caught. I built and validated everything in QEMU on the x86-64 snapshot target: the package installs, jshn resolves as a dependency, olsrd2 reports the pinned commit, and the ignore-section logic works correctly. Details in the per-line replies.

Copilot

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

Reinstates oonf-olsrd2 and its oonf-init-scripts dependency, removed in 58070aa. The two issues that motivated removal are fixed in current OONF master: - GCC 14 -Wint-conversion in os_system_linux.c: master uses designated initializers for struct msghdr. The fix existed on develop and landed on master in the 2025-12 develop->master merge. - CMake 4.x: root CMakeLists.txt now sets cmake_minimum_required 3.10. Bumps the source pin from the stale 2022-08-25 commit to master b2164126 (2025-12-04), bumps PKG_RELEASE, and drops 100-enable-lan-import-plugin.patch, which upstream has absorbed (lan_import is now in src/olsrv2/CMakeLists.txt). Modernizes both Makefiles: SPDX headers, PKG_MAINTAINER, PKG_LICENSE, https URLs, idiomatic install macros, and PKGARCH:=all for the architecture-independent oonf-init-scripts. Replaces the test-version.sh skip with a real check against the pinned commit. Fixes pre-existing bugs in oonf_init.sh (undefined index in the ignore path, hardcoded pidfile, stray debug output) and corrects the hotplug handler to invoke the init script directly instead of sourcing rc.common. Verified: clean build across CI architectures and runtime validation in QEMU on x86-64 (package install, dependency resolution, version reporting, and ignore-section handling). Signed-off-by: Matthias Tarasiewicz <mt@riat.at>

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

BKPepe requested a review from Copilot June 4, 2026 14:19

BKPepe self-assigned this Jun 4, 2026

Copilot started reviewing on behalf of BKPepe June 4, 2026 14:19 View session

parasew mentioned this pull request Jun 4, 2026

oonf-*: remove oonf packages such as init scripts, proxy, radio, olsrd2 #1145

Merged

Copilot AI reviewed Jun 4, 2026

BKPepe requested a review from Copilot June 4, 2026 14:54

Copilot started reviewing on behalf of BKPepe June 4, 2026 14:54 View session

Copilot AI reviewed Jun 4, 2026

parasew force-pushed the reinstate-oonf-olsrd2 branch from c17f401 to d308f19 Compare June 4, 2026 18:47

BKPepe requested a review from Copilot June 4, 2026 20:12

Copilot started reviewing on behalf of BKPepe June 4, 2026 20:12 View session

Copilot AI reviewed Jun 4, 2026

BKPepe requested a review from Copilot June 5, 2026 08:38

Copilot started reviewing on behalf of BKPepe June 5, 2026 08:39 View session

Copilot AI reviewed Jun 5, 2026

BKPepe requested a review from Copilot June 5, 2026 09:15

Copilot started reviewing on behalf of BKPepe June 5, 2026 09:16 View session

Copilot AI reviewed Jun 5, 2026

BKPepe requested changes Jun 5, 2026

View reviewed changes

BKPepe requested review from BKPepe and Copilot June 5, 2026 09:54

Copilot started reviewing on behalf of BKPepe June 5, 2026 09:54 View session

Copilot AI reviewed Jun 5, 2026

View reviewed changes

parasew force-pushed the reinstate-oonf-olsrd2 branch from d308f19 to e2f7443 Compare June 5, 2026 20:33

BKPepe requested a review from Copilot June 6, 2026 10:56

Copilot started reviewing on behalf of BKPepe June 6, 2026 10:56 View session

Copilot AI reviewed Jun 6, 2026

View reviewed changes

Comment thread oonf-init-scripts/files/oonf_hotplug.sh Outdated

Comment thread oonf-olsrd2/Config.in Outdated

Comment thread oonf-init-scripts/Makefile

BKPepe reviewed Jun 8, 2026

View reviewed changes

Comment thread oonf-olsrd2/test-version.sh Outdated

parasew requested a review from BKPepe June 9, 2026 07:34

parasew force-pushed the reinstate-oonf-olsrd2 branch from 83de819 to 6c1d2c4 Compare June 9, 2026 07:50

parasew requested a review from mwarning June 9, 2026 07:54

BKPepe requested a review from Copilot June 10, 2026 10:20

Copilot started reviewing on behalf of BKPepe June 10, 2026 10:20 View session

Copilot AI reviewed Jun 10, 2026

Conversation

parasew commented Jun 4, 2026

Summary

Why this is safe now

What this PR changes

Verification

Scope

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

BKPepe commented Jun 5, 2026

Uh oh!

Uh oh!

BKPepe Jun 5, 2026

Choose a reason for hiding this comment

Uh oh!

parasew Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mwarning Jun 5, 2026

Choose a reason for hiding this comment

Uh oh!

parasew Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

parasew commented Jun 5, 2026

Uh oh!

parasew commented Jun 5, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

parasew Jun 5, 2026 •

edited

Loading