28 files changed, 63 insertions, 158 deletions

diff --git a/TODO b/TODO
index f5160b8f6..9cdf8b56d 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,7 @@ TODO for 1.99.x
 
 [ ] jbe: xcb-proto depends on host's xmllint!
 
-[ ] jbe:
+[X] jbe:
     ptxdist: platformconfig...
     platforms/images.in:14:warning: 'select' used by config symbol 'IMAGE_HD' refers to undefined symbol 'HOST_GENPART'
     platforms/images.in:193:warning: 'select' used by config symbol 'IMAGE_JFFS2' refers to undefined symbol 'HOST_MTD_UTILS'
@@ -31,8 +31,6 @@ TODO for 1.99.x
     no
     [...anything proceeds...]
 
-[ ] mkl: reactivate rules/host-xorg-lib-X11.in select to HOST_LIBXCB
-
 [ ] mkl: reactiveate new install_copy feature (no explicid destination)
 
 [x] rsc: put export LANG=C somewhere into PTXdist, to make compiler
diff --git a/bin/ptxdist b/bin/ptxdist
index 3ee421978..af986d32d 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -445,7 +445,7 @@ Setup and Project Actions:
   u_boot_config			configure U-Boot (U-Boot V2 only)
 
   toolchain [<path>]		if path is omitted the toolchain is guessed,
-				    guessing works only platformconfig is
+				    (guessing works only platformconfig is
 				    already selected)
 				othewise select this toolchain
 				    (<path> to binaries)
@@ -759,6 +759,7 @@ platformconfig() {
 
 	tmpdir="$(mktemp -d ${PTXDIST_TEMPDIR}/platformconfig.XXXXXX)"
 	pushd $tmpdir > /dev/null
+	ln -sf "${PTXDIST_TOPDIR}/rules"
 	ln -sf "${PTXDIST_TOPDIR}/platforms"
 	ln -sf "${PTXDIST_WORKSPACE}" workspace
 
diff --git a/platforms/Kconfig b/platforms/Kconfig
index 1bafde07b..344c949b4 100644
--- a/platforms/Kconfig
+++ b/platforms/Kconfig
@@ -32,3 +32,6 @@ source "platforms/u-boot-v2.in"
 endmenu
 
 source "platforms/images.in"
+
+source "platforms/hosttools.in"
+source "platforms/crosstools.in"
diff --git a/platforms/crosstools.in b/platforms/crosstools.in
new file mode 100644
index 000000000..6ef5cf4c6
--- /dev/null
+++ b/platforms/crosstools.in
@@ -0,0 +1 @@
+source "rules/cross-module-init-tools.in"
diff --git a/platforms/hosttools.in b/platforms/hosttools.in
new file mode 100644
index 000000000..a4e7a78f5
--- /dev/null
+++ b/platforms/hosttools.in
@@ -0,0 +1,11 @@
+source "rules/host-genext2fs.in"
+source "rules/host-genpart.in"
+source "rules/host-e2fsprogs.in"
+source "rules/host-cramfs.in"
+source "rules/host-mtd-utils.in"
+source "rules/host-umkimage.in"
+source "rules/host-mkelfImage.in"
+
+
+# common
+source "rules/host-zlib.in"
diff --git a/platforms/kernel.in b/platforms/kernel.in
index 197daee4b..5e4e8936d 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -1,5 +1,7 @@
 menuconfig KERNEL
 	bool
+	select HOST_UMKIMAGE		if KERNEL_IMAGE_U
+	select CROSS_MODULE_INIT_TOOLS	if KERNEL_MODULES
 	prompt "Linux kernel                  "
 
 config KERNEL_INSTALL
@@ -94,32 +96,6 @@ config KERNEL_ARCH_STRING
 	default "i386"			if KERNEL_ARCH_I386
 	default "x86_64"		if KERNEL_ARCH_X86_64
 
-menu "patching & configuration      "
-	depends on KERNEL
-
-config KERNEL_SERIES
-	depends on KERNEL
-	prompt "patch series file"
-	string
-	default "series${PTXDIST_PLATFORMSUFFIX}"
-	help
-	  This entry specifies a patch series file which has to live in
-	  the kernel patches directory:
-
-	  The series file contains lines with names of patch files which
-	  are then being applied to the kernel.
-
-config KERNEL_CONFIG
-	depends on KERNEL
-	prompt "kernel config file"
-	string
-	default "kernel.config"
-	help
-	  this entry specifies the .config file used to compile your kernel
-
-endmenu
-
-
 choice
 	depends on KERNEL
 	prompt "Image Type          "
@@ -164,6 +140,32 @@ choice
 endchoice
 
 
+menu "patching & configuration      "
+	depends on KERNEL
+
+config KERNEL_SERIES
+	depends on KERNEL
+	prompt "patch series file"
+	string
+	default "series${PTXDIST_PLATFORMSUFFIX}"
+	help
+	  This entry specifies a patch series file which has to live in
+	  the kernel patches directory:
+
+	  The series file contains lines with names of patch files which
+	  are then being applied to the kernel.
+
+config KERNEL_CONFIG
+	depends on KERNEL
+	prompt "kernel config file"
+	string
+	default "kernel.config"
+	help
+	  this entry specifies the .config file used to compile your kernel
+
+endmenu
+
+
 #
 # autogenerated
 #
diff --git a/rules/Kconfig b/rules/Kconfig
index 2a536b38d..34b76f224 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -11,9 +11,7 @@ menu "Code Maturity                 "
 source "rules/experimental.in"
 endmenu
 
-menu "Cross Compilation Tools       "
 source "rules/crosstools.in"
-endmenu
 
 menu "Host Side Tools               "
 source "rules/hosttools.in"
diff --git a/rules/cross-module-init-tools.in b/rules/cross-module-init-tools.in
index 1f6395d6c..4309ac1da 100644
--- a/rules/cross-module-init-tools.in
+++ b/rules/cross-module-init-tools.in
@@ -1,4 +1,2 @@
 config CROSS_MODULE_INIT_TOOLS
 	bool
-	prompt "module init tools"
-	default KERNEL_MODULES
diff --git a/rules/crosstools.in b/rules/crosstools.in
index 65dfb5447..250e8822b 100644
--- a/rules/crosstools.in
+++ b/rules/crosstools.in
@@ -1,4 +1,3 @@
-source "rules/cross-module-init-tools.in"
 source "rules/cross-pkg-config-wrapper.in"
 
 config CROSS_NASM
diff --git a/rules/host-cmake.in b/rules/host-cmake.in
index beed40583..68c2f6ffd 100644
--- a/rules/host-cmake.in
+++ b/rules/host-cmake.in
@@ -1,7 +1,5 @@
 config HOST_CMAKE
 	bool
-        prompt "cmake 2.4.2"
-	select HOST_FAKEROOT
 	help
 	  CMake is an open-source, cross-platfom
 	  build environment. It supports native
diff --git a/rules/host-cramfs.in b/rules/host-cramfs.in
index 9968d1be0..7645268bd 100644
--- a/rules/host-cramfs.in
+++ b/rules/host-cramfs.in
@@ -1,6 +1,5 @@
 config HOST_CRAMFS
 	bool
-	prompt "cramfs tools"
 	select HOST_ZLIB
 	help
 	  This package contains tools that let you construct a CramFs
diff --git a/rules/host-e2fsprogs.in b/rules/host-e2fsprogs.in
index fcbe0f950..aba88f199 100644
--- a/rules/host-e2fsprogs.in
+++ b/rules/host-e2fsprogs.in
@@ -1,20 +1,4 @@
-menuconfig HOST_E2FSPROGS
+config HOST_E2FSPROGS
 	bool
-	prompt "e2fsprogs               "
 	help
 	  Useful hosttools for management of ext2 and ext3 filesystems
-
-config HOST_E2FSPROGS_TUNE2FS
-	bool
-	prompt "tune2fs"
-	depends on HOST_E2FSPROGS
-	help
-	  Tune2fs can read and set various aspects of a ext2/3 filesystem
-
-config HOST_E2FSPROGS_RESIZE2FS
-	bool
-	prompt "resize2fs"
-	depends on HOST_E2FSPROGS
-	help
-	  Resize2fs can be used to resize an ext2/3 filesystem offline
-
diff --git a/rules/host-fontconfig.in b/rules/host-fontconfig.in
index caf798ce2..23b37e0de 100644
--- a/rules/host-fontconfig.in
+++ b/rules/host-fontconfig.in
@@ -1,5 +1,5 @@
-menuconfig HOST_FONTCONFIG
-	bool "Fontconfig              "
+config HOST_FONTCONFIG
+	bool
 	select HOST_FREETYPE
 	select HOST_EXPAT
 	help
@@ -14,26 +14,3 @@ menuconfig HOST_FONTCONFIG
 	  on the application.  The X-specific library 'Xft'
 	  uses fontconfig along with freetype to specify and
  	  rasterize fonts.
-
-config HOST_FONTCONFIG_UTILS
-	bool "install utilities for Fontconfig     "
-	depends on HOST_FONTCONFIG
-	help
-	  The fontconfig utilities package contains fc-list,
-	  fc-match, and fc-cache.
-	  fc-list lists fonts and styles available on the system
-	    for applications using fontconfig.
-	  fc-match  matches fontpattern (empty pattern by
-	    default) using the normal fontconfig matching rules to
-	    find the best font available.
-	  fc-cache  scans the font directories on the system and
-	    builds font information cache files for applications
-	    using fontconfig for their font handling.
-
-config HOST_FONTCONFIG_CONFS
-	bool "install configuration files for Fontconfig"
-	depends on HOST_FONTCONFIG
-	default y
-	help
-	  This installs configuration files of fontconfig,
-	  subpixeling is turned on by default
diff --git a/rules/host-genext2fs.in b/rules/host-genext2fs.in
index 5963c92f2..6755c805e 100644
--- a/rules/host-genext2fs.in
+++ b/rules/host-genext2fs.in
@@ -1,6 +1,5 @@
 config HOST_GENEXT2FS
 	bool
-	prompt "genext2fs"
 	help
 	  ext2 filesystem generator for embedded systems
  	  `genext2fs' is meant to generate an ext2 filesystem
diff --git a/rules/host-genpart.in b/rules/host-genpart.in
index 065fa3843..a6ff79871 100644
--- a/rules/host-genpart.in
+++ b/rules/host-genpart.in
@@ -1,6 +1,5 @@
 config HOST_GENPART
 	bool
-	prompt "genpart"
 	help
 	  Tool to generate a 16 byte partition table entry defined by
 	  command line arguments and dump it to stdout. No CHS magic is
diff --git a/rules/host-gettext.in b/rules/host-gettext.in
index 376b8c257..ddbd6c196 100644
--- a/rules/host-gettext.in
+++ b/rules/host-gettext.in
@@ -1,5 +1,5 @@
 menuconfig HOST_GETTEXT
-	bool "gettext (GNU)               "
+	bool "gettext (GNU)           "
 #	select HOST_LIBICONV if ARCH_MINGW
 	help
 	  The gettext program translates a natural language
diff --git a/rules/host-libsigcpp.in b/rules/host-libsigcpp.in
index 9dd17408f..be72eff7a 100644
--- a/rules/host-libsigcpp.in
+++ b/rules/host-libsigcpp.in
@@ -1,6 +1,5 @@
 config HOST_LIBSIGCPP
 	bool
-	prompt "libsigc++"
 	help
 	  libsigc++ implements a typesafe callback system for standard C++. It
 	  allows you to define signals and to connect those signals to any
diff --git a/rules/host-libxml2.in b/rules/host-libxml2.in
index 213142d40..208aa42e8 100644
--- a/rules/host-libxml2.in
+++ b/rules/host-libxml2.in
@@ -3,9 +3,8 @@
 # Options valid for 2.6.20 as well. ZLIB missing in both.
 #
 
-menuconfig HOST_LIBXML2
+config HOST_LIBXML2
 	bool
-	prompt "libxml2                     "
 	select HOST_ZLIB if HOST_LIBXML2_ZLIB
 	help
 	  Libxml2 is a XML C parser and toolkit. XML itself is a
diff --git a/rules/host-libxslt.in b/rules/host-libxslt.in
index 9f88194c1..478957332 100644
--- a/rules/host-libxslt.in
+++ b/rules/host-libxslt.in
@@ -2,9 +2,8 @@
 # LibXSLT - Options updated as of 1.1.14
 #
 
-menuconfig HOST_LIBXSLT
+config HOST_LIBXSLT
 	bool
-	prompt "libxslt                     "
 	select HOST_LIBXML2
 	select HOST_LIBXML2_OUTPUT
 	select HOST_LIBXML2_XINCLUDE
diff --git a/rules/host-mkelfImage.in b/rules/host-mkelfImage.in
index 1e2ef4d7e..82899834f 100644
--- a/rules/host-mkelfImage.in
+++ b/rules/host-mkelfImage.in
@@ -1,8 +1,6 @@
 config HOST_MKELFIMAGE
 	bool
-	select HOST_FAKEROOT
 	select HOST_ZLIB
-	prompt "mkelfimage"
 	help
 	  With mkelfImage you can create elf images from kernel
 	  files to be downloaded by Etherboot for LinuxBIOS.
diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in
index 647c4123b..994e526b3 100644
--- a/rules/host-mtd-utils.in
+++ b/rules/host-mtd-utils.in
@@ -1,4 +1,3 @@
 config HOST_MTD_UTILS
 	bool
-	prompt "mtd-utils"
 	select HOST_ZLIB
diff --git a/rules/host-python24.in b/rules/host-python24.in
index f422f7f19..0f8d4a15e 100644
--- a/rules/host-python24.in
+++ b/rules/host-python24.in
@@ -1,6 +1,5 @@
 config HOST_PYTHON24
 	bool
-	prompt "Python 2.4"
 	help
 	  Python is an interpreted, interactive,
 	  object-oriented, extensible programming language.
diff --git a/rules/host-qte.in b/rules/host-qte.in
index e27b34a54..ff5a4a10a 100644
--- a/rules/host-qte.in
+++ b/rules/host-qte.in
@@ -1,5 +1,4 @@
 config HOST_QTE
 	bool
-	prompt "qt embedded 3.3.4"
 	help
 	  Trolltech Embedded Qt GUI Library
diff --git a/rules/host-umkimage.in b/rules/host-umkimage.in
index a9842b9c9..572243c26 100644
--- a/rules/host-umkimage.in
+++ b/rules/host-umkimage.in
@@ -1,6 +1,5 @@
 config HOST_UMKIMAGE
 	bool
-	prompt "uboot mkimage"
 	select HOST_ZLIB
 	help
 	  umkimage is the U-Boot mkimage command. It is used to create
diff --git a/rules/hosttools.in b/rules/hosttools.in
index 5053a114f..c544bf583 100644
--- a/rules/hosttools.in
+++ b/rules/hosttools.in
@@ -1,30 +1,4 @@
 comment "------------------------------"
-comment "Filesystem Manipulation Tools "
-comment "------------------------------"
-
-source "rules/host-genext2fs.in"
-source "rules/host-genpart.in"
-source "rules/host-e2fsprogs.in"
-source "rules/host-cramfs.in"
-
-#comment "------------------------------"
-#comment "Packaging Tools               "
-#comment "------------------------------"
-# No header - all packaging tools have no prompt
-
-source "rules/host-fakeroot.in"
-source "rules/host-ipkg.in"
-source "rules/host-ipkg-utils.in"
-
-comment "------------------------------"
-comment "Kernel Tools                  "
-comment "------------------------------"
-
-source "rules/host-util-linux.in"
-source "rules/host-umkimage.in"
-source "rules/host-mkelfImage.in"
-
-comment "------------------------------"
 comment "Graphics Tools                "
 comment "------------------------------"
 
@@ -34,6 +8,16 @@ comment "------------------------------"
 comment "Other Host Tools              "
 comment "------------------------------"
 
+source "rules/host-gettext.in"
+source "rules/host-intltool.in"
+
+
+# automatically selected host tools
+
+source "rules/host-python24.in"
+source "rules/host-fakeroot.in"
+source "rules/host-ipkg.in"
+source "rules/host-ipkg-utils.in"
 source "rules/host-flex.in"
 source "rules/host-mico.in"
 source "rules/host-qte.in"
@@ -45,15 +29,6 @@ source "rules/host-libxml2.in"
 source "rules/host-libxslt.in"
 source "rules/host-libpthread-stubs.in"
 source "rules/host-libsigcpp.in"
-
-comment "------------------------------"
-comment "Scripting Languages           "
-comment "------------------------------"
-
-source "rules/host-python24.in"
-
-# automatically selected host tools
-
 source "rules/host-apache2.in"
 source "rules/host-dbus.in"
 source "rules/host-expat.in"
@@ -61,7 +36,6 @@ source "rules/host-freetype.in"
 source "rules/host-libdbus-cxx.in"
 source "rules/host-mysql.in"
 source "rules/host-zlib.in"
-source "rules/host-mtd-utils.in"
 source "rules/host-pkg-config.in"
 source "rules/host-xcb-proto.in"
 source "rules/host-libxcb.in"
@@ -82,6 +56,4 @@ source "rules/host-xorg-proto-x.in"
 source "rules/host-xorg-proto-xext.in"
 source "rules/host-xorg-proto-xcmisc.in"
 source "rules/host-xorg-proto-fonts.in"
-source "rules/host-gettext.in"
-source "rules/host-intltool.in"
 source "rules/host-libiconv.in"
diff --git a/rules/kernel.make b/rules/kernel.make
index f86774ae4..9b746b16d 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -15,19 +15,6 @@
 PACKAGES-$(PTXCONF_KERNEL) += kernel
 
 #
-# platform dependencies
-#
-ifdef PTXCONF_KERNEL_MODULES
-$(STATEDIR)/kernel.prepare: $(STATEDIR)/cross-module-init-tools.install
-$(STATEDIR)/kernel.targetinstall: $(STATEDIR)/cross-module-init-tools.install
-endif
-
-ifdef PTXCONF_KERNEL_IMAGE_U
-$(STATEDIR)/kernel.prepare: $(STATEDIR)/host-umkimage.install
-$(STATEDIR)/kernel.targetinstall: $(STATEDIR)/host-umkimage.install
-endif
-
-#
 # handle special compilers
 #
 ifdef PTXCONF_KERNEL
diff --git a/rules/post/images.make b/rules/post/images.make
index 69fcc6565..9c3c2823e 100644
--- a/rules/post/images.make
+++ b/rules/post/images.make
@@ -10,19 +10,6 @@ DOPERMISSIONS := '{	\
 	if ($$1 == "n")	\
 		printf("mkdir -p .`dirname %s`; mknod -m %s .%s %s %s %s; chown %s.%s .%s;\n", $$2, $$5, $$2, $$6, $$7, $$8, $$3, $$4, $$2);}'
 
-ifdef PTXCONF_MKNBI_NBI
-MKNBI_EXT = nbi
-else
-MKNBI_EXT = elf
-endif
-
-MKNBI_KERNEL = $(KERNEL_TARGET_PATH)
-
-MKNBI_ROOTFS = $(IMAGEDIR)/root.ext2
-ifdef PTXCONF_IMAGE_EXT2_GZIP
-MKNBI_ROOTFS = $(IMAGEDIR)/root.ext2.gz
-endif
-
 images: $(STATEDIR)/images
 
 ipkg-push: $(STATEDIR)/ipkg-push
diff --git a/scripts/dgen.sh b/scripts/dgen.sh
index 0a4197f11..e70e5fe1f 100755
--- a/scripts/dgen.sh
+++ b/scripts/dgen.sh
@@ -45,6 +45,7 @@ gen_configdeps() {
 
     tmpdir="$(mktemp -d ${PTXDIST_TEMPDIR}/platformconfig.XXXXXX)"
     pushd $tmpdir > /dev/null
+    ln -sf "${PTXDIST_TOPDIR}/rules"
     ln -sf "${PTXDIST_TOPDIR}/platforms"
     ln -sf "${PTXDIST_WORKSPACE}" workspace