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

2 files changed, 45 insertions, 2 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d5d8df8172..3f66ef31c5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11494,6 +11494,46 @@ sha256=b935aaf1e389f767ba8238c7a5c0b4387a345168acddf4f38bb6914149953a28
 md5=593c0861fa10d2a8d0e7d8617479c5cf
 sha256=b3404a5a5dd78c0e1ba12b8aa1445589fa7861fa4d9ecafb53b38be760876913
 
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-berlin-20080430.eet]
+md5=25b515f30606b3f78d5d77c96663185d
+sha256=3ebb791e9bf6b00127b4961d8f15b4d1e48d209468b01365300d3ea5a5cacf37
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-buenos-aires-20080430.eet]
+md5=306c1d9537f510b30273a030f5ace118
+sha256=8486baf16bbc6dd4ad3820330a28546996f9383de96c1b6bf784999dcf4b712e
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-london-20080430.eet]
+md5=fa05427d09f98ea6cbceaa4c88f4c51d
+sha256=1776ba1ec93984d0ff755a677a769e200a6e435fd1385e699e106c9cec83b04c
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-low-levels-20080430.eet]
+md5=c4e4fe25075d3843b6a8430e78321c4e
+sha256=de7bba6c6418782f3af45e8a5988b1d945f276bcc6f1174107b66c7d27316727
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-new-york-20080430.eet]
+md5=3fd0065397e6ae78d43b159a3e9d3660
+sha256=43df4b1407baf3b647e30abf7e5461d86c3145d6df21f4d27a2fb2d8b2b08ec9
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-paris-20080430.eet]
+md5=f93c90a1cfaf3113a1577331582c0cd1
+sha256=b27f67834142417e35dc911fa51f13595bb3271800b9963ed481749bbb17466b
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-providence-20080430.eet]
+md5=105cd93f37409631fd99d23cdd033420
+sha256=ca2a91115445ce8dfb758099158e31425695181909e94f928feef6077a6cba0a
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-san-francisco-20080430.eet]
+md5=c23e48390885391a3b403c8d7863e031
+sha256=a7f00540ac487fa26050a2aaf5a9b7fbb82af0a32c6f5d60043d4228a652151e
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-sydney-20080430.eet]
+md5=5b83060995bade39a80dafb83571f627
+sha256=66150243fa43052fc762ec1d5d141b44c98a49bec49f726c7db7c54968d605c5
+
+[http://people.openmoko.org/olv/om-maps/20080430/om-maps-taipei-20080430.eet]
+md5=5e82e0fb27f1ae480c5099f3bd572cf3
+sha256=5dafd06260fe58847fb92f2e063f8fb0ae8ad4a3fb082f0871217d3ba88b162c
+
 [http://downloads.sourceforge.net/omniorb/omniORB-4.0.7.tar.gz]
 md5=9d478031be34232e988f3d5874396499
 sha256=e4c0875794a74ac627b7b74b6098e75c8413bd156856dc434a49c4c112a68af2
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 5cf7d56cf3..633138f692 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -14,7 +14,8 @@
 SRCREV_pn-accelges ?= "206"
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
-SRCREV_pn-assassin ?= "93"
+SRCREV_pn-assassin ?= "217"
+SRCREV_pn-assassin-thumbnail ?= "4513"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-uclibc ?= "23421"
 SRCREV_pn-uclibc-initial ?= "23421"
@@ -30,7 +31,7 @@ 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 ?= "340"
+SRCREV_pn-diversity-radar ?= "405"
 SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-eglibc ?= "6937"
 SRCREV_pn-eglibc-initial ?= "6937"
@@ -107,6 +108,8 @@ SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-networkmanager ?= "3202"
 SRCREV_pn-networkmanager-applet ?= "200"
 SRCREV_pn-numptyphysics = "45"
+SRCREV_pn-om-locations ?= "28d56a504a41261c363c085a38f81721cdd6683e"
+SRCREV_pn-om-settings ?= "65"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"