- busybox: switch to kconfig infrastructure

package/busybox/busybox.mk

@@ -37,11 +37,11 @@ BUSYBOX_MAKE_OPTS = \
 	EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 	CONFIG_PREFIX="$(TARGET_DIR)"
 
-BUSYBOX_BUILD_CONFIG = $(BUILD_DIR)/$(BUSYBOX_DIR)/.config
+BUSYBOX_BUILD_CONFIG = $(PKG_BUILD_DIR)/$($(PKG)_KCONFIG_FILE)
 
 define BUSYBOX_INSTALL_CONFIG
 	$(INSTALL_DATA) $(PKG_FILES_DIR)/busybox-minimal.config $(BUSYBOX_BUILD_CONFIG)
-	$(call KCONFIG_SET_OPT,CONFIG_PREFIX,"$(TARGET_DIR)",$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_SET_OPT,CONFIG_PREFIX,"$(TARGET_DIR)")
 endef
 BUSYBOX_POST_PATCH_HOOKS += BUSYBOX_INSTALL_CONFIG
 
@@ -49,44 +49,46 @@ BUSYBOX_POST_PATCH_HOOKS += BUSYBOX_INSTALL_CONFIG
 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
 
   define BUSYBOX_SET_IPV6
-	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IPV6)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6)
   endef
 
   ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
 
     define BUSYBOX_SET_SWAP
-	$(call KCONFIG_ENABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_ENABLE_OPT,CONFIG_SWAPOFF,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_SWAPON)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_SWAPOFF)
     endef
-    define BUSYBOX_INSTALL_SWAP
+    define BUSYBOX_INSTALL_SWAP_INIT_SCRIPT
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/swap.init $(TARGET_sysconfdir)/init.d/swap
 	$(UPDATE-RC.D) swap stop 98 0 6 .
     endef
+    BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_SWAP_INIT_SCRIPT
 
     define BUSYBOX_SET_HEXDUMP
-	$(call KCONFIG_ENABLE_OPT,CONFIG_HEXDUMP,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_HEXDUMP)
     endef
 
     define BUSYBOX_SET_PKILL
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PKILL,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_PKILL)
     endef
 
     define BUSYBOX_SET_FBSET
-	$(call KCONFIG_ENABLE_OPT,CONFIG_FBSET,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_FBSET_FANCY,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_FBSET_READMODE,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FBSET)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_FBSET_FANCY)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_FBSET_READMODE)
     endef
-    define BUSYBOX_INSTALL_FBSET
+    define BUSYBOX_INSTALL_FB_MODES
 	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/fb.modes $(TARGET_sysconfdir)/fb.modes
     endef
+    BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_FB_MODES
 
     ifeq ($(BOXSERIES),$(filter $(BOXSERIES),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
 
       define BUSYBOX_SET_START_STOP_DAEMON
-	$(call KCONFIG_ENABLE_OPT,CONFIG_START_STOP_DAEMON,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_START_STOP_DAEMON_FANCY,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_START_STOP_DAEMON)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_START_STOP_DAEMON_FANCY)
       endef
 
     endif
@@ -120,10 +122,7 @@ define BUSYBOX_ADD_TO_SHELLS
 			|| echo "/bin/sh" >> $(TARGET_sysconfdir)/shells; \
 	fi
 endef
-BUSYBOX_PRE_FOLLOWUP_HOOKS += BUSYBOX_ADD_TO_SHELLS
-
-BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_SWAP
-BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_FBSET
+BUSYBOX_POST_INSTALL_HOOKS += BUSYBOX_ADD_TO_SHELLS
 
 ifeq ($(PERSISTENT_VAR_PARTITION),yes)
 define BUSYBOX_INSTALL_LINK_RESOLV_CONF
@@ -170,4 +169,4 @@ endef
 BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_MAKE_IFUPDOWN_SCRIPTS
 
 busybox: | $(TARGET_DIR)
-	$(call generic-package)
+	$(call kconfig-package)