From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH next v2 2/3] batman-adv: Use simple script to patch minor compat problems
Date: Thu, 15 Sep 2016 15:52:48 +0200 [thread overview]
Message-ID: <20160915135249.1925-2-sven@narfation.org> (raw)
In-Reply-To: <20160915135249.1925-1-sven@narfation.org>
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>
---
v2:
- introduce this patch to support the patch 3
Makefile | 3 ++-
compat-patches/replacements.sh | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
create mode 100755 compat-patches/replacements.sh
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
--
2.9.3
next prev parent reply other threads:[~2016-09-15 13:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 13:52 [B.A.T.M.A.N.] [PATCH next v2 1/3] batman-adv: Introduce compat-patches support Sven Eckelmann
2016-09-15 13:52 ` Sven Eckelmann [this message]
2016-09-16 15:34 ` [B.A.T.M.A.N.] [PATCH next v2 2/3] batman-adv: Use simple script to patch minor compat problems Sven Eckelmann
2016-09-15 13:52 ` [B.A.T.M.A.N.] [PATCH next v2 3/3] batman-adv: make netlink attributes const Sven Eckelmann
2016-10-09 2:07 ` Linus Lüssing
2016-10-09 6:25 ` Sven Eckelmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160915135249.1925-2-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox