Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

author: Khem Raj <raj.khem@gmail.com> 2009-02-07 17:03:23 -0800
committer: Khem Raj <raj.khem@gmail.com> 2009-02-07 17:03:23 -0800
commit: 8a022299d8cbe2de444669a5a25b1f1c182d86f2 (patch)
tree: 0801f6ef6d9ccf2edbfc67a10efa10ffd611df8f
parent: ff830a30aca98928bcd5ea6726e3b3064785f506 (diff)
parent: d6bc6a6e31509a9175bdb3636b3fbed89f794986 (diff)
60 files changed, 645 insertions, 230 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 50307c482a..3a129b7924 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -94,6 +94,10 @@ sha256=8f9124bd76c378ae2a25b6b421ebb8f0a88069da697ac6c96943571d93af8b15
 md5=8bd2a92fb94faa1b4fc43865d40bd988
 sha256=a317cd11719659892bdae6ec54ee2e37549d0df7d5bdce02036963acc2ad1486
 
+[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Axiom-0.5.30.tar.gz?format=raw]
+md5=8f0b3a27770e487ad08f4fafdccc4495
+sha256=4a4217e70e01e11d357c2c2c23bc72d244a78fa40a401cca48cd5f0a619c7060
+
 [http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-1.05.tar.gz]
 md5=09e4d37979c8f8ce2518e1d1ccd10d99
 sha256=10106d94e0897c18cd5eb0b782c3212371c9785eba78a15f4623335e01dda23c
@@ -210,6 +214,10 @@ sha256=4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
 md5=3bf4d8d285591a5b7f31170f9b87aba0
 sha256=c196988f55fc6633d9f9f6d9ddc2ae9b4dfa1f300edf4cbbad865c06a8656df7
 
+[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Epsilon-0.5.11.tar.gz?format=raw]
+md5=39710dfdeb42e51c953b17b6cded163e
+sha256=a5907a3b7584d63be30b3f79b0422b2b0778e73c053be9ac5a11004f1c9097dc
+
 [http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Error-0.17004.tar.gz]
 md5=4dfca8732331a4f79c6803c3bc6b722f
 sha256=f464f0068772c276b81a7345f6788bdc3a243c13de24563346043d049a5497ba
@@ -514,6 +522,10 @@ sha256=4ba65d64599ca6937b44b98d1efd04957278679ddd733081d0d8c2ecf6c0143b
 md5=64f780e7f95c252eaaed0201c3d9a4ca
 sha256=281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
 
+[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.32.tar.gz?format=raw]
+md5=75828090af2b26f69fe4a7f148a400f6
+sha256=bc35ce187481db91f047055b3edbce49c14d291b1a2eb3e915e9c1c511620f9a
+
 [http://downloads.sourceforge.net/numpy/Numeric-23.7.tar.gz]
 md5=8054781c58ae9cf6fe498316860b5ea8
 sha256=33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c
@@ -2158,6 +2170,10 @@ sha256=1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b
 md5=b12426fd72bedf00c389a7fb458275a8
 sha256=5a4a5b82dd8f485b4fef941cc216eb052184cf138f72b512eb62d836b460acdb
 
+[http://downloads.sourceforge.net/bftpd/bftpd-2.3.tar.gz]
+md5=4ab1eb33135fa5eaaf050e6d3dd0b319
+sha256=0af27ca6c49f696c64bcfb3e50452cad240997993e0b7afb65624898d3d95ff2
+
 [http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_480p_surround-fix.avi]
 md5=ed7ed01e9aefba8ddd77c13332cec120
 sha256=40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db044634f
@@ -2806,6 +2822,10 @@ sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
 md5=53c44b73aa67d5e0282adfe928f3ba44
 sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
 
+[ftp://invisible-island.net/byacc/byacc-20081225.tgz]
+md5=b9715b9a2867c221176b597e8f73cbc9
+sha256=1364c7fe382de659e8b9841a1736b645345a460d2f4302303e80c02235a2a575
+
 [http://downloads.sourceforge.net/bzflag/bzflag-1.10.6.20040515.tar.bz2]
 md5=8e3e5fbef3cfa21079eb06269e6b3d8b
 sha256=0329e3d0a59e9cc167733ed2b89a0dc2249725642a065cfd385bf1206fe30b19
@@ -3426,6 +3446,10 @@ sha256=1d56be1036de59926548e3defa4b9af894af9e2121d3598da13769da5c0f55b1
 md5=094743343e062ea370fcd461aa48a7fe
 sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
 
+[http://repo.moblin.org/connman/releases/connman-0.10.tar.gz]
+md5=094743343e062ea370fcd461aa48a7fe
+sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz]
 md5=bf48aa07d3c1e5fe272c7f139bc01fc9
 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
@@ -3446,6 +3470,10 @@ sha256=9c626bda7e2cc460cdbfe9a14c13208253de6922a341ef60ba51a673c0317996
 md5=c9a3b384f080ed4cdf139ce9377ef2c8
 sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
 
+[http://repo.moblin.org/connman/releases/connman-gnome-0.4.tar.gz]
+md5=c9a3b384f080ed4cdf139ce9377ef2c8
+sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
+
 [http://www.conserver.com/conserver-8.1.14.tar.gz]
 md5=f7825728e5af8992ed4a99fb560a3df8
 sha256=48a9e2f8a02054bc6740ae354433bfa1636a6e726f2d62af22752d7a6103410b
@@ -4650,6 +4678,10 @@ sha256=fefd63c13ca28713f7f03320c1e341430ea2d016d3ab3e49163a12f4df2123e7
 md5=ec8690ff84b364d2df5b2443a01ba529
 sha256=e0360be0eecee68649246c022825dd5422f895958ffa736886dd2a0b9ec7ebda
 
+[http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip]
+md5=30e2fe5edd143f347e03a8baf5d60f8a
+sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad
+
 [http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-0.108.tar.gz]
 md5=fd318a634c8f67c7ac8a975f16965cc3
 sha256=794070c8108a2d8b7c6890ba42edb37510cc845bf601517cf4a0ea5443dfde29
@@ -6402,6 +6434,10 @@ sha256=00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
 md5=1939de5fe43d12884d85fa5d7797e3c2
 sha256=243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
 
+[http://gdata-python-client.googlecode.com/files/gdata.py-1.2.4.tar.gz]
+md5=521f33a377d64f8a6505ba119415b787
+sha256=fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde
+
 [ftp://ftp.gnu.org/gnu/gdb/gdb-6.3.tar.gz]
 md5=812de9e756d53c749ea5516d9ffa5905
 sha256=c06bf9715436b3a28c189163aa5ca42b46af8286659827f033eaaf7d8b1fc342
@@ -15290,6 +15326,10 @@ sha256=c1454fdf5d3658f492253106c12bbf89a3bcc5789c36851a5f2f345d61a4ac0c
 md5=115dc5380ffdb03ec2e71ff9d6d97e72
 sha256=50bfab6d4b1b9af37ca6832b979f5c891f2dd9259a68700b37214d7897927c17
 
+[http://www.mumpot.org/download/mumpot-0.4.tar.gz]
+md5=52d1e64c63d70604f13985f1f326a802
+sha256=302bea9f0903fecf13ee0e9c24ed090203f2c77f7164a2a0f68c35fc8e1b9f10
+
 [http://www.dotaster.com/~shuu/linux/murasaki/0.8/8/murasaki-0.8.8.tar.gz]
 md5=ea7afa7e0bd9cfa0df7c04a9b270df88
 sha256=2033168723ffd612336acb8a64b33fcd91f7dedeaf78949d3dfce231cb962ce9
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index be7a9faba1..711c0f74d6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,6 +43,7 @@ SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
 SRCREV_pn-ezx-boot-usb-native ?= "2371"
+SRCREV_pn-ezx-gen-blob ?= "2390"
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
@@ -53,6 +54,7 @@ SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d"
 SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
+SRCREV_pn-fso-abyss ?= "b8430f9e8898dae390191fb114904f13583043f5"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
@@ -171,7 +173,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "4338"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today2 ?= "4168"
 SRCREV_pn-openmoko-today2-folders ?= "3704"
-SRCREV_pn-openmoko-toolchain-scripts ?= "4878"
+SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
@@ -185,12 +187,13 @@ SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
 SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pty-forward-native ?= "4214"
+SRCREV_pn-pty-forward-native ?= "4907"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
 SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
+SRCREV_pn-python-coherence ?= "1154"
 SRCREV_pn-python-connexion ?= "1439"
 SRCREV_pn-python-formencode ?= "3148"
 SRCREV_pn-python-gsmd ?= "148"
@@ -205,7 +208,7 @@ SRCREV_pn-qi ?= "ed52486b43dca91891305b9e832c8366a2742798"
 SRCREV_pn-remoko ?= "121"
 SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
-SRCREV_pn-serial-forward ?= "4214"
+SRCREV_pn-serial-forward ?= "4907"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-socketcan-modules ?= "917"
@@ -222,7 +225,7 @@ SRCREV_pn-uclibc ?= "24279"
 SRCREV_pn-uclibc-initial ?= "24279"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5"
+SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-webkit-gtk ?= "39964"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 6ccdc5070e..abc17728b5 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -45,5 +45,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
 require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 4906f87e76..ab532e33ff 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -73,5 +73,4 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
 
-IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 6b73a2af42..5414aa9796 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -238,6 +238,7 @@ do
                       pushover \
                       python \
                       python-pybluez \
+                      python-coherence \
                       qfish2 \
                       qmatrix \
                       qpe-nmap \
@@ -340,7 +341,8 @@ done
 
 # machine packages (machine specific (sub)packages)
 
-for machine in beagleboard omap3evm neuros-osd2 efika dht-walnut palmt650 omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 dns323 mv2120 kuropro lspro tsx09 ts409 qemux86  
+for machine in overo omap3-pandora beagleboard omap3evm neuros-osd2 efika dht-walnut palmt650 omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 dns323 mv2120 kuropro lspro tsx09 ts409 qemux86  
+
 do
         BUILD_MACHINE=$machine
             BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme"
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 1668717cd3..d8144f80e4 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -86,7 +86,7 @@ do
 done 
 
 # build kexecboot kernels for supported machines
-for machine in poodle collie
+for machine in h2200 hx4700 c7x0 akita spitz poodle collie
 do
 	BUILD_MACHINE=$machine
 	BUILD_TARGETS="linux-kexecboot"
@@ -94,17 +94,8 @@ do
 done 
 
 
-# Make uclibc initramfs-bootmenu-image for ipaqs, this should move to more generic klibc stuff, but till then:
-DO_UCLIBC=1
-for machine in h2200 h3900 h4000 h5000 hx4700
-do
-	BUILD_MACHINE=$machine
-	BUILD_TARGETS="initramfs-bootmenu-image"
-done
-DO_UCLIBC=0
-
 # graphics, flash storage
-for machine in beagleboard omap3evm om-gta01 om-gta02 a780 at91sam9263ek qemuarm qemux86 h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad 
+for machine in overo omap3-pandora beagleboard omap3evm om-gta01 om-gta02 a780 at91sam9263ek qemuarm qemux86 h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad 
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
@@ -113,7 +104,7 @@ do
 done
 
 # graphics, disk storage	
-for machine in spitz beagleboard omap3evm 
+for machine in spitz overo omap3-pandora beagleboard omap3evm 
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
@@ -130,7 +121,7 @@ do
 done	
 
 # omap3 boards
-for machine in beagleboard omap3evm
+for machine in overo omap3-pandora beagleboard omap3evm
 do
 	BUILD_MACHINE=$machine
 	BUILD_TARGETS="beagleboard-demo-image"
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 94b8cb6d1a..d624000d17 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -144,6 +144,8 @@ for i in ../* ; do
 echo " DONE"
 cd ${BPWD}
 
+( cd ~/website/repo-updater ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
+
 echo -n "Stripping source lines from Package files"
 for i in `find . -name Packages` ; do grep -v ^Source: $i|gzip -c9>$i.gz ;gunzip -c $i.gz>$i ; touch $i.sig ; done
 echo " DONE"
@@ -162,4 +164,3 @@ if [ "$1" != "--skip-sorted-list" ]; then
     for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
 fi
 
-( cd ~/website/repo-updater ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
index 4d3362b6d2..1ae7086cab 100644
--- a/contrib/angstrom/upload-packages.sh
+++ b/contrib/angstrom/upload-packages.sh
@@ -31,6 +31,9 @@ echo "Checking for duplicates"
 cat files-remote files-local | sort | uniq -u >files-uniq
 cat files-uniq files-local | sort | uniq -d > files-trans
 
+# Remove SGX files
+rm -f upload-queue/*3.00.*
+
 # Copy over non-duplicate files
 echo "Starting rsync..."
 rsync -vz --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/
diff --git a/contrib/feed-browser/index.html b/contrib/feed-browser/index.html
new file mode 100644
index 0000000000..08b1d9a804
--- /dev/null
+++ b/contrib/feed-browser/index.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+    <head>
+	<title>Feed browser</title>
+	<meta http-equiv="Content-Style-Type" content="text/css" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<style type="text/css" media="all">@import "css/feed.css";</style>
+	<script language="javascript" type="text/javascript" src="scripts/js/repo.js"></script>
+    </head>
+    <body onLoad=" qs(); getLetter(); getSection();">
+		<div id="right">
+			<div id="searchletter"</div>
+			<form name="pkg_query" onsubmit="javascript:pkgQuery();return false"">
+				<fieldset>
+					<label for="name">Package name</label>
+					<input id="pkgsearch" type="text" name="pkgsearch" value="" />
+					<select name="arch">
+					   <option value="" selected="selected">all architectures</option>
+					   <option value="all">no arch</option>
+<?php
+
+foreach($archs_list as $architecture)
+{
+    echo "<option value='{$architecture['p_arch']}'";
+
+    if($architecture['p_arch'] == $arch)
+    {
+	echo ' selected="selected"';
+    }
+    echo ">{$architecture['p_arch']}</option>";
+}
+
+?>
+
+
+					</select>
+					<input type="submit" value="Search" />
+				</fieldset>
+			</form>
+			<div id="opkgoutput"><?php echo $ipkgoutput; ?></div>
+		</div>
+		<div id="left">
+			<h1>Sections list</h1>
+			<div id="sectionslist"></div>
+		</div>
+    </body>
+</html>
diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php
deleted file mode 100644
index eca57e9269..0000000000
--- a/contrib/feed-browser/index.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
- * (c) Koen Kooi 2006, 2007
- * (c) Marcin Juszkiewicz 2006, 2007
- *
- * This php script is intended to do the following:
- *
- * - have searchable webfronted for the feed like packages.ubuntu.com
- *
- * ToDo:
- *
- * - search functionality
- * - provide feed-management functionality
- * - allow uploading of new software
- *
- *
- * This program is free software; you can redistribute it and/or  modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License.
- * 
- * This program is distributed in the hope that it will be useful,  but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU Library General Public License along
- * with this library; see the file COPYING.LIB.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- */
-
-require_once 'includes/config.inc';
-require_once 'includes/functions.inc';
-
-if(!check_database())
-{
-	die("Database not found and cannot be created.");
-}
-
-read_vars_from_get(array('name', 'arch', 'pkgsearch', 'letter', 'pkgname', 'section'));
-
-$ipkgoutput = '';
-
-if(!empty($section))
-{
-	$ipkgoutput = searchsection($section);
-}
-elseif(!empty($letter))
-{
-	$ipkgoutput = searchpkg("{$letter}%", $arch);
-}
-elseif(!empty($pkgname))
-{
-	$ipkgoutput = pkgdetails($pkgname);
-}
-elseif(!empty($pkgsearch) OR !empty($arch))
-{
-	$ipkgoutput = searchpkg("%{$pkgsearch}%", $arch);
-}
-
-$archs_list = get_arch_list();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-    <head>
-	<title>Feed browser</title>
-	<meta http-equiv="Content-Style-Type" content="text/css" />
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<style type="text/css" media="all">@import "css/feed.css";</style>
-    </head>
-    <body >
-		<div id="right">
-			<?php echo searchletter(); ?>
-			<form action="" method="get">
-				<fieldset>
-					<label for="name">Package name</label>
-					<input type="text" name="pkgsearch" value="<?php echo $pkgsearch; ?>" />
-					<select name="arch">
-					   <option value="" selected="selected">all architectures</option>
-					   <option value="all">no arch</option>
-<?php
-
-foreach($archs_list as $architecture)
-{
-    echo "<option value='{$architecture['p_arch']}'";
-
-    if($architecture['p_arch'] == $arch)
-    {
-	echo ' selected="selected"';
-    }
-    echo ">{$architecture['p_arch']}</option>";
-}
-
-?>
-					</select>
-					<input type="submit" value="Search" />
-				</fieldset>
-			</form>
-			<?php echo $ipkgoutput; ?>
-		</div>
-		<div id="left">
-			<h1>Sections list</h1>
-			<?php echo sectionslist(); ?>
-		</div>
-    </body>
-</html>
diff --git a/contrib/feed-browser/scripts/js/repo.js b/contrib/feed-browser/scripts/js/repo.js
new file mode 100644
index 0000000000..edd1fd503e
--- /dev/null
+++ b/contrib/feed-browser/scripts/js/repo.js
@@ -0,0 +1,130 @@
+/* The following function creates an XMLHttpRequest object... */
+
+function createRequestObject(){
+	var request_o; //declare the variable to hold the object.
+	var browser = navigator.appName; //find the browser name
+	if(browser == "Microsoft Internet Explorer"){
+		/* Create the object using MSIE's method */
+		request_o = new ActiveXObject("Microsoft.XMLHTTP");
+	} else {
+		/* Create the object using other browser's method */
+		request_o = new XMLHttpRequest();
+	}
+	return request_o; //return the object
+}
+
+/* The variable http will hold our new XMLHttpRequest object. */
+var sectionHTTP = createRequestObject();
+var queryHTTP = createRequestObject(); 
+var http = createRequestObject(); 
+
+var qsParm = new Array();
+qsParm['pkgsearch'] = null;
+qsParm['arch'] = null;
+qsParm['section'] = null;
+qsParm['pkgname'] = null;
+
+
+function qs() {
+	var query = window.location.search.substring(1);
+	var parms = query.split('&');
+	for (var i=0; i<parms.length; i++) {
+		var pos = parms[i].indexOf('=');
+		if (pos > 0) {
+			var key = parms[i].substring(0,pos);
+			var val = parms[i].substring(pos+1);
+			qsParm[key] = val;
+		}
+	}
+	if (qsParm['pkgsearch']) {
+		document.getElementById('pkgsearch').value = qsParm['pkgsearch'];
+		pkgQuery();
+	}
+	if (qsParm['pkgname']) {
+		document.getElementById('pkgsearch').value = qsParm['pkgname'];
+		pkgQuery();
+	}
+	if (qsParm['section']) {
+		pkgQuery();
+	}
+	
+}
+
+function pkgQuery() {
+	var action = 'pkgquery';
+	var params = '';
+	
+	if (qsParm['pkgname']) {
+		action = 'pkgname';
+		params = '&pkgname=' + qsParm['pkgname'];
+		qsParm['pkgname'] = null;
+	} 
+	
+	if (document.getElementById('pkgsearch').value != "") {
+		params = params + '&pkgsearch=' + document.getElementById('pkgsearch').value;
+	} else {
+		if (qsParm['pkgsearch']) {
+			params = params + '&pkgsearch=' + qsParm['pkgsearch'];
+		}
+	}
+	if (qsParm['arch']) {
+		params = params + '&arch=' + qsParm['arch'];
+		qsParm['arch'] = null;
+	}
+	if (qsParm['section']) {
+		action = 'section';
+		params = params + '&section=' + qsParm['section'];
+		qsParm['section'] = null;
+	}
+	
+	params = '&action=' + action + params;
+	
+	queryHTTP.open('post', 'section.php');
+	queryHTTP.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+	queryHTTP.onreadystatechange = queryProgress; 
+	queryHTTP.send(params);
+	
+}
+
+function getLetter() {
+	var params = 'action=searchletter';
+	http.open('post', 'section.php');
+	http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+	http.onreadystatechange = letterProgress; 
+	http.send(params);
+	
+} 
+
+function getSection() {
+	var params = 'action=sectionslist';
+	sectionHTTP.open('post', 'section.php');
+	sectionHTTP.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+	sectionHTTP.onreadystatechange = sectionProgress; 
+	sectionHTTP.send(params);
+	
+} 
+
+function letterProgress() {
+	if(http.readyState == 4){ 
+		var response = http.responseText;
+		document.getElementById('searchletter').innerHTML = response;
+		
+	}
+}
+
+function sectionProgress() {
+	if(sectionHTTP.readyState == 4){ 
+		var response = sectionHTTP.responseText;
+		document.getElementById('sectionslist').innerHTML = response;
+		
+	}
+}
+
+function queryProgress() {
+	document.getElementById('opkgoutput').innerHTML = "loading, please wait";
+	if(queryHTTP.readyState == 4){ 
+		var response = queryHTTP.responseText;
+		document.getElementById('opkgoutput').innerHTML = response;
+		
+	}
+}
diff --git a/contrib/feed-browser/section.php b/contrib/feed-browser/section.php
new file mode 100644
index 0000000000..083910bc46
--- /dev/null
+++ b/contrib/feed-browser/section.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * (c) Koen Kooi 2006, 2007, 2008, 2009
+ * (c) Marcin Juszkiewicz 2006, 2007
+ *
+ * This php script is intended to do the following:
+ *
+ * - have searchable webfronted for the feed like packages.ubuntu.com
+ *
+ * ToDo:
+ *
+ * - search functionality
+ * - provide feed-management functionality
+ * - allow uploading of new software
+ *
+ *
+ * This program is free software; you can redistribute it and/or  modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License.
+ * 
+ * This program is distributed in the hope that it will be useful,  but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public License along
+ * with this library; see the file COPYING.LIB.  If not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.
+ *
+ */
+
+require_once 'includes/config.inc';
+require_once 'includes/functions.inc';
+
+if(!check_database())
+{
+	die("Database not found and cannot be created.");
+}
+
+if (isset($_POST["action"]) && $_POST["action"] != "") {
+	$action = $_POST["action"];
+} else {
+	print "Invalid action: $action";
+	exit;
+}
+
+if (isset($_POST["pkgsearch"]) && $_POST["pkgsearch"] != "") {
+        $pkgsearch = $_POST["pkgsearch"];
+}
+
+if (isset($_POST["section"]) && $_POST["section"] != "") {
+        $section = $_POST["section"];
+}
+
+if (isset($_POST["arch"]) && $_POST["arch"] != "") {
+        $arch = $_POST["arch"];
+} else {
+	$arch = "";
+}
+
+if (isset($_POST["pkgname"]) && $_POST["pkgname"] != "") {
+        $pkgname = $_POST["pkgname"];
+}
+
+
+//print("$action");
+switch($action) {
+case "sectionslist":
+				echo sectionslist();
+				break;
+case "searchletter":				
+				echo searchletter(); 
+				break;
+case "pkgquery":
+				echo searchpkg("%{$pkgsearch}%", $arch);
+				break;
+case "pkgname":
+				echo pkgdetails($pkgname);
+				break;
+case "section":
+				echo searchsection($section);
+				break;
+} 
+?>
diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb
index adc4bb0756..0280859fdc 100644
--- a/packages/angstrom/angstrom-gpe-task-settings.bb
+++ b/packages/angstrom/angstrom-gpe-task-settings.bb
@@ -1,12 +1,13 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r33"
+PR = "r34"
 
 inherit task
 
 RDEPENDS_${PN} = "\
     matchbox-panel-manager \
     mboxkbd-layouts-gui \
-    gpe-su \
+    connman-gnome \
+	gpe-su \
     gpe-conf \
     gpe-package \
     gpe-shield \
diff --git a/packages/apr/apr-util/configure_fixes.patch b/packages/apr/apr-util/configure_fixes.patch
index 16f88b3bba..7c6fa6a4d2 100644
--- a/packages/apr/apr-util/configure_fixes.patch
+++ b/packages/apr/apr-util/configure_fixes.patch
@@ -1,7 +1,5 @@
-Index: apr-util-1.2.12/configure.in
-===================================================================
---- apr-util-1.2.12.orig/configure.in	2008-03-08 19:15:00.000000000 +0000
-+++ apr-util-1.2.12/configure.in	2008-03-08 19:15:13.000000000 +0000
+--- /tmp/configure.in	2009-02-06 16:34:14.000000000 +0100
++++ apr-util-1.2.12/configure.in	2009-02-06 16:34:38.000000000 +0100
 @@ -8,13 +8,13 @@
  AC_CONFIG_HEADER(include/private/apu_config.h)
  AC_CONFIG_AUX_DIR(build)
@@ -23,3 +21,17 @@ Index: apr-util-1.2.12/configure.in
  
  dnl Generate ./config.nice for reproducing runs of configure
  dnl 
+@@ -45,10 +45,10 @@
+ # against installed versions of libapr instead of those just
+ # built.
+ case $host in
+-*-apple-darwin*) LT_NO_INSTALL="" ;;
+-*) LT_NO_INSTALL="-no-install" ;;
++*-apple-darwin*) LV_NO_INSTALL="" ;;
++*) LV_NO_INSTALL="-no-install" ;;
+ esac
+-AC_SUBST(LT_NO_INSTALL)
++AC_SUBST(LV_NO_INSTALL)
+ 
+ dnl
+ dnl compute the top directory of the build
diff --git a/packages/apr/apr-util_1.2.12.bb b/packages/apr/apr-util_1.2.12.bb
index 64f6bcbcf8..6613ab99a8 100644
--- a/packages/apr/apr-util_1.2.12.bb
+++ b/packages/apr/apr-util_1.2.12.bb
@@ -3,7 +3,9 @@ SECTION = "libs"
 DEPENDS = "apr expat gdbm"
 LICENSE = "Apache License, Version 2.0"
 
-PR = "r2"
+PR = "r3"
+
+inherit autotools lib_package binconfig
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
@@ -16,12 +18,16 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
 		--with-expat=${STAGING_DIR_HOST}${layout_prefix}"
 
 
-inherit autotools lib_package binconfig
-
 OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+EXTRA_OEMAKE = " LIBTOOL=\"${S}/${TARGET_PREFIX}libtool\" "
+
+export LIBTOOL="${S}/${TARGET_PREFIX}libtool"
 
 do_configure_prepend() {
+	cp ${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool ${S}/
 	cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
+	echo "AC_PROG_LIBTOOL" >> ${S}/configure.in
+	libtoolize --force
 }
 
 do_stage() {
diff --git a/packages/byacc/byacc-native_20081225.bb b/packages/byacc/byacc-native_20081225.bb
new file mode 100644
index 0000000000..2973c3231b
--- /dev/null
+++ b/packages/byacc/byacc-native_20081225.bb
@@ -0,0 +1,5 @@
+PR = "r0"
+
+require byacc.inc
+
+inherit native
diff --git a/packages/byacc/byacc.inc b/packages/byacc/byacc.inc
new file mode 100644
index 0000000000..7d35974203
--- /dev/null
+++ b/packages/byacc/byacc.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Berkeley Yacc"
+SECTION = "devel"
+LICENSE = "public domain"
+
+SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz"
+EXTRA_OECONF += "--program-transform-name='s,^,b,'"
+S = "${WORKDIR}/byacc-${PV}"
+
+inherit autotools
+
+do_configure() {
+	oe_runconf
+}
diff --git a/packages/byacc/byacc_20081225.bb b/packages/byacc/byacc_20081225.bb
new file mode 100644
index 0000000000..dd3b71db3b
--- /dev/null
+++ b/packages/byacc/byacc_20081225.bb
@@ -0,0 +1,3 @@
+PR = "r0"
+
+require byacc.inc
diff --git a/packages/clutter/clutter.inc b/packages/clutter/clutter.inc
index 60c7a480de..e900c43209 100644
--- a/packages/clutter/clutter.inc
+++ b/packages/clutter/clutter.inc
@@ -36,6 +36,10 @@ DEPENDS_omap3evm = "${STDDEPENDS} libgles-omap3 tslib"
 EXTRA_OECONF_omap3evm = "${BASE_CONF} --with-flavour=eglx --with-gles=2.0"
 PACKAGE_ARCH_omap3evm = "${MACHINE_ARCH}"
 
+DEPENDS_overo = "${STDDEPENDS} libgles-omap3 tslib"
+EXTRA_OECONF_overo = "${BASE_CONF} --with-flavour=eglx --with-gles=2.0"
+PACKAGE_ARCH_overo = "${MACHINE_ARCH}"
+
 DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib"
 EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
 PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
diff --git a/packages/connman/connman-gnome_0.4.bb b/packages/connman/connman-gnome_0.4.bb
index 7714a08bf4..fdcf61823d 100644
--- a/packages/connman/connman-gnome_0.4.bb
+++ b/packages/connman/connman-gnome_0.4.bb
@@ -3,9 +3,18 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
 SECTION = "libs/network"
 LICENSE = "GPL"
 DEPENDS = "gtk+ dbus"
-PR = "r1"
+PR = "r7"
 
-SRC_URI = "ftp://ftp.moblin.org/connman/releases/connman-gnome-${PV}.tar.gz"
+RRECOMMENDS_${PN} = "connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi"
+
+SRC_URI = "http://repo.moblin.org/connman/releases/connman-gnome-${PV}.tar.gz \
+           file://phrase-lenght.diff;patch=1 \
+           file://connman-applet.desktop"
 
 inherit autotools gtk-icon-cache
 
+do_install_append() {
+	install -d ${D}${datadir}/applications/
+	install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/
+}
+
diff --git a/packages/connman/connman.inc b/packages/connman/connman.inc
index a97ca44c90..c79c22cabb 100644
--- a/packages/connman/connman.inc
+++ b/packages/connman/connman.inc
@@ -24,6 +24,10 @@ do_configure_append() {
 	ln -sf . include/connman
 }
 
+do_compile_append() {
+	sed -i -e s:deny:allow:g src/connman-dbus.conf
+}
+
 do_install_append() {
     install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
 }
diff --git a/packages/connman/connman_0.10.bb b/packages/connman/connman_0.10.bb
index a20bf24ea5..dfd631b9bf 100644
--- a/packages/connman/connman_0.10.bb
+++ b/packages/connman/connman_0.10.bb
@@ -1,5 +1,5 @@
 require connman.inc
-PR = "r5"
+PR = "r6"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \
@@ -30,7 +30,7 @@ EXTRA_OECONF += "\
 "
 
 SRC_URI  = "\
-  http://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
+  http://repo.moblin.org/connman/releases/connman-${PV}.tar.gz \
   file://connman \
 "
 
diff --git a/packages/connman/files/connman-applet.desktop b/packages/connman/files/connman-applet.desktop
new file mode 100644
index 0000000000..ad17682507
--- /dev/null
+++ b/packages/connman/files/connman-applet.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Connection Manager
+Comment=Connection Manager applet
+Icon=stock_internet
+Exec=connman-applet
+Terminal=false
+Type=Application
+Categories=Network;GTK
+
diff --git a/packages/connman/files/phrase-lenght.diff b/packages/connman/files/phrase-lenght.diff
new file mode 100644
index 0000000000..383c86cd3a
--- /dev/null
+++ b/packages/connman/files/phrase-lenght.diff
@@ -0,0 +1,23 @@
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Fri, 30 Jan 2009 14:34:05 +0000 (+0100)
+Subject: Don't limit input field length for passphrases
+X-Git-Url: http://git.moblin.org/cgi-bin/gitweb/gitweb.cgi?p=projects%2Fconnman-gnome.git;a=commitdiff_plain;h=faa1dee0cea9bdf47d91f5665880dab335dd94b4
+
+Don't limit input field length for passphrases
+---
+
+diff --git a/applet/main.c b/applet/main.c
+index cf12a34..434e7c8 100644
+--- a/applet/main.c
++++ b/applet/main.c
+@@ -151,8 +151,8 @@ static void passphrase_dialog(const char *path, const char *name)
+ 				GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ 
+ 	entry = gtk_entry_new();
+-	gtk_entry_set_max_length(GTK_ENTRY(entry), 16);
+-	gtk_entry_set_width_chars(GTK_ENTRY(entry), 16);
++	gtk_entry_set_max_length(GTK_ENTRY(entry), 120);
++	gtk_entry_set_width_chars(GTK_ENTRY(entry), 20);
+ 	gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+ 	gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+ 	gtk_container_add(GTK_CONTAINER(vbox), entry);
diff --git a/packages/console-tools/console-tools_0.3.2.bb b/packages/console-tools/console-tools_0.3.2.bb
index 1a02827021..9e48c2c572 100644
--- a/packages/console-tools/console-tools_0.3.2.bb
+++ b/packages/console-tools/console-tools_0.3.2.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 LICENSE = "GPL"
 DESCRIPTION = "Allows you to set-up and manipulate the Linux console."
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
            file://codepage.patch;patch=1 \
@@ -32,17 +32,20 @@ do_install () {
 	mv ${D}${bindir}/chvt ${D}${bindir}/chvt.${PN}
 	mv ${D}${bindir}/deallocvt ${D}${bindir}/deallocvt.${PN}
 	mv ${D}${bindir}/openvt ${D}${bindir}/openvt.${PN}
+	mv ${D}${bindir}/showkey ${D}${bindir}/showkey.${PN}
 }
 
 pkg_postinst_${PN} () {
 	update-alternatives --install ${bindir}/chvt chvt chvt.${PN} 100
 	update-alternatives --install ${bindir}/deallocvt deallocvt deallocvt.${PN} 100
 	update-alternatives --install ${bindir}/openvt openvt openvt.${PN} 100
+	update-alternatives --install ${bindir}/showkey showkey showkey.${PN} 100
 }
 
 pkg_prerm_${PN} () {
 	update-alternatives --remove chvt chvt.${PN}
 	update-alternatives --remove deallocvt deallocvt.${PN}
 	update-alternatives --remove openvt openvt.${PN}
+	update-alternatives --remove showkey showkey.${PN}
 }
 
diff --git a/packages/eglibc/eglibc-package.bbclass b/packages/eglibc/eglibc-package.bbclass
index 2de24db859..74c9b739fb 100644
--- a/packages/eglibc/eglibc-package.bbclass
+++ b/packages/eglibc/eglibc-package.bbclass
@@ -193,9 +193,41 @@ python package_do_split_gconvs () {
 	locales_dir = base_path_join(datadir, "i18n", "locales")
 	binary_locales_dir = base_path_join(libdir, "locale")
 
-	do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', extra_depends='eglibc-gconv')
+	def calc_gconv_deps(fn, pkg, file_regex, output_pattern, group):
+		deps = []
+		f = open(fn, "r")
+		c_re = re.compile('^copy "(.*)"')
+		i_re = re.compile('^include "(\w+)".*')
+		for l in f.readlines():
+			m = c_re.match(l) or i_re.match(l)
+			if m:
+				dp = legitimize_package_name('eglibc-gconv-%s' % m.group(1))
+				if not dp in deps:
+					deps.append(dp)
+		f.close()
+		if deps != []:
+			bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+		bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-gconv-%s' % group.lower(), d)
+
+	do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', hook=calc_gconv_deps, extra_depends='eglibc-gconv')
+
+	def calc_charmap_deps(fn, pkg, file_regex, output_pattern, group):
+		deps = []
+		f = open(fn, "r")
+		c_re = re.compile('^copy "(.*)"')
+		i_re = re.compile('^include "(\w+)".*')
+		for l in f.readlines():
+			m = c_re.match(l) or i_re.match(l)
+			if m:
+				dp = legitimize_package_name('eglibc-charmap-%s' % m.group(1))
+				if not dp in deps:
+					deps.append(dp)
+		f.close()
+		if deps != []:
+			bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+		bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-charmap-%s' % group.lower(), d)
 
-	do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', extra_depends='')
+	do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', hook=calc_charmap_deps, extra_depends='')
 
 	def calc_locale_deps(fn, pkg, file_regex, output_pattern, group):
 		deps = []
@@ -211,7 +243,7 @@ python package_do_split_gconvs () {
 		f.close()
 		if deps != []:
 			bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
-		bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d)
+		bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group.lower(), d)
 
 	do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
 	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d)
diff --git a/packages/eglibc/eglibc_2.9.bb b/packages/eglibc/eglibc_2.9.bb
index e2cac82280..7643bb3f6b 100644
--- a/packages/eglibc/eglibc_2.9.bb
+++ b/packages/eglibc/eglibc_2.9.bb
@@ -4,7 +4,7 @@ DEPENDS += "gperf-native"
 DEFAULT_PREFERENCE = "1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.9"
-PR = "r1"
+PR = "r2"
 SVN_REV="7430"
 EGLIBC_BRANCH="eglibc-2_9"
 SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \
diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb
index fc3ed590e7..9cf0393f79 100644
--- a/packages/eglibc/eglibc_svn.bb
+++ b/packages/eglibc/eglibc_svn.bb
@@ -5,7 +5,7 @@ SRCREV = "7542"
 # DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.9+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 EGLIBC_BRANCH="trunk"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
diff --git a/packages/freesmartphone/fso-abyss_git.bb b/packages/freesmartphone/fso-abyss_git.bb
new file mode 100644
index 0000000000..7038d5e0f9
--- /dev/null
+++ b/packages/freesmartphone/fso-abyss_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Abyss is a GSM 07.10 muxer userspace daemon"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/Abyss"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "vala-native dbus dbus-glib libgee"
+LICENSE = "GPL"
+PV = "0.1.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/fso-abyss.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+RDEPENDS = "dbus dbus-glib"
+RCONFLICTS = "gsm0710muxd fso-gsm0710muxd"
+
+FILES_${PN} += "${datadir} ${sysconfdir}"
diff --git a/packages/gdb/gdbserver_6.8.bb b/packages/gdb/gdbserver_6.8.bb
new file mode 100644
index 0000000000..67fc280ea2
--- /dev/null
+++ b/packages/gdb/gdbserver_6.8.bb
@@ -0,0 +1 @@
+require gdbserver.inc
diff --git a/packages/gtk+/gdk-pixbuf-csource-native_2.12.11.bb b/packages/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
index c7abc18855..22d30bfd01 100644
--- a/packages/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
+++ b/packages/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
@@ -15,6 +15,7 @@ EXTRA_OECONF = "\
   --without-libtiff \
   --with-libjpeg \
   --with-libpng \
+  --disable-cups \
 "
 
 do_compile() {
diff --git a/packages/gtk+/gtk+_2.14.2.bb b/packages/gtk+/gtk+_2.14.2.bb
index b0002b8102..38dd3a411d 100644
--- a/packages/gtk+/gtk+_2.14.2.bb
+++ b/packages/gtk+/gtk+_2.14.2.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r1"
+PR = "r3"
 
 DEPENDS += "cairo jasper"
 
@@ -41,3 +41,8 @@ python populate_packages_prepend () {
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
+
+RPROVIDES_${PN} = "libgailutil18"
+RCONFLICTS_${PN} = "libgailutil18"
+RREPLACES_${PN} = "libgailutil18"
+
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
index 22e9cb3c93..b3f1a4cbf0 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
@@ -1530,7 +1530,7 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
index d65aaff1bb..5d3f16ee19 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
@@ -1550,7 +1550,7 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index 0742e23e58..f6bb17302d 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r24"
+PR = "r25"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/mumpot/files/mumpot-cyclemap.desktop b/packages/mumpot/files/mumpot-cyclemap.desktop
index e761d0f3f1..495e712bac 100644
--- a/packages/mumpot/files/mumpot-cyclemap.desktop
+++ b/packages/mumpot/files/mumpot-cyclemap.desktop
@@ -4,5 +4,5 @@ Comment=Mumpot cyclemap
 Exec=mumpot-cyclemap
 Terminal=0
 Type=Application
-Categories=Application;PIM;GTK
+Categories=X-PIM;GTK;Education;Science;Geography;
 StartupNotify=True
diff --git a/packages/mumpot/files/mumpot-mapnik.desktop b/packages/mumpot/files/mumpot-mapnik.desktop
index b02b077de1..9d852d2577 100644
--- a/packages/mumpot/files/mumpot-mapnik.desktop
+++ b/packages/mumpot/files/mumpot-mapnik.desktop
@@ -4,5 +4,5 @@ Comment=Mumpot Mapnuk
 Exec=mumpot-mapnik
 Terminal=0
 Type=Application
-Categories=Application;PIM;GTK
+Categories=X-PIM;GTK;Education;Science;Geography;
 StartupNotify=True
diff --git a/packages/mumpot/files/mumpot-tah.desktop b/packages/mumpot/files/mumpot-tah.desktop
index bcdba40b0a..805c1d42d9 100644
--- a/packages/mumpot/files/mumpot-tah.desktop
+++ b/packages/mumpot/files/mumpot-tah.desktop
@@ -4,5 +4,5 @@ Comment=Mumpot t@h
 Exec=mumpot-tah
 Terminal=0
 Type=Application
-Categories=Application;PIM;GTK
+Categories=X-PIM;GTK;Education;Science;Geography;
 StartupNotify=True
diff --git a/packages/mumpot/mumpot_0.3.1.bb b/packages/mumpot/mumpot_0.3.1.bb
deleted file mode 100644
index c5b9091bdb..0000000000
--- a/packages/mumpot/mumpot_0.3.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "A map-viewer, simple editor and routing application for OSM maps"
-HOMEPAGE = "http://wiki.openstreetmap.org/index.php/Mumpot"
-AUTHOR = "Andreas Kemnade"
-SECTION = "x11/applications"
-LICENSE = "GPLv2"
-DEPENDS = "gtk+ bluez-libs bzip2 libxml2 libpng jpeg"
-
-SRC_URI = "http://osm.andi.de1.cc/mumpot-${PV}.tar.gz \
-	file://mumpot-tah.desktop \
-	file://mumpot-mapnik.desktop"
-
-inherit autotools pkgconfig
-
-do_install_append() {
-	install -d ${D}${datadir}/applications
-	install -m 0644 ${WORKDIR}/mumpot-tah.desktop ${D}${datadir}/applications/mumpot-tah.desktop
-	install -m 0644 ${WORKDIR}/mumpot-mapnik.desktop ${D}${datadir}/applications/mumpot-mapnik.desktop
-}
diff --git a/packages/mumpot/mumpot_0.3.2.bb b/packages/mumpot/mumpot_0.4.bb
index ab9d876902..ab9d876902 100644
--- a/packages/mumpot/mumpot_0.3.2.bb
+++ b/packages/mumpot/mumpot_0.4.bb
diff --git a/packages/powervr-drivers/libgles-omap3.inc b/packages/powervr-drivers/libgles-omap3.inc
index 3533c47ad9..2789ac8bc5 100644
--- a/packages/powervr-drivers/libgles-omap3.inc
+++ b/packages/powervr-drivers/libgles-omap3.inc
@@ -15,8 +15,6 @@ FILES_${PN} = "${sysconfdir} ${libdir}/lib*.so.* ${bindir}/pvrsrvinit"
 FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
 FILES_${PN}-tests = "${bindir}/*"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 RRECOMMENDS_${PN} = "${PN}-tests \
                      omap3-sgx-modules"
 
@@ -32,16 +30,21 @@ Y
 ${S}" | ${WORKDIR}/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin
 }
 
-addtask accept_license after do_unpack before do_compile
+addtask accept_license after do_unpack before do_configure
 
-do_compile () {
-	:
+do_compile() {
+    for sofile in $(find ${S} -name "lib*Open*.so") $(find ${S} -name "lib*srv*.so")   $(find ${S} -name "lib*gl*.so") $(find ${S} -name "libpvr*.so") $(find ${S} -name "lib*GL*.so"); do
+        if [ "$(readlink -n ${sofile})" = "" ] ; then
+            mv $sofile ${sofile}.${IMGPV}
+            ln -sf $(basename ${sofile}.${IMGPV}) ${sofile}
+        fi
+    done
 }
 
 do_install () {
 
 	install -d ${D}${libdir}
-	cp -pR ${BINLOCATION}/*.so* ${D}${libdir}
+	cp -pP ${BINLOCATION}/*.so* ${D}${libdir}
 
 	install -d ${D}${bindir}/
 	cp -pP ${BINLOCATION}/*_test ${D}${bindir}/
diff --git a/packages/powervr-drivers/libgles-omap3/rc.pvr b/packages/powervr-drivers/libgles-omap3/rc.pvr
index 3fa0aff02f..4476a9d7e9 100755
--- a/packages/powervr-drivers/libgles-omap3/rc.pvr
+++ b/packages/powervr-drivers/libgles-omap3/rc.pvr
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-rmmod bc_example
+#rmmod bc_example
 rmmod omaplfb
 rmmod pvrsrvkm
 
 insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko")
-modprobe bc_example
+#modprobe bc_example
 modprobe omaplfb
 
 pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
diff --git a/packages/powervr-drivers/libgles-omap3_3.00.00.05.bb b/packages/powervr-drivers/libgles-omap3_3.00.00.05.bb
index 62c69a0ed0..814ca04637 100644
--- a/packages/powervr-drivers/libgles-omap3_3.00.00.05.bb
+++ b/packages/powervr-drivers/libgles-omap3_3.00.00.05.bb
@@ -2,11 +2,11 @@ require libgles-omap3.inc
 
 # Not released yet
 DEFAULT_PREFERENCE = "-1"
-PR = "r2"
+PR = "r3"
 
 SGXPV = "3_00_00_05"
+IMGPV = "1.2.12.838"
 
 # Quality control is really poor on these SDKs, so hack around the latest madness:
 FILES_${PN} += "${libdir}/*.so"
 FILES_${PN}-dev = "${includedir}"
-
diff --git a/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb b/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb
index 8a1ea57371..9fae1ff149 100644
--- a/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb
+++ b/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb
@@ -2,9 +2,10 @@ require libgles-omap3.inc
 
 # Not released yet
 DEFAULT_PREFERENCE = "-1"
-PR = "r2"
+PR = "r5"
 
 SGXPV = "3_00_00_06"
+IMGPV = "1.3.13.1397"
 
 do_accept_license() {
     export HOME="${WORKDIR}"
diff --git a/packages/python/divmod.inc b/packages/python/divmod.inc
new file mode 100644
index 0000000000..20be1b2e38
--- /dev/null
+++ b/packages/python/divmod.inc
@@ -0,0 +1,17 @@
+SRC_URI = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/${REALPN}-${PV}.tar.gz?format=raw"
+
+DEPENDS += "python-twisted-native"
+
+do_unpack2() {
+	cd ${WORKDIR}
+	tar zxvf ${REALPN}-${PV}.tar.gz?format=raw
+}
+
+addtask unpack2 after do_unpack before do_configure
+
+inherit distutils
+
+S = "${WORKDIR}/${REALPN}-${PV}"
+
+
+
diff --git a/packages/python/python-coherence_0.6.0.bb b/packages/python/python-coherence_0.6.0.bb
index 2c6ee0c9c6..bf9d964f99 100644
--- a/packages/python/python-coherence_0.6.0.bb
+++ b/packages/python/python-coherence_0.6.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends"
-SECTION = "python/devel"
+SECTION = "devel/python"
 LICENSE = "MIT"
 HOMEPAGE = "http://coherence.beebits.net/wiki"
 PR = "r5"
diff --git a/packages/python/python-coherence_svn.bb b/packages/python/python-coherence_svn.bb
new file mode 100644
index 0000000000..831e3a5ba6
--- /dev/null
+++ b/packages/python/python-coherence_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends"
+SECTION = "devel/python"
+LICENSE = "MIT"
+HOMEPAGE = "http://coherence.beebits.net/wiki"
+
+PR = "r5"
+PV = "0.6.0+svnr${SRCREV}"
+
+inherit setuptools
+
+SRC_URI = "svn://coherence.beebits.net/svn/trunk;module=Coherence;proto=https"
+S = "${WORKDIR}/Coherence"
+
+FILES_${PN} += "${datadir}"
+RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \
+	python-configobj python-twisted python-twisted-core python-misc python-zopeinterface \
+	zope python-modules python-pygobject python-gdata"
+
+
diff --git a/packages/python/python-divmodepsilon_0.5.11.bb b/packages/python/python-divmodepsilon_0.5.11.bb
new file mode 100644
index 0000000000..5184b69252
--- /dev/null
+++ b/packages/python/python-divmodepsilon_0.5.11.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "A small utility package that depends on tools too recent for Twisted "
+LICENSE = "MIT"
+
+REALPN = "Epsilon"
+
+require divmod.inc
+
diff --git a/packages/python/python-elementtree_1.2.7-20070827-preview.bb b/packages/python/python-elementtree_1.2.7-20070827-preview.bb
new file mode 100644
index 0000000000..f1e4c8b322
--- /dev/null
+++ b/packages/python/python-elementtree_1.2.7-20070827-preview.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Lightweight Python components for handling XML"
+SECTION = "devel/python"
+LICENSE = "Python"
+HOMEPAGE = "http://effbot.org/zone/element-index.htm"
+PR = "r0"
+
+inherit distutils
+
+SRC_URI = "http://effbot.org/media/downloads/elementtree-${PV}.zip"
+S = "${WORKDIR}/elementtree-${PV}"
+
+FILES_${PN} += "${datadir}"
+
+
diff --git a/packages/python/python-gdata_1.2.4.bb b/packages/python/python-gdata_1.2.4.bb
new file mode 100644
index 0000000000..2e7e424976
--- /dev/null
+++ b/packages/python/python-gdata_1.2.4.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Google Data APIs Python Client Library"
+SECTION = "devel/python"
+LICENSE = "Apache"
+HOMEPAGE = "http://code.google.com/p/gdata-python-client/"
+PR = "r0"
+
+inherit distutils
+
+SRC_URI = "http://gdata-python-client.googlecode.com/files/gdata.py-${PV}.tar.gz"
+S = "${WORKDIR}/gdata.py-${PV}"
+
+FILES_${PN} += "${datadir}"
+
+RDEPENDS = "python-elementtree"
+
diff --git a/packages/python/python-nevow_0.9.32.bb b/packages/python/python-nevow_0.9.32.bb
new file mode 100644
index 0000000000..155157c517
--- /dev/null
+++ b/packages/python/python-nevow_0.9.32.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Nevow is a web application construction kit written in Python"
+LICENSE = "MIT"
+
+REALPN = "Nevow"
+
+require divmod.inc
+
+FILES_${PN} += "${datadir}"
+DEPENDS += "python-twisted-native"
+
diff --git a/packages/python/python-pycairo_1.4.0.bb b/packages/python/python-pycairo_1.4.0.bb
index db628a5b0e..0cccd76d0f 100644
--- a/packages/python/python-pycairo_1.4.0.bb
+++ b/packages/python/python-pycairo_1.4.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Python Bindings for the Cairo canvas library"
-SECTION = "python-devel"
+SECTION = "devel/python"
 HOMEPAGE = "http://cairographics.org/pycairo"
 LICENSE = "LGPL MPL"
 DEPENDS = "cairo"
diff --git a/packages/python/python-pycairo_1.8.0.bb b/packages/python/python-pycairo_1.8.0.bb
index fdcb6521f9..4e3e4633ba 100644
--- a/packages/python/python-pycairo_1.8.0.bb
+++ b/packages/python/python-pycairo_1.8.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Python Bindings for the Cairo canvas library"
-SECTION = "python-devel"
+SECTION = "devel/python"
 HOMEPAGE = "http://cairographics.org/pycairo"
 LICENSE = "LGPL MPL"
 # cairo >= 1.8.0
diff --git a/packages/python/python-twisted-native_8.2.0.bb b/packages/python/python-twisted-native_8.2.0.bb
new file mode 100644
index 0000000000..063f0fdb13
--- /dev/null
+++ b/packages/python/python-twisted-native_8.2.0.bb
@@ -0,0 +1,7 @@
+require python-twisted_${PV}.bb
+
+inherit native
+
+do_stage() {
+	distutils_stage_all
+}
diff --git a/packages/python/python-xappy_0.5.bb b/packages/python/python-xappy_0.5.bb
index ae9cda69fb..5c5f1ae6d1 100644
--- a/packages/python/python-xappy_0.5.bb
+++ b/packages/python/python-xappy_0.5.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "The xappy python module is an easy-to-use interface to the Xapian search engine"
-SECTION = "python/devel"
+SECTION = "devel/python"
 LICENSE = "GPLv2"
 DEPENDS = "xapian-core"
 PR = "ml0"
diff --git a/packages/serial-utils/pty-forward-native.bb b/packages/serial-utils/pty-forward-native.bb
index 972070d6b6..54ff591928 100644
--- a/packages/serial-utils/pty-forward-native.bb
+++ b/packages/serial-utils/pty-forward-native.bb
@@ -1,7 +1,11 @@
-LICENSE="GPL"
-SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY"
+DESCRIPTION = "Receive a forwarded serial from serial-forward and provide a PTY"
+AUTHOR = "Holger 'Zecke' Freyther"
+LICENSE = "GPL"
+SECTION = "console/network"
+PV = "1.0.0+svnr${SRCREV}""
+PR = "r0"
 
-SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
+SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
 S = "${WORKDIR}/serial_forward"
 
 inherit native
@@ -21,4 +25,3 @@ do_deploy() {
 }
 
 addtask deploy before do_package after do_install
-
diff --git a/packages/serial-utils/serial-forward.bb b/packages/serial-utils/serial-forward.bb
index 3cc33770d6..c3b879a0ee 100644
--- a/packages/serial-utils/serial-forward.bb
+++ b/packages/serial-utils/serial-forward.bb
@@ -1,8 +1,12 @@
-LICENSE="GPL"
-SUMMARY="Forward a serial using TCP/IP"
+DESCRIPTION = "Forward a serial using TCP/IP"
+AUTHOR = "Holger 'Zecke' Freyther'"
+LICENSE = "GPL"
+SECTION = "console/devel"
+PV = "1.0.0+svnr${SRCREV}"
+PR = "r0"
 
-SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
-S="${WORKDIR}/serial_forward"
+SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
+S = "${WORKDIR}/serial_forward"
 
 do_compile() {
     cd ${S}
diff --git a/packages/tasks/task-beagleboard-demo.bb b/packages/tasks/task-beagleboard-demo.bb
index 35c8d6582e..72edd0646d 100644
--- a/packages/tasks/task-beagleboard-demo.bb
+++ b/packages/tasks/task-beagleboard-demo.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for Beagleboard-demo-image"
 
-PR = "r6"
+PR = "r7"
 
 inherit task 
 
@@ -37,6 +37,7 @@ RDEPENDS_${PN} = "\
 	angstrom-gnome-icon-theme-enable \
 	openssh-scp openssh-ssh \
 	picodlp-control \
+	connman-gnome \
 "
 
 # Install all kernel modules
diff --git a/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch b/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch
index 5c89721d8f..b3bb762415 100644
--- a/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch
+++ b/packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch
@@ -110,10 +110,10 @@ index c4612ea..4c1ec6b 100644
  
 diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
 new file mode 100644
-index 0000000..f8a41a8
+index 0000000..10050e4
 --- /dev/null
 +++ b/pixman/pixman-arm-neon.c
-@@ -0,0 +1,1397 @@
+@@ -0,0 +1,1387 @@
 +/*
 + * Copyright © 2009 Mozilla Corporation
 + *
@@ -319,12 +319,10 @@ index 0000000..f8a41a8
 +                        "b 9f\n\t"
 +// LOOP
 +                        "2:\n\t"
-+                        "vld1.8  {d0}, [%[src]]\n\t"
-+                        "vld1.8  {d4}, [%[dst]]\n\t"
++                        "vld1.8  {d0}, [%[src]]!\n\t"
++                        "vld1.8  {d4}, [%[dst]]!\n\t"
 +                        "vst1.8  {d20}, [%[keep_dst]]\n\t"
-+                        "mov     %[keep_dst], %[dst]\n\t"
-+                        "add %[src], %[src], #8\n\t"
-+                        "add %[dst], %[dst], #8\n\t"
++                        "sub     %[keep_dst], %[dst], #8\n\t"
 +                        "subs %[w], %[w], #8\n\t"
 +                        "9:\n\t"
 +                        "vqadd.u8 d20, d0, d4\n\t"
@@ -468,12 +466,10 @@ index 0000000..f8a41a8
 +                        "b 9f\n\t"
 +// LOOP
 +                        "2:\n\t"
-+                        "vld4.8  {d0-d3}, [%[src]]\n\t"
-+                        "vld4.8  {d4-d7}, [%[dst]]\n\t"
++                        "vld4.8  {d0-d3}, [%[src]]!\n\t"
++                        "vld4.8  {d4-d7}, [%[dst]]!\n\t"
 +                        "vst4.8  {d20-d23}, [%[keep_dst]]\n\t"
-+                        "mov     %[keep_dst], %[dst]\n\t"
-+                        "add %[src], %[src], #8*4\n\t"
-+                        "add %[dst], %[dst], #8*4\n\t"
++                        "sub     %[keep_dst], %[dst], #8*4\n\t"
 +                        "subs %[w], %[w], #8\n\t"
 +                        "9:\n\t"
 +                        "vmvn.8  d31, d3\n\t"
@@ -746,12 +742,10 @@ index 0000000..f8a41a8
 +                        "b 9f\n\t"
 +// LOOP
 +                        "2:\n\t"
-+                        "vld4.8       {d0-d3}, [%[src]]\n\t"
-+                        "vld4.8       {d4-d7}, [%[dst]]\n\t"
++                        "vld4.8       {d0-d3}, [%[src]]!\n\t"
++                        "vld4.8       {d4-d7}, [%[dst]]!\n\t"
 +                        "vst4.8       {d20-d23}, [%[keep_dst]]\n\t"
-+                        "mov  %[keep_dst], %[dst]\n\t"
-+                        "add  %[src], %[src], #8*4\n\t"
-+                        "add  %[dst], %[dst], #8*4\n\t"
++                        "sub  %[keep_dst], %[dst], #8*4\n\t"
 +                        "subs  %[w], %[w], #8\n\t"
 +
 +                        "9:\n\t"
@@ -957,12 +951,10 @@ index 0000000..f8a41a8
 +// LOOP
 +                        "2:\n\t"
 +
-+                        "vld1.16      {q12}, [%[dst]]\n\t"
-+                        "vld1.8       {d31}, [%[mask]]\n\t"
++                        "vld1.16      {q12}, [%[dst]]!\n\t"
++                        "vld1.8       {d31}, [%[mask]]!\n\t"
 +                        "vst1.16      {q10}, [%[keep_dst]]\n\t"
-+                        "mov  %[keep_dst], %[dst]\n\t"
-+                        "add  %[mask], %[mask], #8\n\t"
-+                        "add  %[dst], %[dst], #8*2\n\t"
++                        "sub  %[keep_dst], %[dst], #8*2\n\t"
 +                        "subs  %[w], %[w], #8\n\t"
 +                        "9:\n\t"
 +// expand 0565 q12 to 8888 {d4-d7}
@@ -1294,12 +1286,10 @@ index 0000000..f8a41a8
 +                        "b 9f\n\t"
 +// LOOP
 +                        "2:\n\t" 
-+                        "vld4.8       {d4-d7}, [%[dst]]\n\t"
-+                        "vld1.8       {d31}, [%[mask]]\n\t"
++                        "vld4.8       {d4-d7}, [%[dst]]!\n\t"
++                        "vld1.8       {d31}, [%[mask]]!\n\t"
 +                        "vst4.8       {d20-d23}, [%[keep_dst]]\n\t"
-+                        "mov  %[keep_dst], %[dst]\n\t"
-+                        "add  %[mask], %[mask], #8\n\t"
-+                        "add  %[dst], %[dst], #8*4\n\t"
++                        "sub  %[keep_dst], %[dst], #8*4\n\t"
 +                        "subs  %[w], %[w], #8\n\t"
 +                        "9:\n\t"
 +
@@ -1371,7 +1361,7 @@ index 0000000..f8a41a8
 +                dval = vld1_u8((void*)dst);
 +
 +                temp = neon2mul(sval2,alpha);
-+                res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(sval2), alpha_selector)));
++                res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
 +
 +                vst1_u8((void*)dst,res);
 +
@@ -1387,7 +1377,7 @@ index 0000000..f8a41a8
 +                dval = vreinterpret_u8_u32(vld1_dup_u32((void*)dst));
 +
 +                temp = neon2mul(sval2,alpha);
-+                res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(sval2), alpha_selector)));
++                res = vqadd_u8(temp,neon2mul(dval,vtbl1_u8(vmvn_u8(temp), alpha_selector)));
 +
 +                vst1_lane_u32((void*)dst,vreinterpret_u32_u8(res),0);
 +            }
@@ -1513,12 +1503,12 @@ index 0000000..f8a41a8
 +
 diff --git a/pixman/pixman-arm-neon.h b/pixman/pixman-arm-neon.h
 new file mode 100644
-index 0000000..a473841
+index 0000000..bab4dee
 --- /dev/null
 +++ b/pixman/pixman-arm-neon.h
 @@ -0,0 +1,137 @@
 +/*
-+ * Copyright © 2008 Mozilla Corporation
++ * Copyright © 2009 Mozilla Corporation
 + *
 + * Permission to use, copy, modify, distribute, and sell this software and its
 + * documentation for any purpose is hereby granted without fee, provided that
@@ -1539,7 +1529,7 @@ index 0000000..a473841
 + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 + * SOFTWARE.
 + *
-+ * Author:  Jeff Muizelaar (jeff@infidigm.net)
++ * Author:  Ian Rickards (ian.rickards@arm.com)
 + *
 + */
 +
diff --git a/packages/xorg-lib/pixman_0.13.2.bb b/packages/xorg-lib/pixman_0.13.2.bb
index 5b304de104..4b489f89a6 100644
--- a/packages/xorg-lib/pixman_0.13.2.bb
+++ b/packages/xorg-lib/pixman_0.13.2.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 DESCRIPTION = "Low-level pixel manipulation library."
 LICENSE = "X11"
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
author	Khem Raj <raj.khem@gmail.com>	2009-02-07 17:03:23 -0800
committer	Khem Raj <raj.khem@gmail.com>	2009-02-07 17:03:23 -0800
commit	8a022299d8cbe2de444669a5a25b1f1c182d86f2 (patch)
tree	0801f6ef6d9ccf2edbfc67a10efa10ffd611df8f
parent	ff830a30aca98928bcd5ea6726e3b3064785f506 (diff)
parent	d6bc6a6e31509a9175bdb3636b3fbed89f794986 (diff)