From 85e54a6b772ac7423286f6fa6a1a59e761edba54 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 30 May 2011 23:56:59 +0200 Subject: [PATCH] busybox: adjust configuration for non-MMU targets The swaponoff applet doesn't build (and doesn't make sense) on non-MMU platforms. The ash shell cannot build on non-MMU platforms (because it uses fork()), so select the hush shell instead. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ca963c167f..b77880ca7d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -133,6 +133,14 @@ define BUSYBOX_INTERNAL_SHADOW_PASSWORDS endef endif +ifeq ($(BR2_USE_MMU),) +define BUSYBOX_DISABLE_MMU_APPLETS + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPONOFF,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG)) +endef +endif + # We do this here to avoid busting a modified .config in configure BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG @@ -147,6 +155,7 @@ define BUSYBOX_CONFIGURE_CMDS $(BUSYBOX_NETKITBASE) $(BUSYBOX_NETKITTELNET) $(BUSYBOX_INTERNAL_SHADOW_PASSWORDS) + $(BUSYBOX_DISABLE_MMU_APPLETS) @yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \ -C $(@D) oldconfig endef -- 2.30.2