rework toolchain only option

13 files changed, 31 insertions, 13 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 8646c79bc..da78089e2 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -123,9 +123,13 @@ world:
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
 else
+ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile
 else
+	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile root_clean package/install
+endif
+else
 	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
 endif
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 57f394c0d..bec5fe6e6 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -15,7 +15,7 @@ PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
 PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
-PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_HARDWARE_QEMU)
+PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE || ADK_HARDWARE_QEMU)
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index 9f2c54702..f9f89576c 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -18,7 +18,7 @@ PKG_ARCH_DEPENDS:=	x86 x86_64
 
 PKG_CFLINE_GRUB_BIN:=	select BUSYBOX_FEATURE_STAT_FORMAT@
 PKG_CFLINE_GRUB_BIN+=	depends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
-PKG_DFLT_GRUB_BIN:=	y if !ADK_TOOLCHAIN_ONLY
+PKG_DFLT_GRUB_BIN:=	y if !ADK_TOOLCHAIN_ONLY && !ADK_TOOLCHAIN_ARCHIVE
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index 1cc93db5b..a5e31c711 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
 	bool "Toolchain only"
 	select ADK_arm
 	select ADK_toolchain_arm
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
 	help
diff --git a/target/config/Config.in b/target/config/Config.in
index 453c894a3..8697f337e 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -12,12 +12,26 @@ config ADK_TARGET_ENDIAN
 	default "little" if ADK_little
 	default "big" if ADK_big
 
+config ADK_TOOLCHAIN
+	boolean
+
 source "target/config/Config.in.arch"
 source "target/config/Config.in.system"
 
 choice
+prompt "Toolchain options"
+depends on ADK_TOOLCHAIN
+config ADK_TOOLCHAIN_ONLY
+	boolean "Only build toolchain and selected packages"
+
+config ADK_TOOLCHAIN_ARCHIVE
+	boolean "Build a complete system usable f.e. via chroot"
+
+endchoice
+
+choice
 prompt "Target Endianess"
-depends on (ADK_LINUX_ARM || ADK_LINUX_MIPS) && ADK_TOOLCHAIN_ONLY
+depends on (ADK_LINUX_ARM || ADK_LINUX_MIPS) && ADK_TOOLCHAIN
 config ADK_ENDIAN
         boolean "Choose target endianess"
 
@@ -382,7 +396,7 @@ config ADK_TARGET_SUFFIX
 
 choice
 prompt "Target firmware type"
-depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH && !ADK_TOOLCHAIN_ONLY
+depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH && !ADK_TOOLCHAIN
 default ADK_TARGET_ROOTFS_ARCHIVE
 
 config ADK_TARGET_ROOTFS_INITRAMFS
diff --git a/target/cris/sys-available/toolchain-cris b/target/cris/sys-available/toolchain-cris
index 309b85d55..cef2d17c2 100644
--- a/target/cris/sys-available/toolchain-cris
+++ b/target/cris/sys-available/toolchain-cris
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_CRIS
 	bool "Toolchain only"
 	select ADK_cris
 	select ADK_toolchain_cris
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a cris toolchain.
 
diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips
index e2f4bc39e..d07306ee8 100644
--- a/target/mips/sys-available/toolchain-mips
+++ b/target/mips/sys-available/toolchain-mips
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
 	bool "Toolchain only"
 	select ADK_mips
 	select ADK_toolchain_mips
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  MIPS toolchain.
 
diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc
index 8cb915954..0faea45e5 100644
--- a/target/ppc/sys-available/toolchain-ppc
+++ b/target/ppc/sys-available/toolchain-ppc
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC
 	bool "Toolchain only"
 	select ADK_ppc
 	select ADK_toolchain_ppc
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a ppc toolchain.
 
diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64
index 1f0061805..3574e863c 100644
--- a/target/ppc64/sys-available/toolchain-ppc64
+++ b/target/ppc64/sys-available/toolchain-ppc64
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
 	bool "Toolchain only"
 	select ADK_ppc64
 	select ADK_toolchain_ppc64
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a ppc64 toolchain.
 
diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/sys-available/toolchain-sparc
index 769cce546..5d1a6c044 100644
--- a/target/sparc/sys-available/toolchain-sparc
+++ b/target/sparc/sys-available/toolchain-sparc
@@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC
 	select ADK_sparc
 	select ADK_toolchain_sparc
 	select ADK_CPU_SPARC_V8
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a sparc toolchain.
 
diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/sys-available/toolchain-sparc64
index f5c1ff615..060cc62dd 100644
--- a/target/sparc64/sys-available/toolchain-sparc64
+++ b/target/sparc64/sys-available/toolchain-sparc64
@@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
 	select ADK_sparc64
 	select ADK_toolchain_sparc64
 	select ADK_CPU_SPARC_V9
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a sparc64 toolchain.
 
diff --git a/target/x86/sys-available/toolchain-x86 b/target/x86/sys-available/toolchain-x86
index 5c2871f3b..e4c02a0e5 100644
--- a/target/x86/sys-available/toolchain-x86
+++ b/target/x86/sys-available/toolchain-x86
@@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86
 	select ADK_x86
 	select ADK_toolchain_x86
 	select ADK_CPU_I686
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a x86 toolchain (i686 optimized).
 
diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64
index be6a9f5b9..0c175da69 100644
--- a/target/x86_64/sys-available/toolchain-x86_64
+++ b/target/x86_64/sys-available/toolchain-x86_64
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
 	bool "Toolchain only"
 	select ADK_x86_64
 	select ADK_toolchain_x86_64
-	select ADK_TOOLCHAIN_ONLY
+	select ADK_TOOLCHAIN
 	help
 	  Build a x86_64 toolchain.