merge of '2a9f522bb79ea664167e746c79c80fe0d104c20f'

     and 'b2448d9d2bf369b829dab2b33b95bd7d54fcf1f4'

102 files changed, 1002 insertions, 473 deletions

diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb
index 3a8a0a74b7..15850e5bdc 100644
--- a/packages/altboot/altboot_1.0.5.bb
+++ b/packages/altboot/altboot_1.0.5.bb
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+# License: MIT (see COPYING.MIT)
 #
 # Filename: altboot_1.0.5-rc2.bb
 # Date: 21-Feb-06
diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb
index aed66b47a8..9544e6b5ac 100644
--- a/packages/altboot/altboot_1.0.8.bb
+++ b/packages/altboot/altboot_1.0.8.bb
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+# License: MIT (see COPYING.MIT)
 #
 # Filename: altboot_1.0.5-rc2.bb
 # Date: 21-Feb-06
diff --git a/packages/altboot/altboot_1.1.1+wip-20061123.bb b/packages/altboot/altboot_1.1.1+wip-20061123.bb
index d857e5b454..bc96c670e9 100644
--- a/packages/altboot/altboot_1.1.1+wip-20061123.bb
+++ b/packages/altboot/altboot_1.1.1+wip-20061123.bb
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+# License: MIT (see COPYING.MIT)
 #
 # Filename: altboot_1.0.5-rc2.bb
 # Date: 21-Feb-06
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb b/packages/altboot/altboot_1.1.1+wip-SVNR30.bb
index 8b4a65a098..b3ccb70497 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR30.bb
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+# License: MIT (see COPYING.MIT)
 #
 # Filename: altboot_1.0.5-rc2.bb
 # Date: 21-Feb-06
diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb
index 18f73dd6ae..1c43be8fd8 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+# License: MIT (see COPYING.MIT)
 #
 # Filename: altboot_1.0.5-rc2.bb
 # Date: 21-Feb-06
diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb
index 8bd0fe07e7..e5a6dcc2a3 100644
--- a/packages/angstrom/angstrom-console-image.bb
+++ b/packages/angstrom/angstrom-console-image.bb
@@ -5,8 +5,7 @@ PR = "r4"
 ANGSTROM_EXTRA_INSTALL ?= ""
 
 DEPENDS = "task-base"
-RDEPENDS = "task-base-core-default \
-	    task-base \
+RDEPENDS = "task-base \
 	    ${ANGSTROM_EXTRA_INSTALL} \
 	   "
 
diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb
index da40f7e00c..4c9bb83507 100644
--- a/packages/angstrom/angstrom-e-image.bb
+++ b/packages/angstrom/angstrom-e-image.bb
@@ -1,6 +1,6 @@
 #Angstrom e image
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 
 PREFERRED_PROVIDER_virtual/evas   ?= "evas-x11"
@@ -21,7 +21,6 @@ export IMAGE_BASENAME = "e-image"
 DEPENDS = "task-base"
 RDEPENDS = "\
     ${XSERVER} \
-    task-base-core-default \
     task-base \
     angstrom-e-base-depends \
     angstrom-e-depends \
diff --git a/packages/angstrom/angstrom-mokogateway-image.bb b/packages/angstrom/angstrom-mokogateway-image.bb
index 80673f61ec..624274de37 100644
--- a/packages/angstrom/angstrom-mokogateway-image.bb
+++ b/packages/angstrom/angstrom-mokogateway-image.bb
@@ -1,32 +1,17 @@
 #Angstrom moko gateway image
 # tries to be a companion for openmoko based phones
 LICENSE = "MIT"
-PR = "r0"
+PR = "r2"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
 DEPENDS = "task-base"
-RDEPENDS = "task-base-core-default \
-	    task-base \
+RDEPENDS = " \
+	    task-boot \
+	    task-base-bluetooth \
 	    bluez-utils \
-	    blue-probe \
+	    blueprobe \
 	   "
-RRECOMMENDS = " \
-    kernel-module-bluetooth \
-    kernel-module-l2cap \
-    kernel-module-rfcomm \
-    kernel-module-hci-vhci \
-    kernel-module-bnep \
-    kernel-module-hidp \
-    kernel-module-hci-uart \
-    kernel-module-sco \
-    ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \
-    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)} \
-   "
-
 export IMAGE_BASENAME = "mokogateway-image"
 export IMAGE_LINGUAS = ""
 export PACKAGE_INSTALL = "${RDEPENDS}"
diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb
index dbb986ae65..c5d2675b60 100644
--- a/packages/angstrom/angstrom-x11-image.bb
+++ b/packages/angstrom/angstrom-x11-image.bb
@@ -1,6 +1,6 @@
 #Angstrom X11 image
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 
 PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
 PREFERRED_PROVIDER_tslib 		?= "tslib"
@@ -16,7 +16,6 @@ export IMAGE_BASENAME = "x11-image"
 DEPENDS = "task-base"
 RDEPENDS = "\
     ${XSERVER} \
-    task-base-core-default \
     task-base \
     angstrom-x11-base-depends \
     angstrom-gpe-task-base \
diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb
index 228c637158..eb9f025743 100644
--- a/packages/angstrom/task-angstrom-e.bb
+++ b/packages/angstrom/task-angstrom-e.bb
@@ -24,4 +24,4 @@ RDEPENDS_angstrom-e-depends := "\