kernel: replace SUBDIRS with M in package recipes
authorTomasz Maciej Nowak <tomek_n@o2.pl>
Mon, 20 Jan 2020 14:42:00 +0000 (15:42 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 22 Feb 2020 15:38:41 +0000 (16:38 +0100)
The SUBDIRS variable has been removed in kernel 5.4, and was deprecated
since the beginnig of kernel git history in favour of M or KBUILD_EXTMOD.

Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
18 files changed:
package/kernel/acx-mac80211/Makefile
package/kernel/ath10k-ct/Makefile
package/kernel/broadcom-wl/Makefile
package/kernel/button-hotplug/Makefile
package/kernel/gpio-button-hotplug/Makefile
package/kernel/gpio-nct5104d/Makefile
package/kernel/hwmon-gsc/Makefile
package/kernel/i2c-gpio-custom/Makefile
package/kernel/kmod-sched-cake/Makefile
package/kernel/leds-apu2/Makefile
package/kernel/mt76/Makefile
package/kernel/mwlwifi/Makefile
package/kernel/nat46/Makefile
package/kernel/rtc-rv5c386a/Makefile
package/kernel/rtl8812au-ct/Makefile
package/kernel/spi-gpio-custom/Makefile
package/kernel/trelay/Makefile
package/kernel/w1-gpio-custom/Makefile

index 195802f..a04b9e2 100644 (file)
@@ -181,7 +181,7 @@ PKG_EXTRA_CFLAGS:= \
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                $(KERNEL_MAKE_FLAGS) \
-               SUBDIRS="$(PKG_BUILD_DIR)" \
+               M="$(PKG_BUILD_DIR)" \
                $(PKG_EXTRA_KCONFIG) \
                EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(4,2,0)\"" \
                LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi -I$(STAGING_DIR)/usr/include/mac80211-backport \
index 02df930..6317fc7 100644 (file)
@@ -112,7 +112,7 @@ endif
 define Build/Compile
        +$(MAKE) $(CT_MAKEDEFS) $(PKG_JOBS) -C "$(LINUX_DIR)" \
                $(KERNEL_MAKE_FLAGS) \
-               SUBDIRS="$(PKG_BUILD_DIR)/ath10k$(CT_KVER)" \
+               M="$(PKG_BUILD_DIR)/ath10k$(CT_KVER)" \
                NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
                modules
 endef
index 68581c2..a3d7b5f 100644 (file)
@@ -102,7 +102,7 @@ endef
 MAKE_KMOD := $(MAKE) -C "$(LINUX_DIR)" \
                $(KERNEL_MAKE_FLAGS) \
                PATH="$(TARGET_PATH)" \
-               SUBDIRS="$(PKG_BUILD_DIR)/kmod" \
+               M="$(PKG_BUILD_DIR)/kmod" \
 
 define Build/Prepare
        $(call Build/Prepare/Default)
@@ -113,18 +113,18 @@ endef
 define Build/Compile
        # Compile glue driver
        $(MAKE_KMOD) -C "$(LINUX_DIR)" \
-               SUBDIRS="$(PKG_BUILD_DIR)/glue" \
+               M="$(PKG_BUILD_DIR)/glue" \
                modules
 
        # Compile the kernel part
        $(MAKE_KMOD) \
-               SUBDIRS="$(PKG_BUILD_DIR)/driver" \
+               M="$(PKG_BUILD_DIR)/driver" \
                MODFLAGS="-DMODULE -mlong-calls" \
                KBUILD_EXTRA_SYMBOLS="$(PKG_BUILD_DIR)/glue/Module.symvers" \
                modules
 
        $(MAKE_KMOD) \
-               SUBDIRS="$(PKG_BUILD_DIR)/driver-mini" \
+               M="$(PKG_BUILD_DIR)/driver-mini" \
                MODFLAGS="-DMODULE -mlong-calls" \
                BUILD_TYPE="wl_apsta_mini" \
                KBUILD_EXTRA_SYMBOLS="$(PKG_BUILD_DIR)/glue/Module.symvers" \
index 2554ae6..55412e5 100644 (file)
@@ -37,7 +37,7 @@ EXTRA_CFLAGS:= \
 
 MAKE_OPTS:= \
        $(KERNEL_MAKE_FLAGS) \
-       SUBDIRS="$(PKG_BUILD_DIR)" \
+       M="$(PKG_BUILD_DIR)" \
        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
        $(EXTRA_KCONFIG)
 
index ffbc197..09f9c00 100644 (file)
@@ -34,7 +34,7 @@ endef
 
 MAKE_OPTS:= \
        $(KERNEL_MAKE_FLAGS) \
-       SUBDIRS="$(PKG_BUILD_DIR)"
+       M="$(PKG_BUILD_DIR)"
 
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
index 3335238..e85639c 100644 (file)
@@ -38,7 +38,7 @@ EXTRA_CFLAGS:= \
 
 MAKE_OPTS:= \
        $(KERNEL_MAKE_FLAGS) \
-       SUBDIRS="$(PKG_BUILD_DIR)" \
+       M="$(PKG_BUILD_DIR)" \
        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
        $(EXTRA_KCONFIG)
 
index 3888a2f..454f685 100644 (file)
@@ -21,7 +21,7 @@ endef
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                $(KERNEL_MAKE_FLAGS) \
-               SUBDIRS="$(PKG_BUILD_DIR)" \
+               M="$(PKG_BUILD_DIR)" \
                EXTRA_CFLAGS="$(BUILDFLAGS)" \
                modules
 endef
index 11095ab..0779107 100644 (file)
@@ -34,7 +34,7 @@ EXTRA_CFLAGS:= \
 
 MAKE_OPTS:= \
        $(KERNEL_MAKE_FLAGS) \
-       SUBDIRS="$(PKG_BUILD_DIR)" \
+       M="$(PKG_BUILD_DIR)" \
        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
        $(EXTRA_KCONFIG)
 
index 7778d48..42e45b5 100644 (file)
@@ -36,7 +36,7 @@ define KernelPackage/sched-cake/description
 endef
 
 define Build/Compile
-       $(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)" modules
+       $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
 endef
 
 $(eval $(call KernelPackage,sched-cake))
index 08aca17..1d01548 100644 (file)
@@ -38,7 +38,7 @@ EXTRA_CFLAGS:= \
 
 MAKE_OPTS:= \
        $(KERNEL_MAKE_FLAGS) \
-       SUBDIRS="$(PKG_BUILD_DIR)" \
+       M="$(PKG_BUILD_DIR)" \
        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
        $(EXTRA_KCONFIG)
 
index 4e1ec91..e9ad96d 100644 (file)
@@ -202,7 +202,7 @@ define Build/Compile
        +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
                $(KERNEL_MAKE_FLAGS) \
                $(PKG_MAKE_FLAGS) \
-               SUBDIRS="$(PKG_BUILD_DIR)" \
+               M="$(PKG_BUILD_DIR)" \
                NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
                modules
 endef
index aa8eea0..b9e0e75 100644 (file)
@@ -44,7 +44,7 @@ NOSTDINC_FLAGS = \
 define Build/Compile
        +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
                $(KERNEL_MAKE_FLAGS) \
-               SUBDIRS="$(PKG_BUILD_DIR)" \
+               M="$(PKG_BUILD_DIR)" \
                NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
                modules
 endef
index 755a295..dfe7539 100644 (file)
@@ -26,7 +26,7 @@ endef
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 define Build/Compile
-       $(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)/nat46/modules" \
+       $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/nat46/modules" \
                MODFLAGS="-DMODULE -mlong-calls" \
                EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \
                modules
index 791d596..0cca785 100644 (file)
@@ -24,7 +24,7 @@ endef
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                $(KERNEL_MAKE_FLAGS) \
-               SUBDIRS="$(PKG_BUILD_DIR)" \
+               M="$(PKG_BUILD_DIR)" \
                EXTRA_CFLAGS="$(BUILDFLAGS)" \
                modules
 endef
index 2d7cfeb..b7f6d22 100644 (file)
@@ -45,7 +45,7 @@ NOSTDINC_FLAGS+=-DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -DBUILD_OPE
 define Build/Compile
        +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
                $(KERNEL_MAKE_FLAGS) \
-               SUBDIRS="$(PKG_BUILD_DIR)" \
+               M="$(PKG_BUILD_DIR)" \
                NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
                modules
 endef
index 34a478f..d658dc2 100644 (file)
@@ -34,7 +34,7 @@ EXTRA_CFLAGS:= \
 
 MAKE_OPTS:= \
        $(KERNEL_MAKE_FLAGS) \
-       SUBDIRS="$(PKG_BUILD_DIR)" \
+       M="$(PKG_BUILD_DIR)" \
        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
        $(EXTRA_KCONFIG)
 
index 258cbb1..a6bada1 100644 (file)
@@ -32,7 +32,7 @@ endef
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 define Build/Compile
-       $(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)" modules
+       $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
 endef
 
 define KernelPackage/trelay/conffiles
index 5445097..76581c1 100644 (file)
@@ -34,7 +34,7 @@ EXTRA_CFLAGS:= \
 
 MAKE_OPTS:= \
        $(KERNEL_MAKE_FLAGS) \
-       SUBDIRS="$(PKG_BUILD_DIR)" \
+       M="$(PKG_BUILD_DIR)" \
        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
        $(EXTRA_KCONFIG)