From abc999b9ebe36de53c53090c077ae06985de808c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Tue, 25 Oct 2016 21:01:17 +0200
Subject: allow to choose base apps, minor dot cleanup

---
 mk/build.mk                         |  4 ++++
 mk/host-bottom.mk                   | 12 +++++++++---
 package/base-files/Config.in.manual |  6 ++----
 package/busybox/Config.in.manual    |  3 +--
 target/config/Config.in.runtime     | 28 +++++++++++++++++++++++++---
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index fd3664c73..b77e5a38a 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -126,6 +126,10 @@ POSTCONFIG=		-@\
 			cleandir=1;\
 			rebuild=1;\
 		fi; \
+		if [ "$$(grep ^ADK_RUNTIME_BASE_ .config|md5sum)" != "$$(grep ^ADK_RUNTIME_BASE_ .config.old|md5sum)" ];then \
+			cleandir=1;\
+			rebuild=1;\
+		fi; \
 		if [ "$$(grep ^ADK_TARGET_USE .config|md5sum)" != "$$(grep ^ADK_TARGET_USE .config.old|md5sum)" ];then \
 			cleandir=1;\
 			rebuild=1;\
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 8af7de253..6ae8f1c7e 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -51,9 +51,11 @@ ifeq (${HOST_STYLE},auto)
 	    --disable-nls \
 	    ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE)
 endif
-ifeq (${HOST_STYLE},manual)
-	@$(CMD_TRACE) "configuring.. "
-	${MAKE} host-configure $(MAKE_TRACE)
+ifeq (${HOST_STYLE},cmake)
+	@$(CMD_TRACE) "configuring cmake.. "
+	cd ${WRKBUILD}; PATH='${HOST_PATH}' \
+		cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		${HOST_CMAKE_FLAGS} ${WRKSRC} $(MAKE_TRACE)
 endif
 ifeq (${HOST_STYLE},perl)
 	@$(CMD_TRACE) "configuring perl module.. "
@@ -63,6 +65,10 @@ ifeq (${HOST_STYLE},perl)
 		PERL_AUTOINSTALL=--skipdeps \
 		$(HOST_PERL_ENV) \
 		perl-host Makefile.PL ${HOST_CONFIGURE_ARGS}
+endif
+ifeq (${HOST_STYLE},manual)
+	@$(CMD_TRACE) "configuring.. "
+	${MAKE} host-configure $(MAKE_TRACE)
 endif
 	touch $@
 
diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual
index 2e56a5129..60ee15445 100644
--- a/package/base-files/Config.in.manual
+++ b/package/base-files/Config.in.manual
@@ -4,8 +4,7 @@ config ADK_COMPILE_BASE_FILES
 	default n
 
 config ADK_PACKAGE_BASE_FILES
-	prompt "base-files........... basic filesystem structure and scripts"
-	tristate
+	tristate "base-files.............. basic filesystem structure and scripts"
 	select ADK_COMPILE_BASE_FILES
 	depends on !ADK_APPLIANCE_TOOLCHAIN
 	default y if !ADK_APPLIANCE_TOOLCHAIN
@@ -13,8 +12,7 @@ config ADK_PACKAGE_BASE_FILES
 	  basic filesystem structure and scripts
 
 config ADK_PACKAGE_CONFIG_IN_ETC
-	prompt ".config in /etc.... include buildsystem configuration in image"
-	bool
+	bool ".config in /etc....... include buildsystem configuration in image"
 	depends on ADK_PACKAGE_BASE_FILES
 	default y if !ADK_APPLIANCE_TOOLCHAIN
 	help
diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual
index 01ef1a53d..1aa8065c0 100644
--- a/package/busybox/Config.in.manual
+++ b/package/busybox/Config.in.manual
@@ -3,9 +3,8 @@ config ADK_COMPILE_BUSYBOX
 	depends on ADK_PACKAGE_BUSYBOX
 
 config ADK_PACKAGE_BUSYBOX
-	bool "busybox.............. core utilities for embedded systems"
+	bool "busybox................. core utilities for embedded systems"
 	select ADK_COMPILE_BUSYBOX
-	default y if !ADK_APPLIANCE_TOOLCHAIN
 	help
 	  Core utilities for embedded Linux systems
 	  
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index d1e26c97e..09c78bbf9 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -8,7 +8,7 @@ config ADK_RUNTIME_HOSTNAME
 	  Set your target hostname.
 
 choice
-prompt "init"
+prompt "init system"
 depends on !ADK_APPLIANCE_TOOLCHAIN
 default ADK_RUNTIME_INIT_SYSV
 
@@ -33,7 +33,7 @@ config ADK_RUNTIME_INIT_SIMPLEINIT
 endchoice
 
 choice
-prompt "System for /dev management"
+prompt "system for /dev management"
 depends on !ADK_APPLIANCE_TOOLCHAIN
 default ADK_RUNTIME_DEV_STATIC if ADK_TARGET_WITHOUT_MMU || ADK_TARGET_ARCH_CRIS
 default ADK_RUNTIME_DEV_MDEV
@@ -56,9 +56,31 @@ config ADK_RUNTIME_DEV_STATIC
 
 endchoice
 
+choice
+prompt "base applications"
+depends on !ADK_APPLIANCE_TOOLCHAIN
+default ADK_RUNTIME_BASE_BUSYBOX
+
+config ADK_RUNTIME_BASE_BUSYBOX
+	bool "Use busybox"
+	select ADK_PACKAGE_BUSYBOX
+
+config ADK_RUNTIME_BASE_TOYBOX
+	bool "Use toybox"
+	select ADK_PACKAGE_TOYBOX
+
+config ADK_RUNTIME_BASE_COREUTILS
+	bool "Use coreutils"
+	select ADK_PACKAGE_COREUTILS
+	select ADK_PACKAGE_GREP
+	select ADK_PACKAGE_FIND
+
+endchoice
+
 config ADK_RUNTIME_FIX_PERMISSION
-	bool "Fix permissions for target files (suid bit, ..)"
+	bool "fix permissions for target files (suid bit, ..)"
 	select ADK_HOST_BUILD_FAKEROOT
+	depends on ADK_TARGET_ROOTFS_GENIMAGE
 	help
 	  Use fakeroot to fix permissions for target dir before image
 	  creation.
-- 
cgit v1.2.3