File 0004-Makefile-M-is-preferred-to-KBUILD_EXTMOD-f... of Package dahdi-linux

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-Makefile-M-is-preferred-to-KBUILD_EXTMOD-for-externa.patch of Package dahdi-linux (Revision 9b86c8628f35f1fe241747b94a7e3961)

Currently displaying revision 9b86c8628f35f1fe241747b94a7e3961 , Show latest

From c98f59eead28cf66b271b031288542e34e603c43 Mon Sep 17 00:00:00 2001
From: Shaun Ruffell <sruffell@sruffell.net>
Date: Wed, 20 Nov 2019 22:53:18 -0600
Subject: [PATCH 04/12] Makefile: 'M=' is preferred to 'KBUILD_EXTMOD=' for
 external modules.

I should have used 'M=' in (e93c53ce05c4824a5e "Makefile: SUBDIRS ->
KBUILD_EXTMOD") originally.

See:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/kbuild/modules.rst?h=v5.3#n77
Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
---
 Makefile                        | 2 +-
 drivers/dahdi/datamods/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 75f6779..066408c 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ INST_HEADERS:=kernel.h user.h fasthdlc.h wctdm_user.h dahdi_config.h
 
 DAHDI_BUILD_ALL:=m
 
-KMAKE=+$(MAKE) -C $(KSRC) KBUILD_EXTMOD=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include DAHDI_MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)" HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
+KMAKE=+$(MAKE) -C $(KSRC) M=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include DAHDI_MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)" HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 
 ROOT_PREFIX:=
 
diff --git a/drivers/dahdi/datamods/Makefile b/drivers/dahdi/datamods/Makefile
index 5d63668..c4679bd 100644
--- a/drivers/dahdi/datamods/Makefile
+++ b/drivers/dahdi/datamods/Makefile
@@ -8,7 +8,7 @@ PWD=$(shell pwd)
 
 MODULESO:=$(MODULES:%=%.o)
 MODULESKO:=$(MODULES:%=%.ko)
-KMAKE = $(MAKE) -C $(KSRC) KBUILD_EXTMOD=$(PWD)
+KMAKE = $(MAKE) -C $(KSRC) M=$(PWD)
 KMAKE_INST = $(KMAKE) \
   INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
 
-- 
2.29.2

Places

File 0004-Makefile-M-is-preferred-to-KBUILD_EXTMOD-for-externa.patch of Package dahdi-linux (Revision 9b86c8628f35f1fe241747b94a7e3961)

Places