-
Notifications
You must be signed in to change notification settings - Fork 324
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
443 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
patches/packages/routing/0005-oonf-olsrd2-fix-building-with-multiple-plugins.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From: Maciej Krüger <mkg20001@gmail.com> | ||
Date: Mon, 2 Jan 2023 01:45:37 +0100 | ||
Subject: oonf-olsrd2: fix building with multiple plugins | ||
|
||
Code to replace colons wasn't working (debian stable) | ||
Took it from stackoverflow, works now | ||
|
||
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile | ||
index 40190edb72547587bc53bb3bee150398b7413aa2..6067003a846340fb0e6221c2473959480b12fb4b 100644 | ||
--- a/oonf-olsrd2/Makefile | ||
+++ b/oonf-olsrd2/Makefile | ||
@@ -17,8 +17,8 @@ CMAKE_INSTALL:=1 | ||
include $(INCLUDE_DIR)/package.mk | ||
include $(INCLUDE_DIR)/cmake.mk | ||
|
||
-SPACE:= | ||
-SPACE+= | ||
+# ref https://stackoverflow.com/a/10571900/3990041 | ||
+SPACE:= $(subst ,, ) | ||
CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ | ||
$(if $(filter y,$(CONFIG_OONF_NHDP_AUTOLL4)),auto_ll4,) \ | ||
$(if $(filter y,$(CONFIG_OONF_OLSRV2_LAN_IMPORT)),lan_import,) \ |
40 changes: 40 additions & 0 deletions
40
patches/packages/routing/0006-oonf-olsrd2-add-missing-static-plugin-olsrv2_lan.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
From: Patrick Grimm <patrick@lunatiki.de> | ||
Date: Sun, 8 Jan 2023 18:14:36 +0100 | ||
Subject: oonf-olsrd2: add missing static plugin olsrv2_lan | ||
|
||
Signed-off-by: Patrick Grimm <patrick@lunatiki.de> | ||
|
||
diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in | ||
index 1cc037aff3ebc9a2a1ea2d2c94857d62b8b28006..b0d7d7cb2767f7b12d089ccd44042e6788dcf9de 100644 | ||
--- a/oonf-olsrd2/Config.in | ||
+++ b/oonf-olsrd2/Config.in | ||
@@ -44,4 +44,16 @@ | ||
The MPR plugin reduce the routing graph to limit the overhead of the OLSRv2 protocol | ||
default n | ||
|
||
+ config OONF_OLSRV2_LAN | ||
+ bool "New config option for Locally attached entries" | ||
+ help | ||
+ Adds the 'lan' section to the config to configure LANs without setting multiple settings in a single key/value pair | ||
+ default y | ||
+ | ||
+ config OONF_OLSRV2_OLD_LAN | ||
+ bool "Legacy option for Locally attached entries" | ||
+ help | ||
+ Adds the olsr 'lan' config key in the olsrv2 section | ||
+ default n | ||
+ | ||
endmenu | ||
diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile | ||
index 6067003a846340fb0e6221c2473959480b12fb4b..f3d81fcfe61936635280afd997ec487ed0ffa2fc 100644 | ||
--- a/oonf-olsrd2/Makefile | ||
+++ b/oonf-olsrd2/Makefile | ||
@@ -27,6 +27,8 @@ CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ | ||
$(if $(filter y,$(CONFIG_OONF_GENERIC_REMOTECONTROL)),remotecontrol,) \ | ||
$(if $(filter y,$(CONFIG_OONF_OLSRV2_MPR)),mpr,) \ | ||
$(if $(filter y,$(CONFIG_OONF_GENERIC_HTTP)),http,) \ | ||
+ $(if $(filter y,$(CONFIG_OONF_OLSRV2_LAN)),olsrv2_lan,) \ | ||
+ $(if $(filter y,$(CONFIG_OONF_OLSRV2_OLD_LAN)),olsrv2_old_lan,) \ | ||
)) | ||
|
||
BUILD_TYPE:= $(if $(filter y,$(CONFIG_DEBUG)),Debug,Release) |
33 changes: 33 additions & 0 deletions
33
...kages/routing/0007-oonf-init-scripts-start-olsrd2-10-seceond-after-boot.-Workaround.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
From: Patrick Grimm <patrick@lunatiki.de> | ||
Date: Fri, 13 Jan 2023 20:52:36 +0100 | ||
Subject: oonf-init-scripts: start olsrd2 10 seceond after boot. Workaround. | ||
|
||
Signed-off-by: Patrick Grimm <patrick@lunatiki.de> | ||
|
||
diff --git a/oonf-init-scripts/Makefile b/oonf-init-scripts/Makefile | ||
index 8bfbf6ede32c1fa02edae41aefbda30074d6bf41..7abd3b950af1d4fb17dd2a81d25c61611aae1008 100644 | ||
--- a/oonf-init-scripts/Makefile | ||
+++ b/oonf-init-scripts/Makefile | ||
@@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/kernel.mk | ||
|
||
PKG_NAME:=oonf-init-scripts | ||
PKG_VERSION:=0.9.1-r3 | ||
-PKG_RELEASE:=1 | ||
+PKG_RELEASE:=2 | ||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) | ||
|
||
include $(INCLUDE_DIR)/package.mk | ||
diff --git a/oonf-init-scripts/files/oonf_init.sh b/oonf-init-scripts/files/oonf_init.sh | ||
index 8ab5b3b90661fcbe01b884e191d9159af87c1b0a..509e15bdc50792ed747adbce73726050e510d12d 100755 | ||
--- a/oonf-init-scripts/files/oonf_init.sh | ||
+++ b/oonf-init-scripts/files/oonf_init.sh | ||
@@ -118,3 +118,9 @@ reload() | ||
oonf_add_devices_to_configuration | ||
oonf_reread_config | ||
} | ||
+ | ||
+boot() { | ||
+ sleep 10 | ||
+ logger -t olsrd2init "boot delay" | ||
+ start | ||
+} |
Oops, something went wrong.