merge of 2057bca5a2cf515271e6a43d7432ecd028f5dca5

     and 72409a634bd5ef5e1a72c253a907fbec85506604

56 files changed, 67 insertions, 57 deletions

diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass
index 5fdd340673..f6af799e69 100644
--- a/classes/image_ipk.bbclass
+++ b/classes/image_ipk.bbclass
@@ -1,5 +1,8 @@
 inherit rootfs_ipk
 
+# We need to follow RDEPENDS and RRECOMMENDS for images
+BUILD_ALL_DEPS = "1"
+
 # Images are generally built explicitly, do not need to be part of world.
 EXCLUDE_FROM_WORLD = "1"
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index bebad809d2..61c08758b2 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -67,6 +67,12 @@ TIME := "${@time.strftime('%H%M%S',time.gmtime())}"
 DATETIME = "${DATE}${TIME}"
 
 ##################################################################
+# Openembedded Software Prerequisites.
+##################################################################
+
+ASSUME_PROVIDED = "python-native cvs-native svn-native"
+
+##################################################################
 # Package default variables.
 ##################################################################
 
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 8515247d40..cbe829c2a1 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -34,11 +34,11 @@ BBMASK = ""
 # provide packages for toolchain and additional libraries yourself. You also
 # have to set PATH in your environment to make sure BitBake finds additional binaries.
 # Note: You will definitely need to say:
-#     ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
+#     ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
 # to build any of two Linux 2.4 Embedix kernels,
 # i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget
 # to rename the binaries as instructed in the Wiki.
-# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
+# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
 
 # Select between multiple alternative providers, if more than one is eligible.
 PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie"
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 6cf622ae1c..da699e7258 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -4,7 +4,7 @@
 
 KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
 ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf
index ef9bd3419e..196cd51ebb 100644
--- a/conf/machine/blueangel.conf
+++ b/conf/machine/blueangel.conf
@@ -26,10 +26,10 @@ SERIAL_CONSOLE = "115200 tts/2 vt100"
 
 USE_VT = "0"
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 ROOT_FLASH_SIZE = "32"
 
 # optimize images, but build feeds without using tune-xscale so as to retain backwards compatibility
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf
index b7bb5a0afe..83899514f5 100644
--- a/conf/machine/borzoi.conf
+++ b/conf/machine/borzoi.conf
@@ -4,8 +4,8 @@
 
 KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
 PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 6b8348e117..af1c9dad1c 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -4,8 +4,8 @@
 
 KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
 ROOT_FLASH_SIZE = "25"
 # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 4af42deb24..a8226ea04e 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -22,8 +22,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 IMAGE_LINGUAS = ""
 
-include conf/machine/handheld-common.conf
-include conf/machine/tune-strongarm.conf
+include conf/machine/include/handheld-common.conf
+include conf/machine/include/tune-strongarm.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index ff4a82f95c..329ac6816d 100644
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
 BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel virtual/bootloader"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 429242c9bd..2963131486 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -10,5 +10,5 @@ GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 IPKG_ARCHS = "i386"
 
-include conf/machine/tune-c3.conf
+include conf/machine/include/tune-c3.conf
 
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 468fcf1838..0c602398c7 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -8,7 +8,7 @@ OVERRIDES =. "${KERNEL}:"
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv5te h1910"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 354e3a9552..4526006cfe 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -42,9 +42,9 @@ SERIAL_CONSOLE = "115200 tts/0 vt100"
 
 USE_VT = "0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
+include conf/machine/include/ipaq-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 48990d5618..96651aa6ae 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -35,8 +35,8 @@ USE_VT = "0"
 
 IMAGE_LINGUAS = ""
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
-include conf/machine/tune-strongarm.conf
+include conf/machine/include/ipaq-common.conf
+include conf/machine/include/handheld-common.conf
+include conf/machine/include/tune-strongarm.conf
 
 SERIAL_CONSOLE = "115200 ttySA0"
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index cff74131d5..a047761598 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -33,10 +33,10 @@ SERIAL_CONSOLE = "115200 tts/0 vt100"
 USE_DEVFS_kernel24 = "1"
 USE_VT = "0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
+include conf/machine/include/ipaq-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 
 #use tune xscale for extra performance. Distro feeds be built with tune-strongarm 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 166701a46b..85a6d36950 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -26,4 +26,4 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-include conf/machine/tune-arm9tdmi.conf
+include conf/machine/include/tune-arm9tdmi.conf
diff --git a/conf/machine/include/.mtn2git_empty b/conf/machine/include/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/include/.mtn2git_empty
diff --git a/conf/machine/handheld-common.conf b/conf/machine/include/handheld-common.conf
index 40fd9780f9..40fd9780f9 100644
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/include/ipaq-common.conf
index 791abd2103..791abd2103 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/include/ipaq-common.conf
diff --git a/conf/machine/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf
index dc603d3bcc..dc603d3bcc 100644
--- a/conf/machine/poodle-2.4.conf
+++ b/conf/machine/include/poodle-2.4.conf
diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 7edebad2d3..7edebad2d3 100644
--- a/conf/machine/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
diff --git a/conf/machine/thinclient-common.conf b/conf/machine/include/thinclient-common.conf
index e6c97886c9..e6c97886c9 100644
--- a/conf/machine/thinclient-common.conf
+++ b/conf/machine/include/thinclient-common.conf
diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf
index 6e208f4fc6..6e208f4fc6 100644
--- a/conf/machine/tosa-2.4.conf
+++ b/conf/machine/include/tosa-2.4.conf
diff --git a/conf/machine/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf
index 5455e3f0d5..fdd706d093 100644
--- a/conf/machine/tosa-2.6.conf
+++ b/conf/machine/include/tosa-2.6.conf
@@ -1,4 +1,4 @@
-include conf/machine/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-clamshell-2.6.conf
 # SOUND Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-snd-ac97-bus kernel-module-snd-ac97-codec kernel-module-snd-mixer-oss kernel-module-snd-page-alloc kernel-module-snd-pcm kernel-module-snd-pcm-oss kernel-module-snd-pxa2xx-ac97 kernel-module-snd-pxa2xx-pcm kernel-module-snd-timer kernel-module-soundcore"
 
diff --git a/conf/machine/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf
index 936b137517..936b137517 100644
--- a/conf/machine/tune-arm920t.conf
+++ b/conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf
index 5e2f6b7c62..5e2f6b7c62 100644
--- a/conf/machine/tune-arm926ejs.conf
+++ b/conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.conf
index cfc3bad1c1..cfc3bad1c1 100644
--- a/conf/machine/tune-arm9tdmi.conf
+++ b/conf/machine/include/tune-arm9tdmi.conf
diff --git a/conf/machine/tune-c3.conf b/conf/machine/include/tune-c3.conf
index e6a522af10..e6a522af10 100644
--- a/conf/machine/tune-c3.conf
+++ b/conf/machine/include/tune-c3.conf
diff --git a/conf/machine/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.conf
index 7c8714cfc2..7c8714cfc2 100644
--- a/conf/machine/tune-ppc603e.conf
+++ b/conf/machine/include/tune-ppc603e.conf
diff --git a/conf/machine/tune-ppce500.conf b/conf/machine/include/tune-ppce500.conf
index 11717eba70..11717eba70 100644
--- a/conf/machine/tune-ppce500.conf
+++ b/conf/machine/include/tune-ppce500.conf
diff --git a/conf/machine/tune-sh3.conf b/conf/machine/include/tune-sh3.conf
index 192dd8fd22..192dd8fd22 100644
--- a/conf/machine/tune-sh3.conf
+++ b/conf/machine/include/tune-sh3.conf
diff --git a/conf/machine/tune-sh4.conf b/conf/machine/include/tune-sh4.conf
index 866f7f89d5..866f7f89d5 100644
--- a/conf/machine/tune-sh4.conf
+++ b/conf/machine/include/tune-sh4.conf
diff --git a/conf/machine/tune-strongarm.conf b/conf/machine/include/tune-strongarm.conf
index 8654c996ef..8654c996ef 100644
--- a/conf/machine/tune-strongarm.conf
+++ b/conf/machine/include/tune-strongarm.conf
diff --git a/conf/machine/tune-supersparc.conf b/conf/machine/include/tune-supersparc.conf
index 1b1ec1207f..1b1ec1207f 100644
--- a/conf/machine/tune-supersparc.conf
+++ b/conf/machine/include/tune-supersparc.conf
diff --git a/conf/machine/tune-xscale.conf b/conf/machine/include/tune-xscale.conf
index 0b98f09fc8..0b98f09fc8 100644
--- a/conf/machine/tune-xscale.conf
+++ b/conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf
index d61dc197b2..d61dc197b2 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/include/zaurus-clamshell-2.4.conf
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index 757fc6acf3..757fc6acf3 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index f55f2d2554..e0a26f3dc7 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -17,9 +17,9 @@ GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
 GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 626b5cf218..33c8ad8aa5 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -23,15 +23,15 @@ PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
+include conf/machine/include/ipaq-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim" 
 GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
 HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index 4ac63b556d..9de9eaba89 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -16,5 +16,5 @@ USE_DEVFS = "1"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-include conf/machine/handheld-common.conf
-include conf/machine/tune-strongarm.conf
+include conf/machine/include/handheld-common.conf
+include conf/machine/include/tune-strongarm.conf
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index 5e81c35430..6526f50ef4 100644
--- a/