merge of '4e808662b364403781cd4e899198db521c13afc9'

     and '88288139695df3e5cc87ecfe407fbad1d201c362'

4 files changed, 24 insertions, 8 deletions

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 2c2bffea96..0edb4ef0ae 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -1,9 +1,11 @@
+EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}"
 SRCREV_pn-assassin ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
 SRCREV_pn-diversity-nav ?= "${AUTOREV}"
 SRCREV_pn-illume ?= "${AUTOREV}"
+SRCREV_pn-illume-theme ?= "${AUTOREV}"
 SRCREV_pn-libgsmd ?= "${AUTOREV}"
 SRCREV_pn-libjana ?= "${AUTOREV}"
 SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
@@ -14,11 +16,13 @@ SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-multitap-pad ?= "${AUTOREV}"
+SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}"
 SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
@@ -52,8 +56,10 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
-#SRCREV_pn-opkg ?= "${AUTOREV}"
-#SRCREV_pn-opkg-native ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
+SRCREV_pn-opkg-sdk ?= "${AUTOREV}"
+SRCREV_pn-python-etk ?= "${AUTOREV}"
 SRCREV_pn-python-gsmd ?= "${AUTOREV}"
 SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 23093ef2c1..7721d97ce6 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 ?= "20080427"
+EFL_SRCDATE ?= "20080428"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -155,3 +155,6 @@ SRCDATE_yamonenv ?= "20060814"
 # Freedesktop.org
 SRCDATE_poppler0.6 = "20070708"
 
+# aleph1/yaffs
+SRCDATE_yaffs2-utils = "20080331"
+SRCDATE_yaffs2-utils-native = "20080331"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index ffa847677b..246789fcbe 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -12,7 +12,7 @@
 # you know what that means? like... a, b, c, d, e, f, g...
 
 SRCREV_pn-aircrack-ng ?= "802"
-SRCREV_pn-assassin ?= "41"
+SRCREV_pn-assassin ?= "93"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-uclibc ?= "21926"
 SRCREV_pn-uclibc-initial ?= "21926"
@@ -22,11 +22,12 @@ SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "4160"
 SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "277"
-SRCREV_pn-diversity-nav ?= "284"
+SRCREV_pn-diversity-nav ?= "340"
 SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-eglibc ?= "5963"
 SRCREV_pn-eglibc-initial ?= "5963"
 SRCREV_pn-eglibc-intermediate ?= "5963"
+SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
@@ -43,7 +44,8 @@ SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "14"
+SRCREV_pn-illume ?= "58"
+SRCREV_pn-illume-theme ?= "58"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
@@ -59,6 +61,7 @@ SRCREV_pn-libmokoui2 ?= "4342"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-librfid ?= "2094"
 SRCREV_pn-libw100 ?= "47"
+SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
@@ -80,7 +83,7 @@ SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-neod ?= "4336"
 SRCREV_pn-netsurf ?= "3859"
-SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager ?= "3202"
 SRCREV_pn-networkmanager-applet ?= "200"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
@@ -88,7 +91,7 @@ SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-agpsui ?= "7"
-SRCREV_pn-openmoko-alsa-scenarios ?= "4317"
+SRCREV_pn-openmoko-alsa-scenarios ?= "4406"
 SRCREV_pn-openmoko-appearance ?= "3262"
 SRCREV_pn-openmoko-appmanager ?= "1851"
 SRCREV_pn-openmoko-appmanager2 ?= "3442"
@@ -154,6 +157,7 @@ SRCREV_pn-opkg-sdk ?= "4247"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "74a3b7e3f3bc8627c23349e0b0d8429fd5f53fc6"
 SRCREV_pn-psplash ?= "249"
+SRCREV_pn-pty-forward-native ?= "4214"
 SRCREV_pn-python-odeviced ?= "e2ae2c252ef43be23781c2d09567a8d21ca1e965"
 SRCREV_pn-python-ophoned ?= "e657c81a6729aeef21ba4c6b75590658cbbef391"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
@@ -165,6 +169,7 @@ SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
 SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
+SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna ?= "45"
@@ -177,4 +182,5 @@ SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1971"
+SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
 SRCREV_pn-zhone ?= "a9496c35328f66ed8e4f840709721c5bacae2bb4"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index e041b34c6f..3b9ed1b468 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -9,6 +9,7 @@ MACHINE_CLASS = "neo1973"
 PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"