batman-adv: Re-add compat-patches infrastructure
Subsystems (2)
Sven Eckelmann
maintainerPATCH 1/2 batman-adv: Re-add compat-patches infrastructure
Some patches were added again in the mainline kernel which make it rather hard to allow building of the unmodified batman-adv sources against older kernel versions.
Just switch again to the old build infrastructure again. It creates a copy of the sources in net/batman-adv which can be patched and then compiled+linked to create build/net/batman-adv/batman-adv.ko
--- .gitignore | 13 +----------- Makefile | 38 +++++++++++++++++++++++++++------- compat-patches/README | 27 ++++++++++++++++++++++++ compat-patches/replacements.sh | 5 +++++ 4 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 compat-patches/README create mode 100755 compat-patches/replacements.sh
.gitignore +1 -12
@@ -1,14 +1,3 @@ -/.cache.mk /compat-autoconf.h /compat-autoconf.h.tmp -/compat-sources/**/.* -/compat-sources/**/*.o -/modules.order -/Module.symvers -/net/batman-adv/batman-adv.ko -/net/batman-adv/.batman-adv.ko.cmd -/net/batman-adv/batman-adv.mod.c -/net/batman-adv/modules.order -/net/batman-adv/*.o -/net/batman-adv/.*.o.cmd -/.tmp_versions +/build/
Makefile +31 -7
@@ -24,6 +24,7 @@ export CONFIG_BATMAN_ADV_SYSFS=n export CONFIG_BATMAN_ADV_TRACING=n PWD:=$(shell pwd) +BUILD_DIR=$(PWD)/build KERNELPATH ?= /lib/modules/$(shell uname -r)/build # sanity check: does KERNELPATH exist? ifeq ($(shell cd $(KERNELPATH) && pwd),)
@@ -32,17 +33,24 @@ endif export KERNELPATH RM ?= rm -f +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 DEPMOD := depmod -a +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 +SOURCE_STAMP = $(BUILD_DIR)/net/batman-adv/.compat-prepared + 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),)
@@ -55,8 +63,8 @@ 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) \
@@ -70,18 +78,34 @@ BUILD_FLAGS := \ CONFIG_BATMAN_ADV_BATMAN_V=$(CONFIG_BATMAN_ADV_BATMAN_V) \ INSTALL_MOD_DIR=updates/ -all: config +all: config $(SOURCE_STAMP) $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules clean: $(RM) compat-autoconf.h* $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) clean -install: config +install: config $(SOURCE_STAMP) $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules_install $(DEPMOD) config: $(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h +$(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; \ + patches="$$(ls -1 compat-patches/|grep '.patch$$'|sort)"; \ + for i in $${patches}; do \ + echo ' COMPAT_PATCH '$${i};\ + cd $(BUILD_DIR); \ + $(PATCH) ../compat-patches/$${i}; \ + cd - > /dev/null; \ + done + compat-patches/replacements.sh + touch $(SOURCE_STAMP) + .PHONY: all clean install config
compat-patches/README new file +27 -0
@@ -0,0 +1,27 @@ +.. SPDX-License-Identifier: GPL-2.0 + +WARNING +======= + +Please avoid using the compat-patches/ to implement support for old kernels. +This should be the last resort. + + * it is nearly always possible to use compat-includes/ to do the same with a + lot less problems + + * maintaining these patches is *censored* + +GENERATING A PATCH +================== + +If it not possible to avoid a patch then please make the patch as small as +possible. Even refactor the code which has to be patched to reduce the +size/number of the changes. + +Please use git-format-patches to generate them and order them inside via the +XXXX- prefix before the patch name. + + git format-patch --no-stat --full-index --no-renames --binary \ + --diff-algorithm=histogram --no-signature \ + --format=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' \ + -1
compat-patches/replacements.sh new file +5 -0
@@ -0,0 +1,5 @@ +#! /bin/sh +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2007-2018 B.A.T.M.A.N. contributors + +set -e
Signature · 1 line
2.28.0
Sven Eckelmann
maintainerPATCH 2/2 batman-adv: mcast: rename br_ip's u member to dst
From: Nikolay Aleksandrov <[email protected]>
Since now we have src in br_ip, u no longer makes sense so rename it to dst. No functional changes.
--- compat-include/linux/if_bridge.h | 26 ++++++++++++++++++++++++++ compat-patches/replacements.sh | 5 +++++ net/batman-adv/multicast.c | 14 +++++++------- 3 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 compat-include/linux/if_bridge.h
compat-include/linux/if_bridge.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: +* +* Marek Lindner, Simon Wunderlich +* +* This file contains macros for maintaining compatibility with older versions +* of the Linux kernel. +*/ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ + +#include <linux/version.h> +#include_next <linux/if_bridge.h> + +#if LINUX_VERSION_IS_LESS (5 ,10 ,0 ) + +#define BATADV_BR_IP_UNION u + +#else + +#define BATADV_BR_IP_UNION dst + +#endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ */
compat-patches/replacements.sh +5 -0
@@ -3,3 +3,8 @@ # Copyright (C) 2007-2018 B.A.T.M.A.N. contributors set -e + +# for kernel < 5.10 to enable br_ip compat code +sed -i \ + -e 's/\(->\|\.\)dst\.ip/\1BATADV_BR_IP_UNION.ip/' \ + build/net/batman-adv/multicast.c
net/batman-adv/multicast.c +7 -7
@@ -221,7 +221,7 @@ static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv,* address here, only IPv6 ones */ if (br_ip_entry->addr.proto ==htons (ETH_P_IPV6 ) && -ipv6_addr_is_ll_all_routers (&br_ip_entry->addr.u.ip6)) +ipv6_addr_is_ll_all_routers (&br_ip_entry->addr.dst.ip6)) flags &= ~BATADV_MCAST_WANT_NO_RTR6 ;list_del (&br_ip_entry->list);
@@ -562,10 +562,10 @@ batadv_mcast_mla_softif_get(struct net_device *dev,static void batadv_mcast_mla_br_addr_cpy (char *dst,const struct br_ip *src) {if (src->proto ==htons (ETH_P_IP )) -ip_eth_mc_map (src->u.ip4, dst); +ip_eth_mc_map (src->dst.ip4, dst);#if IS_ENABLED (CONFIG_IPV6 ) else if (src->proto == htons(ETH_P_IPV6)) - ipv6_eth_mc_map(&src->u.ip6, dst); + ipv6_eth_mc_map(&src->dst.ip6, dst);#endif elseeth_zero_addr (dst );
@@ -609,11 +609,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev,continue ;if (tvlv_flags &BATADV_MCAST_WANT_ALL_UNSNOOPABLES && -ipv4_is_local_multicast (br_ip_entry->addr.u.ip4)) +ipv4_is_local_multicast (br_ip_entry->addr.dst.ip4))continue ;if (!(tvlv_flags &BATADV_MCAST_WANT_NO_RTR4 ) && - !ipv4_is_local_multicast (br_ip_entry->addr.u.ip4)) + !ipv4_is_local_multicast (br_ip_entry->addr.dst.ip4))continue ; }
@@ -623,11 +623,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev,continue ;if (tvlv_flags &BATADV_MCAST_WANT_ALL_UNSNOOPABLES && -ipv6_addr_is_ll_all_nodes (&br_ip_entry->addr.u.ip6)) +ipv6_addr_is_ll_all_nodes (&br_ip_entry->addr.dst.ip6))continue ;if (!(tvlv_flags &BATADV_MCAST_WANT_NO_RTR6 ) && -IPV6_ADDR_MC_SCOPE (&br_ip_entry->addr.u.ip6) > +IPV6_ADDR_MC_SCOPE (&br_ip_entry->addr.dst.ip6) >IPV6_ADDR_SCOPE_LINKLOCAL )continue ; }
Signature · 1 line
2.28.0
Re: [PATCH 2/2] batman-adv: mcast: rename br_ip's u member to dst
Quoted 10 lines · Sven Eckelmann
From: Nikolay Aleksandrov <[email protected]>
Since now we have src in
br_ip, u no longer makes sense so rename it to dst. No functional changes.Signed-off-by Nikolay Aleksandrov <[email protected]>Signed-off-by David S. Miller <[email protected]>[[email protected]: Add compat code]Signed-off-by Sven Eckelmann <[email protected]>---
Hi Sven,
The version I've just posted [1] should hopefully work without needing to readd the source code patching infrastructure.
Regards, Linus
[1]: https://patchwork.open-mesh.org/project/b.a.t.m.a.n./patch/[email protected]/