From 8aed1fcd443b550c15a21ddbf1b1d3899803120a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Mar 2014 15:55:20 +0200 Subject: rework hosttools building, add tools into package stuff --- target/config/Config.in | 5 ++-- target/config/Config.in.tools | 32 ++++++++++++++++++----- target/microblaze/sys-available/qemu-microblaze | 1 - target/microblaze/sys-available/qemu-microblazeel | 1 - 4 files changed, 29 insertions(+), 10 deletions(-) (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index 794cc934f..2b9afa98e 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -786,7 +786,7 @@ config ADK_TARGET_ROOTFS_SQUASHFS config ADK_TARGET_ROOTFS_JFFS2 bool "Compressed read-write root filesystem (jffs2)" select ADK_KERNEL_JFFS2_FS - select ADK_HOST_NEED_JFFS2 + select ADK_HOST_NEED_MTD_UTILS select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU depends on ADK_TARGET_WITH_MTD help @@ -867,8 +867,9 @@ config ADK_TARGET_ROOTFS_ISO select ADK_KERNEL_JOLIET select ADK_KERNEL_SCSI select ADK_KERNEL_BLK_DEV_SR - select ADK_HOST_NEED_MKISOFS + select ADK_HOST_NEED_CDRTOOLS select ADK_HOST_NEED_SYSLINUX + select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU depends on ADK_HOST_LINUX depends on ADK_LINUX_X86 help diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index b232a3674..8ef6ee2d7 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -1,4 +1,24 @@ -config ADK_HOST_NEED_MKISOFS +config ADK_HOST_NEED_HEIRLOOM_CPIO + boolean + default y + +config ADK_HOST_NEED_BC + boolean + default y + +config ADK_HOST_NEED_MKCRYPT + boolean + default y + +config ADK_HOST_NEED_FILE + boolean + default y + +config ADK_HOST_NEED_BZIP2 + boolean + default n + +config ADK_HOST_NEED_CDRTOOLS boolean default n @@ -10,7 +30,7 @@ config ADK_HOST_NEED_SQUASHFS boolean default n -config ADK_HOST_NEED_JFFS2 +config ADK_HOST_NEED_MTD_UTILS boolean default n @@ -26,10 +46,6 @@ config ADK_HOST_NEED_LZMA boolean default n -config ADK_HOST_NEED_BZIP2 - boolean - default n - config ADK_HOST_NEED_XZ boolean default n @@ -42,6 +58,10 @@ config ADK_HOST_NEED_MKIMAGE boolean default n +config ADK_HOST_NEED_MKSH + boolean + default n + config ADK_HOST_NEED_PCRE boolean default y if ADK_HOST_DARWIN diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze index a5bdb65e8..ee9cb6a52 100644 --- a/target/microblaze/sys-available/qemu-microblaze +++ b/target/microblaze/sys-available/qemu-microblaze @@ -6,7 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_MTD select ADK_TARGET_KERNEL_LINUXBIN - select ADK_HOST_NEED_MKIMAGE help Qemu support for microblaze big endian architecture. diff --git a/target/microblaze/sys-available/qemu-microblazeel b/target/microblaze/sys-available/qemu-microblazeel index 4d752a942..8dff0e260 100644 --- a/target/microblaze/sys-available/qemu-microblazeel +++ b/target/microblaze/sys-available/qemu-microblazeel @@ -6,7 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_MTD select ADK_TARGET_KERNEL_LINUXBIN - select ADK_HOST_NEED_MKIMAGE help Qemu support for microblaze little endian architecture. -- cgit v1.2.3 From 113a0add9081f04a0dc1f11ae47eb11fbe6b5512 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Mar 2014 17:08:52 +0200 Subject: remove performance killer on bootup --- target/config/Config.in.runtime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target') diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index a6f504a49..776a1a6f9 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -38,8 +38,8 @@ config ADK_RUNTIME_TIMEZONE choice prompt "Start getty or shell after bootup" -default ADK_RUNTIME_GETTY default ADK_RUNTIME_SHELL if ADK_PKG_TEST +default ADK_RUNTIME_GETTY config ADK_RUNTIME_GETTY boolean "start a getty after bootup" -- cgit v1.2.3 From 3b513e5acf1524d3974e90fdab332c2b794a622f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Mar 2014 18:12:41 +0200 Subject: build host tools on demand, when not available on the host --- target/config/Config.in.tools | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'target') diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 8ef6ee2d7..c4c0ae23e 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -2,17 +2,17 @@ config ADK_HOST_NEED_HEIRLOOM_CPIO boolean default y -config ADK_HOST_NEED_BC +config ADK_HOST_NEED_MKCRYPT boolean default y -config ADK_HOST_NEED_MKCRYPT +config ADK_HOST_NEED_BC boolean - default y + default n config ADK_HOST_NEED_FILE boolean - default y + default n config ADK_HOST_NEED_BZIP2 boolean @@ -66,3 +66,5 @@ config ADK_HOST_NEED_PCRE boolean default y if ADK_HOST_DARWIN default n + +source "target/config/Config.in.prereq" -- cgit v1.2.3 From 9c8476bd6abc1994ca54b195c92f826de707cc5f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Mar 2014 19:00:41 +0200 Subject: build hosttools only when not available or required --- target/config/Config.in.tools | 76 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 14 deletions(-) (limited to 'target') diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index c4c0ae23e..0e7816fca 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -1,36 +1,59 @@ -config ADK_HOST_NEED_HEIRLOOM_CPIO +# always required from OpenADK +config ADK_HOST_BUILD_HEIRLOOM_CPIO boolean default y -config ADK_HOST_NEED_MKCRYPT +config ADK_HOST_BUILD_MKCRYPT boolean default y -config ADK_HOST_NEED_BC +# always required, but can be provided by host +config ADK_HOST_BUILD_BASH boolean default n -config ADK_HOST_NEED_FILE +config ADK_HOST_BUILD_BC boolean default n -config ADK_HOST_NEED_BZIP2 +config ADK_HOST_BUILD_BISON boolean default n -config ADK_HOST_NEED_CDRTOOLS +config ADK_HOST_BUILD_BZIP2 boolean default n -config ADK_HOST_NEED_SYSLINUX +config ADK_HOST_BUILD_FILE + boolean + default n + +config ADK_HOST_BUILD_FLEX boolean default n -config ADK_HOST_NEED_SQUASHFS +config ADK_HOST_BUILD_M4 boolean default n -config ADK_HOST_NEED_MTD_UTILS +config ADK_HOST_BUILD_XZ + boolean + default n + +# optional, but can be provided by host +config ADK_HOST_NEED_CCACHE + boolean + default n + +config ADK_HOST_BUILD_CCACHE + boolean + default n + +config ADK_HOST_NEED_CDRTOOLS + boolean + default n + +config ADK_HOST_BUILD_CDRTOOLS boolean default n @@ -38,7 +61,7 @@ config ADK_HOST_NEED_GENEXT2FS boolean default n -config ADK_HOST_NEED_LZOP +config ADK_HOST_BUILD_GENEXT2FS boolean default n @@ -46,15 +69,15 @@ config ADK_HOST_NEED_LZMA boolean default n -config ADK_HOST_NEED_XZ +config ADK_HOST_BUILD_LZMA boolean default n -config ADK_HOST_NEED_CCACHE +config ADK_HOST_NEED_LZOP boolean default n -config ADK_HOST_NEED_MKIMAGE +config ADK_HOST_BUILD_LZOP boolean default n @@ -62,7 +85,32 @@ config ADK_HOST_NEED_MKSH boolean default n -config ADK_HOST_NEED_PCRE +config ADK_HOST_BUILD_MKSH + boolean + default n + +config ADK_HOST_NEED_SYSLINUX + boolean + default n + +config ADK_HOST_BUILD_SYSLINUX + boolean + default n + +# optional, must be used from OpenADK +config ADK_HOST_BUILD_MTD_UTILS + boolean + default n + +config ADK_HOST_BUILD_SQUASHFS + boolean + default n + +config ADK_HOST_BUILD_MKIMAGE + boolean + default n + +config ADK_HOST_BUILD_PCRE boolean default y if ADK_HOST_DARWIN default n -- cgit v1.2.3 From 2615fde640b4420ab281006b996360ae7efb2e82 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Mar 2014 19:31:39 +0200 Subject: add pkgconf, always needed --- target/config/Config.in.tools | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'target') diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 0e7816fca..6f2cdab88 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -36,6 +36,10 @@ config ADK_HOST_BUILD_M4 boolean default n +config ADK_HOST_BUILD_PKGCONF + boolean + default n + config ADK_HOST_BUILD_XZ boolean default n -- cgit v1.2.3 From 712a7998a6e64638154c2cc3b3262b0881ca0138 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Mar 2014 19:49:07 +0200 Subject: add findutils do host machinery --- target/config/Config.in.tools | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'target') diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 6f2cdab88..92bbae9d6 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -28,6 +28,10 @@ config ADK_HOST_BUILD_FILE boolean default n +config ADK_HOST_BUILD_FINDUTILS + boolean + default n + config ADK_HOST_BUILD_FLEX boolean default n -- cgit v1.2.3