[openwrt/openwrt] button-hotplug: simplify build

LEDE Commits lede-commits at lists.infradead.org
Mon Oct 24 11:50:14 PDT 2022


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/24bf94ecb728d47d45ec9a419b92bb8440eb64ce

commit 24bf94ecb728d47d45ec9a419b92bb8440eb64ce
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Oct 24 18:16:56 2022 +0200

    button-hotplug: simplify build
    
    Remove unnecessary kconfig junk
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 package/kernel/button-hotplug/Makefile     | 17 +----------------
 package/kernel/button-hotplug/src/Kconfig  |  2 --
 package/kernel/button-hotplug/src/Makefile |  2 +-
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/package/kernel/button-hotplug/Makefile b/package/kernel/button-hotplug/Makefile
index 55412e5685..8e8c02609c 100644
--- a/package/kernel/button-hotplug/Makefile
+++ b/package/kernel/button-hotplug/Makefile
@@ -28,23 +28,8 @@ define KernelPackage/button-hotplug/description
   If your device uses GPIO buttons, see gpio-button-hotplug.
 endef
 
-EXTRA_KCONFIG:= \
-	CONFIG_BUTTON_HOTPLUG=m
-
-EXTRA_CFLAGS:= \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
-
-MAKE_OPTS:= \
-	$(KERNEL_MAKE_FLAGS) \
-	M="$(PKG_BUILD_DIR)" \
-	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-	$(EXTRA_KCONFIG)
-
 define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		$(MAKE_OPTS) \
-		modules
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
 endef
 
 $(eval $(call KernelPackage,button-hotplug))
diff --git a/package/kernel/button-hotplug/src/Kconfig b/package/kernel/button-hotplug/src/Kconfig
deleted file mode 100644
index aa292e9c13..0000000000
--- a/package/kernel/button-hotplug/src/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-config BUTTON_HOTPLUG
-	tristate "Button Hotplug driver"
diff --git a/package/kernel/button-hotplug/src/Makefile b/package/kernel/button-hotplug/src/Makefile
index 230d604f8c..e38fa40bb4 100644
--- a/package/kernel/button-hotplug/src/Makefile
+++ b/package/kernel/button-hotplug/src/Makefile
@@ -1 +1 @@
-obj-${CONFIG_BUTTON_HOTPLUG}	+= button-hotplug.o
\ No newline at end of file
+obj-m := button-hotplug.o




More information about the lede-commits mailing list