[4/6] batman-adv: Revert "compat: Move netlink const compat to coccinelle"
Commit Message
The coccinelle in Debian Jessie seems to be broken. It fails to parse
the patches and thus makes it impossible to use the out-of-tree
module in these systems. Therefore drop it for now.
This reverts commit 2f9f52d1dfc417201028cc65f91aaddc5eaf493a.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Makefile | 3 ++-
compat-patches/0002-genl-const.INFO | 15 ---------------
compat-patches/0002-genl-const.cocci | 10 ----------
compat-patches/replacements.sh | 9 +++++++++
4 files changed, 11 insertions(+), 26 deletions(-)
delete mode 100644 compat-patches/0002-genl-const.INFO
delete mode 100644 compat-patches/0002-genl-const.cocci
create mode 100755 compat-patches/replacements.sh
Comments
On Mon, Oct 31, 2016 at 08:36:27AM +0100, Sven Eckelmann wrote:
> The coccinelle in Debian Jessie seems to be broken. It fails to parse
> the patches and thus makes it impossible to use the out-of-tree
> module in these systems. Therefore drop it for now.
>
> This reverts commit 2f9f52d1dfc417201028cc65f91aaddc5eaf493a.
>
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> Makefile | 3 ++-
> compat-patches/0002-genl-const.INFO | 15 ---------------
> compat-patches/0002-genl-const.cocci | 10 ----------
> compat-patches/replacements.sh | 9 +++++++++
> 4 files changed, 11 insertions(+), 26 deletions(-)
> delete mode 100644 compat-patches/0002-genl-const.INFO
> delete mode 100644 compat-patches/0002-genl-const.cocci
> create mode 100755 compat-patches/replacements.sh
>
684d4cad930d97902 ("batman-adv: Remove replacement compat script")
needs to be reverted first before this patch applies cleanly,
doesn't it?
On Tue, Nov 01, 2016 at 01:46:19AM +0100, Linus Lüssing wrote:
> 684d4cad930d97902 ("batman-adv: Remove replacement compat script")
> needs to be reverted first before this patch applies cleanly,
> doesn't it?
Ah, sorry, no, just noticed you rebased it on master +
"batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv".
Cherry-picking that commit onto master first helped.
@@ -108,7 +108,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/
@$(LN) ../Makefile $(BUILD_DIR)/Makefile
@$(RM) $(SOURCE_BUILD)
@@ -126,6 +126,7 @@ $(SOURCE_STAMP): $(SOURCE) compat-patches/*
$(SPATCH) $(SPATCH_FLAGS) --dir $(BUILD_DIR) --sp-file compat-patches/$${i} > /dev/null; \
fi; \
done
+ compat-patches/replacements.sh
touch $(SOURCE_STAMP)
.PHONY: all clean install config
deleted file mode 100644
@@ -1,15 +0,0 @@
-Newer kernels make generic netlink ops and multicast groups
-const, but older can't have that. We therefore introduce
-__genl_const, which can be defined depending on the kernel.
-
-What kernel versions require this?
-
-XXX: try to SmPLify
-
-The struct genl_ops gave the *option* to make it const via:
-mcgrof@ergon ~/linux (git::master)$ git describe --contains f84f771d9
-v3.13-rc1~33^2~32^2~2
-
-The struct genl_multicast_group was *forced* to be const via:
-mcgrof@ergon ~/linux (git::master)$ git describe --contains 2a94fe48f
-v3.13-rc1~33^2^2
deleted file mode 100644
@@ -1,10 +0,0 @@
-@@
-attribute __genl_const;
-@@
-(
--const struct genl_multicast_group
-+__genl_const struct genl_multicast_group
-|
--const struct genl_ops
-+__genl_const struct genl_ops
-)
new file mode 100755
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+set -e
+
+# for kernel < 3.13 to make netlink compat code work
+sed -i \
+ -e 's/^static const struct genl_multicast_group batadv_netlink_mcgrps/static __genl_const struct genl_multicast_group batadv_netlink_mcgrps/' \
+ -e 's/^static const struct genl_ops batadv_netlink_ops/static __genl_const struct genl_ops batadv_netlink_ops/' \
+ build/net/batman-adv/netlink.c