Repository : ssh://git@open-mesh.org/batman-adv

On branches: master,next

commit 17018a99bc68f49ea1da199c9c1b290e3b2c42ed Author: Sven Eckelmann sven@narfation.org Date: Sun Oct 9 08:57:29 2016 +0200

batman-adv: Use simple script to patch minor compat problems

Unified diff base patches have the problem that they fix only a single line and depend on the surrounding. This approach can fail relative often when the surrounding code will be changed often. Thus semantic patches (like spatch from coccinelle) or simple find+replace scripts are better for this approach.

Introduce a simple script file which will store these kind of find+replace instructions.

Signed-off-by: Sven Eckelmann sven@narfation.org

17018a99bc68f49ea1da199c9c1b290e3b2c42ed Makefile | 3 ++- compat-patches/replacements.sh | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile index b105290..7ef2569 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ install: config $(SOURCE_STAMP) config: $(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h

-$(SOURCE_STAMP): $(SOURCE) compat-patches/* +$(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh $(MKDIR) $(BUILD_DIR)/net/batman-adv/ @$(RM) $(SOURCE_BUILD) @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/ @@ -111,6 +111,7 @@ $(SOURCE_STAMP): $(SOURCE) compat-patches/* $(PATCH) ../compat-patches/$${i}; \ cd - > /dev/null; \ done + compat-patches/replacements.sh touch $(SOURCE_STAMP)

.PHONY: all clean install config diff --git a/compat-patches/replacements.sh b/compat-patches/replacements.sh new file mode 100755 index 0000000..c7875c0 --- /dev/null +++ b/compat-patches/replacements.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +set -e