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

Conflicts:

	packages/tasks/task-openmoko-feed.bb

4 files changed, 42 insertions, 26 deletions

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 96484d4d2c..c89b650033 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1381,7 +1381,7 @@ PREFERRED_VERSION_openswan ?= "2.4.7"
 PREFERRED_VERSION_openttd ?= "0.6.2"
 PREFERRED_VERSION_openvpn ?= "2.0.9"
 PREFERRED_VERSION_oplinux-packages ?= "1.0"
-PREFERRED_VERSION_oprofile ?= "0.9.3"
+PREFERRED_VERSION_oprofile ?= "0.9.4"
 PREFERRED_VERSION_orage ?= "4.4.1"
 PREFERRED_VERSION_orbit2 ?= "2.14.12"
 PREFERRED_VERSION_orbit2-native ?= "2.14.12"
@@ -1778,7 +1778,7 @@ PREFERRED_VERSION_startup-monitor ?= "0.18-2"
 PREFERRED_VERSION_startup-notification ?= "0.8"
 PREFERRED_VERSION_stat ?= "3.3"
 PREFERRED_VERSION_stat-native ?= "3.3"
-PREFERRED_VERSION_strace ?= "4.5.14"
+PREFERRED_VERSION_strace ?= "4.5.15"
 PREFERRED_VERSION_streamripper ?= "1.61.10"
 PREFERRED_VERSION_stress ?= "0.18.8"
 PREFERRED_VERSION_stunnel ?= "4.09"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a5537876c3..c0946a784e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -15,8 +15,8 @@ SRCREV_pn-accelges ?= "206"
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
 SRCREV_pn-app-restarter ?= "4552"
-SRCREV_pn-assassin ?= "217"
-SRCREV_pn-assassin-thumbnail ?= "4513"
+SRCREV_pn-assassin ?= "265"
+SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-uclibc ?= "23421"
 SRCREV_pn-uclibc-initial ?= "23421"
@@ -31,8 +31,8 @@ SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "4160"
 SRCREV_pn-dfu-util-native ?= "4160"
-SRCREV_pn-diversity-daemon ?= "277"
-SRCREV_pn-diversity-radar ?= "405"
+SRCREV_pn-diversity-daemon ?= "571"
+SRCREV_pn-diversity-radar ?= "453"
 SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-eglibc ?= "6937"
 SRCREV_pn-eglibc-initial ?= "6937"
@@ -44,6 +44,7 @@ SRCREV_pn-ezx-boot-usb-native = "2186"
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
+SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-frameworkd ?= "b4fc84fef759999e9e0cb73902e4b42fbbc8351d"
@@ -60,7 +61,7 @@ SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume-theme-asu ?= "170"
+SRCREV_pn-illume-theme-asu ?= "4783"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
@@ -70,12 +71,12 @@ SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libframeworkd-glib ?= "5dc148e22bab012e8be5e4d9bb98933ad32fb07b"
 SRCREV_pn-libgdbus ?= "6605699e3a1ff8275dcc359da7aa73e9d36996f2"
-SRCREV_pn-libgsmd ?= "4335"
+SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libiac ?= "1590"
-SRCREV_pn-libjana ?= "704"
+SRCREV_pn-libjana ?= "713"
 SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
-SRCREV_pn-libmokopanelui2 ?= "3349"
+SRCREV_pn-libmokopanelui2 ?= "4568"
 SRCREV_pn-libmokoui2 ?= "4342"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-librfid ?= "2094"
@@ -86,8 +87,8 @@ SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "9706327002caebe6633c93e605882ea37172ec57"
-SRCREV_pn-linux-openmoko-devel ?= "04f54c7001fb609e11ff4b2b4575c04188dbefef"
+SRCREV_pn-linux-openmoko ?= "6e2a723ef54ee2e739c34786981b2c508db803c1"
+SRCREV_pn-linux-openmoko-devel ?= "c0a2797d7ba8f6e07187794ccd2664ca3209b613"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -100,7 +101,9 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "e2698d54e2bec9a61ac858f9773d9ca1b78cc9a5"
 SRCREV_pn-mickeyterm ?= "e2698d54e2bec9a61ac858f9773d9ca1b78cc9a5"
-SRCREV_pn-moko-gtk-engine ?= "3612"
+SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
+SRCREV_pn-moko-gtk-engine ?= "4734"
+SRCREV_pn-mokoko ?= "119"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer ?= "27659"
 SRCREV_pn-mplayer-maemo ?= "342"
@@ -111,8 +114,10 @@ SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-networkmanager ?= "3202"
 SRCREV_pn-networkmanager-applet ?= "200"
 SRCREV_pn-numptyphysics = "109"
-SRCREV_pn-om-locations ?= "28d56a504a41261c363c085a38f81721cdd6683e"
-SRCREV_pn-om-settings ?= "65"
+SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
+SRCREV_pn-om-locations ?= "88ecdbab66d1586a8d12a6f83bb40e25336d3086"
+SRCREV_pn-om-settings ?= "72"
+SRCREV_pn-ompower ?= "4727"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
@@ -125,15 +130,15 @@ SRCREV_pn-openmoko-appmanager2 ?= "4530"
 SRCREV_pn-openmoko-browser2 ?= "4172"
 SRCREV_pn-openmoko-calculator2 ?= "3655"
 SRCREV_pn-openmoko-common2 ?= "3259"
-SRCREV_pn-openmoko-contacts2 ?= "418"
-SRCREV_pn-openmoko-dates2 ?= "673"
-SRCREV_pn-openmoko-dialer2 ?= "4343"
+SRCREV_pn-openmoko-contacts2 ?= "419"
+SRCREV_pn-openmoko-dates2 ?= "703"
+SRCREV_pn-openmoko-dialer2 ?= "4364"
 SRCREV_pn-openmoko-feedreader2 ?= "3645"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
 SRCREV_pn-openmoko-footer ?= "2354"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "4232"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "4232"
-SRCREV_pn-openmoko-mediaplayer2 ?= "4173"
+SRCREV_pn-openmoko-mediaplayer2 ?= "4750"
 SRCREV_pn-openmoko-messages2 ?= "4340"
 SRCREV_pn-openmoko-panel-battery ?= "3360"
 SRCREV_pn-openmoko-panel-bt ?= "4331"
@@ -149,7 +154,7 @@ SRCREV_pn-openmoko-panel-wifi ?= "4344"
 SRCREV_pn-openmoko-sample2 ?= "3537"
 SRCREV_pn-openmoko-set-root-password ?= "4590"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271"
-SRCREV_pn-openmoko-tasks2 ?= "399"
+SRCREV_pn-openmoko-tasks2 ?= "404"
 SRCREV_pn-openmoko-terminal2 ?= "4782"
 SRCREV_pn-openmoko-theme-standard2 ?= "4338"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
@@ -162,14 +167,14 @@ SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opkg ?= "4755"
 SRCREV_pn-opkg-native ?= "4755"
 SRCREV_pn-opkg-sdk ?= "4755"
-SRCREV_pn-opkg-utils ?= "4534"
-SRCREV_pn-opkg-utils-native ?= "4534"
+SRCREV_pn-opkg-utils ?= "4578"
+SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
 SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4214"
-SRCREV_pn-pyefl-sudoku ?= "18"
+SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
@@ -193,9 +198,10 @@ SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-starling ?= "9574"
-SRCREV_pn-tichy ?= "168"
+SRCREV_pn-tichy ?= "279"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "2b78a9413619902aa4ff55a986b12ece3021fbe3"
+SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
+SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index a4a006f92c..8caa9ecb5f 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -69,6 +69,16 @@ PREFERRED_PROVIDER_midpath = "midpath-openmoko"
 # We don't use this, but select one to shut bitbake up.
 PREFERRED_PROVIDER_virtual/libqte2 = "qte"
 
+# Helper to say what image we built
+OM_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/om-version"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${OM_VERSION_FILE};cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${OM_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${OM_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${OM_VERSION_FILE};"
+ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${OM_VERSION_FILE};"
+
+
+
 # opkg
 PREFERRED_PROVIDER_opkg = "opkg"
 
diff --git a/conf/enterprise.conf b/conf/enterprise.conf
index 5f89cb1c5e..f839340ebc 100644
--- a/conf/enterprise.conf
+++ b/conf/enterprise.conf
@@ -1,2 +1,2 @@
 # For the enterprise edition we want to avoid certain packages by default.
-BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(gst-plugins-ugly|mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|libsidplay|sidplayer|python-mad|opie-mediaplayer1-libmadplugin)', '', d)}"
+BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(gst-plugins-ugly|mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|libsidplay|sidplayer|python-mad|opie-mediaplayer1-libmadplugin|ffmpeg|mplayer)', '', d)}"