diff mbox

[maint,v3] batman-adv: Install module in $INSTALL_MOD_DIR/updates/net/batman-adv

Message ID 20161031072719.26286-1-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 22c08574065743dd31d1359fa82c83d0c74984d4
Delegated to: Simon Wunderlich
Headers

Commit Message

Sven Eckelmann Oct. 31, 2016, 7:27 a.m. UTC 
  depmod may skip the batman-adv.ko module in the $INSTALL_MOD_DIR/update/
folder when it contains the word "build" as directory name.

Avoid this extra directory "build" in the installation path by making the
obj-y dir relative to build/ in the source directory.

Reported-by: Jean-Jacques Sarton <jj.sarton@t-online.de>
Fixes: 66ac14a09445 ("batman-adv: Introduce compat-patches support")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
v3:
 - adjust commit message
v2:
 - Remove clean target change which was accidentally added to this patch

 Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Comments

Martin Weinelt Oct. 31, 2016, 1:04 p.m. UTC | #1 
Thank you, depmod again properly recognizes the module now.

Tested-by: Martin Weinelt <martin@darmstadt.freifunk.net>

On 31.10.2016 08:27, Sven Eckelmann wrote:
> depmod may skip the batman-adv.ko module in the $INSTALL_MOD_DIR/update/
> folder when it contains the word "build" as directory name.
> 
> Avoid this extra directory "build" in the installation path by making the
> obj-y dir relative to build/ in the source directory.
> 
> Reported-by: Jean-Jacques Sarton <jj.sarton@t-online.de>
> Fixes: 66ac14a09445 ("batman-adv: Introduce compat-patches support")
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> v3:
>  - adjust commit message
> v2:
>  - Remove clean target change which was accidentally added to this patch
> 
>  Makefile | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 1d2e01c..e9c499f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -54,6 +54,7 @@ PATCH_FLAGS = --batch --fuzz=0 --forward --strip=1 --unified --version-control=n
>  PATCH := patch $(PATCH_FLAGS) -i
>  SPATCH_FLAGS := --in-place --relax-include-path --use-coccigrep --very-quiet
>  CP := cp -fpR
> +LN := ln -sf
>  
>  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
> @@ -63,25 +64,25 @@ 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),)
>  NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\"
>  endif
>  
> -include $(PWD)/compat-sources/Makefile
> +-include $(PWD)/../compat-sources/Makefile
>  
> -obj-y += build/net/batman-adv/
> +obj-y += net/batman-adv/
>  
>  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) \
> @@ -109,6 +110,7 @@ config:
>  
>  $(SOURCE_STAMP): $(SOURCE) compat-patches/*
>  	$(MKDIR) $(BUILD_DIR)/net/batman-adv/
> +	@$(LN) ../Makefile $(BUILD_DIR)/Makefile
>  	@$(RM) $(SOURCE_BUILD)
>  	@$(CP) $(SOURCE) $(BUILD_DIR)/net/batman-adv/
>  	@set -e; \
>
Sven Eckelmann Nov. 1, 2016, 7:31 a.m. UTC | #2 
On Montag, 31. Oktober 2016 08:27:19 CET Sven Eckelmann wrote:
> depmod may skip the batman-adv.ko module in the $INSTALL_MOD_DIR/update/
> folder when it contains the word "build" as directory name.
> 
> Avoid this extra directory "build" in the installation path by making the
> obj-y dir relative to build/ in the source directory.
> 
> Reported-by: Jean-Jacques Sarton <jj.sarton@t-online.de>
> Fixes: 66ac14a09445 ("batman-adv: Introduce compat-patches support")
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> Tested-by: Martin Weinelt <martin@darmstadt.freifunk.net>
> ---
> v3:
>  - adjust commit message
> v2:
>  - Remove clean target change which was accidentally added to this patch
> 
>  Makefile | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)

Applied in 22c08574065743dd31d1359fa82c83d0c74984d4 [1].

Kind regards,
        Sven

[1] https://git.open-mesh.org/batman-adv.git/commit/22c08574065743dd31d1359fa82c83d0c74984d4
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 7ef2569..b852a17 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@  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
 
 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
@@ -55,25 +56,25 @@  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),)
 NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\"
 endif
 
-include $(PWD)/compat-sources/Makefile
+-include $(PWD)/../compat-sources/Makefile
 
-obj-y += build/net/batman-adv/
+obj-y += net/batman-adv/
 
 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) \
@@ -101,6 +102,7 @@  config:
 
 $(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; \