Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges

12 files changed, 130 insertions, 34 deletions

diff --git a/packages/tasks/task-cli-tools.bb b/packages/tasks/task-cli-tools.bb
index 8bc4b83211..e69c2924a2 100644
--- a/packages/tasks/task-cli-tools.bb
+++ b/packages/tasks/task-cli-tools.bb
@@ -2,17 +2,17 @@ DESCRIPTION = "A set of command line tools"
 SECTION = "console"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r0"
+PR = "r1"
 
 inherit task
 
+PACKAGES += "${PN}-python"
+
 RDEPENDS_${PN} = "\
   dosfstools \
   htop \
   iptables \
   lsof \
-  mickeydbus \
-  mickeyterm \
   mtd-utils \
   nano \
   powertop \
@@ -27,3 +27,7 @@ RDEPENDS_${PN}_append_om-gta02 = "\
   s3c24xx-gpio \
 "
 
+RDEPENDS_${PN}-python = "\
+  mickeydbus \
+  mickeyterm \
+"
diff --git a/packages/tasks/task-fso-toolchain-host.bb b/packages/tasks/task-fso-toolchain-host.bb
new file mode 100644
index 0000000000..afb1ce830b
--- /dev/null
+++ b/packages/tasks/task-fso-toolchain-host.bb
@@ -0,0 +1,9 @@
+require task-sdk-host.bb
+
+DESCRIPTION = "Packages for a standalone FSO SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r0"
+
+PACKAGES = "${PN}"
diff --git a/packages/tasks/task-fso-toolchain-target.bb b/packages/tasks/task-fso-toolchain-target.bb
new file mode 100644
index 0000000000..d042849bed
--- /dev/null
+++ b/packages/tasks/task-fso-toolchain-target.bb
@@ -0,0 +1,69 @@
+DESCRIPTION = "Packages for a standalone  SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r1"
+
+PACKAGES = "${PN}"
+
+# Stuff contained in this SDK is largely taken from task-sdk-base.bb.
+# This is a starting point, and nothing more at present -- please fill
+# this out with a reasonable set of development tools for an FSO image.
+# Also feel free to remove stuff that's silly.  And someone should
+# review the glibc-gconv list to see if that makes sense.
+
+RDEPENDS_${PN} = "\
+    glibc \
+    glibc-dbg \
+    glibc-dev \
+    glibc-utils \
+    libsegfault \
+    glibc-thread-db \
+    glibc-localedata-i18n \
+    glibc-gconv-ibm850 \
+    glibc-gconv-cp1252 \
+    glibc-gconv-iso8859-1 \
+    glibc-gconv-iso8859-15 \
+    locale-base-en-gb \
+    libgcc \
+    libstdc++ \
+    linux-libc-headers-dev \
+    \
+    libssl \
+    libcrypto \
+    openssl-dev \
+    libts-dev \
+    ncurses-dev \
+    readline-dev \
+    gnutls-dev \
+    libgcrypt-dev \
+    libapm-dev \
+    alsa-dev \
+    alsa-lib-dev \
+    libgpg-error-dev \
+    libx11-dev \
+    util-macros-dev \
+    bigreqsproto-dev \
+    xproto-dev \
+    xextproto-dev \
+    xtrans-dev \
+    xcmiscproto-dev \
+    xf86bigfontproto-dev \
+    kbproto-dev \
+    inputproto-dev \
+    glib-2.0-dev \
+    expat-dev \
+    libice-dev \
+    libsm-dev \
+    dbus-dev \
+    bluez-libs-dev \
+    jpeg-dev \
+    libpng-dev \
+    "
+
+# This one needs further investigation; seems to be some
+# sort of naming problem that breaks the SDK when it is
+# added directly.
+ODDLY_BROKEN_PACKAGES ="\
+    libz-dev \
+"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 921f4d7edd..921077b40b 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r45"
+PR = "r46"
 
 inherit task
 
@@ -104,4 +104,14 @@ RDEPENDS_task-openmoko-feed = "\
   midori \
   microcom \
   emacs \
+# for werner \
+  net-tools \
+  iproute2 \
+  iputils \
+  psmisc \
+  tar \
+  coreutils \
+  debianutils \
+  tcptraceroute \
+# dnsutils/bind-tools for dig, nslookup is still missing \
 "
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 9f1403f050..e316971e75 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for OPIE stuff"

 SECTION = "opie/base"

 LICENSE = "MIT"

-PR = "r2"

+PR = "r3"

 

 inherit task

 

@@ -34,7 +34,7 @@ RDEPENDS_task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid
 RDEPENDS_task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"

 

 RDEPENDS_task-opie-multimedia = "opie-mediaplayer1 \

-                        opie-mediaplayer1-libmadplugin \

+                        ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'opie-mediaplayer1-libmadplugin', d)} \

                         opie-mediaplayer1-libmodplugin \

                         opie-mediaplayer1-libtremorplugin \

                         opie-mediaplayer1-libwavplugin \

diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
index 6e1cd5d895..ce512535dc 100644
--- a/packages/tasks/task-proper-tools.bb
+++ b/packages/tasks/task-proper-tools.bb
@@ -1,25 +1,30 @@
 DESCRIPTION = "Full versions of tools provided by busybox"
-PR = "r6"
+PR = "r7"
 
 inherit task
 
 RDEPENDS_${PN} = "\
-            coreutils \
-	    findutils \
-	    util-linux-ng \
-	    gawk \
-	    sed \
-	    wget \
-	    patch \
-            tar \
-	    diffutils \
-            less \
-            vim \
-	    e2fsprogs \
-            binutils-symlinks \
-            module-init-tools \
+		coreutils \
+		findutils \
+		util-linux-ng \
+		gawk \
+		sed \
+		wget \
+		patch \
+		tar \
+		diffutils \
+		less \
+		vim \
+		e2fsprogs \
+		binutils-symlinks \
+		module-init-tools \
+		net-tools \
+		iproute2 \
+		iputils \
+		psmisc \
+		debianutils \
+		tcptraceroute \
 	    "
-
 #
 # binutils-symlinks provide ar in a way which conflict with busybox - #1465 for more info
 #
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 6c8e21ebd9..02cecbf586 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml34"
+PR = "ml36"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -16,7 +16,9 @@ RDEPENDS = "\
 		python-fnorb		\
 		python-formencode	\
 		python-fpconst		\
+		python-fugrep		\
 		python-fuse			\
+		python-fusil		\
 		python-gammu		\
 		python-gmpy		\
 		python-gnosis		\
diff --git a/packages/tasks/task-sdk-base.bb b/packages/tasks/task-sdk-base.bb
index 4041b27536..3d86d030f7 100644
--- a/packages/tasks/task-sdk-base.bb
+++ b/packages/tasks/task-sdk-base.bb
@@ -34,7 +34,7 @@ RDEPENDS = "\
     libiw-dev \
     libmimedir-dev \
     libpcap-dev \
-    libpixman-dev \
+    pixman-dev \
     libpng-dev \
     libschedule-dev \
     libsm-dev \
diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb
index efb12c3cfb..c4414dbcf8 100644
--- a/packages/tasks/task-sdk-extra.bb
+++ b/packages/tasks/task-sdk-extra.bb
@@ -28,7 +28,7 @@ RDEPENDS_task-sdk-x11-ext = "\
     libxrandr-dev \
     libxrender-dev \
     libxsettings-client-dev \
-    randrext-dev \
+    randrproto-dev \
     libxau-dev \
     xcalibrateext-dev \
     libxcomposite-dev \
diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb
index a38e58385f..f6446c4f76 100644
--- a/packages/tasks/task-sdk-opie.bb
+++ b/packages/tasks/task-sdk-opie.bb
@@ -3,6 +3,8 @@ PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
+PALMTOP_USE_MULTITHREADED_QT ?= "yes"
+
 PACKAGES = "task-sdk-opie"
 
 RDEPENDS_task-sdk-opie = "\
@@ -13,6 +15,6 @@ RDEPENDS_task-sdk-opie = "\
     libopiepim2 \
     libopieui2 \
     libqpe-opie \
-    qte \
+    ${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)} \
     libqtaux2 \
     libmailwrapper"
diff --git a/packages/tasks/task-x11-illume.bb b/packages/tasks/task-x11-illume.bb
index a477c6e8c5..8b813b4ebb 100644
--- a/packages/tasks/task-x11-illume.bb
+++ b/packages/tasks/task-x11-illume.bb
@@ -9,7 +9,7 @@ PR = "r0"
 inherit task
 
 # Default illume theme
-ILLUME_THEME ?= "illume-theme-illume"
+ILLUME_THEME ?= "e-wm-theme-illume"
 
 RDEPENDS_${PN} = "\
   task-x11-server \
@@ -17,11 +17,6 @@ RDEPENDS_${PN} = "\
 #  xserver-kdrive-splash-illume \
   \
   e-wm \
-  illume \
-  illume-config-illume \
-  illume-dicts-english-us \
-  illume-keyboards-default \
-  illume-keyboards-numbers \
-  illume-keyboards-terminal \
+  e-wm-config-illume \
   ${ILLUME_THEME} \
 "
diff --git a/packages/tasks/task-x11.bb b/packages/tasks/task-x11.bb
index ad5ca3a412..fe8dfff198 100644
--- a/packages/tasks/task-x11.bb
+++ b/packages/tasks/task-x11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
 SECTION = "x11/server"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r0"
+PR = "r1"
 
 # WORK IN PROGRESS