merge of '470ca3fe64c9411d3a7d992db39d5efbed869839'

     and '912f388483a3e1703ca89d7b2309723fd3407420'

7 files changed, 8 insertions, 31 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index d6354411fd..3026e6f043 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -190,7 +190,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
     opkg-nogpg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \
-    util-linux-mount util-linux-umount \
+    util-linux-ng-mount util-linux-ng-umount \
     ${DEBUG_APPS} \
     "
 
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 4734187f0f..8c76de6f1a 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -29,9 +29,6 @@ FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2"
 FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -ftree-vectorize -O2"
-FULL_OPTIMIZATION_pn-glibc_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -ftree-vectorize -O3"
-
 BUILD_OPTIMIZATION = "-Os"
 BUILD_OPTIMIZATION_pn-perl = "-O1"
 BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index c411149cd9..9043345134 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -21,7 +21,6 @@ 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}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index a9fbb3067d..a03f42fe0d 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1555,8 +1555,8 @@ PREFERRED_VERSION_python-pymp3 ?= "0.3.4"
 PREFERRED_VERSION_python-pyrad ?= "0.8"
 PREFERRED_VERSION_python-pyraf ?= "1.4"
 PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
-PREFERRED_VERSION_python-pyrex ?= "0.9.5.1a"
-PREFERRED_VERSION_python-pyrex-native ?= "0.9.5.1a"
+PREFERRED_VERSION_python-pyrex ?= "0.9.8"
+PREFERRED_VERSION_python-pyrex-native ?= "0.9.8"
 PREFERRED_VERSION_python-pyro ?= "3.7"
 PREFERRED_VERSION_python-pyserial ?= "2.2"
 PREFERRED_VERSION_python-pytester ?= "0.6.0"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 10a0330f17..f248a81bba 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 ?= "20080610"
+EFL_SRCDATE ?= "20080716"
 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 f646ee55cb..feb237cea6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -72,6 +72,7 @@ SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1066"
 SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
+SRCREV_pn-linux-openmoko-devel ?= "9c058ff0d2641df3c36fc3300acb72078d2c41d4"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -100,30 +101,19 @@ SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-agpsui ?= "7"
 SRCREV_pn-openmoko-alsa-scenarios ?= "4406"
 SRCREV_pn-openmoko-appearance ?= "3262"
-SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3442"
+SRCREV_pn-openmoko-appmanager2 ?= "4530"
 SRCREV_pn-openmoko-browser2 ?= "4172"
-SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "3655"
-SRCREV_pn-openmoko-common ?= "397"
 SRCREV_pn-openmoko-common2 ?= "3259"
-SRCREV_pn-openmoko-contacts ?= "2298"
 SRCREV_pn-openmoko-contacts2 ?= "418"
-SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "673"
-SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "4343"
 SRCREV_pn-openmoko-feedreader2 ?= "3645"
-SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
 SRCREV_pn-openmoko-footer ?= "2354"
-SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "4232"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "4232"
-SRCREV_pn-openmoko-keyboard ?= "1631"
-SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-mediaplayer2 ?= "4173"
-SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-messages2 ?= "4340"
 SRCREV_pn-openmoko-panel-battery ?= "3360"
 SRCREV_pn-openmoko-panel-bt ?= "4331"
@@ -136,22 +126,12 @@ SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-memory ?= "3903"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
 SRCREV_pn-openmoko-panel-wifi ?= "4344"
-SRCREV_pn-openmoko-sample2 ?= "3528"
-SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-sample2 ?= "3537"
-SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271"
-SRCREV_pn-openmoko-stylus-demo ?= "2324"
-SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
-SRCREV_pn-openmoko-taskmanager ?= "1663"
-SRCREV_pn-openmoko-tasks ?= "320"
 SRCREV_pn-openmoko-tasks2 ?= "399"
 SRCREV_pn-openmoko-terminal2 ?= "4039"
-SRCREV_pn-openmoko-theme-standard ?= "4167"
-SRCREV_pn-openmoko-theme-standard-qvga ?= "4167"
 SRCREV_pn-openmoko-theme-standard2 ?= "4338"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
-SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "4168"
 SRCREV_pn-openmoko-today2-folders ?= "3704"
 SRCREV_pn-openmoko-toolchain-scripts ?= "4430"
@@ -185,6 +165,7 @@ SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "4297"
+SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-webkit-gtk ?= "35062"
diff --git a/conf/machine/include/neuros.inc b/conf/machine/include/neuros.inc
index d744bf9082..96e2f1bd25 100644
--- a/conf/machine/include/neuros.inc
+++ b/conf/machine/include/neuros.inc
@@ -16,7 +16,7 @@ neuros_make_installkit () {
     cp ${IMAGE_NAME}.rootfs.yaffs2 ${IMAGE_NAME}-installkit/rootfs.yaffs2 
 
     cd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ 
-      mkfs.jffs2 -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 -n 
+      mkfs.jffs2 -x lzo -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 -n 
       echo "${MACHINE}" > rootfs.version
       echo "${MACHINE}" > u-boot.version
       echo "${MACHINE}" > uImage.version