summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-30 17:09:11 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-30 17:09:11 +0200
commit208c1a556654a5cc3a3fd5fcc500f70261fb084b (patch)
tree1a1a0112594a7939739b32e48bf370618f8eb812 /target/config
parent113a0add9081f04a0dc1f11ae47eb11fbe6b5512 (diff)
parent44422107fcae7591bc9ee0ca54fa580160345e4a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in5
-rw-r--r--target/config/Config.in.tools32
2 files changed, 29 insertions, 8 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index 5c1874264..498c5d9e4 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -787,7 +787,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
@@ -868,8 +868,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