merge of '6bfc098b36170550230dc57120c75b31480dc6b3'

     and 'abcca41fb7edac5318b0cb0266d5f0c167f87c2f'

22 files changed, 135 insertions, 28 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index b24a57f537..e42dd1cb3b 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -60,6 +60,9 @@ PCMCIA_MANAGER = "pcmciautils"
 #Preferred version for the kernel on various machines
 PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 
+#Initramfs for kernels
+KERNEL_INITRAMFS_PATH = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/initramfs-bootmenu-image-${MACHINE}.cpio.gz"
+
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 
@@ -201,7 +204,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
-    ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \
+    opkg-ipkg-compat ${ANGSTROM_FEED_CONFIGS} \
     util-linux-mount util-linux-umount \
     ${DEBUG_APPS} \
     "
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index ef0fa80f65..c439ad67f6 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -83,7 +83,8 @@ PREFERRED_VERSION_pango            = "1.16.4"
 PREFERRED_VERSION_atk              = "1.18.0"
 PREFERRED_VERSION_gtk+             = "2.10.14"
 
-PREFERRED_VERSION_gnome-vfs        = "2.16"
+PREFERRED_VERSION_gnome-vfs        = "2.16.3"
+
 # 3.9.1 would be correct
 PREFERRED_VERSION_gtkhtml-3.8      = "3.8.2"
 PREFERRED_VERSION_libxml2          = "2.6.27"
@@ -99,12 +100,16 @@ PREFERRED_VERSION_gst-plugins-base = "0.10.14"
 # 0.11.3 would be correct ( + maemo patches)
 PREFERRED_VERSION_gst-ffmpeg       = "0.10.2"
 
+PREFERRED_VERSION_bluez-libs            = "3.20"
+
 PREFERRED_PROVIDER_virtual/db           = "db"
 PREFERRED_PROVIDER_virtual/db-native    = "db-native"
 PREFERRED_PROVIDER_virtual/xserver      = "xserver-kdrive"
 
 # This is a hack to avoid building mesa which crashes the compiler
 PREFERRED_PROVIDER_virtual/libsdl       = "libsdl-directfb"
+PREFERRED_VERSION_libsdl-directfb       = "1.2.9"
+PREFERRED_VERSION_libsdl-image          = "1.2.3"
 
 PREFERRED_PROVIDER_xserver          = "xserver-kdrive"
 
@@ -137,11 +142,6 @@ PREFERRED_VERSION_pixman                  = "0.9.6"
 PREFERRED_PROVIDER_virtual/libqte2	  = "qte-mt"
 PREFERRED_PROVIDER_avahi		  = "avahi"
 
-# Prevent chosing jikes-native (until java bootstrap patch is merged).
-PREFERRED_PROVIDER_virtual/javac-native	  = "ecj-bootstrap-native"
-
-PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
-
 PREFERRED_VERSION_libsoup = "2.2.7"
 PREFERRED_VERSION_libglade = "2.4.2"
 PREFERRED_VERSION_gnutls = "1.4.5"
@@ -150,6 +150,23 @@ PREFERRED_VERSION_libgcrypt = "1.2.3"
 
 PREFERRED_VERSION_gpe-scap = "1.3"
 
+# various Maemo4 specific libraries
+PREFERRED_VERSION_mce-dev = "1.6.3"
+PREFERRED_VERSION_libosso = "2.13"
+PREFERRED_VERSION_libhildon = "1.99.0"
+PREFERRED_VERSION_libhildonmime = "1.10.0"
+PREFERRED_VERSION_libhildonfm = "1.9.46"
+PREFERRED_VERSION_hildon-thumbnail = "0.14"
+PREFERRED_VERSION_osso-gwconnect = "1.0.12"
+PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
+
+# Java stuff 
+
+PREFERRED_PROVIDER_virtual/javac-native	  = "ecj-bootstrap-native"
+
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
+PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
+
 # Does not compile with the CodeSourcery compiler .. :(
 PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
 PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
@@ -172,3 +189,11 @@ PKG_hildon-1 = "libhildon1"
 PKG_zlib = "zlib1g"
 PKG_libglade = "libglade2-0"
 PKG_libsoup = "libsoup2.2-8"
+
+PKG_libsdl-image = "libsdl-image1.2"
+PKG_libsdl-directfb = "libsdl1.2"
+
+PKG_bluez-libs = "libbluetooth2"
+
+PKG_osso-ic-oss = "osso-ic"
+PKG_libconic = "libconic0"
diff --git a/conf/distro/colinuxoe.conf b/conf/distro/colinuxoe.conf
index 7454c0167f..25ea04a1f5 100644
--- a/conf/distro/colinuxoe.conf
+++ b/conf/distro/colinuxoe.conf
@@ -2,6 +2,8 @@
 #@NAME: coLinuxoe
 #@DESCRIPTION: Generic OE built distro for the coLinux MACHINE
 
+TARGET_OS = "linux"
+
 INHERIT += "package_ipk debian"
 
 # MACHINE decides that linux-colinux is the correct kernel.
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf
index 26e78f89c1..805cfe7955 100644
--- a/conf/distro/generic-uclibc.conf
+++ b/conf/distro/generic-uclibc.conf
@@ -27,3 +27,10 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
 PREFERRED_PROVIDER_virtual/libintl = "libintl"
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+
+PREFERRED_VERSION_uclibc = "0.9.29"
+PREFERRED_VERSION_uclibc-initial = "0.9.29"
+
diff --git a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
index d712fadb8c..ef97eae09a 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
@@ -548,7 +548,7 @@ PREFERRED_VERSION_gpe-irc ?= "0.08"
 PREFERRED_VERSION_gpe-keylock ?= "0.12"
 PREFERRED_VERSION_gpe-life ?= "0.2"
 PREFERRED_VERSION_gpe-lights ?= "0.13"
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
 PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
 PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17"
 PREFERRED_VERSION_gpe-mininet ?= "0.7"
@@ -1489,7 +1489,7 @@ PREFERRED_VERSION_pwdutils ?= "2.6"
 PREFERRED_VERSION_pwlib ?= "1.5.2"
 PREFERRED_VERSION_pwmpi ?= "2.2.7"
 PREFERRED_VERSION_pxaregs ?= "1.14"
-PREFERRED_VERSION_python ?= "2.5.1"
+PREFERRED_VERSION_python ?= "2.5.2"
 PREFERRED_VERSION_python-ao ?= "0.82"
 PREFERRED_VERSION_python-constraint ?= "1.1"
 PREFERRED_VERSION_python-dbus ?= "0.81.1"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 5641c8ee39..b8685a578e 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,7 +1,7 @@
 PREFERRED_VERSION_dbus = "1.1.4"
 PREFERRED_VERSION_busybox = "1.9.1"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_libtool = "1.5.10"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 6ba20c4830..0f7ce15a9d 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -12,6 +12,7 @@ TARGET_VENDOR = "-angstrom"
 # Can be "glibc", "eglibc" or "uclibc"
 ANGSTROM_MODE ?= "glibc"
 
+CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}"
 DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
 require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
 
@@ -46,6 +47,9 @@ ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0"
 ENABLE_BINARY_LOCALE_GENERATION_omap2420h4 = "0"
 ENABLE_BINARY_LOCALE_GENERATION_omap2430sdp = "0"
 
+#qemu has taken a dislike to armeb as well
+ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
+
 #ARM EABI is softfloat by default, but let's make sure :)
 #make it overridable for platforms with FPU, like ep93xx or i.mx31
 TARGET_FPU_arm ?= "soft"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index c5390811c6..aa2d39f3db 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -9,6 +9,10 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
+
+SRCREV_pn-multitap-pad ?= "${AUTOREV}"
 
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
@@ -30,6 +34,7 @@ SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-memory ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index fb9e2815ba..55e51409be 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -32,7 +32,7 @@ PREFERRED_VERSION_libxsettings-client ?= "0.17"
 
 PREFERRED_VERSION_gpe-icons ?= "0.25"
 
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
 PREFERRED_VERSION_gpe-su ?= "0.19"
 PREFERRED_VERSION_keylaunch ?= "2.0.10"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 5641c8ee39..10af8675e8 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1,7 +1,11 @@
-PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_asterisk = "1.4.17"
 PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus-glib = "0.74"
+PREFERRED_VERSION_gnash = "0.8.1"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_libtool = "1.5.24"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
index 6db9d92f71..5a391aa45a 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
@@ -339,3 +339,9 @@ PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1"
 PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1"
 PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1"
 PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1"
+
+# Unreleased Packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
index 782549589d..c387161577 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
@@ -183,3 +183,9 @@ PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0"
 PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0"
+
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
index 59a481a104..dc34a99340 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
@@ -269,3 +269,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
 PREFERRED_VERSION_xserver-xorg ?= "1.2.0"
 
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
index d7e19284bc..648472e9b6 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
@@ -280,3 +280,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
 PREFERRED_VERSION_xserver-xorg ?= "1.4"
 
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index b04f72180d..4af2405aa7 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -284,3 +284,9 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 # xserver
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
 PREFERRED_VERSION_xserver-xorg ?= "1.4"
+
+# Unreleased packages
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
index f34b29f147..05136138fc 100644
--- a/conf/distro/include/preferred-xorg-versions.inc
+++ b/conf/distro/include/preferred-xorg-versions.inc
@@ -109,3 +109,7 @@ PREFERRED_VERSION_xtrans ?= "1.0.3"
 PREFERRED_VERSION_xtrans-native ?= "1.0.3"
 PREFERRED_VERSION_xinit ?= "1.0.4"
 PREFERRED_VERSION_xev ?= "1.0.2"
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 43ffa1de9f..5a1e8f2758 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080129"
+EFL_SRCDATE = "20080216"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 4d92f48928..5fa9ed7e38 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -7,6 +7,10 @@
 
 # this is alphabetical!
 
+# yes, really!
+
+# you know what that means? like... a, b, c, d, e, f, g...
+
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-contact ?= "1410"
@@ -22,11 +26,12 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7650"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
+SRCREV_pn-ffmpeg ?= "12186"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "73"
+SRCREV_pn-gsm0710muxd ?= "85"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "56"
 SRCREV_pn-hildon-1 ?= "14429"
@@ -41,13 +46,14 @@ SRCREV_pn-libmokogsmd2 ?= "3663"
 SRCREV_pn-libmokojournal2 ?= "3217"
 SRCREV_pn-libmokopanelui2 ?= "3349"
 SRCREV_pn-libmokoui2 ?= "3688"
+SRCREV_pn-libw100 ?= "47"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1039"
-SRCREV_pn-linux-openmoko ?= "4014"
+SRCREV_pn-linux-openmoko ?= "4102"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -57,7 +63,12 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-moko-gtk-engine ?= "3405"
 SRCREV_pn-mpd-alsa ?= "6952"
+SRCREV_pn-mplayer ?= "24587"
+SRCREV_pn-multitap-pad ?= "337"
 SRCREV_pn-neod ?= "3421"
+SRCREV_pn-netsurf ?= "3859"
+SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager-applet ?= "200"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
@@ -97,6 +108,7 @@ SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
 SRCREV_pn-openmoko-panel-gsm ?= "3664"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
+SRCREV_pn-openmoko-panel-memory ?= "3903"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
 SRCREV_pn-openmoko-sample2 ?= "3528"
 SRCREV_pn-openmoko-session ?= "152"
@@ -120,26 +132,26 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
-SRCREV_pn-opkg ?= "4022"
-SRCREV_pn-opkg-native ?= "4019"
+SRCREV_pn-opkg ?= "4142"
+SRCREV_pn-opkg-native ?= "4142"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
+SRCREV_pn-pyneod ?= "88"
+SRCREV_pn-pyneog ?= "88"
 SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-fso-pyproto = "70"
 SRCREV_pn-python-gsmd = "127"
 SRCREV_pn-python-lightmediascanner = "68"
+SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
+SRCREV_pn-u-boot-openmoko ?= "4100"
+SRCREV_pn-usbpath ?= "3108"
+SRCREV_pn-usbpath-native ?= "3108"
 SRCREV_pn-webkit-gtk ?= "28656"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1623"
-SRCREV_pn-mplayer ?= "24587"
-SRCREV_pn-networkmanager ?= "2887"
-SRCREV_pn-networkmanager-applet ?= "200"
-SRCREV_pn-libw100 ?= "47"
-SRCREV_pn-usbpath ?= "3108"
-SRCREV_pn-usbpath-native ?= "3108"
+
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 334c8bba9b..0623ce6dd0 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -11,6 +11,8 @@
 #
 # Bruno Randolf <bruno.randolf@4g-systems.biz>
 
+TARGET_OS = "linux"
+
 INHERIT += "package_ipk debian nylon-mirrors"
 INHERIT += "linux-kernel-base"
 
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index b08e5f2ddb..8fab5e5058 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -14,12 +14,13 @@ DISTRO_NAME = "OpenMoko"
 DISTRO_VERSION = "P1-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
+DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat"
 
-OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
 
-PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/"
+PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
 
 FEED_URIS = "\
   snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
@@ -63,7 +64,11 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
 PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
 
+# for jalimo
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
+
 # deploy gta01 and gta02 in ${MACHINE_CLASS} directory
 DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
 DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-
diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf
index 92e5ac5b39..0646b17f90 100644
--- a/conf/distro/openwrt-sdk.conf
+++ b/conf/distro/openwrt-sdk.conf
@@ -20,10 +20,14 @@ require conf/distro/generic-uclibc.conf
 DISTRO_NAME = "OpenWRT"
 DISTRO_REVISION = "2"
 
+# Build ipk's wrapped with tar.gz instead of ar, like OpenWRT has them
 IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 
 # This is what lives in SDK
 ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
 
+# Rename packages to names used in OpenWRT
+PKG_ncurses = "libncurses"
+
 # Make sure that we have correct package dependencies for SDK-provided libs.
 ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 3fbe79e354..0e130a2fd7 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -38,6 +38,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" 
 PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
 
 PREFERRED_VERSION_glibc = "2.2.5"
@@ -52,6 +53,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 QTE_VERSION = "2.3.10"
 OPIE_VERSION = "1.2.2"
 PALMTOP_USE_MULTITHREADED_QT = "no"
+export palmtopdir = "/opt/QtPalmtop"
 require conf/distro/include/preferred-opie-versions.inc
 
 #