commits November 2016

commits@lists.open-mesh.org

1 participants
42 discussions

[batman-adv] maint: batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv (22c0857)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 22c08574065743dd31d1359fa82c83d0c74984d4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Oct 31 08:27:19 2016 +0100 batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv depmod may skip the batman-adv.ko module in the $INSTALL_MOD_DIR/update/ folder when it contains the word "build" as directory name. Avoid this extra directory "build" in the installation path by making the obj-y dir relative to build/ in the source directory. Reported-by: Jean-Jacques Sarton <jj.sarton(a)t-online.de> Fixes: 66ac14a09445 ("batman-adv: Introduce compat-patches support") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Tested-by: Martin Weinelt <martin(a)darmstadt.freifunk.net> >--------------------------------------------------------------- 22c08574065743dd31d1359fa82c83d0c74984d4 Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7ef2569..b852a17 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,7 @@ MKDIR := mkdir -p PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=- PATCH := patch $(PATCH_FLAGS) -i CP := cp -fpR +LN := ln -sf SOURCE = $(wildcard net/batman-adv/*.[ch]) net/batman-adv/Makefile SOURCE_BUILD = $(wildcard $(BUILD_DIR)/net/batman-adv/*.[ch]) $(BUILD_DIR)/net/batman-adv/Makefile @@ -55,25 +56,25 @@ REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) NOSTDINC_FLAGS += \ - -I$(PWD)/compat-include/ \ - -I$(PWD)/include/ \ - -include $(PWD)/compat.h \ + -I$(PWD)/../compat-include/ \ + -I$(PWD)/../include/ \ + -include $(PWD)/../compat.h \ $(CFLAGS) ifneq ($(REVISION),) NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\" endif -include $(PWD)/compat-sources/Makefile +-include $(PWD)/../compat-sources/Makefile -obj-y += build/net/batman-adv/ +obj-y += net/batman-adv/ export batman-adv-y BUILD_FLAGS := \ - M=$(PWD) \ - PWD=$(PWD) \ + M=$(BUILD_DIR) \ + PWD=$(BUILD_DIR) \ REVISION=$(REVISION) \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \ @@ -101,6 +102,7 @@ config: $(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh $(MKDIR) $(BUILD_DIR)/net/batman-adv/ + @$(LN) ../Makefile $(BUILD_DIR)/Makefile @$(RM) $(SOURCE_BUILD) @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/ @set -e; \

6 years, 4 months

[batman-adv] master: batman-adv: Deactivate __ro_after_init for kernels < 4.10 (83e3cb3)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 83e3cb32617d07a33fb43faa0957b91b3ac622c5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Nov 1 07:17:50 2016 +0100 batman-adv: Deactivate __ro_after_init for kernels < 4.10 The pre-4.10 kernels must write to batadv_netlink_family after the family was registered. Thus disabling __ro_after_init for now is required on these kernels. Fixes: c776b4a071d8 ("batman-adv: genetlink: mark families as __ro_after_init") Reported-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Tested-by: Linus Lüssing <linus.luessing(a)c0d3.blue> >--------------------------------------------------------------- 83e3cb32617d07a33fb43faa0957b91b3ac622c5 compat-include/linux/cache.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compat-include/linux/cache.h b/compat-include/linux/cache.h index 93dff58..7b7069a 100644 --- a/compat-include/linux/cache.h +++ b/compat-include/linux/cache.h @@ -24,11 +24,13 @@ #include <linux/version.h> #include_next <linux/cache.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) -#ifndef __ro_after_init -#define __ro_after_init +/* hack for netlink.c which marked the family ops as ro */ +#ifdef __ro_after_init +#undef __ro_after_init #endif +#define __ro_after_init #endif /* < KERNEL_VERSION(4, 6, 0) */

6 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2016