From c488f647afcbb49c01ba362b27f4798a20a4fd78 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 4 Apr 2020 14:10:17 +0200 Subject: [PATCH] boot/busybox: don't specify .config to munge Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/busybox/busybox.mk | 71 +++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 5d5f3e92bd..24f3ba3b19 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -80,7 +80,6 @@ BUSYBOX_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" BUSYBOX_CFLAGS_busybox += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`" endif -BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config # Allows the build system to tweak CFLAGS BUSYBOX_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ @@ -148,53 +147,53 @@ define BUSYBOX_INSTALL_MDEV_CONF $(TARGET_DIR)/etc/mdev.conf endef define BUSYBOX_SET_MDEV - $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE) endef endif # sha passwords need USE_BB_CRYPT_SHA ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256)$(BR2_TARGET_GENERIC_PASSWD_SHA512),y) define BUSYBOX_SET_CRYPT_SHA - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_CRYPT_SHA,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_CRYPT_SHA) endef endif ifeq ($(BR2_USE_MMU),y) define BUSYBOX_SET_MMU - $(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU) endef else define BUSYBOX_SET_MMU - $(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BRACE_EXPANSION,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_HELP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_INTERACTIVE,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_SAVEHISTORY,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_JOB,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_TICK,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_IF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOOPS,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_CASE,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_FUNCTIONS,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOCAL,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_RANDOM_SUPPORT,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_EXPORT_N,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_MODE_X,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU) + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON) + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF) + $(call KCONFIG_DISABLE_OPT,CONFIG_ASH) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BRACE_EXPANSION) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_HELP) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_INTERACTIVE) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_SAVEHISTORY) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_JOB) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_TICK) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_IF) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOOPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_CASE) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_FUNCTIONS) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOCAL) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_RANDOM_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_EXPORT_N) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_MODE_X) endef endif # If we're using static libs do the same for busybox ifeq ($(BR2_STATIC_LIBS),y) define BUSYBOX_PREFER_STATIC - $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC) endef endif @@ -210,7 +209,7 @@ endef ifeq ($(BR2_INIT_BUSYBOX),y) define BUSYBOX_SET_INIT - $(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_INIT) endef ifeq ($(BR2_TARGET_GENERIC_GETTY),y) @@ -232,15 +231,15 @@ endif # BR2_INIT_BUSYBOX ifeq ($(BR2_PACKAGE_BUSYBOX_SELINUX),y) BUSYBOX_DEPENDENCIES += host-pkgconf libselinux libsepol define BUSYBOX_SET_SELINUX - $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUX,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUXENABLED,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUX) + $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUXENABLED) endef endif ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),y) define BUSYBOX_SET_INDIVIDUAL_BINARIES - $(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_INDIVIDUAL,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX) + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_INDIVIDUAL) endef define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES @@ -285,7 +284,7 @@ endif ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y) define BUSYBOX_SET_WATCHDOG - $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG) endef define BUSYBOX_INSTALL_WATCHDOG_SCRIPT $(INSTALL) -D -m 0755 package/busybox/S15watchdog \ @@ -298,12 +297,12 @@ endif # PAM support requires thread support in the toolchain ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_TOOLCHAIN_HAS_THREADS),yy) define BUSYBOX_LINUX_PAM - $(call KCONFIG_ENABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_PAM) endef BUSYBOX_DEPENDENCIES += linux-pam else define BUSYBOX_LINUX_PAM - $(call KCONFIG_DISABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_PAM) endef endif