summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2011-05-30 21:56:59 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-06-12 19:52:52 (GMT)
commit85e54a6b772ac7423286f6fa6a1a59e761edba54 (patch)
tree9cd3c6b10a99c266c97e062f04c75d9b3b86335e
parent837a85e70c47fbd65a233f690a8c633de15f147c (diff)
downloadbuildroot-85e54a6b772ac7423286f6fa6a1a59e761edba54.tar.gz
buildroot-85e54a6b772ac7423286f6fa6a1a59e761edba54.tar.bz2
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 <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/busybox/busybox.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index ca963c1..b77880c 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