Skip to content

Commit

Permalink
kernel: replace SUBDIRS with M in package recipes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
tmn505 authored and hauke committed Feb 22, 2020
1 parent e6cec17 commit 9c6b6ab
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion package/kernel/acx-mac80211/Makefile
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/ath10k-ct/Makefile
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions package/kernel/broadcom-wl/Makefile
Expand Up @@ -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)
Expand All @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/button-hotplug/Makefile
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/kernel/gpio-button-hotplug/Makefile
Expand Up @@ -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)" \
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/gpio-nct5104d/Makefile
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/kernel/hwmon-gsc/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/i2c-gpio-custom/Makefile
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/kernel/kmod-sched-cake/Makefile
Expand Up @@ -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))
2 changes: 1 addition & 1 deletion package/kernel/leds-apu2/Makefile
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/kernel/mt76/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/mwlwifi/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/nat46/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/rtc-rv5c386a/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/rtl8812au-ct/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/spi-gpio-custom/Makefile
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package/kernel/trelay/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/w1-gpio-custom/Makefile
Expand Up @@ -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)

Expand Down

0 comments on commit 9c6b6ab

Please sign in to comment.