batman-adv/patches/0001-batman-adv-Install-module-in-INSTALL_MOD_DIR-updates.patch

   1 From: Sven Eckelmann <sven@narfation.org>
   2 Date: Mon, 31 Oct 2016 08:27:19 +0100
   3 Subject: [PATCH] batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv
   4
   5 depmod may skip the batman-adv.ko module in the $INSTALL_MOD_DIR/update/
   6 folder when it contains the word "build" as directory name.
   7
   8 Avoid this extra directory "build" in the installation path by making the
   9 obj-y dir relative to build/ in the source directory.
  10
  11 Reported-by: Jean-Jacques Sarton <jj.sarton@t-online.de>
  12 Fixes: 66ac14a09445 ("batman-adv: Introduce compat-patches support")
  13 Signed-off-by: Sven Eckelmann <sven@narfation.org>
  14 Tested-by: Martin Weinelt <martin@darmstadt.freifunk.net>
  15 ---
  16  Makefile | 16 +++++++++-------
  17  1 file changed, 9 insertions(+), 7 deletions(-)
  18
  19 diff --git a/Makefile b/Makefile
  20 index 7ef2569..b852a17 100644
  21 --- a/Makefile
  22 +++ b/Makefile
  23 @@ -46,6 +46,7 @@ MKDIR := mkdir -p
  24  PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=never -g0 --remove-empty-files --no-backup-if-mismatch --reject-file=-
  25  PATCH := patch $(PATCH_FLAGS) -i
  26  CP := cp -fpR
  27 +LN := ln -sf
  28
  29  SOURCE = $(wildcard net/batman-adv/*.[ch]) net/batman-adv/Makefile
  30  SOURCE_BUILD = $(wildcard $(BUILD_DIR)/net/batman-adv/*.[ch]) $(BUILD_DIR)/net/batman-adv/Makefile
  31 @@ -55,25 +56,25 @@ REVISION= $(shell   if [ -d "$(PWD)/.git" ]; then \
  32                                 echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \
  33                         fi)
  34  NOSTDINC_FLAGS += \
  35 -       -I$(PWD)/compat-include/ \
  36 -       -I$(PWD)/include/ \
  37 -       -include $(PWD)/compat.h \
  38 +       -I$(PWD)/../compat-include/ \
  39 +       -I$(PWD)/../include/ \
  40 +       -include $(PWD)/../compat.h \
  41         $(CFLAGS)
  42
  43  ifneq ($(REVISION),)
  44  NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\"
  45  endif
  46
  47 -include $(PWD)/compat-sources/Makefile
  48 +-include $(PWD)/../compat-sources/Makefile
  49
  50 -obj-y += build/net/batman-adv/
  51 +obj-y += net/batman-adv/
  52
  53  export batman-adv-y
  54
  55
  56  BUILD_FLAGS := \
  57 -       M=$(PWD) \
  58 -       PWD=$(PWD) \
  59 +       M=$(BUILD_DIR) \
  60 +       PWD=$(BUILD_DIR) \
  61         REVISION=$(REVISION) \
  62         CONFIG_BATMAN_ADV=m \
  63         CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \
  64 @@ -101,6 +102,7 @@ config:
  65
  66  $(SOURCE_STAMP): $(SOURCE) compat-patches/* compat-patches/replacements.sh
  67         $(MKDIR) $(BUILD_DIR)/net/batman-adv/
  68 +       @$(LN) ../Makefile $(BUILD_DIR)/Makefile
  69         @$(RM) $(SOURCE_BUILD)
  70         @$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/
  71         @set -e; \