summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbrodkorb@infonline.de>2021-04-09 06:43:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2021-04-09 06:45:49 +0200
commit66535f83d2c8bfb72caa43408fde3c6e98e1a50a (patch)
treea0b785b7d314487764f1735f074d68fc444e2e18
parent7e1aa8df1fb08887360f5d352ff5d123eb3a7416 (diff)
busybox: noMMU fixes
-rw-r--r--mk/build.mk2
-rw-r--r--package/busybox/config/shell/Config.in2
-rw-r--r--package/busybox/config/util-linux/Config.in8
3 files changed, 7 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk
index bbd123930..a0a4242bd 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -459,6 +459,8 @@ defconfig: .menu $(CONFIG)/conf
@if [ ! -z "$(ADK_TARGET_MMU)" ];then \
printf "# ADK_TARGET_WITH_MMU is not set\n" \
>> $(ADK_TOPDIR)/.defconfig; \
+ printf "BUSYBOX_NOMMU=y\n" \
+ >> $(ADK_TOPDIR)/.defconfig; \
fi
@if [ ! -z "$(ADK_TARGET_THREADS)" ];then \
if [ "$(ADK_TARGET_THREADS)" = "nptl" ];then \
diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index bc96b0267..0ce917dc3 100644
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -88,7 +88,7 @@ config BUSYBOX_SHELL_ASH
config BUSYBOX_ASH
bool "ash (78 kb)"
- default y
+ default n
depends on !BUSYBOX_NOMMU
select BUSYBOX_SHELL_ASH
help
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index bd6de5d38..b383ec87f 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -554,7 +554,7 @@ config BUSYBOX_MKFS_VFAT
Alias to "mkdosfs".
config BUSYBOX_MKSWAP
bool "mkswap (6.3 kb)"
- default y
+ default n
help
The mkswap utility is used to configure a file or disk partition as
Linux swap space. This allows Linux to use the entire file or
@@ -827,7 +827,7 @@ config BUSYBOX_SETSID
setsid runs a program in a new session
config BUSYBOX_SWAPON
bool "swapon (15 kb)"
- default y
+ default n
select BUSYBOX_PLATFORM_LINUX
help
Once you have created some swap space using 'mkswap', you also need
@@ -854,7 +854,7 @@ config BUSYBOX_FEATURE_SWAPON_PRI
config BUSYBOX_SWAPOFF
bool "swapoff (14 kb)"
- default y
+ default n
select BUSYBOX_PLATFORM_LINUX
config BUSYBOX_FEATURE_SWAPONOFF_LABEL
@@ -933,7 +933,7 @@ config BUSYBOX_FEATURE_UMOUNT_ALL
Support -a option to unmount all currently mounted filesystems.
config BUSYBOX_UNSHARE
bool "unshare (7.2 kb)"
- default y
+ default n
depends on !BUSYBOX_NOMMU
select BUSYBOX_PLATFORM_LINUX
select BUSYBOX_LONG_OPTS