commits October 2018

commits@lists.open-mesh.org

1 participants
63 discussions

[openwrt-feed-devel] ecsv/master, master: batman-adv-devel: remove DEPENDS:=kmod-crypto-core (8e5d919)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit 8e5d919ba23e607541a1f002dec82a166d05939c Author: Alexander Couzens <lynxis(a)fe80.eu> Date: Sun Jun 5 03:47:51 2016 +0200 batman-adv-devel: remove DEPENDS:=kmod-crypto-core kmod-crypto-core was removed in openwrt/trunk svn 46820 and all kconfig's are now built-in. Signed-off-by: Alexander Couzens <lynxis(a)fe80.eu> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8e5d919ba23e607541a1f002dec82a166d05939c batman-adv-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 6715154..d7ae6a1 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -28,7 +28,7 @@ define KernelPackage/batman-adv-devel URL:=https://www.open-mesh.org/ MAINTAINER:=Simon Wunderlich <sw(a)simonwunderlich.de> SUBMENU:=Network Support - DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211 + DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211 TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,cfg80211 batman-adv)

1 0

[openwrt-feed-devel] ecsv/master, master: batman-adv-devel: Fix "aggregated_ogms" setting (c5ebf9c)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit c5ebf9c80bf37060e5f8b50c06948d18ec39362d Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Mon Jan 30 14:46:03 2017 +0100 batman-adv-devel: Fix "aggregated_ogms" setting The new setting for aggregated_ogms was read from the correct config key. But the setting was applied to the wrong file. Also the value to set was not read from the correct variable. Reported-by: Edward Beech <initialed85(a)gmail.com> Fixes: e035d4c433b4 ("batman-adv-devel: hotplug rewrite") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> >--------------------------------------------------------------- c5ebf9c80bf37060e5f8b50c06948d18ec39362d batman-adv-devel/files/lib/batman-adv/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 3039d3c..3a746a3 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -33,7 +33,7 @@ bat_config() [ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1 - [ -n "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms + [ -n "$aggregated_ogms" ] && echo $aggregated_ogms > /sys/class/net/$mesh/mesh/aggregated_ogms [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance 2>&-

1 0

[openwrt-feed-devel] ecsv/master, master: batman-adv-devel: use kernel-specific PKG_BUILD_DIR (92b6e6e)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit 92b6e6eb18c89d892caf7eddbacdf64626790734 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Fri Jan 27 13:23:39 2017 +0100 batman-adv-devel: use kernel-specific PKG_BUILD_DIR The batman-adv Makefile set a PKG_BUILD_DIR outside of KERNEL_BUILD_DIR; this could lead to batman-adv not being rebuilt when switching targets and thus kernel configurations. This resulted in ABI mismatches and occasionally broke the build with messages like the following: Package kmod-batman-adv is missing dependencies for the following libraries: crc16.ko Reported-by: David Lutz <kpanic(a)hirnduenger.de> Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> [sven(a)narfation.org: Re-add PKG_BUILD_DIR to support batman-adv-devel builds] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 92b6e6eb18c89d892caf7eddbacdf64626790734 batman-adv-devel/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index aff9ff7..6715154 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -19,10 +19,10 @@ PKG_SOURCE_URL:=https://git.open-mesh.org/snapshot/ PKG_SOURCE:=$(PKG_BATMAN_FNAME) PKG_LICENSE:=GPL-2.0 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_BATMAN_DIR) - -include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/package.mk + +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/$(PKG_BATMAN_DIR) define KernelPackage/batman-adv-devel URL:=https://www.open-mesh.org/

1 0

[openwrt-feed-devel] ecsv/master, master: alfred-devel: Add libnl-tiny dependency (3422bcb)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit 3422bcb7346f7dbe0e56dd62ad6224836204a821 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 11 21:48:35 2017 +0100 alfred-devel: Add libnl-tiny dependency Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3422bcb7346f7dbe0e56dd62ad6224836204a821 alfred-devel/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/alfred-devel/Makefile b/alfred-devel/Makefile index c8dc640..48121f7 100644 --- a/alfred-devel/Makefile +++ b/alfred-devel/Makefile @@ -25,7 +25,7 @@ define Package/alfred-devel SECTION:=net CATEGORY:=Network TITLE:=Almighty Lightweight Fact Remote Exchange Daemon - DEPENDS:= +libc +kmod-ipv6 +librt \ + DEPENDS:= +libc @IPV6 +libnl-tiny +librt \ +ALFRED_DEVEL_NEEDS_lua:lua \ +ALFRED_DEVEL_NEEDS_libgps:libgps endef @@ -41,7 +41,9 @@ endef MAKE_ALFRED_FLAGS=\ CONFIG_ALFRED_VIS=$(if $(CONFIG_PACKAGE_ALFRED_DEVEL_VIS),y,n) \ CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_DEVEL_GPSD),y,n) \ - CONFIG_ALFRED_CAPABILITIES=n + CONFIG_ALFRED_CAPABILITIES=n \ + LIBNL_NAME="libnl-tiny" \ + LIBNL_GENL_NAME="libnl-tiny" TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin

1 0

[openwrt-feed-devel] ecsv/master, master: batman-adv-devel: Add compat code for get_link_net (f20f0ad)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit f20f0adc9d646f4e25d07af82b5746d75f930243 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 11 21:28:37 2017 +0100 batman-adv-devel: Add compat code for get_link_net Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- f20f0adc9d646f4e25d07af82b5746d75f930243 batman-adv-devel/files/compat-hacks.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index af91f41..6c98a98 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -33,6 +33,15 @@ #endif /* < KERNEL_VERSION(4, 5, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) + +/* wild hack for batadv_getlink_net only */ +#define get_link_net get_xstats_size || 1 ? fallback_net : (struct net*)netdev->rtnl_link_ops->get_xstats_size + +#endif /* < KERNEL_VERSION(4, 0, 0) */ + + #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb,

1 0

[openwrt-feed-devel] ecsv/master, master: alfred-devel: not only wait for the interface, but also a link-local address (48f9836)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit 48f9836b65d3e5d344d3b5bc51f0638191d2c2ab Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Sun Aug 9 18:03:28 2015 +0200 alfred-devel: not only wait for the interface, but also a link-local address Changes between alfred 2015.0 and 2015.1 cause alfred to print an error and exit when the interface to bind to is not completely set up (has no non-tentative link-local address). As a workaround, wait for such an address by reading /proc/net/if_inet6 before alfred is started. In the long term, it would be nice to make alfred more robust against missing interfaces (allowing alfred to start without the interface existing, and keeping it working even when the interface is removed and re-added while alfred is running). Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 48f9836b65d3e5d344d3b5bc51f0638191d2c2ab alfred-devel/files/alfred.init | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/alfred-devel/files/alfred.init b/alfred-devel/files/alfred.init index 5ce06c0..4c9a9e1 100755 --- a/alfred-devel/files/alfred.init +++ b/alfred-devel/files/alfred.init @@ -37,6 +37,31 @@ wait_for_dir() fi } +wait_for_ll_address() +{ + local iface="$1" + local timeout=30 + + echo "${initscript}: waiting $timeout secs for $iface address..." + for i in $(seq $timeout); do + # We look for + # - the link-local address (starts with fe80) + # - without tentative flag (bit 0x40 in the flags field; the first char of the flags field begins 38 columns after the fe80 prefix + # - on interface $iface + if awk ' + BEGIN { RET=1 } + /^fe80.{37} [012389ab]/ { if ($6 == "'"$iface"'") RET=0 } + END { exit RET } + ' /proc/net/if_inet6; then + return + fi + sleep 1 + done + + echo "${initscript}: $iface address not detected, alfred not starting." + exit 1 +} + alfred_start() { local args="" @@ -62,7 +87,7 @@ alfred_start() wait_for_dir "$batmanif" "/sys/class/net/$batmanif/mesh" fi - wait_for_dir "$interface" "/sys/class/net/$interface/" + wait_for_ll_address "$interface" append alfred_args "$args" enable=1

1 0

[openwrt-feed-devel] ecsv/master, master: batman-adv-devel: Synchronize Kconfig entries with openwrt-routing (371632c)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit 371632c5cbe4aaeba60e21c17630ce5b56569f56 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 11 21:15:07 2017 +0100 batman-adv-devel: Synchronize Kconfig entries with openwrt-routing Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 371632c5cbe4aaeba60e21c17630ce5b56569f56 batman-adv-devel/Config.in | 11 ++++++++--- batman-adv-devel/Makefile | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 01f9e7e..2b42b7c 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -14,6 +14,11 @@ config KMOD_BATMAN_ADV_DEVEL_DAT depends on PACKAGE_kmod-batman-adv-devel default y +config KMOD_BATMAN_ADV_DEVEL_DEBUGFS + bool "enable debugfs support" + depends on PACKAGE_kmod-batman-adv-devel + default y + config KMOD_BATMAN_ADV_DEVEL_MCAST bool "enable multicast transmission optimization" depends on PACKAGE_kmod-batman-adv-devel @@ -25,9 +30,9 @@ config KMOD_BATMAN_ADV_DEVEL_NC default n config KMOD_BATMAN_ADV_DEVEL_BATMAN_V - bool "enable batman v routing algorithm" - depends on PACKAGE_kmod-batman-adv-devel - default n + bool "enable batman v routing algorithm" + depends on PACKAGE_kmod-batman-adv-devel + default y config KMOD_BATMAN_ADV_DEVEL_BATMAN_BRANCH string diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 83da0cc..f7b4529 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -51,6 +51,7 @@ endef PKG_EXTRA_KCONFIG:= \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),y,n) \ + CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUGFS),y,n) \ CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BLA),y,n) \ CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DAT),y,n) \ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_MCAST),y,n) \

1 0

[openwrt-feed-devel] ecsv/master, master: batctl-devel: Add dependency to librt for clock_gettime (96fbe72)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit 96fbe72e007664d24b9cbaf008c7956397770dcf Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 11 22:19:47 2017 +0100 batctl-devel: Add dependency to librt for clock_gettime Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 96fbe72e007664d24b9cbaf008c7956397770dcf batctl-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index f07a621..e49993a 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -25,7 +25,7 @@ define Package/batctl-devel URL:=https://www.open-mesh.org/ SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-batman-adv-devel +libnl-tiny +libc + DEPENDS:=+kmod-batman-adv-devel +libnl-tiny +libc +librt TITLE:=B.A.T.M.A.N. Advanced user space configuration tool batctl MAINTAINER:=Simon Wunderlich <sw(a)simonwunderlich.de> endef

1 0

[openwrt-feed-devel] ecsv/master, master: batman-adv-devel: Fix order of compat includes (ef4dc19)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit ef4dc19c539cf8056cbd67fe1074fe3ac23a0011 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 11 21:17:43 2017 +0100 batman-adv-devel: Fix order of compat includes Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ef4dc19c539cf8056cbd67fe1074fe3ac23a0011 batman-adv-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index f7b4529..aff9ff7 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -64,11 +64,11 @@ PKG_EXTRA_CFLAGS:= \ NOSTDINC_FLAGS = \ -I$(PKG_BUILD_DIR)/net/batman-adv \ - -I$(PKG_BUILD_DIR)/include/ \ -I$(STAGING_DIR)/usr/include/mac80211-backport \ -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ -I$(STAGING_DIR)/usr/include/mac80211 \ -I$(STAGING_DIR)/usr/include/mac80211/uapi \ + -I$(PKG_BUILD_DIR)/include/ \ -include backport/backport.h \ -include $(PKG_BUILD_DIR)/compat-hacks.h \ -DBATADV_SOURCE_VERSION=\\\"$(PKG_BATMAN_SHORTREV)\\\" \

1 0

[openwrt-feed-devel] ecsv/master, master: alfred-devel: Import metadata from openwrt-routing (25b6237)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit 25b6237eed6c9af2b3da71c434b427526ce21190 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 11 21:49:04 2017 +0100 alfred-devel: Import metadata from openwrt-routing Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 25b6237eed6c9af2b3da71c434b427526ce21190 alfred-devel/Makefile | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/alfred-devel/Makefile b/alfred-devel/Makefile index 48121f7..d1cb036 100644 --- a/alfred-devel/Makefile +++ b/alfred-devel/Makefile @@ -18,18 +18,36 @@ PKG_SOURCE_URL:=https://git.open-mesh.org/snapshot/ PKG_SOURCE:=$(PKG_ALFRED_FNAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_ALFRED_DIR) +PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk define Package/alfred-devel + URL:=https://www.open-mesh.org/ SECTION:=net CATEGORY:=Network - TITLE:=Almighty Lightweight Fact Remote Exchange Daemon + TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon devel DEPENDS:= +libc @IPV6 +libnl-tiny +librt \ +ALFRED_DEVEL_NEEDS_lua:lua \ +ALFRED_DEVEL_NEEDS_libgps:libgps endef +define Package/alfred-devel/description +alfred is a user space daemon for distributing arbitrary local information over +the mesh/network in a decentralized fashion. This data can be anything which +appears to be useful - originally designed to replace the batman-adv +visualization (vis), you may distribute hostnames, phone books, administration +information, DNS information, the local weather forecast ... + +alfred runs as daemon in the background of the system. A user may insert +information by using the alfred binary on the command line, or use special +programs to communicate with alfred (done via unix sockets). alfred then takes +care of distributing the local information to other alfred servers on other +nodes. This is done via IPv6 link-local multicast, and does not require any +configuration. A user can request data from alfred, and will receive the +information available from all alfred servers in the network. +endef + define Package/alfred-devel/conffiles /etc/config/alfred endef

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2018