domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: replace SUBDIRS with M in package recipes

Browse Source 
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>
This commit is contained in:
Tomasz Maciej Nowak
2020-01-20 15:42:00 +01:00
committed by Hauke Mehrtens
parent e6cec17568
commit 9c6b6abdcd
18 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/acx-mac80211/Makefile
View File

@@ -181,7 +181,7 @@ PKG_EXTRA_CFLAGS:= \
define Build/Compile define Build/Compile
$(MAKE) -C "$(LINUX_DIR)" \ $(MAKE) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
$(PKG_EXTRA_KCONFIG) \ $(PKG_EXTRA_KCONFIG) \
EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(4,2,0)\"" \ 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 \ LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi -I$(STAGING_DIR)/usr/include/mac80211-backport \

2
package/kernel/ath10k-ct/Makefile
View File

@@ -112,7 +112,7 @@ endif
define Build/Compile define Build/Compile
+$(MAKE) $(CT_MAKEDEFS) $(PKG_JOBS) -C "$(LINUX_DIR)" \ +$(MAKE) $(CT_MAKEDEFS) $(PKG_JOBS) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)/ath10k$(CT_KVER)" \ M="$(PKG_BUILD_DIR)/ath10k$(CT_KVER)" \
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
modules modules
endef endef

8
package/kernel/broadcom-wl/Makefile
View File

@@ -102,7 +102,7 @@ endef
MAKE_KMOD := $(MAKE) -C "$(LINUX_DIR)" \ MAKE_KMOD := $(MAKE) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
PATH="$(TARGET_PATH)" \ PATH="$(TARGET_PATH)" \
SUBDIRS="$(PKG_BUILD_DIR)/kmod" \ M="$(PKG_BUILD_DIR)/kmod" \
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
@@ -113,18 +113,18 @@ endef
define Build/Compile define Build/Compile
# Compile glue driver # Compile glue driver
$(MAKE_KMOD) -C "$(LINUX_DIR)" \ $(MAKE_KMOD) -C "$(LINUX_DIR)" \
SUBDIRS="$(PKG_BUILD_DIR)/glue" \ M="$(PKG_BUILD_DIR)/glue" \
modules modules
# Compile the kernel part # Compile the kernel part
$(MAKE_KMOD) \ $(MAKE_KMOD) \
SUBDIRS="$(PKG_BUILD_DIR)/driver" \ M="$(PKG_BUILD_DIR)/driver" \
MODFLAGS="-DMODULE -mlong-calls" \ MODFLAGS="-DMODULE -mlong-calls" \
KBUILD_EXTRA_SYMBOLS="$(PKG_BUILD_DIR)/glue/Module.symvers" \ KBUILD_EXTRA_SYMBOLS="$(PKG_BUILD_DIR)/glue/Module.symvers" \
modules modules
$(MAKE_KMOD) \ $(MAKE_KMOD) \
SUBDIRS="$(PKG_BUILD_DIR)/driver-mini" \ M="$(PKG_BUILD_DIR)/driver-mini" \
MODFLAGS="-DMODULE -mlong-calls" \ MODFLAGS="-DMODULE -mlong-calls" \
BUILD_TYPE="wl_apsta_mini" \ BUILD_TYPE="wl_apsta_mini" \
KBUILD_EXTRA_SYMBOLS="$(PKG_BUILD_DIR)/glue/Module.symvers" \ KBUILD_EXTRA_SYMBOLS="$(PKG_BUILD_DIR)/glue/Module.symvers" \

2
package/kernel/button-hotplug/Makefile
View File

@@ -37,7 +37,7 @@ EXTRA_CFLAGS:= \
MAKE_OPTS:= \ MAKE_OPTS:= \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
$(EXTRA_KCONFIG) $(EXTRA_KCONFIG)

2
package/kernel/gpio-button-hotplug/Makefile
View File

@@ -34,7 +34,7 @@ endef
MAKE_OPTS:= \ MAKE_OPTS:= \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" M="$(PKG_BUILD_DIR)"
define Build/Compile define Build/Compile
$(MAKE) -C "$(LINUX_DIR)" \ $(MAKE) -C "$(LINUX_DIR)" \

2
package/kernel/gpio-nct5104d/Makefile
View File

@@ -38,7 +38,7 @@ EXTRA_CFLAGS:= \
MAKE_OPTS:= \ MAKE_OPTS:= \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
$(EXTRA_KCONFIG) $(EXTRA_KCONFIG)

2
package/kernel/hwmon-gsc/Makefile
View File

@@ -21,7 +21,7 @@ endef
define Build/Compile define Build/Compile
$(MAKE) -C "$(LINUX_DIR)" \ $(MAKE) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(BUILDFLAGS)" \ EXTRA_CFLAGS="$(BUILDFLAGS)" \
modules modules
endef endef

2
package/kernel/i2c-gpio-custom/Makefile
View File

@@ -34,7 +34,7 @@ EXTRA_CFLAGS:= \
MAKE_OPTS:= \ MAKE_OPTS:= \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
$(EXTRA_KCONFIG) $(EXTRA_KCONFIG)

2
package/kernel/kmod-sched-cake/Makefile
View File

@@ -36,7 +36,7 @@ define KernelPackage/sched-cake/description
endef endef
define Build/Compile define Build/Compile
$(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)" modules $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
endef endef
$(eval $(call KernelPackage,sched-cake)) $(eval $(call KernelPackage,sched-cake))

2
package/kernel/leds-apu2/Makefile
View File

@@ -38,7 +38,7 @@ EXTRA_CFLAGS:= \
MAKE_OPTS:= \ MAKE_OPTS:= \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
$(EXTRA_KCONFIG) $(EXTRA_KCONFIG)

2
package/kernel/mt76/Makefile
View File

@@ -202,7 +202,7 @@ define Build/Compile
+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
$(PKG_MAKE_FLAGS) \ $(PKG_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
modules modules
endef endef

2
package/kernel/mwlwifi/Makefile
View File

@@ -44,7 +44,7 @@ NOSTDINC_FLAGS = \
define Build/Compile define Build/Compile
+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
modules modules
endef endef

2
package/kernel/nat46/Makefile
View File

@@ -26,7 +26,7 @@ endef
include $(INCLUDE_DIR)/kernel-defaults.mk include $(INCLUDE_DIR)/kernel-defaults.mk
define Build/Compile define Build/Compile
$(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)/nat46/modules" \ $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/nat46/modules" \
MODFLAGS="-DMODULE -mlong-calls" \ MODFLAGS="-DMODULE -mlong-calls" \
EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \ EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \
modules modules

2
package/kernel/rtc-rv5c386a/Makefile
View File

@@ -24,7 +24,7 @@ endef
define Build/Compile define Build/Compile
$(MAKE) -C "$(LINUX_DIR)" \ $(MAKE) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(BUILDFLAGS)" \ EXTRA_CFLAGS="$(BUILDFLAGS)" \
modules modules
endef endef

2
package/kernel/rtl8812au-ct/Makefile
View File

@@ -45,7 +45,7 @@ NOSTDINC_FLAGS+=-DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -DBUILD_OPE
define Build/Compile define Build/Compile
+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
modules modules
endef endef

2
package/kernel/spi-gpio-custom/Makefile
View File

@@ -34,7 +34,7 @@ EXTRA_CFLAGS:= \
MAKE_OPTS:= \ MAKE_OPTS:= \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
$(EXTRA_KCONFIG) $(EXTRA_KCONFIG)

2
package/kernel/trelay/Makefile
View File

@@ -32,7 +32,7 @@ endef
include $(INCLUDE_DIR)/kernel-defaults.mk include $(INCLUDE_DIR)/kernel-defaults.mk
define Build/Compile define Build/Compile
$(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)" modules $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
endef endef
define KernelPackage/trelay/conffiles define KernelPackage/trelay/conffiles

2
package/kernel/w1-gpio-custom/Makefile
View File

@@ -34,7 +34,7 @@ EXTRA_CFLAGS:= \
MAKE_OPTS:= \ MAKE_OPTS:= \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
SUBDIRS="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
$(EXTRA_KCONFIG) $(EXTRA_KCONFIG)