projects / openwrt / staging / dedeckeh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e6cec17)
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 patch | blob | history
package/kernel/ath10k-ct/Makefile patch | blob | history
package/kernel/broadcom-wl/Makefile patch | blob | history
package/kernel/button-hotplug/Makefile patch | blob | history
package/kernel/gpio-button-hotplug/Makefile patch | blob | history
package/kernel/gpio-nct5104d/Makefile patch | blob | history
package/kernel/hwmon-gsc/Makefile patch | blob | history
package/kernel/i2c-gpio-custom/Makefile patch | blob | history
package/kernel/kmod-sched-cake/Makefile patch | blob | history
package/kernel/leds-apu2/Makefile patch | blob | history
package/kernel/mt76/Makefile patch | blob | history
package/kernel/mwlwifi/Makefile patch | blob | history
package/kernel/nat46/Makefile patch | blob | history
package/kernel/rtc-rv5c386a/Makefile patch | blob | history
package/kernel/rtl8812au-ct/Makefile patch | blob | history
package/kernel/spi-gpio-custom/Makefile patch | blob | history
package/kernel/trelay/Makefile patch | blob | history
package/kernel/w1-gpio-custom/Makefile patch | blob | history

diff --git a/package/kernel/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile
index 195802f5f5feb6e41b4a946d14e3f5638a3c6365..a04b9e28ba75eee0d3f566629ade715c8cfb0b77 100644 (file)
--- a/package/kernel/acx-mac80211/Makefile
+++ b/package/kernel/acx-mac80211/Makefile
@@ -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 \
diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
index 02df9307293c7e8004239f10ec654763987dbc10..6317fc79129070484b443f17ebc7b660cc1eaac7 100644 (file)
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -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
diff --git a/package/kernel/broadcom-wl/Makefile b/package/kernel/broadcom-wl/Makefile
index 68581c27d07d7cfb0f7c66d2c0fafe69d60ac64c..a3d7b5f1bb16c0677622319e08a12413a5355e77 100644 (file)
--- a/package/kernel/broadcom-wl/Makefile
+++ b/package/kernel/broadcom-wl/Makefile
@@ -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" \
diff --git a/package/kernel/button-hotplug/Makefile b/package/kernel/button-hotplug/Makefile
index 2554ae61dd94d6770b6c2ea86217334a73597270..55412e56854219eefe01ba121f992dbb9dcd2635 100644 (file)
--- a/package/kernel/button-hotplug/Makefile
+++ b/package/kernel/button-hotplug/Makefile
@@ -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)
 
diff --git a/package/kernel/gpio-button-hotplug/Makefile b/package/kernel/gpio-button-hotplug/Makefile
index ffbc19756c36938401bd2da1042bff98947dda87..09f9c00e990f553e38e0e3406e90ae360d67d250 100644 (file)
--- a/package/kernel/gpio-button-hotplug/Makefile
+++ b/package/kernel/gpio-button-hotplug/Makefile
@@ -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)" \
diff --git a/package/kernel/gpio-nct5104d/Makefile b/package/kernel/gpio-nct5104d/Makefile
index 33352388cff63d9db25db52b36d1d6c0a1a04982..e85639c94afef5260896544a0a065a23f98b2ca3 100644 (file)
--- a/package/kernel/gpio-nct5104d/Makefile
+++ b/package/kernel/gpio-nct5104d/Makefile
@@ -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)
 
diff --git a/package/kernel/hwmon-gsc/Makefile b/package/kernel/hwmon-gsc/Makefile
index 3888a2f17e7a0ee72f2bd3543cd1122e60c03c2c..454f685f8f409f9ac1a5edd6b59dd00f77400081 100644 (file)
--- a/package/kernel/hwmon-gsc/Makefile
+++ b/package/kernel/hwmon-gsc/Makefile
@@ -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
diff --git a/package/kernel/i2c-gpio-custom/Makefile b/package/kernel/i2c-gpio-custom/Makefile
index 11095abbb813d20203435e75b58f0db05accc4ad..0779107c1813e22e5d37b1ec23f0744e9a991bae 100644 (file)
--- a/package/kernel/i2c-gpio-custom/Makefile
+++ b/package/kernel/i2c-gpio-custom/Makefile
@@ -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)
 
diff --git a/package/kernel/kmod-sched-cake/Makefile b/package/kernel/kmod-sched-cake/Makefile
index 7778d48041e79f5eb62c27deeb6655c9dbf10782..42e45b578958b43aec358a41c4527e71f23f39df 100644 (file)
--- a/package/kernel/kmod-sched-cake/Makefile
+++ b/package/kernel/kmod-sched-cake/Makefile
@@ -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))
diff --git a/package/kernel/leds-apu2/Makefile b/package/kernel/leds-apu2/Makefile
index 08aca1750f66b224051d8fcd5345d795ff4234a7..1d01548ba235d028302223cd9b03c4e99163b2b4 100644 (file)
--- a/package/kernel/leds-apu2/Makefile
+++ b/package/kernel/leds-apu2/Makefile
@@ -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)
 
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index 4e1ec915bbfbb817e23c9897cd5640183d7f07f4..e9ad96dcf7dc9a61cc675e28565ad786b2475901 100644 (file)
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -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
diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
index aa8eea0450a2e16a460c2f18af1fa6a3dcc07a0c..b9e0e75690bc80dbfa0a6a0c8238d3736ee97a1f 100644 (file)
--- a/package/kernel/mwlwifi/Makefile
+++ b/package/kernel/mwlwifi/Makefile
@@ -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
diff --git a/package/kernel/nat46/Makefile b/package/kernel/nat46/Makefile
index 755a2958c954a7fa1842a0c4337a2dd4694171d4..dfe7539c5338278778a7521c0fe99101341659f8 100644 (file)
--- a/package/kernel/nat46/Makefile
+++ b/package/kernel/nat46/Makefile
@@ -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
diff --git a/package/kernel/rtc-rv5c386a/Makefile b/package/kernel/rtc-rv5c386a/Makefile
index 791d5962c370242ca2706ecdaa43fa2e4ba778e7..0cca78548a2016fd4200a04f5c6c570fe23f999d 100644 (file)
--- a/package/kernel/rtc-rv5c386a/Makefile
+++ b/package/kernel/rtc-rv5c386a/Makefile
@@ -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
diff --git a/package/kernel/rtl8812au-ct/Makefile b/package/kernel/rtl8812au-ct/Makefile
index 2d7cfebd54a84afb1da7fbe86dae2c55a463b230..b7f6d225b12ab0a1fc751c6d5e333d6c97e448f1 100644 (file)
--- a/package/kernel/rtl8812au-ct/Makefile
+++ b/package/kernel/rtl8812au-ct/Makefile
@@ -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
diff --git a/package/kernel/spi-gpio-custom/Makefile b/package/kernel/spi-gpio-custom/Makefile
index 34a478fb5db2393183e8cb1b21554d019bcb53b8..d658dc2630a14d45985933154eeadc37e9b16cda 100644 (file)
--- a/package/kernel/spi-gpio-custom/Makefile
+++ b/package/kernel/spi-gpio-custom/Makefile
@@ -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)
 
diff --git a/package/kernel/trelay/Makefile b/package/kernel/trelay/Makefile
index 258cbb184ac49d7c9a0ae3690433b93cb483ab50..a6bada1a9b7e8ee7d85fd449826df9bfb36ff95d 100644 (file)
--- a/package/kernel/trelay/Makefile
+++ b/package/kernel/trelay/Makefile
@@ -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
diff --git a/package/kernel/w1-gpio-custom/Makefile b/package/kernel/w1-gpio-custom/Makefile
index 5445097a8128cd085dd1077331b82aa232993aeb..76581c101e6b7f9e669f8681231563d3338b2e68 100644 (file)
--- a/package/kernel/w1-gpio-custom/Makefile
+++ b/package/kernel/w1-gpio-custom/Makefile
@@ -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)
 
Staging tree of dedeckeh