merge of '77de2c054faaf8169bea5553ae2311a39a581403'

and 'fd59ca4a2d1cdb56a15d6a3323721ce78836fe52'
author: Florian Boor <florian.boor@kernelconcepts.de> 2008-08-14 23:48:23 +0000
committer: Florian Boor <florian.boor@kernelconcepts.de> 2008-08-14 23:48:23 +0000
commit: e9570b88fa18c49a68b5f44bffd7e2abb101f499 (patch)
tree: 083d8795a6ff13b6950f8da4ba4c507791b39fa2
parent: 8e9a327b9c3924807b7c2093d6cc910213720440 (diff)
parent: 2792ce30ea1b3eb6a32bad578a956557e3040e89 (diff)
180 files changed, 9439 insertions, 833 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 7137876a93..b4e78f8118 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -215,8 +215,10 @@ autotools_stage_all() {
 	# b) packaged staging will fix that anyways. :M:
 	if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ]
 	then
-		echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/"
-		cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/
+		if [ -e ${STAGE_TEMP}/${libdir}/pkgconfig/ ] ; then
+			echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/"
+			cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/
+		fi
 	fi
 	rm -rf ${STAGE_TEMP}/${mandir} || true
 	rm -rf ${STAGE_TEMP}/${infodir} || true
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass
index fa34565eaf..a35ca27bd4 100644
--- a/classes/distutils.bbclass
+++ b/classes/distutils.bbclass
@@ -1,5 +1,6 @@
 inherit distutils-base
 
+DISTUTILS_BUILD_ARGS ?= ""
 DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}"
 DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${layout_prefix} \
     --install-data=${STAGING_DATADIR}"
@@ -8,7 +9,7 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
 
 distutils_do_compile() {
          BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-         ${STAGING_BINDIR_NATIVE}/python setup.py build || \
+         ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \
          oefatal "python setup.py build_ext execution failed."
 }
 
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 50fbbfb663..d0db4c70d2 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -233,6 +233,9 @@ ALLOW_EMPTY_kernel-image = "1"
 DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
 RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
 
+# renamed modules
+RPROVIDES_kernel-module-aes-generic = "kernel-module-aes"
+
 pkg_postinst_kernel-image () {
 if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
 	mkdir -p $D/lib/modules/${KERNEL_VERSION}
@@ -450,7 +453,7 @@ python populate_packages_prepend () {
 # Support checking the kernel size since some kernels need to reside in partitions
 # with a fixed length or there is a limit in transferring the kernel to memory
 do_sizecheck() {
-	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}"]; then
+	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}" ]; then
         	size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
         	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
                 	rm ${KERNEL_OUTPUT}
diff --git a/conf/checksums.ini b/conf/checksums.ini
index b3d2f441a3..648da96cb6 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -26,6 +26,10 @@ sha256=5782f645ab00224e733b018f82ea6e84d72a9f16a56ad645f4930145576bc8b5
 md5=7f76fd173b550b1236025592be88f84c
 sha256=f09d4ae3365b876da9f40f49178ab7241bb7e4c1d67db9e2f310f9c76d5834a6
 
+[http://maxim.org.za/AT91RM9200/2.6/2.6.20-at91.patch.gz]
+md5=333b0e9328194f28af83c26d3717e4ac
+sha256=8930ebfdc8a606d8cb26f073d4700460c3289fb79e943e12948329e17336ca47
+
 [http://www.amd.com/files/connectivitysolutions/geode/geode_lx/AES_Linux_LX_02.01.0100.tar.gz]
 md5=12cb241a9037fffe31ba7c68a48ed614
 sha256=a6068b4aa0e2330eed6e4741bad3191dc9ca7d7326f7bfab578ac55e2b8b91a2
@@ -66,6 +70,10 @@ sha256=8750d58745e57654820aa9359891cb0d875d804dbfcfa2e1bb95c56531e423d1
 md5=1ab76bfd6731d80f6abbd1643c90cabd
 sha256=7794d91711e8c9e526431da72c53bb08e14790f326d0e330d9e9d651f3f6fc6c
 
+[http://pypi.python.org/packages/source/C/Cython/Cython-0.9.6.14.tar.gz]
+md5=edb342c7525119c2a924897873d215b4
+sha256=dde5d254cd00e4182680b1241e9a5feebbc9b4887f5d0bac2ba2935f213c97e7
+
 [http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-0.101.tar.gz]
 md5=6e9bb994a8716112a78c1306261f4164
 sha256=a96fb122261fb5f069341d7e69dcf07a2988da7cfd8df65d50843b8b102fb55c
@@ -150,6 +158,10 @@ sha256=8401b31d22605e787edef75025eb048b2b3cfaee92ed8358bdcaedca5761f7ea
 md5=3942a55cfc5e6d3b612a46cc1a9515b9
 sha256=e6dafb82ddf7730ebe7ae2de0ce158d3052d782780b41a14c4fed304e463632e
 
+[http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip]
+md5=9a6dc3846041b899edf9eff8a906fb11
+sha256=f764d0554e236357fc55d128a012cb6ac2ceb638023f4af88c8f509511f209fd
+
 [http://www.urban.ne.jp/home/kanemori/zaurus/IaiMaster_0.5.tar.gz]
 md5=6e3992e261e1fb7fbae08530d45886b7
 sha256=bb837de5130cdbe2c1f4dd7ded8c890ef11f37979526e480afd82b364605563b
@@ -158,6 +170,10 @@ sha256=bb837de5130cdbe2c1f4dd7ded8c890ef11f37979526e480afd82b364605563b
 md5=b12df56aedcfd0af2e61c503b3643f51
 sha256=8c03d7fec2bc1f43be6b1b4d91b88e79fed3f02bf0f993553083222d24da6190
 
+[ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-6.3.5-10.tar.bz2]
+md5=1b31777138ed78ae0e95b8480cb7e2c2
+sha256=a4d26fb438b15502cc4fb7842111d75d0bd4958c484b3d1bbe25dc60b4e63f84
+
 [http://effbot.org/downloads/Imaging-1.1.5.tar.gz]
 md5=a64512e39469213ced0d091b9eba76c0
 sha256=14fd700b64d3060e356fc217d8539d1fb468d8688a451f9d6e2faaef1139a58c
@@ -170,6 +186,10 @@ sha256=7dd7358ab519161967c838df27465282d180a3206f693ba2db64273d688b3f90
 md5=0f429212fdcfd99efe6bfd3904adece8
 sha256=272ddac7f039d12938f50c281f42941d6dea7ab940f1b3b3dd5ab28572678bd4
 
+[http://olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2]
+md5=cb5dcdaf07ccad18a921058138dedc4a
+sha256=0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c
+
 [ftp://sources.redhat.com/pub/lvm2/LVM2.2.01.15.tgz]
 md5=c71654baff263254fb5a226624ee8ef3
 sha256=80b47604ace83db4450f43d94a99fdf2ca317323fde8a591f57290d28ece7d3b
@@ -206,6 +226,10 @@ sha256=ffac9cd4a6fbc59618bf4e79c389a927491a81b448528278e010a190e2483544
 md5=18c05d88e22c3b815a43ca8d7152ccdc
 sha256=8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063
 
+[http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2]
+md5=7e27e535c2d267637df34898f1b91707
+sha256=3875b7cc85e8e7df81c02a638db6b4a970d1e66a86dad6ebf29a1d19f38f5953
+
 [http://www.cpan.org/modules/by-module/Mail/Mail-Sendmail-0.79.tar.gz]
 md5=038f261afd091d8fad347d6c66d2833d
 sha256=8a5eb39d3b9a3a4219c6d6051328c62bd51e9b53723ee5b42cd66e8672e681b9
@@ -266,6 +290,10 @@ sha256=fc87440d252c77f5c1afc17bb3015586cca264bc5fa8794bc54b869b8106265d
 md5=bb1b4859522cb6e1a3a3dc4b7397db64
 sha256=412e4880d79533a2bbd33757e031a2bee24a7bc771f22cf4fed3cb81790b1b68
 
+[http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.12.tar.bz2]
+md5=6f4bf7d803d442e9d093a0daa203d506
+sha256=d60027a4a36e64d02723d00b76c08e8d92850cab6269b2edcda4a1bb30cc7723
+
 [http://downloads.sourceforge.net/openjade/OpenSP-1.5.tar.gz]
 md5=87f56e79ae0c20397f4207d61d154303
 sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704
@@ -322,6 +350,14 @@ sha256=9fab66f9584fb8e67aebd8745a5c97bf1c5a2e2e461adf68862bcec64e448c13
 md5=0415b95a023061679021323d9ce56fe0
 sha256=e93c6f74e425d4b9e65ecc7e7b7854c586a1448009ce873b30e7a2d6c8ca30ae
 
+[http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.5.1a.tar.gz]
+md5=0132c5cd2f8685e4948fb14dcb65f637
+sha256=7f34e865505bd467557220961b091fc54782114865e1c5b81e68395989ddbd53
+
+[http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.8.4.tar.gz]
+md5=100b95005bb93c8b95e96406aad661bc
+sha256=0f8f39a3c78a0d0ec947da1c19c7f8ecb41123755ff2bc31795a77946280f627
+
 [http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tar.bz2]
 md5=0ba90c79175c017101100ebf5978e906
 sha256=325fdc7351a08bd8d811e7fb53c41bff11764648ab1a671abd910afec946b38a
@@ -354,10 +390,22 @@ sha256=ee75c05bb8a17a7978abbbc0f38fb79b1915c1e2357889e65657a39024d5b3a3
 md5=a150750ad33c512edc4afee5270b37cb
 sha256=e005a93a0b463e01edba2b79038b54c29a7932efee61c851a2ac644b8a4e5dd4
 
+[http://www.ralinktech.com.tw/data/RT71W_Firmware_V1.8.zip]
+md5=1e7a5dc574e0268574fcda3fd5cf52f7
+sha256=e2d3ac1aaf4815e0c9531bc3fb7f56f30604cd52351332f1f8d6a28bb9a953bf
+
 [http://www.libsdl.org/release/SDL-1.2.11.tar.gz]
 md5=418b42956b7cd103bfab1b9077ccc149
 sha256=6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
 
+[http://www.libsdl.org/release/SDL-1.2.12.tar.gz]
+md5=544b4554986e51eed6d34435cf9c5f3f
+sha256=df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9
+
+[http://www.libsdl.org/release/SDL-1.2.13.tar.gz]
+md5=c6660feea2a6834de10bc71b2f8e4d88
+sha256=94f99df1d60f296b57f4740650a71b6425da654044ca30f8f0ce34934429e132
+
 [http://www.libsdl.org/release/SDL-1.2.7.tar.gz]
 md5=d29b34b6ba3ed213893fc9d8d35e357a
 sha256=f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd
@@ -378,10 +426,18 @@ sha256=2f710b94f547ec7e39844f7872e1fe8d6fe2a434c896cc8a54b5540854bb5a69
 md5=2b8beffad9179d80e598c22c80efb135
 sha256=89f94840b1b42ddfe53a8aee415331516f1bbdd942b42d25e74906a332cdf22a
 
+[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8.tar.gz]
+md5=0b5b91015d0f3bd9597e094ba67c4d65
+sha256=a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6
+
 [http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.5.tar.gz]
 md5=e45b1048d2747480dcc65ece4130a920
 sha256=397dee6b7ac13dea70dd3dd2ae6044f45a632a1ba156da178c96df66fb8ccdcb
 
+[http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.7.tar.gz]
+md5=6bd4662d1423810f3140d4da21b6d912
+sha256=2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53
+
 [http://bloodgate.com/perl/sdl/pub/SDL_perl-1.20.3.tar.gz]
 md5=ab7fb92a1ed0db54a88839e64b9ce2c6
 sha256=ac6f511404457592b88fd57c4c77f7feba8e3b55d62c3c45c117fe84f1e07a7d
@@ -466,6 +522,10 @@ sha256=9e488e3ee3fc0f56d8f8898f4729819512dd43afff0fba4e32390d1af4bd53d5
 md5=56df2ae66db57932515a491c03bf514f
 sha256=f3b2df3f4483752a42f1a775a1163da1f9e91bf5f19d302abc93544aca20d2cd
 
+[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.35.tar.gz]
+md5=1a933b1114c41a25587ee59ba8376f7c
+sha256=1684cb64a6bd24e019532ae2e5d4a962d43d9215623e9d4dc77536f118fbf31b
+
 [http://snafu.freedom.org/Vmaps/Vmaps-1.1.tgz]
 md5=0ba6f2b97ff8eb3e975ed906f2311080
 sha256=f97b3c0a36c7422d38af67dd68855e5c25581f7b6e79f8671e298e66b4d0026e
@@ -554,10 +614,34 @@ sha256=482891fb0e376e2aaeee25afa8b4913e6dc50f4fdc280f9f152b3ee8745d735d
 md5=bbc9c124f8072875129bd67092f0fa0b
 sha256=db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f
 
+[http://www.abiword.org/downloads/abiword/2.6.0/source/abiword-2.6.0.tar.gz]
+md5=d627a5d1061160c683f2257da498355b
+sha256=35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb
+
+[http://www.abiword.org/downloads/abiword/2.6.3/source/abiword-2.6.3.tar.gz]
+md5=40d9da8b04c70035b89f8ad7fcc4519d
+sha256=e5ffecc423e2a9214cb4abd9dbd086552a0d45387b7bc2072738f5e2a8dd90ec
+
+[http://www.abiword.org/downloads/abiword/2.6.4/source/abiword-2.6.4.tar.gz]
+md5=16748b2d6e318e0e2a25581005e1943a
+sha256=4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe
+
 [http://www.abiword.org/downloads/abiword/2.5.2/source/abiword-plugins-2.5.2.tar.gz]
 md5=0ad700d0cb6d176b39a191b16e3886c0
 sha256=5714753ce1e89e72c2ba7e7d7d95546d9965a4e86bf76c060a8779b08fc2ae85
 
+[http://www.abiword.org/downloads/abiword/2.6.0/source/abiword-plugins-2.6.0.tar.gz]
+md5=ebdc165d1b6c3c69f11148cf7841f257
+sha256=329521398105348ff466b90e1a7567574bd690639b048b6356ddc353d864b785
+
+[http://www.abiword.org/downloads/abiword/2.6.3/source/abiword-plugins-2.6.3.tar.gz]
+md5=92a2e98fb26595666cb68e9bb56babd0
+sha256=d3ddfd3dbd20ed9bb35dceb06a55ec13d66acb1c3fce28976a8d10929c39a194
+
+[http://www.abiword.org/downloads/abiword/2.6.4/source/abiword-plugins-2.6.4.tar.gz]
+md5=3bf973c5a1446ef3eaf980724821d6e9
+sha256=ec561e865387fa0a108ac135fc39ef0aa18e0dddd99f1f92749f67b029ba30eb
+
 [http://www.labyrinth.net.au/~trandor/abuse/files/abuse_sdl-0.7.0.tar.bz2]
 md5=59ea4498886642aa975f04233cc92558
 sha256=bda8a3c42733853444e1d4bee16e85990b78c2eaafc4b26e0769be2e14dab931
@@ -606,6 +690,18 @@ sha256=0273c476875e5dd09c7e15e8de58ed18fa9f5f2f9482a78e4171b3f56d75efa4
 md5=34c0447951d438d76fa32d08eab5da01
 sha256=90cbd5030938ce1622a8e399c95088bf464bceb95adc290640d4610eb8522aeb
 
+[http://download.aircrack-ng.org/aircrack-ng-0.9.1.tar.gz]
+md5=07488ff1e178b5b7fe04c6fd78da2b96
+sha256=dd76f20083aca758c71ce8b7d9f0a4c0042b9720d508e48339bf0949fad5300c
+
+[http://download.aircrack-ng.org/aircrack-ng-0.9.3.tar.gz]
+md5=f37fdb000d8bad77da6a0a43bc2ef67a
+sha256=71bca53eae0261d5bdd72e4363f43f5a6e40b2375dc4852a4029a061c789da58
+
+[http://repository.maemo.org/pool/maemo4.1/free/a/alarmd/alarmd_0.5.20.tar.gz]
+md5=9730a07d6990422a92559f9795a694f5
+sha256=0a2cfda6701b344eed3e760089e306c50bfd71699592e4e0711c4609814a23ba
+
 [http://downloads.sourceforge.net/albumshaper/albumshaper_2.1.tar.bz2]
 md5=242c260c50fd774f2301dba66deb668b
 sha256=67b43e51aa5afb22a7329fd78e9d17f489fceb4ac00d9861312993709739528e
@@ -642,6 +738,10 @@ sha256=01e693daf4c0e2af2e10082a635559d390f9127556a86d25105abfa646a9b0a3
 md5=94254ea0d2c966a58184b134e9da29ff
 sha256=f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952
 
+[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.17.tar.bz2]
+md5=9bbbdc502478cdc75074c9ba42c385b3
+sha256=bc691463af8506c1c84db0edab727ee8f8ee4ecd1777b0e264db2525d4500833
+
 [ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2]
 md5=3106c2d59a329263867fa3dd44133dda
 sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790
@@ -654,6 +754,18 @@ sha256=c8feb3eb9d4255a4aff7ca839555293c237c1b2f034c118127e826843c6f0184
 md5=49fb5fbae8bf955b248e46ff9c9a2aa1
 sha256=85245d7666d82cc44010dfe14f6427a8586da2c8b033fb636f0f041dd7e5168b
 
+[ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.17.tar.bz2]
+md5=1b1850c2fc91476a73d50f537cbd402f
+sha256=8d009e23e2cbee1691ec3c95d1838056a804d98440eae7715d6c3aebc710f9ca
+
+[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.15.tar.bz2]
+md5=908c2dd7ec33bc8e1fcd5e92c7e5e125
+sha256=3fec2349a94254c82dd568a8f4f8b8ef9735aee7dc56a5cf93e80f5938df9e95
+
+[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.17.tar.bz2]
+md5=f37d0b2b19dfbe215144941ab8bb6e49
+sha256=35a7e1411ab7b34353136ecfbd2267201d37b671f48b946bf238a6d1f7fdf560
+
 [ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.11.tar.bz2]
 md5=ba9b8010120701d0f6daf061d392cfa2
 sha256=4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b
@@ -670,6 +782,10 @@ sha256=307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb
 md5=287f46f891581c15018de4f8c0731575
 sha256=3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac
 
+[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.17.tar.bz2]
+md5=14ccd0c900bf663afb36eac6f92d41d6
+sha256=6a06f457d66eca75ac1ab065e64539e4ccf22ed4e53703a70194cb85203b3125
+
 [http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz]
 md5=e3619c07bd175ce5f73d67388c0c2ea5
 sha256=140828e8aa7d690d8f2a9a54faeac38bcbf40ea18c1f44a186af51bd6964cd13
@@ -686,6 +802,10 @@ sha256=bce6638d95fa8d32b109176a7cef6aa71e40c130068fac71b0df369d1a36c82c
 md5=ed2183311aacf5714afbd825f3671417
 sha256=a319f936af9df20cd173d2e4c486cb6f1a011287ebcbd429a7f38c3214f555f3
 
+[ftp://ftp.buici.com/pub/apex/apex-1.5.8.tar.gz]
+md5=bb96cc8d50b4f00ee653f0800643ea8a
+sha256=4ad287720b87213154fa272afee5f442b0d8d61c1f56e43d0d056ae25849a926
+
 [ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.2.2.orig.tar.gz]
 md5=b1e6309e8331e0f4e6efd311c2d97fa8
 sha256=7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d
@@ -746,6 +866,10 @@ sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10
 md5=67d439a252996357b0313b3ad999739a
 sha256=6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686
 
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.14.tar.gz]
+md5=19efa18fb1ef20c58b9b44e94258b814
+sha256=8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045
+
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.3.tar.gz]
 md5=e2e6e23f43bfdf135b923205659dfaf1
 sha256=d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710
@@ -774,14 +898,30 @@ sha256=3179a3cb9d42cd9651622e911e18c6ebff58f338a9f2f4f36610ca74d8c54885
 md5=c0d60035d45c7f43d2ddd3c021709220
 sha256=693609f59d0c0a6518a3654314aaef841305e029c8f7de4c42fbc0fd7f2dbb35
 
+[http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2]
+md5=ada6a8dff4a147f41de02174f8703a0b
+sha256=adbc29af4d08e64a221e213597556bf2a7121503fd33a66a2ffceeeffb404e88
+
 [ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz]
 md5=cebfeb99c4a7c2a6cee2564770415fe7
 sha256=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
 
+[http://downloads.sourceforge.net/asio/asio-1.1.1.tar.bz2]
+md5=3e6bcedc549cb4c014227f882969db5c
+sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e
+
+[http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.3.patch]
+md5=ce753d3c06825e3e8d6801258d63f761
+sha256=1c6e90e00f3cb202f206e4b8f0524948ba295feb66aa6a68cf189f34dc851bde
+
 [ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.5.tar.gz]
 md5=17fd8acac6293336bcef44391b71e337
 sha256=ee9e81d2e3e66b01ad91da736e48568ed8acd6dfb6b664d904066ecc5ea4e84b
 
+[ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.6.tar.gz]
+md5=bc80f0198773d5c05086522be67334eb
+sha256=4f5b1520e26cf6bbb1b5ca8a2f9f22948c3ca38ac4c2dd9e02df042fee7c0e36
+
 [ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-6.0-0.tar.bz2]
 md5=16449e0a266e1ecc526b2f3cd39d4bc2
 sha256=24f0688711d2b893fa06c16d14d0aa3a8000e326226b839aad32611f7ace4898
@@ -802,6 +942,14 @@ sha256=115248cb7b1fc35dc2be24218f91a87272cf5c0d8c2050a36da2314fadc05cf4
 md5=88cfcd5c3b2a8f2504e561cb93546299
 sha256=cc70d2ff8a2cafe3c7cce10dc5e90146111bc686ed6e08fc753e950c7050611e
 
+[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.4.10.tar.gz]
+md5=69057e2916287f6e2a1e36dba6d6800d
+sha256=72bbb19e35ec304df06dca717b7ac2cae0d3409fe47c17c2dcf75850f61ddbe1
+
+[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.4.19.1.tar.gz]
+md5=3b416557d2c395a36b97a819812e99b0
+sha256=2bcc5d5620f8533eb4300ba1b48c9d2a00092ce04588e32f7074cf2aadc34259
+
 [http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-1.2.1.tar.gz]
 md5=bed4259905a7d7bc070c6319142b2075
 sha256=bfa7def7d0f1190a111bde232920d2b3481d3932e2d1056573b3a9c4801c602a
@@ -970,6 +1118,10 @@ sha256=d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561
 md5=c84b1a8a23126e188426728710414dc8
 sha256=9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52
 
+[http://avahi.org/download/avahi-0.6.23.tar.gz]
+md5=aab1a304851d8145ea5f6a85c10af9e9
+sha256=dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d
+
 [http://downloads.sourceforge.net/avetanabt/avetanaBluetooth-20060413.tgz]
 md5=3cb3be404950ef08e51adbe59c7b811e
 sha256=c3648f02dd7d4dc8c0ef9a48089fda4ca47b81a977c838b17f55e6abf7f51447
@@ -1262,6 +1414,10 @@ sha256=016b0faa1bbe20c13a4b5f495a5a4071349f6385012b767c89bb908452faecf2
 md5=e26e2e06b6e4bf3acf1dc8688a94c0d1
 sha256=e2c33ce6f23c9a366f109ced295626cb2f8bd6b2f08ff9df6dafb5448505a25e
 
+[http://kernel.org//pub/linux/devel/binutils/binutils-2.18.50.0.7.tar.bz2]
+md5=d5bce238060d631be60a3f1f1009a7ba
+sha256=6fe3c4b2d45a50582f832bc77deb4e3da74a15ea8e09dbb214b9c44e7c3378fc
+
 [ftp://ftp.gnu.org/gnu/binutils/binutils-2.18.tar.bz2]
 md5=9d22ee4dafa3a194457caf4706f9cf01
 sha256=487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b
@@ -1274,6 +1430,10 @@ sha256=31b816846903d319a6f6cd1c9aada5ff83914206cb7df69c235ae909785109a1
 md5=1e80b2a4e0d17aba3e377b3ee140ab5e
 sha256=a226f7b37694669aa6efe6c30462e2d44f5881ca70604dac15c23fce66992872
 
+[http://download.berlios.de/bitbake/bitbake-1.8.6.tar.gz]
+md5=0e0dacaae704aed08a940389250e61e9
+sha256=fd8a9e9e916314f9385f497d1f9b81d0885487f7741ad7be790972f44fc68b25
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/bitmap-X11R7.0-1.0.1.tar.bz2]
 md5=bbb3df097821d3edb4d5a4b2ae731de6
 sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219
@@ -1314,6 +1474,10 @@ sha256=5980de18e195be06f99afbc76f3c72e7ef7dbba03f16814351d20b8a2531c474
 md5=d76dbdbb59924ace618e48fbddbf3365
 sha256=eaa1a9746a4613a75a9fe9fc0c54a724758b899c5a898b8b50578066d8a82ead
 
+[http://bluez.sourceforge.net/download/bluez-gnome-0.14.tar.gz]
+md5=7c4106e6932683c12c1e30bfb166c13d
+sha256=cdc6ceea80bb1f3d951deae17dbb2854a13c214ac5f452765650d59c9014ffe6
+
 [http://bluez.sourceforge.net/download/bluez-gnome-0.26.tar.gz]
 md5=d1e68cf63458472eaeb70ef1b3f1df5d
 sha256=e03a131c26f1f1c51b8cadb4e68db8a3d0f64c43b4aefc706b07129336ebe5c2
@@ -1366,6 +1530,10 @@ sha256=3ea7817c91b8cff9cacba23392f4a4163412d92ee09236997622e0d19cad884e
 md5=60d48b5b83d98718ea642a887fa59b0b
 sha256=3eb55f212f554bdd6f41c10df8966e4ae90d89154756ffad396027c859d1e7b6
 
+[http://bluez.sourceforge.net/download/bluez-libs-3.33.tar.gz]
+md5=4b3403f1c61f7b7758cabf1ac5cb5092
+sha256=04ad733f88662470906a6f0d9894f670a07573f7f7d2698c5ada70b3ae1ba3da
+
 [http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz]
 md5=8b73b0ccbcef6a4270468487b1309990
 sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8
@@ -1402,6 +1570,10 @@ sha256=4f3d52cc207e438018b3a4c307d9969862bf25c35b1e281c0d6201b624acd103
 md5=3d17bb712d243bb1b316f7e8a909fa82
 sha256=9ffeaa94b862edb7e753a2f97f50b872435a7d5fe9135f24690733a777e85ecb
 
+[http://bluez.sourceforge.net/download/bluez-utils-3.33.tar.gz]
+md5=2e02aabd1a48998a48a22797f59ccf14
+sha256=c9e8f3aa3a34a558293faa1cb2b2204061852d045aaa5311bb1481f89751ab1d
+
 [http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz]
 md5=f63b440396baee7dee9259395a205d48
 sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39
@@ -1442,6 +1614,10 @@ sha256=7aeb2c4eb6ad6636631f85816b4f4d21ce811f763412530b70b2c85602e795d3
 md5=00b1eee7f98b68fa762c4efb3b34caa1
 sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1c1dd3f014caff74005294c9ed6a0cbf
 
+[http://www.coker.com.au/bonnie++/bonnie++-1.03c.tgz]
+md5=77a1ba78f37bdd7f024b67e1e36ad151
+sha256=c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26
+
 [http://downloads.sourceforge.net/boost/boost-jam-3.1.11.tgz]
 md5=b86fb56a824d4a3dedcbda12f8b1a2b3
 sha256=6cdb945ac41b5ac78e05435e742b3a9928e5d1a5ff22728656deff29249edc66
@@ -1526,6 +1702,22 @@ sha256=f3e1592607d42cab45387790af0cb0fea2d061f70f8679672a4397bcfe3562e5
 md5=63041103f88192d209f6b1d7944fd118
 sha256=1d7c1b1931549ac294f438c50148da052f69f501676ba361034ef72b111605d3
 
+[http://www.busybox.net/downloads/busybox-1.11.0.tar.gz]
+md5=2e5b08cd8a76daf4a185c69b8070797f
+sha256=458e4f20723a1527be0b563896b2d314bf2bb0063d5627f0c6536ed07f544771
+
+[http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-basename.patch]
+md5=f7780f73d3338b17d5f2eedbe76132de
+sha256=0f3129eff8420f2e3da237a95dbb6234ef380ac4343cb192eccd69fe8c840c7b
+
+[http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-tar.patch]
+md5=83763d83057bd5288bbd99f8a5b93c5c
+sha256=8b09efc89a8618d526dd210a8a296558a27b1a5324d47b219826b2e1713e5e58
+
+[http://www.busybox.net/downloads/busybox-1.11.1.tar.gz]
+md5=9c9f06c2d949c6de844c7bed8eb47064
+sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03
+
 [http://www.busybox.net/downloads/busybox-1.2.0.tar.gz]
 md5=6af69ebbbf8adc874ccb6d67dca95df5
 sha256=df6e3b0079194251a2ff68d7be7b06025c79f4fe62f4a73158ee52ff4bc515a0
@@ -1590,10 +1782,30 @@ sha256=0329e3d0a59e9cc167733ed2b89a0dc2249725642a065cfd385bf1206fe30b19
 md5=ee76864958d568677f03db8afad92beb
 sha256=4b526afa73ca1ccd6f5f1f5fd23813f159f715c3d0e00688f1df54b51f443cdd
 
+[http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz]
+md5=3c15a0c8d1d3ee1c46a1634d00617b1a
+sha256=f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22
+
 [http://daniel.haxx.se/projects/c-ares/c-ares-1.3.0.tar.gz]
 md5=badb4563a02d4188b478df31fa1b657d
 sha256=5c4594f71eab62e24d12c67ae6a6aead306c537cf71e946c4e9fbebbe9786243
 
+[http://jalimo.evolvis.org/repository/sources/cacao-0.98+hg20071001.tar.bz2]
+md5=9ff10c929bd0cbf15909107c1aff7518
+sha256=fdfdbdfdebefb89af560297796d4861ef4fc939e9dbe8500750909dea8662bee
+
+[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.98/cacao-0.98.tar.bz2]
+md5=8b8907c8b925761c9410bcadb9705346
+sha256=cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188
+
+[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.1/cacao-0.99.1.tar.bz2]
+md5=a5641452c7ba173060c99ed700950b3d
+sha256=c3b078efa6a417b5dff677497de0ae6ab9f66bb56c6490dcc96f43c082e69e07
+
+[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.2/cacao-0.99.2.tar.bz2]
+md5=912e353a26c88ba5f5f59ebb9f688e2f
+sha256=670cd8fccb0749e657ebe72fa01e1b2dfbce3d811fe617136ccb8a39fc0bd5da
+
 [http://cairographics.org/releases/cairo-1.2.2.tar.gz]
 md5=2460487b1257a5583c889b1b9d2033ec
 sha256=9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02
@@ -1774,6 +1986,10 @@ sha256=885eda0bbe68018b5770437e542473508f88205bb09cbfde7fc6e0c31f5a6f83
 md5=5767ec5e6ff0857cbfe2d3ec1ee0e2bc
 sha256=39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93
 
+[http://www.kokkinizita.net/linuxaudio/downloads/clalsadrv-1.2.2.tar.bz2]
+md5=7865b6c175e457ea9cb0148ce8baa746
+sha256=0fed89dd092936b5ffa74ad7df77a72b8cbeec8cea226ff48e107e326bd36f50
+
 [http://downloads.sourceforge.net/clamav/clamav-0.88.6.tar.gz]
 md5=db7f8b947bc21023f36e04bfdd555dd0
 sha256=cc7f90983aa61b3d893c3311e3f832c5faa204467143cff597ad80bf8ad24daa
@@ -1814,6 +2030,18 @@ sha256=6a068f70f908ee4de0ba4d7e1d5127b12ad548da371494c668966d1ff98e05a2
 md5=cf5aaaf07fe43567fa605b33165355d7
 sha256=4f2824c42062dea269e489c1acb2769c015bf78cdaa929ee75441d412f10a03b
 
+[ftp://ftp.gnu.org/gnu/classpath/classpath-0.93.tar.gz]
+md5=ffa9e9cac31c5acbf0ea9eff9efa923d
+sha256=df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945
+
+[ftp://ftp.gnu.org/gnu/classpath/classpath-0.96.1.tar.gz]
+md5=a2ffb40f13fc76c2dda8f8311b30add9
+sha256=ee464d20ef9df2196e238302d5d06954cb96a11e73c4c44c6ef376859de2a078
+
+[ftp://ftp.gnu.org/gnu/classpath/classpath-0.97.2.tar.gz]
+md5=6a35347901ace03c31cc49751b338f31
+sha256=001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4
+
 [http://downloads.sourceforge.net/sylpheed-claws/claws-mail-2.7.2.tar.bz2]
 md5=079f167fba6e17ae2c688a0dae858b0f
 sha256=a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5
@@ -1822,6 +2050,10 @@ sha256=a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5
 md5=c0e2718d4bcd932709a6e1bcc910c47a
 sha256=056500e4f61f28791390270636ef279c326b090c8634c15faa59497fb3086c8b
 
+[http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.0.2.tar.bz2]
+md5=97a0c627f91b51b6851b9a1ed9ee7afe
+sha256=d04db59df8b013651721312ed167df95d47c88d55eac0eb5b7950d6958f3636e
+
 [http://downloads.sourceforge.net/clearlooks/clearlooks-0.6.2.tar.bz2]
 md5=451ef33d1bffa261c5cbe01182199f97
 sha256=be080113c9e9d137ee14eaf7f731c5ae58d24924748aaa725d0f061d59265f3b
@@ -1834,6 +2066,14 @@ sha256=71d8c6459a4be1912dbc445e2e9d46303be6623cea51563c21abe39c8b5b0bd2
 md5=7265673901eacb0b72a11cd6732cc698
 sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057
 
+[http://www.kokkinizita.net/linuxaudio/downloads/clthreads-2.4.0.tar.bz2]
+md5=90b650f1f5c9f39f4d77f73aca3c53be
+sha256=a69fd566af24b85a10c5ecd957a85b7f5eb1c56995d2b999219b52f353ea1de9
+
+[http://www.kokkinizita.net/linuxaudio/downloads/clxclient-3.6.1.tar.bz2]
+md5=bd47f80a855d3203fcf10365e79d85e4
+sha256=9de3e621d7acabb161b5926565a9c9373fedbc632222018f692346790149545d
+
 [http://www.cmake.org/files/v2.2/cmake-2.2.3.tar.gz]
 md5=c0b57a115e24005f9828ca7b53908779
 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd
@@ -1850,6 +2090,10 @@ sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1
 md5=e95ae003672dfc6c8151a1ee49a0d4a6
 sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27
 
+[http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz]
+md5=32b0df93b285ee094e053552d9301cb6
+sha256=eb9f4b4b5973f444d16920201dfea217fb30542fea23107cf80a1f189408b321
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec.patch]
 md5=97cdbeb23bc8c8f4fe563d10a0c8c110
 sha256=2e5488039040e76bdedb08323f729a0ef0549d23b35bb740f541c960393ec378
@@ -2026,6 +2270,10 @@ sha256=7b83689a47efa627d4b5670317125de3d87ae9278cf69c3ac7e3b7be646e715d
 md5=823010ec78215d476537c9eba9381cdd
 sha256=7e2ef5d0656ac23cecd03374d9b00291a55b274c972adfe94d6f41ae3ba60c73
 
+[http://downloads.sourceforge.net/dtorrent/ctorrent-dnh3.3.1.tar.gz]
+md5=9bfe42c2dd6a6aabd545fe332bc23e87
+sha256=e65d9c7a4da499314126d979a0a79ce5123e0f969c786bfddcee261f14cb648b
+
 [http://sources.nslu2-linux.org/sources/ctrlproxy-2.6.2.tar.gz]
 md5=37570a7f018f41d701cd29cd95b45241
 sha256=c8c42cc08b9b462f9c497441dacde1eac71fd717195ddfbeac68141bd0ad95a8
@@ -2126,6 +2374,10 @@ sha256=384279adfd582ad6f905197c46a5157f855462718530148fdbab3328cf621eb7
 md5=ea76410ad88fa7b6c17a6aac424382c9
 sha256=0ee2d5d04972a15c3154730f328467a5cf5c7e69766a73bab06664263666bfeb
 
+[http://www.cython.org/cython-0.9.6.9.zip]
+md5=5eba3f3d2ed1271adf85b39079ab0415
+sha256=b58768fd50c7eefde5a0943ce3c99843cfbdf736793e439a0df4ab7916c7fb58
+
 [http://xlibs.freedesktop.org/release/damageext-1.0.tar.bz2]
 md5=1d88a72b12b5ec505747069053d54847
 sha256=4488bee8994e45dfe91563e89fd7e862779ae02a67b8a121d2ec10b263f2d2f3
@@ -2186,6 +2438,10 @@ sha256=a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337
 md5=efd0c958da79c1cd941ecd3f63e637ae
 sha256=055e411081ae25fd358dd0f4c1547ee1bd7429bea0f1fad9156a50a09ddd668b
 
+[http://samba.org/ftp/tridge/dbench/dbench-4.0.tar.gz]
+md5=1fe56ff71b9a416f8889d7150ac54da4
+sha256=6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a
+
 [http://downloads.sourceforge.net/dbh/dbh_1.0-18.tar.bz2]
 md5=dca09e2949616471669320e3429a49ef
 sha256=62c8c36df69c48bed9e8a1406faa5df5d057876b34fc110492c87260a70692c6
@@ -2242,6 +2498,14 @@ sha256=4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
 md5=ee893bc87b784a8c2285f5041b5e7033
 sha256=4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
 
+[http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.82.4.tar.gz]
+md5=f491e0372128a6d1178b210a8b1a842f
+sha256=e34e30a4c0ea405f9e830aa0026e9c0632f526f242e90526ff0a7da8dd7f5e2e
+
+[http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.83.0.tar.gz]
+md5=562c78876219bf458d79a041af18293d
+sha256=89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191
+
 [http://packetstormsecurity.org/UNIX/scanners/dcetest-2.0.tar.gz]
 md5=74ee7617c8b01cc641992c1d13dc394b
 sha256=4a319a08ae0838234f5b6fbd0b4d2e0fac7560a7553a4e1b043527cc17032aa3
@@ -2438,6 +2702,14 @@ sha256=6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
 md5=621dc7dc1e3b9b6770110117df45611a
 sha256=e6651e3de7fee6d953b6ee56732eafa7d4666cb4070db5a925ba071626067c9a
 
+[http://downloads.sourceforge.net/djvu/djvulibre-3.5.19.tar.gz]
+md5=0330d87ad337e408e21e1018eb511839
+sha256=57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78
+
+[http://downloads.sourceforge.net/djvu/djvulibre-3.5.20.tar.gz]
+md5=c94091de014b3aaf037d3d0f398d36c2
+sha256=d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
+
 [http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.2.2.tar.bz2]
 md5=d80acad88411e7944b9b085463d53302
 sha256=aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
@@ -2474,6 +2746,10 @@ sha256=f4eeee90f076d891034faf1268b6352b8df9cb262b787384ed4386cf6ea4faa7
 md5=ea0a936e88eb294038e67eeb0d7129c4
 sha256=05fdfd561eee33de12d978795b7f12338327c6da1ce65971463b58f2e90b48e4
 
+[http://downloads.sourceforge.net/dosbox/dosbox-0.72.tar.gz]
+md5=262939cc28966c1f9b07c2bc472b699f
+sha256=1747d7d9f1e5c0635b5d2d3e6648e8dc36316b1bc88b3755bf96b7fde499ac79
+
 [ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-2.10.src.tar.gz]
 md5=59a02f311a891af8787c4c9e28c6b89b
 sha256=55a7b2f5ea4506bde935ee3145573e1773427fc72283a36796c7c2cf861dd064
@@ -2482,6 +2758,10 @@ sha256=55a7b2f5ea4506bde935ee3145573e1773427fc72283a36796c7c2cf861dd064
 md5=407d405ade410f7597d364ab5dc8c9f6
 sha256=0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484
 
+[http://www.azzit.de/dotconf/download/v1.0/dotconf-1.0.13.tar.gz]
+md5=bbf981a5f4a64e94cc6f2a693f96c21a
+sha256=8955fad7d9e7aef36f7a82f9577c3ae4901db1ded6ce57aec0d93e39c8899b65
+
 [ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.13.22.tar.gz]
 md5=0fc9fffc2c2cfa7107d8f422815078c1
 sha256=c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f
@@ -2494,6 +2774,10 @@ sha256=8b1ed52659c5f6723f37bf1122508d7f1b82e064aa9db04d18d726bde34c2713
 md5=88effb358aa04d25036b662d588433a6
 sha256=a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817
 
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.14.19.tar.gz]
+md5=dad1a4a08c475b31a6b62e7dc92fe9d2
+sha256=5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587
+
 [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz]
 md5=8e11d77770452f97bb3c23f510489815
 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
@@ -2522,10 +2806,22 @@ sha256=152f87b4fbfe3976c0409fb9e0812af17c9aa0907b04549604110c05248f810f
 md5=5c0f7405b915799c3d952d3a93a5df69
 sha256=39999c5bfb663404f6450da66d98d69193a5d0ab496d2d47cc53cd0202c4051c
 
+[http://matt.ucc.asn.au/dropbear/dropbear-0.51.tar.bz2]
+md5=95d900913bee4b27d7e9ce55f8a55427
+sha256=8daa89512f9349fc131d48555726ffe1187e0f7d9f4cef992464c8098d86e77c
+
 [http://www.monkey.org/~dugsong/dsniff/dsniff-2.3.tar.gz]
 md5=183e336a45e38013f3af840bddec44b4
 sha256=82e492455486e655c315f027d393dbeb49ad930804acccdc51b30d57e1294ff5
 
+[http://install.tarball.in.source.dir/dsplink_1_50.tar.gz]
+md5=f14e000ae17735568c9cb58bde504fb5
+sha256=677a8cd27d05b1401ddef152270a498fc4d34cb9ba94779c571f2f2794b20811
+
+[http://install.tarball.in.source.dir/dsplink_1_51_00_08.tar.gz]
+md5=a2d7803976f82db3edeb374109cba6df
+sha256=8ae0026054fb9f437d59a3bb932628fc2915af6697e430325e0950e960ca6c34
+
 [http://www.jdl.com/pub/software/dtc-20070216.tgz]
 md5=8762121262ead127171c4fce40ccc289
 sha256=dd687b4f691bf9970f53ca2c84d8481b9f82d857de347375d29bacf648b8da71
@@ -2566,6 +2862,10 @@ sha256=fe3c72d861f2a3791f31ea33043d25e29e9a4e3d6a3833b151237a62c5c703f9
 md5=1829b2b261e0e0d07566066769b5b28b
 sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b
 
+[http://people.openmoko.org/stefan/e_nm-big-hack.patch]
+md5=91d8ce9e7bfcc0a61220ebc4ea83ab5f
+sha256=60ed501bd19b61f7d8456a2e906c890307e73f20ec1e4186d4eca312a74b0d05
+
 [http://activecampus2.ucsd.edu/apt/sarge/easysoap++/easysoap++_0.6.1-5.diff.gz]
 md5=fecfbc5272922f85635d0229d1b05260
 sha256=37e5aab00a316a22329c64848f467b0ce73bba3bcb08c4cba6d193ba8f5e9b90
@@ -2586,6 +2886,18 @@ sha256=6b5a71790120977a96d5a468ed69987107c5079f14b0a4081f460b3b14fbf952
 md5=c3c60c83f6df30021e11da50a699dec9
 sha256=2382f315fda4241a0043bac1dfc669f006d8e93e87fa382b263b1672972f4077
 
+[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecj.jar]
+md5=412d8badd227807ef2f52608435240fb
+sha256=dfe24798ca067c75c84f01bf4ee3734fde3e32e4f270f7222025218d3baffbbb
+
+[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip]
+md5=9e1fc1c86c85e72df5e141069b82041d
+sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
+
+[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc.zip]
+md5=9e1fc1c86c85e72df5e141069b82041d
+sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
+
 [http://enlightenment.freedesktop.org/files/ecore-0.9.9.037.tar.gz]
 md5=ec6d00a39ca6648f12f58f8d4f2208cc
 sha256=2c31372ccfc9b411edc73785450c5212dc4a2fe286de9f49f38a02dd24895aea
@@ -2634,6 +2946,10 @@ sha256=c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28
 md5=fd318a634c8f67c7ac8a975f16965cc3
 sha256=794070c8108a2d8b7c6890ba42edb37510cc845bf601517cf4a0ea5443dfde29
 
+[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-0.131.tar.gz]
+md5=f7963fba80c6f74cd6c4990d2a76d121
+sha256=947a9566a622f701a2fe2416d3b85b397d38d5f4189da91fc0a306b4d9950e6f
+
 [http://www.mowem.de/elitaire/elitaire-0.0.5.tar.bz2]
 md5=3fb7b6073f3171d446698eb963fb087e
 sha256=91f16720df83b15da8747506d17224e2b3e5dd5e606c91a7f76cc7d784aae694
@@ -2646,6 +2962,10 @@ sha256=9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0
 md5=2a09c0355f33112e96ed253bd0bb308a
 sha256=0b46174c68b9cb19d0335f3f5194ee41e26865f4a9a62df9410f30693865e2d5
 
+[http://ftp.gnome.org/pub/GNOME/sources/empathy/0.23/empathy-0.23.4.tar.bz2]
+md5=5a41033e3e41e9769628e0118f32d5c3
+sha256=c493b9a22c9580d49fd90d2bb6955435ccba9304ecb382411864041d914c94d6
+
 [http://ftp.gnome.org/pub/GNOME/sources/empathy/0.9/empathy-0.9.tar.bz2]
 md5=74c7255a56ffa8e37147a1a0cfe40565
 sha256=51eab13f16c48433035e84b8eb6c66afbbf3e48199323d25f4f9a09c8047d078
@@ -2662,6 +2982,10 @@ sha256=f4b43083923e2998298fd270a8a9f9ed570f4fbebeaa46ce5f1788b76920308b
 md5=b3581e28d68d452286fb0bfe58bed3b3
 sha256=02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d
 
+[http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-1.9.tar.bz2]
+md5=b3581e28d68d452286fb0bfe58bed3b3
+sha256=02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d
+
 [http://download.sourceforge.net/abiword/enchant-1.1.3.tar.gz]
 md5=c95186755fe46b27a78d9a85fef2175c
 sha256=6a8bce57437c514f2578e7ff09f8a48ff3b20e7ed746c3113372d2c75d382c83
@@ -2714,10 +3038,18 @@ sha256=af38ecbffded26fd6caf3216ce0d1286322c461498630a2c83ab8722b8a8b712
 md5=70b4c5c36781b6e1d5d2ed30a79db9c5
 sha256=d437b49f40f61e3ba5a3ed8edad783895dcbdfc3cd4cbe6ef37a56f7eea59573
 
+[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.6.tar.bz2]
+md5=cce9edb41b4a8308e0ef0eea24b5a1ab
+sha256=61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
+
 [http://enlightenment.freedesktop.org/files/epeg-0.9.0.007.tar.gz]
 md5=383db51e46d13d986966459e4918d236
 sha256=bb12585b433fd0eca11865541bdb877166b9e53b0ea12624776f11cce3ce189b
 
+[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.22/epiphany-2.22.1.tar.bz2]
+md5=f3354751f7e293c03ffb9f26bd00b17f
+sha256=6faf0aaf8a44ad119baa921a634eb8dd2d02c4f501af176f294164f7d49dca5e
+
 [http://enlightenment.freedesktop.org/files/epsilon-0.3.0.007.tar.gz]
 md5=408d3c63f9efa06e93e29a691c28985e
 sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc
@@ -2734,6 +3066,14 @@ sha256=ae023107f8e0c872a2bb6f23a9a5f019b254e9b7eebd20a309af996d9cb7e38e
 md5=3facb5aa0115cc1c31771b9ad454ae76
 sha256=68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76
 
+[https://launchpad.net/ubuntu/breezy/+source/esound/0.2.36-1ubuntu5/+files/esound_0.2.36-1ubuntu5.diff.gz]
+md5=44b4d713387fb3f18666d289f88ae00c
+sha256=9bd7db657b8e9622910b9d3188096e37ee627ac0651c78ddce58e205e7487932
+
+[http://downloads.sourceforge.net/espeak/espeak-1.37-source.zip]
+md5=5c7b292d0537232868b4ac1317d76c02
+sha256=77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3
+
 [http://downloads.sourceforge.net/espgs/espgs-7.07.1-source.tar.bz2]
 md5=d30bf5c09f2c7caa8291f6305cf03044
 sha256=7e0ed705da90a4c65368675d68ccecb871f89cb06d2efc61ddd0bb5fee5570f2
@@ -2794,10 +3134,22 @@ sha256=ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e
 md5=f9414b4dbfdff9a8f7f2f146a351e05a
 sha256=30dbad09953d92e48cc27681d601d0a55e30dc8e82a89c173098187bd7b35e61
 
+[http://ftp.gnome.org/pub/GNOME/sources/evince/2.22/evince-2.22.2.tar.bz2]
+md5=3661f901ab40cee44d5350a045a8bdb1
+sha256=4dcbdbd253b1978dcd70452780d7804ade912f4ede90f122f30d5322f53c5c3e
+
+[http://ftp.gnome.org/pub/GNOME/sources/evince/2.23/evince-2.23.4.tar.bz2]
+md5=4e353edd6481f67ee534a40d4b7f3b8c
+sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b
+
 [http://enlightenment.freedesktop.org/files/ewl-0.0.4.007.tar.gz]
 md5=29bc8aec80b53480c2ea53aea1796e15
 sha256=0a0dba00517013082b8e094b4b7753162cf5fb71a170eb54cbc2eaa35717d5f6
 
+[http://www.exiv2.org/exiv2-0.15.tar.gz]
+md5=bb18d19e1d6fb255dadda456cadec00e
+sha256=b72d82e9117308063471993f3832e58064c0599dec3df2bf2a7ce54450984a3e
+
 [http://projects.o-hand.com/sources/exmap-console/exmap-console-0.4.tgz]
 md5=eb8b6d834d2224e17561593dc4158e4d
 sha256=418c3b9e099b96f7b8e1456c34b585b2f4bd10af88fb976116a154e4cb54fa9b
@@ -2874,10 +3226,18 @@ sha256=6a3a993ab90540719e47b4968f60f8023a3cbb93f2a1ce611cd7a2d52ac1c38e
 md5=163a846e51b39fd626b43548c2cdda7c
 sha256=6a3a993ab90540719e47b4968f60f8023a3cbb93f2a1ce611cd7a2d52ac1c38e
 
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz]
+md5=c324eb1e157edad17d98b1b2c8b99e25
+sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81
+
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz]
 md5=c324eb1e157edad17d98b1b2c8b99e25
 sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81
 
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.5.tar.gz]
+md5=95c0c78c734b9782ec8d47e99c8e3fc8
+sha256=2cbf95aef9e3f9a32b6859ae35723eaa76b5ed483ddaa654cf627d1eacdea5fa
+
 [ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz]
 md5=1c5a2ea659680bdd1e238d7828a857a7
 sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e
@@ -2890,6 +3250,10 @@ sha256=1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
 md5=2aaf871471a9ec037763c5dc7c193c57
 sha256=6b9785167934948a582839f9723e37214cab1607a9764c35f10d555f8e662575
 
+[http://download.savannah.nongnu.org/releases/fastjar/fastjar-0.95.tar.gz]
+md5=92a70f9e56223b653bce0f58f90cf950
+sha256=ca03811490c965abc9f466e75418ae48bb71f14d8e8ed4c43e8109207b85ce54
+
 [http://ftp3.ie.freebsd.org/pub/gentoo/distfiles/fbgetty-0.1.698.tar.gz]
 md5=1705bc0f8f1e03fe50d324ba84ac4e56
 sha256=332cbffa7c489b39a7d13d12d581c27dfc57ba098041431a6845b44785cf2d35
@@ -2914,6 +3278,10 @@ sha256=ec9f93968147526a9b2dd17e31a6d2795356b2eeed309f796f655b37b98abd83
 md5=17062ae0f1d7d093e61cd002e39885ae
 sha256=190e2b5ae8467d4b0c26b10e091c74509e00d4bd895c240842ee02a870caa3eb
 
+[http://only.mawhrin.net/fbreader/fbreader-sources-0.8.2a.tgz]
+md5=3b4944bf0d37b42249bef84d59918ce0
+sha256=4e505820b150ae35a40c39a3d2aeb7a8dcb6bd9b599055c40f566d874e4d1c82
+
 [http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz]
 md5=40ed9608f46d787bfb65fd1269f7f459
 sha256=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338
@@ -2966,6 +3334,10 @@ sha256=61ba89c0deaaf324485b2bf480fdb90941b74e2c47b4810e34f530b77005bb8c
 md5=08f2e21c9fd02f4be2bd53a62592afa4
 sha256=e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf
 
+[http://www.fftw.org/fftw-3.2alpha3.tar.gz]
+md5=a657ef428d0643942ec3e472b61b56d9
+sha256=4fc8fbe0cf94a0d281ddc309fa91e2b6e2fb14f4cafe525d20635a196c2cc245
+
 [ftp://ftp.feep.net/pub/software/fget/fget-1.3.3.tar.gz]
 md5=a556eef04aeb574ac8ab0dd8c868fcab
 sha256=ceaa67f19a1c5462f5e739fcd3b53dd42b0173d9deee579c55e5088801559e43
@@ -3010,6 +3382,14 @@ sha256=dba581583ef390fab90c39c9a667bf1a5bfbeaec75e6fbb2a9cedcc857d26800
 md5=7a1fc804ed735c5b7e9b1498bac8b5db
 sha256=b7db1a7d7ee37707dd5736a656982d1deaea7b29654f49564c2aa54c59ba1e24
 
+[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-3.0-source.tar.bz2]
+md5=4210ae0801df2eb498408533010d97c1
+sha256=606e84ac02322aff692b9d4612cb8e27f5fa0da29e14bce7744927e0dad9c4b9
+
+[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.1/source/firefox-3.0.1-source.tar.bz2]
+md5=406d67174f8f74ab154a1b17d0881b27
+sha256=e16c9794b624188a85af52a2f61131189f422cb99c7fb9777686741cb330dc33
+
 [http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0b2/source/firefox-3.0b2-source.tar.bz2]
 md5=77f0455cc0dcfaaf020f9ce54c065fb0
 sha256=57a2d9cdbe69a507d2294c081bc74aeb4d6cbf4e72dc764cfc9b972151535f57
@@ -3054,6 +3434,10 @@ sha256=ca7653a03f562057098c9fb956de34021a14017c2a44eedd3ab0963dc877e7e5
 md5=24c1576f5b3eb23ecedf4bebde96710f
 sha256=10ff42ce08a628c7fd84d26b5228d549e9eecb1eb03cb158e87d8be66bc58ae2
 
+[http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/flite-1.3-release.tar.gz]
+md5=ae0aca1cb7b4801f4372f3a75a9e52b5
+sha256=922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b
+
 [ftp://ftp.microwindows.org/pub/microwindows/flnx/flnx-0.17.tar.gz]
 md5=d44da0fc0fd495f580b9174d3beb6f7e
 sha256=84fa995c461066ed39c587c834414ef1a320f605b6b6e1db2d10d12fa6a587db
@@ -3262,6 +3646,10 @@ sha256=13f59a7cd5190983412689495c399444cf73c1ced0813149e4480c8848bb9f17
 md5=f035852f521b54677f2b5c9e2f6d54a4
 sha256=63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
 
+[http://fontconfig.org/release/fontconfig-2.6.0.tar.gz]
+md5=ab54ec1d4ddd836313fdbc0cd5299d6d
+sha256=a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
+
 [http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono.tar.gz]
 md5=890615fa4b3e6c82cd1b9807b106f042
 sha256=42c15ed555719c27f67990454cdda791cbcd26ab98712fd88ca7e20e6ce3f1fd
@@ -3346,6 +3734,10 @@ sha256=7157876cf358d1fb68b890c7da4f7025288a4e7b756af7b01009c5055637c954
 md5=65234327c5ac46ee00ebda15995d4c1c
 sha256=1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
 
+[http://downloads.sourceforge.net/freetype/freetype-2.3.6.tar.bz2]
+md5=fb182d508017cb608e9df8c7dca648dc
+sha256=d5a698c30376d14c1ce6540ed6d5627796421e6e97576620ea4562411a110e77
+
 [http://downloads.sourceforge.net/fribidi/fribidi-0.10.4.tar.bz2]
 md5=0f6e7ecca08e6e108dc06337f5b5cabf
 sha256=f3ecdb9d108bd61ec9394df75f5fd68ba886a8da0863ba6258338893aec6c04f
@@ -3550,6 +3942,10 @@ sha256=63dc1c03a107ec73871151bb765da7d5dfc1d699c0d0d6a3d244cf5ccb030913
 md5=b594ff4ea4fbef4ba9220887de713dfe
 sha256=3444179840638cb8664e8e53604900c4521d29d57785a5091202ee4937d8d0fd
 
+[ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2]
+md5=4a21ac777d4b5617283ce488b808da7b
+sha256=7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39
+
 [ftp://ftp.gnu.org/gnu/gcc/gcc-4.0.0/gcc-4.0.0.tar.bz2]
 md5=55ee7df1b29f719138ec063c57b89db6
 sha256=38a9a01e195000976dcd04ec854c398478ada839510b1de384ffbd5f99791bdc
@@ -3582,6 +3978,14 @@ sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1
 md5=ef2a4d9991b3644115456ea05b2b8163
 sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80
 
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2]
+md5=d79f553e7916ea21c556329eacfeaa16
+sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a
+
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2]
+md5=4afa0290cc3a41ac8822666f1110de98
+sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
+
 [http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.gz]
 md5=fc49f45251c1336fe1dad5dba1c83fcd
 sha256=fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92
@@ -3658,6 +4062,10 @@ sha256=8e7dfa34f3919226550dc6507a23753f9fda55e78b15b264291ecf5940d837e9
 md5=78f4b862510beb2e5d43223dd610e77d
 sha256=41f20c469c7759acb34cfa7e0b3cac9096d59a58ad800e471f07424a8e7adbb7
 
+[ftp://ftp.gnu.org/gnu/gettext/gettext-0.17.tar.gz]
+md5=58a2bc6d39c0ba57823034d55d65d606
+sha256=209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba
+
 [http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz]
 md5=f3d3f474a1458f37174c410dfef61a46
 sha256=27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694
@@ -3698,6 +4106,10 @@ sha256=41f4befa851177e2ca9bbab2fad19926178c831454ca51f2cb91fec0ed9e243e
 md5=a46acb413484300583ffca1fa54e0874
 sha256=38ddc0ebc452968db653efce31864d61bc4a5e521a9694a8b9b8f4fe49a2d131
 
+[ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-2.3.19.tar.bz2]
+md5=9b5cc6aef0baca3735ce9bc4fdc949d9
+sha256=f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
+
 [ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-2.3.7.tar.bz2]
 md5=dfc47a29b3a7ade07bd17244f0e83311
 sha256=2a6c869ba61c1b18bbafa95bdf89cdc8fe1f07b068aa37dc9332a158b7e295eb
@@ -3706,6 +4118,14 @@ sha256=2a6c869ba61c1b18bbafa95bdf89cdc8fe1f07b068aa37dc9332a158b7e295eb
 md5=393e7fb4e5e141faa2e3b44da3f301e3
 sha256=ea5cb59c739357003b3c7fb0d1166e8d8f913be6e9f4737c1905e62b93b0246f
 
+[ftp://ftp.gimp.org/pub/gimp/v2.4/gimp-2.4.0.tar.bz2]
+md5=35fecf14cd5237065aef624b93030d5e
+sha256=ddeafb632050bba9163416c4a18c4cb8706b922c0fa99a0c216176584826a9dc
+
+[ftp://ftp.gimp.org/pub/gimp/v2.5/gimp-2.5.2.tar.bz2]
+md5=98add4a1ca6af2e20f80ae3f5a84a922
+sha256=78d209885768790be6d610d275430e6e775392b6384d326401a7ecc13606c539
+
 [http://downloads.sourceforge.net/g-inspector/ginspector-20050529.tar.bz2]
 md5=0a8474e0d90b139b1baa70b097a4fd51
 sha256=7f55ec02b5ab9e86c64f5718be64854fd9c64899908e580e1a9759421ac3b436
@@ -3818,6 +4238,22 @@ sha256=562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d
 md5=195f9a803cc5279dbb39afdf985f44cb
 sha256=562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d
 
+[http://download.gnome.org/sources/glib/2.16/glib-2.16.4.tar.bz2]
+md5=2ab79b3c93258827cc6ea8ee50128e49
+sha256=16ac93dc0da95cb20e4f14507fab688c4be1d23bcd2f28bc069c8ca7dc9d7e9d
+
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.4.tar.bz2]
+md5=2ab79b3c93258827cc6ea8ee50128e49
+sha256=16ac93dc0da95cb20e4f14507fab688c4be1d23bcd2f28bc069c8ca7dc9d7e9d
+
+[http://download.gnome.org/sources/glib/2.16/glib-2.16.5.tar.bz2]
+md5=039f02d47d4071322a3f00abf031e5d9
+sha256=cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20
+
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.5.tar.bz2]
+md5=039f02d47d4071322a3f00abf031e5d9
+sha256=cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20
+
 [http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2]
 md5=aa214a10d873b68ddd67cd9de2ccae55
 sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
@@ -3978,6 +4414,14 @@ sha256=7b47fd0d2e5a2f2d626b3e9e903ff8a0c0ce7c926925944dcea1f9ca3e6cfda1
 md5=7b2e951912d4bee9613c35244ca32673
 sha256=5cd061fa5d4906d6aa7183393c98d070dc689cbb946c13bebab6d6e4ecdc2231
 
+[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.2/gnash-0.8.2.tar.bz2]
+md5=05cac831181be3fb40cbf3c00ab25c0f
+sha256=4c81e71e6619b79da9641a90ed2c73c362603103bcdcc7b9cc5cc53739d06baa
+
+[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.3/gnash-0.8.3.tar.bz2]
+md5=5033ef2602ea1234a9ccb73000a0dedb
+sha256=af1fd8454472e0ac588c015b09c67449392f32aa6297d4a625b8344dce11c39a
+
 [http://gnokii.org/download/gnocky/gnocky-0.0.3.tar.bz2]
 md5=239cfb4b743dc69723acbd01c44e7128
 sha256=fb11b959c039f1a2c5471b2dc1270607acfc15fb667a69c2d4bdb0970b3595bb
@@ -4010,6 +4454,10 @@ sha256=de8ba10bf7321b70ba5b3bdd45b61411b5a9fbd401fbe639041a875be01bd8f4
 md5=e92edb17cd75faca45a4fe2d6806bdd8
 sha256=56c7dbe56e6a9fbcd3730c55892734a9daff23a86d69f49a381a4c965732f9d1
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.18/gnome-desktop-2.18.3.tar.bz2]
+md5=98de3b7d0da690da8b94cddc74f3914b
+sha256=8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.7/gnome-desktop-2.7.90.tar.bz2]
 md5=16691f6bdc7c09445c457387adaba1f1
 sha256=6a1499a1e50ac89210a9a1fdb36bc070ef6d1a02764a0f8d90de314dba01972e
@@ -4030,6 +4478,10 @@ sha256=d7a823601f569589437d671d12b1b12f53abc08aeb7d25280bb3242299353086
 md5=e5fbfa461612916143a1321c9e0efde4
 sha256=9d31e7ff0ebed5c7213bf45c5a810656b079ad03ebe3cc8fb952d984a52d6ddb
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.22/gnome-icon-theme-2.22.0.tar.bz2]
+md5=a4c03092da28ad53ed3867aef83f29d9
+sha256=98e4202a7745e0533c7a665fc6d2cc6b4ee851debf159a61d8de706b952ac748
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.2/gnome-keyring-0.2.1.tar.bz2]
 md5=2fe5fb39cc18d1a6792fd3281223dfff
 sha256=1c6d5a1732742469ec32ab7297f3b8eacfc0f4bfae5fdb096b603877dde12612
@@ -4078,6 +4530,10 @@ sha256=dc60f7f6e9b9ce52ad4e2ce1f7d6dca643590e86e49c749d513d9f8a25068a7a
 md5=a532717e8ac7f67b7198c256909cd7dd
 sha256=61a01f535b50ca0a4c35b4b59513287f17e0665c0b678952cae663b883b13827
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.18/gnome-panel-2.18.1.tar.bz2]
+md5=6c325f5b5f9f424faa494665720bcfb9
+sha256=c04b53bcc0057ed042169baa725ed3769194864e5824643cc0af8c58cf773d2c
+
 [http://downloads.sourceforge.net/gnome-power/gnome-power-0.0.5.tar.gz]
 md5=db310dadcc958a781a2752a6a7748e60
 sha256=78f7dc6946e178513202f06afc19496c8ac1e3ac6c43c56c40f4db1a23762179
@@ -4134,6 +4590,10 @@ sha256=417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8
 md5=78ffd75ae6abc3bb20dd04407a082a26
 sha256=badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.8/gnumeric-1.8.3.tar.bz2]
+md5=3ce6ba6483ccd6fe9974cface582337a
+sha256=173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07
+
 [ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.2.2.tar.bz2]
 md5=c34736eb7cb687f9e5b6d4df48aaf7c8
 sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
@@ -4142,6 +4602,18 @@ sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
 md5=66258443d9f93cc4f46b147dac33e63a
 sha256=a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48
 
+[http://downloads.sourceforge.net/gnuplot/gnuplot-4.2.3.tar.gz]
+md5=6b6d22662df5101b308c465a722c43ce
+sha256=4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4
+
+[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.0.4.tar.gz]
+md5=d04b446fc76687272e64259d36d78b0e
+sha256=2374cbf6df3568d7cef16ba6a11802e52e37d88719f704dff40d4fff9f81d313
+
+[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.1.2.tar.gz]
+md5=0208be69c598b37c8a0c4f59437e55d9
+sha256=f215b31c55da6f6111ab473565689eb3d0e23523a20a889efefe5ac612a8ceeb
+
 [ftp://ftp.gnutls.org/pub/gnutls/gnutls-1.4.4.tar.bz2]
 md5=de5e060eeb2da36654e9e8af6b8b012a
 sha256=dfcdcd622b80b00d28ee40881ee56fec771213110b7fc07048bce07df7cec035
@@ -4170,6 +4642,10 @@ sha256=cc78e52e9afc3006e4d97bf1c4e232fa6253f8be15ee6ebb7272ce885213f34b
 md5=ebd3dc3ed4dffde781a2dc4eb4e39f3b
 sha256=cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57
 
+[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.4.0.tar.bz2]
+md5=dce4000841ba5f80d310c4972b5f3efe
+sha256=c682bca6f1ccc28bdc15751168893e0b28107217b275168b456d519292e44d87
+
 [http://ftp.5z.com/pub/gob/gob2-2.0.14.tar.gz]
 md5=f8721af6f4e90ff48bd7cb4c96a5a94c
 sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9
@@ -4186,6 +4662,10 @@ sha256=158258dcb85fd4f3e4ee5a61df49560f8b65d94682ef9322cbb20fb2d3e93034
 md5=bb86c6ee2d953da77519cac4e1a5c609
 sha256=fb35c1ae8dcd8cf81836a65536b7f62a274a90ccab6f579519c0885a575095bc
 
+[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.6/goffice-0.6.3.tar.bz2]
+md5=3d8d3357f9d58af901cd1d6eb42e2973
+sha256=a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c
+
 [http://ftp.gnome.org/pub/GNOME/sources/gpdf/2.10/gpdf-2.10.0.tar.bz2]
 md5=9278cd3b9d06e3b1d364452f0e512fa9
 sha256=b6a5abf78363205e01bf1d238eaf4c349c9725f57aa18e2adc0445268540c7e6
@@ -4322,6 +4802,10 @@ sha256=e51bdbba46d7d6950c1f4d3139a167f4c823e403f8a53b30a16cea32c7d540dc
 md5=b10a91ce3fb39b87656fc5c5510b68d6
 sha256=780ddb4f2bb72e3e8d970ebc647c8040cfef0fccd405773cf7776074c26175b6
 
+[http://gpe.linuxtogo.org/download/source/gpe-calendar-0.91.tar.bz2]
+md5=478ed24de48860712f45563640041301
+sha256=75581218e2871c8bd1ab645977318050d9ba60c5cf632a51c05c4339fa9365ae
+
 [http://gpe.linuxtogo.org/download/source/gpe-clock-0.14.tar.gz]
 md5=367d329ff8af75abcb7f214e9b669c9c
 sha256=fb5790c58430e1ce9cfdccef117de4937c35a411894642aea622638519e5b764
@@ -4362,6 +4846,10 @@ sha256=6a246caeb7d29c2afb48e8c70ef8e1f2ba2a4642faeef3defd266522304d278b
 md5=849e9c42564174921f9bc9a1b08722ef
 sha256=0d46c8ec7b443d37630ef0625df3ac824f590a3048c6b973be83c305ab4de079
 
+[http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.7.tar.bz2]
+md5=7fe086de357f209df9413fb07a515724
+sha256=f69273239546ea212f862e0c86a8288f63dad78359ce3c1081b98bddd778b378
+
 [http://gpe.linuxtogo.org/download/source/gpe-confd-0.16.tar.gz]
 md5=2677260df7d834ec416450e09ae5ba72
 sha256=9ffba12d92466f9e34fed21e38baae5cbb6608436ee53fa3704fe3be5fceb4af
@@ -4382,6 +4870,10 @@ sha256=f35c5e664ba0e9c3b3d694cdb1ee9af7c9195b6ace8e2ddeec0a0c21d7632df0
 md5=5fcffd454e9c8f0b14804283c32da0ee
 sha256=5ceab2c275036da754ae7b7cbe162f9f2a5936334050beb34838d4f82e89843c
 
+[http://gpe.linuxtogo.org/download/source/gpe-contacts-0.47.tar.bz2]
+md5=c956ed93b8a163c046e9a7c19256432d
+sha256=aa9656db3e46b27abf7564f2a04799f4b32e4c342e3036d069d456b103717bc5
+
 [http://gpe.linuxtogo.org/download/source/gpe-dm-0.48.tar.gz]
 md5=92e81fc34bb4643088efeaf1f6423483
 sha256=4a78e69b44209d1c79a8649024584175aea518e5862d39c582944719a9a5e995
@@ -4426,6 +4918,10 @@ sha256=172e19d8ccaec35329064184790f9e4e64f1b31f412ba8b12c21860208a4e35e
 md5=625cb4e7a316c3a17f5cedca90dc3cb7
 sha256=debebb0d6572ebaeabcd7581d688f69e20024f25be5fde01e6d0d8aaa149ebb3
 
+[http://gpe.linuxtogo.org/download/source/gpe-filemanager-0.30.tar.bz2]
+md5=aecfb8d03fbfe11dfe6bc17db9591aee
+sha256=6b4b4ee697472c7073e3ef9fa2e2ff89bcee07be452942814857cad3ef4f55ff
+
 [http://dominion.kabel.utwente.nl/koen/pda/files/gpe-fsi.tar.bz2]
 md5=e485b0c8424dc9666078d482d22447da
 sha256=6a7455e4a066d5ecd9520feb9cd7bb1a7ecfe267faef32cd04a97b5c1738f8ec
@@ -4474,10 +4970,18 @@ sha256=c87b5b67205dded1df87436badf0af307937e8d8d67c6279e961ee043dd23388
 md5=459167b93c5ec6965d841e680243713f
 sha256=dde5a6aea6c997fa7621278c3c9fa95d4e18e1019409dd94a7e36b72615fa761
 
+[http://gpe.linuxtogo.org/download/source/gpe-login-0.90.tar.bz2]
+md5=1c2f4993ce0355e364c3d0c5abd04c84
+sha256=e6441d0c64dde18f8cf3b6f733dfdc697708e982fb1dda122aa0d8877e0e826d
+
 [http://gpe.linuxtogo.org/download/source/gpe-login-0.91.tar.bz2]
 md5=edfd1b07de39b4e5a0908cef8159b21d
 sha256=0fead38b9078842f847cfcc49fc903637d8185a0eca0be493078adfba799b7bf
 
+[http://gpe.linuxtogo.org/download/source/gpe-login-0.93.tar.bz2]
+md5=cb537b8091f91e5d6776f5435c26d2cf
+sha256=6dd6f9b558ef7306578b4be1a83712e1080104570499fa9329072973bd2ed50f
+
 [http://stag.mind.be/gpe-mini-browser-0.11.tar.bz2]
 md5=ebdb2eebb1ca1a5cb8ca7f1e4e3bb817
 sha256=372836198e10982525f01e8bf9d959777ab66f93d0688274c43200c4b8c959f8
@@ -4522,6 +5026,10 @@ sha256=ece034b916a7760cfb854baab474b7931246bdb078c814366bf90a9fbff246af
 md5=1a7a4095cafed9cda21e500842b686a1
 sha256=ddba5fea0424c9c121269e96ea202014a29568263d478ac5682022973d2986f1
 
+[http://gpe.linuxtogo.org/download/source/gpe-mini-browser-0.21.tar.gz]
+md5=a1297dfd14c008e3415f89b01eef75cd
+sha256=ec0358d104fa992f1437b37cdf70e83ab152794d2989ef2e9715ab8659dc46e3
+
 [http://gpe.linuxtogo.org/download/source/gpe-mininet-0.5.tar.gz]
 md5=4d199db47e91da9c89817e8bfbc2cded
 sha256=288d2470e6c8febb717ed0affa1f55484a0d0a4cdb8a331fae08d56d298a5653
@@ -4622,6 +5130,10 @@ sha256=609e24aa1413b1053ee3fd42c36c6ccf05d8067867021511c7d50d4829875b44
 md5=774c64ed54455f1297ecbeeffdc52eed
 sha256=da051f5049d44415fff02b48368db4e3e3b6154135a50f990844d73896d18e19
 
+[http://gpe.linuxtogo.org/download/source/gpe-session-scripts-0.68.tar.gz]
+md5=af6941561f0ef676b4536531cd4c40bf
+sha256=f0cc9809776f77649287e88455657d47e804b11296c0f9f503ea0b1603b2e377
+
 [http://gpe.linuxtogo.org/download/source/gpe-shield-0.9.tar.gz]
 md5=1373a00d9dba5508da579c585c585d6d
 sha256=07d2a2d1c1868b292e3c362e4df4bf32c2aa4b6b22e394a9c5448b8cff4075dc
@@ -4666,6 +5178,10 @@ sha256=bf1df54e88dbfa94be7b9f9a4c897635dca1ec56885352d8ebeac99f747b0554
 md5=1225673cf9cc1671a031f0eb2b57b3f9
 sha256=b0a7db0fceeda65b88bb8abd8743afb9bf0d5674ed3fe6444439c0dad90da27b
 
+[http://gpe.linuxtogo.org/download/source/gpe-su-0.20.tar.gz]
+md5=157cb20e41953d2148193d7e3eab173a
+sha256=b5e3917a2a2fb1cbce5cc724cd4c6f523c84890b7f97d520808122cf04e89139
+
 [http://gpe.linuxtogo.org/download/source/gpe-taskmanager-0.17.tar.gz]
 md5=fd52d952a11913f98c833f6af012099d
 sha256=7d5938bea991f00e33268305ae11c977b92e4ab3392576f59132cd71fb7d782c
@@ -4738,6 +5254,10 @@ sha256=addaf005bbcc23482bb655a0bfe476b4cc5fb303c29a7d6633165f3cbea02571
 md5=402b0dcfff28bc5d2bfbcf7b1f644afe
 sha256=1200fd739898ce71303c758149150910faa803722bd790811b754a48e0ef944d
 
+[http://gpe.linuxtogo.org/download/source/gpe-timesheet-0.32.tar.bz2]
+md5=dc99875e4bcc5d4c41b0c471270c3736
+sha256=9360cadc13eea2906089df5fd5f79d94efb14a72081a3d02ea165ee45a792ae2
+
 [http://gpe.linuxtogo.org/download/source/gpe-today-0.10.tar.gz]
 md5=7cd5e86b94d84a48077ec6ab6357be60
 sha256=1b007d46df292109147f4b270a2a555a5e8c2a90804c37028f1e7d10db512729
@@ -4770,6 +5290,10 @@ sha256=ec2ef95c967acce5834c8b4985c610014c16242d223d233947d67b4514ebe298
 md5=d60eda0b82431bc4dd92cf7c40c0efe9
 sha256=85124fe55ecd1ad303a3a333b9d8501deb627beeca85bfb6f66832389bc73f49
 
+[http://gpe.linuxtogo.org/download/source/gpe-todo-0.57.tar.bz2]
+md5=149ba7a31c7a7855146faa8f321d7cca
+sha256=b8304c9f69922b30064a4e8637576034fe0be3a4b699a04968e1b1f899974df1
+
 [http://gpe.linuxtogo.org/download/source/gpe-watch-0.10.tar.gz]
 md5=0c1cc9a5e7086194c1d2ff462759f135
 sha256=4e3cc87dfde964eda9092f72f6a945765795d00dad5bb2368d9cb0a500f21fc8
@@ -4810,6 +5334,10 @@ sha256=63287527c8d9e27e801cf0804436f3494bd569db05d49dcdd2a942ae72fa9055
 md5=8b6344276252635b18572bca17aa62f6
 sha256=5858eb726867e8c28f42101dbff7a5234b960f5944c7800939bf39a775147322
 
+[http://gpe.linuxtogo.org/download/source/gpesyncd-2.0.tar.bz2]
+md5=399bbb65ddd5d7c4bcd328d2e3880532
+sha256=26db3e8e03af47ffdbf5951e3bbfa2b7ccfd13e03fdac9f4b2d9111a436bc8f7
+
 [ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.0.tar.gz]
 md5=1abf7accd905c435da567d0852c080af
 sha256=685e0162af08d90e01251a02c2f916de59b2b4fa903e9a3a119208b6bcca6092
@@ -4822,6 +5350,10 @@ sha256=376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f
 md5=3b133a3703f16835e55d1a2f8cfdfa70
 sha256=e8dddaf7abc51a33b635bcb6b1864fca72f31fe8e9de3eb70a58e631eed99959
 
+[ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.gz]
+md5=0a2d20f70e6e01a4869ad6b7497404ae
+sha256=9b5c1d9dd51c4c8909219619412c7a983512b6ac958ab4cf661322d930c2a665
+
 [http://downloads.sourceforge.net/gphoto/gphoto2-2.1.4.tar.bz2]
 md5=5bbee55d4e59b063d3cff0fbc9121006
 sha256=c52e77a52ad11a02ae9f0b8491915f3f09fec23f8f740cc6079570241caf63cb
@@ -4834,6 +5366,10 @@ sha256=fefaabea8aede51ae9560ba71e2a7c31f4d856b0bb1fc0de7297d12e1215698c
 md5=2de2bcc62599b8a7337b54b0a067c50b
 sha256=82330519effc421a39c196d2a2806dc9c3cdcc891b7ec34dee04b3fe4ef4534a
 
+[http://downloads.sourceforge.net/gphoto/gphoto2-2.4.0.tar.bz2]
+md5=5fd1f711ca806adb687b33c55964d898
+sha256=8aa5ac34dae18284f3f04db874648a6dc70ecee3045ace674351b7326ae1c4e5
+
 [ftp://arcana.linux.it/pub/gpm/gpm-1.20.1.tar.bz2]
 md5=2c63e827d755527950d9d13fe3d87692
 sha256=11fabe7f27a205ff1ea6aee23e1dc2bb2dc5dbfc45ff0320fca0cd559806a936
@@ -4846,6 +5382,10 @@ sha256=c29373b752730195fc52e6ab0fc871f259284e2175bf2baf1701f027da60d200
 md5=cf9f349fec33760c8026c9b12c6f7a9d
 sha256=539d5c703799b12f5785286a689fd16f5fe957c2eaf460360e79f5f51d8c132e
 
+[http://downloads.sourceforge.net/gpsbabel/gpsbabel-1.3.3.tar.gz]
+md5=0ba7f4c623518e6bfe8da12d0691fb96
+sha256=b5d1021b0ea755d6b3bee57b0720a22021b6c8bad88acbda314874987f7fc1a6
+
 [http://download.berlios.de/gpsd/gpsd-2.28.tar.gz]
 md5=a49e1bd180a4ad4b1f5f9c3bd7f0e15d
 sha256=2e81676f9bcb01249216c413d253acddd1358a0dd982e77c5e14d15e6a45cabe
@@ -4862,10 +5402,18 @@ sha256=e6a055689ad05f6adba7dbb9490891a18a240d1a30e34424b3a034f4152f2c28
 md5=1ad07e10f34e46ffdaf10688743f2f43
 sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
 
+[http://download.berlios.de/gpsd/gpsd-2.37.tar.gz]
+md5=6c96cc0b2df0279cb7baac1ebc5881d3
+sha256=8860e61edc26f0665ad6ea0b34be4e3fd2cc7c51c5fd63b25c857a1870e8e137
+
 [http://www.gpsdrive.cc/gpsdrive-2.10pre2.tar.gz]
 md5=28b13b7253c8f019433be68686070558
 sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
 
+[http://www.gpsdrive.de/gpsdrive-2.10pre2.tar.gz]
+md5=28b13b7253c8f019433be68686070558
+sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
+
 [http://www.gpsdrive.de/packages/gpsdrive-2.10pre2.tar.gz]
 md5=28b13b7253c8f019433be68686070558
 sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
@@ -4886,6 +5434,10 @@ sha256=fcee22d7e31a936cde4672ac318ffabb9d39b7fc3b74de391bdade1419c59dfd
 md5=2cd110305cfe4c530fcd6e34bb52e1f2
 sha256=948d389d72906b798db3b5013a1769d1f8c9c9f3b6dff66c8820dfa0820b02e2
 
+[http://downloads.sourceforge.net/gqview/gqview-2.1.5.tar.gz]
+md5=4644187d9b14b1dc11ac3bb146f262ea
+sha256=12fea494e607a69eff31cdca13d306ef1b0b3b7850be0f8b236f267d8f2e9546
+
 [http://downloads.sourceforge.net/granule/granule-1.2.4-1.tar.gz]
 md5=7f4e11d04e369391de27fca82ee60f11
 sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c
@@ -4942,6 +5494,18 @@ sha256=f05d6793b943b7d1115e2b4b047ec1131c07c9ef0fd890d1616e5be0edd4a555
 md5=e21aef9a84d67dea9a68c1379781f763
 sha256=a2c877c38d057875c7dfbf1803030c5cc9707020b77f91673500d6ea8d858607
 
+[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.2.tar.bz2]
+md5=3c7fb1cd1308b1972a76b86bb29fc890
+sha256=ffa7c89bccab5d1be53b6fcedcf7a5c071d585cf522fee5864add05d350f5842
+
+[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.3.tar.bz2]
+md5=c07fd2da0835989fc4eae291cbc05f09
+sha256=b85899ac1c792db2e12d7063c45c0c6638dc8cc234d3ac6786b739cc6486439f
+
+[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.4.tar.bz2]
+md5=761cbbc0b5f077449082d0ea7527941e
+sha256=840015b4e0f0e7248b178eafc37476d6eb9aea3876eb3b07e2a66b430b526da2
+
 [http://core.fluendo.com/gstreamer/src/gst-fluendo-mp3/gst-fluendo-mp3-0.10.2.tar.bz2]
 md5=f3c32e0bc3ec1be461ce43e407a6a67f
 sha256=cba1eac94de8de8c181c6c60dfc59f8069d388761aba71bcd8c48b8ba9b2edf5
@@ -4954,6 +5518,10 @@ sha256=8e6e078161d9cc020ac9a403c3e7c0f124684c994d66b01895b147bf618bdc13
 md5=7887664f95687aa72519f3bcd49091dc
 sha256=4dc7305cdca586ef8d31b7a587c36d5eaa242ec0ddd50db32c3159fdcfab42bb
 
+[http://gstreamer.freedesktop.org/src/gst-openmax/pre/gst-openmax-0.10.0.4.tar.bz2]
+md5=5c250ac8027ba855bc46b1bf8aefa658
+sha256=79e3618edd959e29c877b9f8b0c9156d8249d725096582dffdd5308ba6a0e645
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.1.tar.bz2]
 md5=398729b82b911eebb14156c2fa02525b
 sha256=05d83a609aaea44ea8c979897f336cb8b5537a39b271af2831e6cca3851d3007
@@ -4966,6 +5534,14 @@ sha256=648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
 md5=395f3ed705928e77e5620cccf11a8cff
 sha256=9ac7eb27c9975d4cd24cd3da9b457e69790e4a8cbec75077f0f42fc8b0060eed
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.6.tar.bz2]
+md5=fb47838aa0ccef52683cea5d89364053
+sha256=c702dab34d3b330ec06d915a91a937dadb0a93ace25bbe8e337223ddb834efe6
+
+[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.8.tar.bz2]
+md5=ddc8f92dab0081f131650ad6c95908b8
+sha256=da4d8b06d3cb3d35940c2313b9c4b52e24d46eb94d3e8b346f0c144362b612a4
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.11.tar.bz2]
 md5=2e78ff25635b31d948def7c2b2d79054
 sha256=2193e3f940f0fd2ca10a137efbb79bc1edc8a12543b618b9a97f680f9d15bfb4
@@ -4982,6 +5558,10 @@ sha256=9d7bd85694e2d563ce30b01b902055149ce93a5fe45060ae9c06413f7ecee4c1
 md5=151b66228e08ab0c7601713030fb1c3f
 sha256=f82cfd5669c756726f503dde5936e2fbe2969631095f0efc40df1fae1a74f70d
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.20.tar.bz2]
+md5=180dd3452438b31fba732d2216e55eb6
+sha256=aa3d5ce29232ee5b24b6c032194ac1fc757309ea50ac850c0db46e45ab0a78ff
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2]
 md5=2b5958fb0baaf8d1b4eae18f7b13d49b
 sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac
@@ -5014,6 +5594,14 @@ sha256=dcf56a49b8fc0db16985bf133d4085d84602a19c15acb79890ac012d7cf9f962
 md5=25f111360c2930705b91b4fcf93ae5c5
 sha256=9e9cd6a5e134c29400b9dc302e523684dca55d0f7f11eb4b06535b24e5032d66
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.7.tar.bz2]
+md5=e02d729b22451f75414a27456ae5c16a
+sha256=9e12c58a794e61c0124b7d239eae731d4ac4863a4fc28147202d3811c3bce39d
+
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.9.tar.bz2]
+md5=c6d873b254eda073d722064003e304b6
+sha256=077bb0e095e5dd6dd16d697efd8d51761f3b5418efc808ed6ca7c60b34df51f8
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2]
 md5=cf604b6acd80b57dc5173db7e93fc116
 sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f
@@ -5026,6 +5614,10 @@ sha256=4871c52b2421b582330a0f9dc6a42da3b706140c346aa0cd690eb40758afe152
 md5=f1016148ecbfba968c0ef1773066988b
 sha256=9c514d4002fb2a2efc5c60e009c330be2ee05c28649d73de3aa45530161c2c62
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.7.tar.bz2]
+md5=cff4f55138d12152cf580a3ee71c2519
+sha256=556ba24072bdb32ee568adc682d69add1241d77936bc9563e50cdb953097be35
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.8.tar.bz2]
 md5=090d87a1716eee45a9804ca8558668da
 sha256=643a9414e3c883f4a87d0d4f1bc88a43045667fa0afc995cdbedecc90c8da4de
@@ -5034,6 +5626,14 @@ sha256=643a9414e3c883f4a87d0d4f1bc88a43045667fa0afc995cdbedecc90c8da4de
 md5=7c60018e8b9ce7f62c7078bee5851f07
 sha256=3cbce4b90328530980c6af3b4ec0c818b98df9e63a6bb4b2b350d806f0fd8d98
 
+[http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.7.tar.gz]
+md5=166164eb07eacd1d70b965731eb6cbdb
+sha256=b9f1bb98917d9879d46b6a959ce9068471908763f2ca98e480837485e290b106
+
+[http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.10.tar.bz2]
+md5=6183d61e434b5d34f232248a35571627
+sha256=c875753a6cccd40a79f5824ea5ec51ee4615a4f22103e4adfc6a0221bf615d8e
+
 [http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.7.tar.bz2]
 md5=16dd6515fd011ad449e5ce191dbb94be
 sha256=24520b3e33f98a3bcc79ad68f7d426475cbacf12e4c56338f58a05158523d71d
@@ -5058,6 +5658,10 @@ sha256=522d674bd9884bb1aff8e5e16fe64d7b8d190a329323db6a1795c4f5fd66ae2e
 md5=3232416ea6fceab628236d67a7d0a44a
 sha256=442862dc93e734aa58f13bcf3914dc7a40d3fa28f0ae2152c80457438dc3569c
 
+[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.20.tar.bz2]
+md5=d5af70413a65ebf855f788f965685e2b
+sha256=c839c3872510890bdbdfb43a79fd8b5646f3b9164b637127fb550351dc147eba
+
 [http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2]
 md5=263a7800ecf44d0f38d0cbc80bce65ff
 sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc
@@ -5098,6 +5702,10 @@ sha256=3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3
 md5=e9c280afec29b11772af5a7c807abf41
 sha256=faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
 
+[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.11.tar.bz2]
+md5=f7aab88e856a813386f797aade5867ad
+sha256=c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9
+
 [http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.3.tar.bz2]
 md5=dc8455144f27945f2fcbe91e75acd118
 sha256=e77dcec1b2f7ab7606afdaf63a1ddf80af4c5f518e1fcc7260dadb679dd858fa
@@ -5190,6 +5798,10 @@ sha256=47492876466dcbcd82e371264c6a1422f82feb80e40fe25a42ccc1fb7897180c
 md5=a16fc3d5e2c7b3d94791bf797588adc3
 sha256=a5b138e5cfa1f5c2c4dbb0a071d5492d49142c363ec9b92da8d7e3a6e6bb35b5
 
+[http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.13/gtkhtml-3.13.91.tar.bz2]
+md5=debaf8eb4468dc1c084cb3f1b527bafd
+sha256=e739290102fed3fb616e27578dee61a33c84301ec875bcf6af9493e8959dbeaa
+
 [http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.6/gtkhtml-3.6.2.tar.bz2]
 md5=37465fde0f1e1d7ba2284c5a4fd06fe7
 sha256=0c34357bd2b4ed3584e18a30f13a9f5d4c70738872ef90db97c1298013b2f7b9
@@ -5210,10 +5822,18 @@ sha256=a9cbed1b4d3491b4e22b80c9f066224ffb80eb7e1113869534ce53b599c7ea5b
 md5=64d0040925043c0a5d9a8add76a0f98c
 sha256=99ce4d10541d964d809036970f53579813bb563495070ab09c742cc1e2cdef38
 
+[http://www.angstrom-distribution.org/unstable/sources/gtkimageview-1.3.0.tar.gz]
+md5=574789e014988398dca2debc65c02097
+sha256=6a2f50c1a6e83c94618a271cc9b7ce0460fd1fe58adb12e05d0b1b07b43e4beb
+
 [http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.7.6.tar.gz]
 md5=4bb348c98367228f0de0a2216a13d48f
 sha256=4b104ab94774ca429aa639a1a6f0adec1ca1443bfd444f2100c063e3cf70e6bb
 
+[http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.8.0.tar.gz]
+md5=b53564e553728d4b69f7d366dfeb5299
+sha256=1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43
+
 [http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/gtkmm-2.4.8.tar.bz2]
 md5=c2aee4c259a75fa0dc766d402bef253b
 sha256=218420f1c091846fa5f860e5f12c57650d8719f6cf9b922e7c6a69e0505aac32
@@ -5234,6 +5854,14 @@ sha256=ce2a88a784c73d49b3600b5927f65624f665460684dc4b479989ad1c53e565c5
 md5=a4aceb5f185878c1de4e8aa7c38b6d1d
 sha256=6391c9735615ee929f4ae23bbfa8373c97ae64923c7fbe72cc4b0e262c4759e0
 
+[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.2.tar.gz]
+md5=a4b64a992deae0532f8015bcc6c40784
+sha256=1f7667c30228737e3cea58ff2b384bcc0eed8cb679392de827821e4d540c760e
+
+[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.5.tar.gz]
+md5=a3f8216544509a74a4441f689a0410d2
+sha256=e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289
+
 [http://sebdelestaing.free.fr/gweled/Release/gweled-0.5.tar.gz]
 md5=238f5ef66317bb24c3d4018a7d1e9ec3
 sha256=d5baec578b22407e3fc78cc47393942f9704f1ab7b8d1c012577037d3421f90e
@@ -5286,6 +5914,10 @@ sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 md5=c7005ccb1765d8359fd2348350770495
 sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0
 
+[http://hal.freedesktop.org/releases/hal-info-20080313.tar.gz]
+md5=a391649c5d5baa1a8998b2e1c1ad6464
+sha256=120e6b8019b5d608038d8f9a5a14bb97c4162b803118bb8530d9735d65b553a9
+
 [http://downloads.sourceforge.net/haserl/haserl-0.8.0.tar.gz]
 md5=bd9195d086566f56634c0bcbbbcbebea
 sha256=ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be
@@ -5346,6 +5978,14 @@ sha256=1379b222f81a86f10f5ba0113f43d52a13b5700cd6c57ea4416c8e8650f28300
 md5=388d916894122be839ba09d804eefeb5
 sha256=c8eabb77f72efaedb2ed4f1f18e2f3ca84164e0a9fa4dd313a23e3b0cc1ca3d4
 
+[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-common-strings-l10n-public/hildon-common-strings-l10n-public_5.0+r6160.tar.gz]
+md5=c882f41d9fa63090bc311d474a5f60ee
+sha256=9abc9651c9998aae27ec3b2efa1901e24b502965e56922fc77682d7ab8ee3c84
+
+[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-control-panel-l10n-public/hildon-control-panel-l10n-public_5.0+r6088.tar.gz]
+md5=ace44f0019c459cec92a8650944dafe9
+sha256=33b1621daf7cee020a6edcb0268fb71991c691b1412ea84bb9b60f1e2a166460
+
 [http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-control-panel/hildon-control-panel_0.9.1-1.2.tar.gz]
 md5=72c8b814ebeec8668cea575e08bb1548
 sha256=bbe77d297c7560d3fdad343ab49f23c9c0aa1574db77108d1b97845fb7bb26d5
@@ -5354,10 +5994,22 @@ sha256=bbe77d297c7560d3fdad343ab49f23c9c0aa1574db77108d1b97845fb7bb26d5
 md5=b2247355c2fa3763904d698ec03ee78f
 sha256=bc532113a4e4f4646fb523393e1c3da4dbd5cb2955f223bcbfc794216a7ab8b0
 
+[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-desktop/hildon-desktop_2.0.18-1.tar.gz]
+md5=b559f191ffa21d3bcc9defdaff5ec2a2
+sha256=10e4321f8d30d629f67749f93cec129da1535b087ec1d67d95c23daf8afeb16d
+
+[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-fm-l10n-public/hildon-fm-l10n-public_5.0+r6135.tar.gz]
+md5=732e11dbca619dd7d24b1f5291f30517
+sha256=1e3200c9a1c04236a73c82151d538a33ed87bb97e4a8c362977c4795b604591c
+
 [http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_0.9.1-2.tar.gz]
 md5=6d2646bf0ef3da795a34245b870f7983
 sha256=9305aff5ec4eefe462e94b49c0e1ec3037e9d3ae5a6fa47c8cb7136dadcb1e8c
 
+[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-games-wrapper/hildon-games-wrapper_1.9.4-1.tar.gz]
+md5=b6fd35baddd7f275c3ad980030ab937f
+sha256=b523e63ceef6cc7773f0b80e604ee3a9c032855c1a2de49207e8ed1963f8f62c
+
 [http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-home/hildon-home_0.8.20-2.tar.gz]
 md5=dd62148b18abe1e02182abba91e1d55b
 sha256=1b62825a44d7058e56162d6fc08d06454d30889cfaad6ff0bbd9e32bf4b0ce5c
@@ -5374,6 +6026,14 @@ sha256=8899a280fb8d54594aa2423b7dea2c959070ae3fe4eb86458abdc8bb167ef483
 md5=5218b2d7864f6f8af3ab6ea0cc27a313
 sha256=43a532c99b8cdcc0e2f60d95769dee89f2e03a37c5d5931b8de6e4c39ad721ad
 
+[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-libs-l10n-public/hildon-libs-l10n-public_5.0+r6160.tar.gz]
+md5=ac1f91e1e631c20adc4c4b9fe923020e
+sha256=feacb7f38d7d859b982acf593ecaca6eeec34d6da34d3a28175dea020eda2aec
+
+[http://launchpadlibrarian.net/7598381/hildon-libs_0.15.1-1ubuntu2.tar.gz]
+md5=562d712b5cce9989b8b640e877384b47
+sha256=13d1330f1154d3eec92e06a9f15b246434ffef0e4947b3f4787a581dcc34f236
+
 [http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-libs/hildon-libs_0.9.6-2.tar.gz]
 md5=cba9fb4c6d61720d03aa4a4d543e2c5b
 sha256=763bd538f0647c373383c2d91fc0c76ae4840d64158509347162b20425a4c8f9
@@ -5386,6 +6046,14 @@ sha256=51005d8161b45a422158f04e76b244394aa5eb99b5098b2846f989ee9845b9e6
 md5=7948087bfe3b1bf8025a37fbb64bde44
 sha256=eca16f42de8e4a213acb3ba0978fa56fbdf2f38e5be5882163753068ab4a15cd
 
+[http://repository.maemo.org/pool/sardine/main/source/h/hildon-thumbnail/hildon-thumbnail_0.11.tar.gz]
+md5=25d8cc1cf817489a255a5bc6541b8bb6
+sha256=0dbce673dd0b32731994aaee276ad990ad0437174ef7887e51868d5841c3002a
+
+[http://repository.maemo.org/pool/maemo4.0/free/source/h/hildon-thumbnail/hildon-thumbnail_0.14.tar.gz]
+md5=07ae084214ff2c8645a7f7b9337b525a
+sha256=f7bdf832d3e44b552d9bd1824598c72f5bb9c1644531c5b6e830a541ea2c84dc
+
 [ftp://ftp.logilab.org/pub/hmm/hmm-0.4.tar.gz]
 md5=9cd5734e1a54fdcec60ebf345e2e83c3
 sha256=a6ca7fc30502b5d724c1ef52fbb2e587755831270fcfeb2e32a83984a6256b3c
@@ -5486,6 +6154,10 @@ sha256=27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601
 md5=1713d9a4941120235cb0721ceba6493b
 sha256=acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586
 
+[http://downloads.sourceforge.net/htop/htop-0.7.tar.gz]
+md5=4afc961fa709167e1b434682897991f9
+sha256=1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b
+
 [http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2]
 md5=887bf4a85505e97babe1d90635361c0d
 sha256=dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c
@@ -5546,6 +6218,10 @@ sha256=837b95b128815f3d6689d2ecfbdc9a28023bae5f45879513f3b4c2ad12f459ee
 md5=059e56be476891e84715c897b5935431
 sha256=e01b7efcfafa5c00cd1786d71b526f963dcd5129b518cab2b597d21c5d68eaa8
 
+[http://www.rpsys.net/openzaurus/patches/archive/hx2750_bl-r8.patch]
+md5=e03eb32c8e2a2329a424d92ea08566af
+sha256=ba4ecafacfc25dddfafee84a5cb71a3d70d8f76ab3008047523036b0feafb84a
+
 [http://www.rpsys.net/openzaurus/patches/archive/hx2750_bl-r9.patch]
 md5=ebb78f58e9c84c73b90e9cbdde5f89d6
 sha256=7578448fc2adbfc820158b2467dbb127ab012b3a97ad95366d8d1af002defbce
@@ -5594,10 +6270,26 @@ sha256=46a02c0dddbe80fbd802da47d0a9eac03002deb538b109dae804553fbbdfa7bd
 md5=f134dc7324525cd41aa0096072a25449
 sha256=13a3c3dc16eb6aaa3a5854a80633f4b047a9396cfb92a30c910b460492fe8f26
 
+[http://repository.maemo.org/extras/pool/chinook/free/source/i/icebreaker/icebreaker_0.2.6.tar.gz]
+md5=cebdfc23cf6ce656cd36c887f8eebd18
+sha256=ef6b1c8def236f16ea914eccbb050c84ee314c0028b03c560ed20ff96776f74c
+
 [http://www.digital-opsis.com/openembedded/icecc-create-env-0.1.tar.gz]
 md5=641ec45fe377529c7fd914f77b11b44f
 sha256=9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834
 
+[http://ftp.de.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz]
+md5=7124ea3c13369ff27bcff0080aca678f
+sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad
+
+[http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz]
+md5=7124ea3c13369ff27bcff0080aca678f
+sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad
+
+[http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0~rc2-2.diff.gz]
+md5=acfc72473215e2f498ac8dafea78eefa
+sha256=15c64c5854e2151be3f1d583a1087c2058c541a73588ba46c1cb78ce346aa48a
+
 [http://downloads.sourceforge.net/icewm/icewm-1.2.20.tar.gz]
 md5=6c94dae56fbf9aa085a1d780538018c1
 sha256=0138dc364ee23156a58d890a5b2c61685bd91ea0017accf90118b38fef2df1d3
@@ -5706,6 +6398,10 @@ sha256=d42ec6f70b00100aa8816740259e3d70686aeae8c05a4f76b67f76b84c79833c
 md5=4d08cc2b3d54d88f7b68939d85d2dfab
 sha256=713a67e88d5e4a838823e5340f23d7862ff986a82c4ed0a2aed8fe44f9935120
 
+[http://www.rpsys.net/openzaurus/patches/archive/input_power-r6.patch]
+md5=ee641ee6fda72f4b3c4e388d97fe8c17
+sha256=73c23893ee42b4bc98e84576ab833e9bc40e3a773fcb95747204fc811a33dca6
+
 [http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch]
 md5=25bbe0e1412dce7f36f54392872c673c
 sha256=8526befd5b233a5911ccc6b6db4bba29ca3156db2828c11b5c696aa2e506c621
@@ -5746,6 +6442,10 @@ sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5
 md5=0da271f396bede5b8d09a61f6d1c4484
 sha256=3b48f495f9af74fc7cca2fe913e10ce3d947d1aa5e677722e87620b32f1068d0
 
+[ftp://ftp.suse.com/pub/projects/init/insserv-1.11.0.tar.gz]
+md5=252e8602205e733f1a4cbde09df8dcfb
+sha256=ccec9cb7b6a5c9137918efac8a80ef0c80a16afa132a5ef2640263cf255e710f
+
 [http://www.Vanille.de/mirror/insttrain-1.0.5.tgz]
 md5=2cec5b79969d0fc64c510edfe7113319
 sha256=2dd29e066dece7062cb30daeedad7e5baa0b5cb993c67ba700ebacd6e0212487
@@ -5902,10 +6602,26 @@ sha256=942240421710da8a04fa6c7071f50f0737ab7198e31c1d96f1e0b73330e0d066
 md5=4b83d4047670eb75bd14ae1bdd68dc38
 sha256=47344b444d78ad5965eb40cc4c8df8450fdc54135e2b058710ee8c500b958d6c
 
+[http://www.irssi.org/files/irssi-0.8.12.tar.bz2]
+md5=e407b557b3cfc7c91ce4de2571dd79cb
+sha256=462d634bb509cc2bdd550ee5c7b269495f3173721b7404f162ad1f69b49bfff0
+
+[ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-1.4.tar.bz2]
+md5=4073466e57df23d39721513219e4f7ae
+sha256=0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97
+
 [http://download.ikaaro.org/itools/itools-0.13.0.tar.gz]
 md5=007ff9e08e26504f5c28462d7bbdaa3e
 sha256=c682a23faf732203a7de9b82ffb736396e5948e000ab10c1a42b0e936b6cc329
 
+[http://www.kokkinizita.net/linuxaudio/downloads/jaaa-0.4.2.tar.bz2]
+md5=e3013bb1e287b495b0668f4b6e2887c7
+sha256=0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a
+
+[http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.103.0.tar.gz]
+md5=03a0f63b997ce7b83a1eeaa6b80f4388
+sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
+
 [http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.99.0.tar.gz]
 md5=a891a699010452258d77e59842ebe4a0
 sha256=2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e
@@ -5930,6 +6646,14 @@ sha256=a73727c9c2e15d6302cf4f5d3aaf8378c5de9d60a302b9d5fa4ee5332341f867
 md5=c7affcc61d4135ee838121a57b08de0f
 sha256=dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3
 
+[http://downloads.sourceforge.net/jamvm/jamvm-1.5.0.tar.gz]
+md5=a965452442cdbfc94caba57d0dd25a8f
+sha256=18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab
+
+[http://downloads.sourceforge.net/jamvm/jamvm-1.5.1.tar.gz]
+md5=5a82751b50391eb092c906ce64f3b6bf
+sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a
+
 [http://www.rpsys.net/openzaurus/patches/archive/jffs2_longfilename-r1.patch]
 md5=1e30c4f6d5148d8462c41b7f58738531
 sha256=f01a8f0975905597aaccd2d6647331aac14615b67a37ccf626bb2ea45db13294
@@ -5962,6 +6686,14 @@ sha256=ef72a154320c9949f8de0732e8dbfa186b83feb0a5e890d90807757de9998585
 md5=863bb6462f4ce535399a7c6276ae6776
 sha256=ef72a154320c9949f8de0732e8dbfa186b83feb0a5e890d90807757de9998585
 
+[http://ftp.mozilla.org/pub/mozilla.org/js/js-1.60.tar.gz]
+md5=bd8f021e43a8fbbec55ac2cd3d483243
+sha256=cffbcf6721b897ca1259661f418f3d81c1193702f59a29f0f3232c9b8f24faa3
+
+[http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz]
+md5=5571134c3863686b623ebe4e6b1f6fe6
+sha256=44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b
+
 [http://downloads.sourceforge.net/justreader/justreader_2.0k.tgz]
 md5=74b2b89b12668cbbbb093b6343e9f52d
 sha256=55b0dd7ac3f9860a4cba0797213fdaa898b77f3228612e3499d54e6fe6144514
@@ -6022,6 +6754,10 @@ sha256=f219303e60f81b3cf6206b6c1851bd42069bd018ed18482ab04dded0b4339f8a
 md5=e86438fb4fff46bda188c2211eede1bf
 sha256=54bfe3995975d17355152c7bd1c5b0dbe61973e15135d52a799be890bc979467
 
+[http://www.rpsys.net/openzaurus/patches/archive/kexec-arm-r4a.patch]
+md5=6ddd28b065a4d31685fe5551ecf5df46
+sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d
+
 [http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-1.101.tar.gz]
 md5=b4f7ffcc294d41a6a4c40d6e44b7734d
 sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38
@@ -6050,6 +6786,10 @@ sha256=eb8a1c688b07adede53c362355e639d8ac29d30536d69eaee97235d14e6d7e76
 md5=a1dcea71f0c3f881ef72f5bca2db7b39
 sha256=1b998b34e2e9377f5ac7704295d64507234fe7656e49d384f8bf95604e97e05b
 
+[http://www.kismetwireless.net/code/kismet-2007-10-R1.tar.gz]
+md5=2100c667e69db0cde35fa2d06c8516e2
+sha256=023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9
+
 [http://kernel.org//pub/linux/libs/klibc/Stable/klibc-0.190.tar.bz2]
 md5=6c96f954676c7b898dfe230e0f2a1fb5
 sha256=5767cbb094300c5e26eb0bab588ecdbf9e5db2a637e9ae73c2efb8a62e05217e
@@ -6058,6 +6798,10 @@ sha256=5767cbb094300c5e26eb0bab588ecdbf9e5db2a637e9ae73c2efb8a62e05217e
 md5=baa1f6e0b6acbf9576bb28cca5c32c89
 sha256=6a2efdfc757c518a8185f457799506086084b59498f53db37cfb6728008127e0
 
+[http://kernel.org//pub/linux/libs/klibc/Stable/klibc-1.5.tar.bz2]
+md5=481dfdef7273f2cc776c2637f481f017
+sha256=27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7
+
 [http://downloads.sourceforge.net/klimt/klimt-src-0.6.1.zip]
 md5=d12f56384b4ccde11cd756db2b14065c
 sha256=48ae508d72e453e2a1f5748870362259786b475548c545feaec1aea71d2f8fdb
@@ -6106,6 +6850,10 @@ sha256=3e406c76874827c236c7070c1349f8b4ee058aa664fc3066435c938bf6d5f0e8
 md5=d9c05283660eae742a77dcbc0091841a
 sha256=35360dd6160d94a981d923486a026fe91dfc3e0db2f5923aeb782b7e9c5e606f
 
+[http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz]
+md5=a64c40feb74862cb4a91281bc7737f72
+sha256=9e69ded08dc9a8c75f36a3c020e7aa96b90313d91b2f58add6d4dfff1f8861b0
+
 [http://downloads.sourceforge.net/lcdproc/lcdproc-0.4.5.tar.gz]
 md5=c1e74364963054b26b2a77a37bd2bf36
 sha256=a2163b474d75dc87891c6a81ce9e89f0c9ceab7cbef14b50f066bf3508eec977
@@ -6122,6 +6870,10 @@ sha256=f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727
 md5=76c921973fdea4f880944a024197f924
 sha256=930ef7de15eb028c1cdbfe3f1170aaa1d5b0b4d45a8fa496d944216e155122c2
 
+[http://downloads.sourceforge.net/lcms/lcms-1.17.tar.gz]
+md5=07bdbb4cfb05d21caa58fe3d1c84ddc1
+sha256=5ef3b4dab30956772009e29dba33fe1256cf9da161106a1e70b0966c96d14583
+
 [http://savannah.nongnu.org/download/leafpad/leafpad-0.8.9.tar.gz]
 md5=66a502c2c9e87b8f7ef0370ecb83cbbb
 sha256=5e8014be4fbebd0ced491d16eef8ef38a03382c25ef0ce41f0ee22a9ada30a6f
@@ -6182,6 +6934,10 @@ sha256=e37cffdb45bbb193e5cb75e74e7e0410554f4b3c3a1fe436debea907778e6aac
 md5=b372dcd527fd5b5058e77ee1b586afdf
 sha256=feb4abd0ea31b5a0b8344bfcb0e5987eefad723fa45f1d8e1e95c62acebab524
 
+[http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.10.tar.bz2]
+md5=9e10a77ff225587e59c0a28c66b4faa7
+sha256=91a5b69435f10002b222be022c832d9860a93e0bc181e3f94abc150486ab031a
+
 [ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2]
 md5=a75d2dbf3a3c66b567047c94245f8b82
 sha256=1c9529f7245778a4f1422d6257d446b7c90a19c3b603b1a25db1669552c464b3
@@ -6706,6 +7462,10 @@ sha256=a2f434898bd5319024a97294cc4c7ba1d89bda4951af2015a887feca116e162f
 md5=12e136a4c0995068ff134997c84421ed
 sha256=99565c6f8a560abc24bf6c07726737d54db64daae08c8708fc9e8f3aeb723985
 
+[http://downloads.xiph.org/releases/ao/libao-0.8.8.tar.gz]
+md5=b92cba3cbcf1ee9bc221118a85d23dcd
+sha256=e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954
+
 [http://www.25thandclement.com/~william/projects/releases/libarena-0.2.tgz]
 md5=dc51d2466493d16a81af10ae0390b292
 sha256=560a17bc5d9e8ef71579391703c2a138d365e68396a5d8b21b1d9e1b232e16d0
@@ -6746,6 +7506,10 @@ sha256=b1a185c6e20ac50c95ec3ba1aca486819984cd213e9cea69ab0dbca21db78b92
 md5=f1f0255f94e3354250d142b688013fad
 sha256=d49cc01bf85a185836689013191f92c21b625e7f38bcfcd06b41e19201765754
 
+[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.22/libbonobo-2.22.0.tar.bz2]
+md5=998a576ad26784ac87eab99e96013527
+sha256=5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4
+
 [http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-2.6.0.tar.bz2]
 md5=078942cb9c6a1a31f93958e993353f45
 sha256=cd579e8dff38882d685be01449db92dad7c78900885d5a9abf6160756f83a7a8
@@ -6786,6 +7550,14 @@ sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 md5=f29e1e63fcc55e3ae4e81f5ee9dd7bdd
 sha256=448a3ab76109664bb6bd8bcc2c62d957c7d44b52e39c37d91b3b73b5cfe35a3f
 
+[http://repository.maemo.org/pool/bora/free/source/libconic_0.13.tar.gz]
+md5=f852e61c2700b5bc571a730c6516e4ce
+sha256=1a9caf3ab9fd4d84fb2d8bb2fa1459e41d896a778d63cfd515cd55e1181379b0
+
+[http://repository.maemo.org/pool/maemo4.1/free/libc/libconic/libconic_0.16.tar.gz]
+md5=f1eb01149548d59956e7aaeb5e929ee1
+sha256=d90517115be58a29de7cf87e006e5e7cb2ae1786792d7d73042563f7b33f55ca
+
 [http://gpe.linuxtogo.org/download/source/libcontactsdb-0.1.tar.bz2]
 md5=575442be0c61e4b1e05f2188e2ae3141
 sha256=33a61a28617e5513e58bde9c16ef21c82c582c1513a0a325735c090ebbd9aefe
@@ -6902,6 +7674,10 @@ sha256=6ff7a5dbb5ccf14995f6bde7f1fca6be5f7f91f62b2680a00d32e82b172c9499
 md5=d444fb0068cdfed01bb1fd1e91d29270
 sha256=6ff7a5dbb5ccf14995f6bde7f1fca6be5f7f91f62b2680a00d32e82b172c9499
 
+[https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-1.04.tar.gz]
+md5=4846797ef0fc70b0cbaede2514677c58
+sha256=0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1
+
 [http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz]
 md5=77728078a17e39f7c242b42c3bf6feb8
 sha256=174cf27c57612971434ec8cc4a52bfd37bad8408e9b9219539c6d5113df6ff8f
@@ -6918,6 +7694,10 @@ sha256=74c81e8c29de3fda2e196ce7082a5ec35aad9399a6c7f67bb906b3c9d91dc6f3
 md5=493de1bfc84c1e0f82fd865795e48ffb
 sha256=039861766d330b8ff2309334feb97d384e16d927dd859fdc0fad4c4a13d66b7c
 
+[http://downloads.sourceforge.net/libetpan/libetpan-0.52.tar.gz]
+md5=119eb4ac27fb75540ca74d8997f7fc7f
+sha256=dddf7b94e3547436beca1ed5ed22616f350d7e79cd1d72c83b122c1707237525
+
 [http://downloads.sourceforge.net/libetpan/libetpan-0.54.tar.gz]
 md5=0214de45b1b92277fbfc6c9a00af5316
 sha256=f4547fae43a30265dd1d1e7f88c556d067a3ba67ca7ec0d46e540e6dc561a010
@@ -6966,6 +7746,10 @@ sha256=8daa7618787b3af2218eee9e074f90664bff5676896b997a760f8034383d70d6
 md5=1b1e2b495c5aa20c08725f30545a110b
 sha256=830802525700e65809afdd56ccdb5cd9950747044ab50666257bbb3d59a82754
 
+[http://downloads.sourceforge.net/libexif/libexif-0.6.16.tar.bz2]
+md5=deee153b1ded5a944ea05d041d959eca
+sha256=db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43
+
 [http://downloads.sourceforge.net/libexif/libexif-0.6.9.tar.gz]
 md5=0aa142335a8a00c32bb6c7dbfe95fc24
 sha256=a2f309c702ee72967676d96b1a9d06806d069fde8e88076200cca6479c3d3c38
@@ -7226,6 +8010,10 @@ sha256=db67f8fd78da55e71fe61eb28263d823f1bcda8d878bc6f2ffd9254a925dc84a
 md5=88d53855c41fa7713263e913871a5fcc
 sha256=ebbbc25a27587c21ed640b5d87b7c7783f4820c59c22f7b07e29e2306f1bbd65
 
+[http://gpe.linuxtogo.org/download/source/libgpewidget-0.117.tar.bz2]
+md5=b85a839264a35d0faf9a1a38c486e189
+sha256=f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868a9e18c
+
 [ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-0.6.tar.gz]
 md5=516623893401d391b6c346cba543681d
 sha256=32fe6ccae632a2d6ede51477dbdd5b39a0816510031bae0b5e5059099044a58c
@@ -7262,6 +8050,10 @@ sha256=4691bc87f567eba4938d1465e7a2ddfaf7bdea86629390830111bd03bd227ed5
 md5=1938cbd9718595fd419907bf2f7c3195
 sha256=f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80
 
+[http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.0.tar.bz2]
+md5=a60154772635b693ff08b4f34dea7f61
+sha256=0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79
+
 [http://repository.maemo.org/pool/bora/free/source/libgpsbt_0.1-18.tar.gz]
 md5=ce884aff8d063f9d51ebf75d899747fa
 sha256=495ebd711a63bee4eeaae7f0766323f2070bf30ab9b54f5ac18912baa1b41084
@@ -7302,6 +8094,10 @@ sha256=8b78905b3c61f67dbe9b50782b7005ee5a44cdb48dd0f654f42732b4807c829d
 md5=0c1a70ca77aef5706544c1b4082a632a
 sha256=54a1432c73e2df93dfe16bd6c11eb56c949da0967479be2e31e2c08ea0ee1901
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.8.tar.bz2]
+md5=09e4b6639be79fa888cabc751f73674f
+sha256=d5f635ea86f8417dd777c32bcf7ef86cf3af3912f34ae21db9933a0e48e54748
+
 [http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz]
 md5=29690b14762a970b9ff725c85627c24b
 sha256=ee8dcb9cb850f94e75e374273b0860bcf214fd242651ee22ac74cbfd37449b4f
@@ -7326,14 +8122,46 @@ sha256=383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c
 md5=2f0882a711759113b2388a790abe8fd8
 sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981
 
+[http://gpe.linuxtogo.org/download/source/libhandoff-0.1.tar.bz2]
+md5=8ec44fda9476391ed372f835d5358fe8
+sha256=9505377f6b4d4b657889e8468fca8049c8c2c46c3ddd03bb4eef0e7b2e1bad3b
+
 [http://repository.maemo.org/pool/maemo4.0/free/source/libh/libhildon/libhildon_1.99.0-1.tar.gz]
 md5=0ac69c278bd9f531a93b3c535f7ff145
 sha256=67e74666b49b0d17ff16e209196674dc23faa8c45b4f9b2ad33b94ffb6f3be4c
 
+[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildon/libhildon_2.0.4-1.tar.gz]
+md5=2708e643dbfaa722486d71c2516a0480
+sha256=44a7942eaa7ed7f640b3c3b700289f2363bb7264a7443853bdc0786e92ed6346
+
+[http://repository.maemo.org/pool/sardine/main/source/libh/libhildonfm/libhildonfm_1.9.41.tar.gz]
+md5=204be732181d57af01a35ec5fbe072bf
+sha256=f77ecd176be0c470d25431e2f8868bb78179ff1c52f5dd96bb093b13c2718ae2
+
+[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildonfm/libhildonfm_2.0.5.tar.gz]
+md5=0196b326a048e4d1a1ac009f71e235ec
+sha256=5065b98c01d9cbd4f7c5a769e659ce1f81cf3396f7c6e7af7785215cd18d7910
+
+[http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libh/libhildonhelp/libhildonhelp_1.9.1-1.tar.gz]
+md5=7388ddc8b191f1ee450c0cb150d36969
+sha256=80272253b0ac6a6e3abe4c8a5398f65bf303f1654a44be7d8ceb1e7a3213b519
+
 [http://repository.maemo.org/pool/maemo4.0/free/source/libh/libhildonhelp/libhildonhelp_1.9.6-1.tar.gz]
 md5=6f3328136f1b8dabf667d954b0698189
 sha256=b2219de48715579d589705cb7b88af8d3dd3cf18de0fd3d799241720b2384bdf
 
+[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildonhelp/libhildonhelp_2.0.3-0.tar.gz]
+md5=f02c47001669ef103a22dbde4aa97d2b
+sha256=46ad5df524cc74ab728e2a23b4ddc17f2624feb517c2d011b2b32c95ace3ecaf
+
+[http://archive.ubuntu.com/ubuntu/pool/universe/libh/libhildonmime/libhildonmime_1.9.5-1ubuntu1.tar.gz]
+md5=2320b71819d44dc40a974cb67084f2a7
+sha256=6815f0a46de672711866b031c09ed8a94e1cbbe193c6a6b5cb72286ff90cfe54
+
+[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildonmime/libhildonmime_2.0.2-1.tar.gz]
+md5=b36a6332cbdd8deb73cd97f6e7bd4804
+sha256=a1dd25b7b4a8979f1d78596c2c65f062c30b5db794be71508ceb4d662052a8ee
+
 [http://gpephone.linuxtogo.org/download/gpephone/libiac-0.1/libiac-0.1.tar.bz2]
 md5=cf829bb82f84728194c64a41e9f1cf32
 sha256=10197df9daee806453c5a7e99e538d7eac0421796f2a9ae114d4369d85fcf3af
@@ -7342,6 +8170,10 @@ sha256=10197df9daee806453c5a7e99e538d7eac0421796f2a9ae114d4369d85fcf3af
 md5=b77a17e4a5a817100ad4b2613935055e
 sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
 
+[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz]
+md5=c2be282595751535a618ae0edeb8f648
+sha256=a99e244fd78babb95ea3c9a5c88b964994edaa1d15fd8dde5b4067801e23f0cd
+
 [ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.0b.tar.gz]
 md5=a625307d2cda4f3c609b79c1e3a93d87
 sha256=794092368890321ffbb9cb1b260808d732658af093bd0a3e01c9b54c4bd657e5
@@ -7430,6 +8262,10 @@ sha256=f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea
 md5=705106da305e8de191549f1e7393185c
 sha256=2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929
 
+[http://downloads.sourceforge.net/mikmod/libmikmod-3.1.12.tar.gz]
+md5=9f3c740298260d5f88981fc0d51f6f16
+sha256=891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32
+
 [http://mikmod.raphnet.net/files/libmikmod-3.2.0-beta2.tar.gz]
 md5=19fc0879aebd1610813a23bd84726362
 sha256=857b66ef04d695f70414188b985e08b04f1f62cc250d72a43d0e0609dfbdba03
@@ -7470,6 +8306,10 @@ sha256=f40f0318e8c8f7eee802de91ee8a9b5673c0f28a15527883bd20826e74dff54c
 md5=330cb7e3da57d7a4800bdc22e4608c51
 sha256=e9e3f157c5c75acef702da9b41c17daa7ea7bb8d0952e6c6960f26980497477e
 
+[http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.5.tar.gz]
+md5=d5e19bb77edd6ea798ce206bd05ccc5f
+sha256=c6629c4bed428f9df3f89efc065b2d96f05eba36286532ebe8b8e404022371a0
+
 [ftp://ftp.debian.org/debian/pool/main/libn/libnet0/libnet0_1.0.2a.orig.tar.gz]
 md5=bf4983ea440542f3ec019cc1bb6ca87d
 sha256=cf6bf75d590884fa9d0725d4d86afa93211e29cf0c5f333a60bb4e4eb347dc29
@@ -7530,6 +8370,10 @@ sha256=4587753a023550a066abe59a7e467c1af35b9f5e81bfb40a12463ad2df8f088c
 md5=65ce3266be385d0c7cd9a1157433332f
 sha256=deb6530d40ecad2b849d68912500e6d03bab4ac63de7a97340d05af1d7cf0ad4
 
+[http://liboil.freedesktop.org/download/liboil-0.3.14.tar.gz]
+md5=7a9f719e50656b795c06c0167012a84f
+sha256=a40c09db6ee24e03aa81f58329a57e45e55462a2e0f619b3796d4bf942c23f2f
+
 [http://liboil.freedesktop.org/download/liboil-0.3.9.tar.gz]
 md5=5d139b1fb16f0e93f0c84290ad2aaff8
 sha256=dd4d680ce95e586a1bbe767e1a7b25e1c53f842b8be6cf4e30e89cfa8232dd90
@@ -7562,6 +8406,10 @@ sha256=98a06dfb046c0bf064c12361333a88c6f624df311d8acbc0d25c93fdd6f2c1fe
 md5=2003ba5397e6d7f5446c03b2321b7b3e
 sha256=ad2336edd245788a528e55555e92a11bd434360fb7ff092e9edaeafb0442f3ab
 
+[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.0.tar.gz]
+md5=6d6b6a75bc8751a7421b5e739c53ef6e
+sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c
+
 [http://download.ofb.net/liboop/liboop-1.0.tar.bz2]
 md5=88fc8decf99fd75d2af40e0a005fa0d3
 sha256=4a973d28466fde0b689099192f9bcd081b129d90b3c5a9815e5ade73052cf8d2
@@ -7642,10 +8490,22 @@ sha256=4e13febd65a2f8f18cb55151cd10f5f0888bf1e7dc2a4c0d54f39f170255de1c
 md5=4c5b31154943108ba0fecf00c8af9f3c
 sha256=687f46d5d5eb5ced18534f3cfcfdd82db6b25679437602f1519cae48d019b55d
 
+[http://repository.maemo.org/pool/maemo4.0/free/source/libo/libosso-gsf/libosso-gsf_1.11.10.4-1.tar.gz]
+md5=4c5b31154943108ba0fecf00c8af9f3c
+sha256=687f46d5d5eb5ced18534f3cfcfdd82db6b25679437602f1519cae48d019b55d
+
 [http://repository.maemo.org/pool/maemo/ossw/source/libo/libosso-help/libosso-help_1.0.01.tar.gz]
 md5=dbc3c68809e39bd6681aab8ad16ffe3c
 sha256=ef6f6fda31dfbf7b3186b6f1d0ffd12ee0675d9a057ad2994f81b5164213a693
 
+[http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libo/libosso-help/libosso-help_2.1.2-2.tar.gz]
+md5=fc5a1f4598670cec9ac40fb603f80570
+sha256=ecbff97da422f1498eae8f9b8a17389c0ccdd7eee1ca0259f035e712c8e0a405
+
+[http://repository.maemo.org/pool/maemo4.1/free/libo/libosso-help/libosso-help_2.1.2-3.tar.gz]
+md5=af766ed86b10dc14ed75d7ed256cbc8e
+sha256=3e19a9940c3afb6e55623844f687e7ab0fa5599a1d01313d094f6ea0fe1367a4
+
 [http://repository.maemo.org/pool/maemo/ossw/source/libo/libosso/libosso_0.8.9-1.tar.gz]
 md5=f40c4c73f58cf62859129c3ff08d159d
 sha256=d832126b22dec3a60ee6cdbd476c908f7715fc94d6f1ee11731b1b1ffaf41d47
@@ -7658,6 +8518,10 @@ sha256=90febc4d50cb7b383f4afe67aa80acce9a246ba6a927b5bf805e8f401f16b7bd
 md5=92c51a937120eb1f230f84f58ce08da7
 sha256=998a13a713c826a6ddbc69f956fbb78deef18b63e65f450a430df39930bcadb4
 
+[http://repository.maemo.org/pool/maemo4.1/free/libo/libosso/libosso_2.16-1.tar.gz]
+md5=7be17731c65497c3122a562a6e117db4
+sha256=7a61e8b686ae7d659835175018da3a1baa959329b77c18e6e9381a197937296f
+
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/libp/libpaper/libpaper_1.1.20.tar.gz]
 md5=7075f580606a84e63b7d6d9fa3124c31
 sha256=7ff5f355bb254a3d4ed4541377e6304432ee8678e7c9ec29e7d43488903004c9
@@ -7734,6 +8598,10 @@ sha256=2989d6a969b6f80d354f8120a5dd625d2c0b4e9e04bf178e9e7b34ae28e2ac69
 md5=4691ad687281e943260021272c28043e
 sha256=ff30a5f1a99c61caebcdce9f59417b3f7a0dbed15c6786368f4a4a1d05c67eb1
 
+[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.22/librsvg-2.22.2.tar.bz2]
+md5=aae602677ce201b1a0ed6a0c18c207f2
+sha256=2bfc1853ecdc545bf3767ed92c93b8796f2075f522c8eab1693c96f11d55a59e
+
 [http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.6/librsvg-2.6.5.tar.bz2]
 md5=2d1d16f9493c80ce8214e585727334ae
 sha256=11b97cbc654e366adedc28a93e334d34d46365b09a3adb028449119ab67cd643
@@ -7762,6 +8630,10 @@ sha256=9b3577052db92ac9282f4912eaa487729de34bf058585cfcbc79478831207889
 md5=da63b0ed460c0f44b9f85774caf3fb0d
 sha256=a33977201ff13a4c08d3a74de0fcdbe7f072e4a92a261d5f39fbf16aab069050
 
+[http://gpe.linuxtogo.org/download/source/libschedule-0.17.tar.bz2]
+md5=ba3a1063a9e8cd5a730b3871e468c227
+sha256=802c72f5f11d60f5cb75ef8acc116c5ab0600e3bc099fc5accf8a997e463b374
+
 [http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.10.tar.gz]
 md5=c009b0c89e5cf91dba17261f4cccfc4c
 sha256=e7720307f3fafb210963b6d91c608f25ae2088880260b3e39508c27aab13a3a0
@@ -7786,6 +8658,10 @@ sha256=912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160
 md5=37c51ba4bd57164b1b0bb7b43b9adece
 sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
 
+[http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz]
+md5=c2945a19ebfc94cb3a04b394ba2e07ed
+sha256=a6b13f25e5e6b91ad490fe9e8afac22c484f372e4e245d397a813ea6563abdb3
+
 [http://downloads.sourceforge.net/libsigc/libsigc++-1.2.5.tar.gz]
 md5=d0d1ffcae0eced97ef4f17ce0ba81352
 sha256=dcd6d3ea9a2c185b5286f80eefe9ac1402036b8fa21cfc742442d99579bd2b3e
@@ -7818,6 +8694,10 @@ sha256=13447233b19f7a9d4e14b362f28f1dbe4bb6652bdc182bba974234b0bc15e791
 md5=5a36bc38b8b70a0951fb3acc479503f5
 sha256=d74ed600fab1bf5bab86a4815a5170157607317030bd9316e587486e29e815f8
 
+[http://gpe.linuxtogo.org/download/source/libsoundgen-0.6.tar.bz2]
+md5=ce7e2c206c612e2dd09ec42e1179c9a7
+sha256=b4d9050bf46dab0f2f3a47911eac255c08159ab3965f5f10c4ab4e903eee1e31
+
 [http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.2/libsoup-2.2.100.tar.bz2]
 md5=936e29d705aab0483b9a5b8860f68c13
 sha256=fa9f33e96a11133adbfd10538d95ed9704e582ef334c0a119a2a0bfca302877d
@@ -7838,6 +8718,10 @@ sha256=e69f4cc9baee9be87400371cbdca1cb03428394c624640e64397089d090dbf0d
 md5=c779f84c4add124e704e6ea3ccc4039c
 sha256=d98203f017c6e1de7dca2037c533000705fc86b12f29694ddb4db17854e5498a
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
+md5=d0fc91ccb9da401e9e40d2f4612bdac9
+sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
+
 [http://www.libspf2.org/spf/libspf2-1.0.4.tar.gz]
 md5=5fe69ba13bf35d505b733247032a8a64
 sha256=222803a98d1e86ac7eee9491beb5fbf30e259a3c74cd4166bda1796374c26cd1
@@ -7846,6 +8730,14 @@ sha256=222803a98d1e86ac7eee9491beb5fbf30e259a3c74cd4166bda1796374c26cd1
 md5=3b291762e0149c975dab9f5ea15bad15
 sha256=6b498c1070e17f665625dc3e5113e8af55da5ce3d4d5abf0ae3fec344b8208d4
 
+[http://downloads.sourceforge.net/libspiff/libspiff-0.8.2.tar.bz2]
+md5=e6505bdff9048bf61533c00caf48d553
+sha256=8451c7182a99f0f4a88b3c19234c5182689f91444c50fcb510452b5e5b8a7805
+
+[http://downloads.sourceforge.net/libspiff/libspiff-0.8.3.tar.bz2]
+md5=0f989402e5edcbd84c456be56c856f25
+sha256=8b4ebd22dcfa7511109c2f6fa9e304c2ef3acaa492d55423cdf9a6f54a2fdb22
+
 [http://www.0xbadc0de.be/libssh/libssh-0.11.tgz]
 md5=ad703c4702646c83ca4fcace92c220d3
 sha256=94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb
@@ -7878,6 +8770,10 @@ sha256=53e8740a3a36ece8078b371b95c79646dc69f0ad3ee2665e5fb659412c0baf35
 md5=594e9999483cdd5cd913b6ea8cf9b076
 sha256=413ac7973fb4a353d98079b4ace1adaa8dcf8ce858113544c1ddb45660441b91
 
+[http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.3.3.tar.gz]
+md5=490ca1a0c614d4466394b72d43bf7370
+sha256=e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878
+
 [http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz]
 md5=55ee3c6db3e0927e7918309891a8f52b
 sha256=f5c7730ded0273a8615b12b46a32b800bbcb9e861e3a18aa92b1c062981a2fef
@@ -7930,6 +8826,10 @@ sha256=c3963d969e13588fb142001d5a81c07962dc2ce7c03e2f4f551a29760e844a10
 md5=0b87e84c7aad3b5e979bbe35312fd4c1
 sha256=b8839214df514d560a202f54c30d1b2e2f443f0798193c9e926c9f9e11218b9c
 
+[http://downloads.sourceforge.net/giflib/libungif-4.1.3.tar.bz2]
+md5=8c198831cc0495596c78134b8849e9ad
+sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
+
 [http://downloads.sourceforge.net/libungif/libungif-4.1.3.tar.bz2]
 md5=8c198831cc0495596c78134b8849e9ad
 sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
@@ -7946,6 +8846,22 @@ sha256=2f0ed0261074beaa6e060f9539c54017a3f3b4d2b272311e6cf60ba09c4aeadc
 md5=caf182cbc7565dac0fd72155919672e6
 sha256=37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44
 
+[http://downloads.sourceforge.net/libusb/libusb-0.9.0.tar.bz2]
+md5=a23f06379e05f04a77aec1c1428082a0
+sha256=49aaecc7b8ff57903801745ad56e918b25df8a3839cff526c8a210c5cf5a2995
+
+[http://downloads.sourceforge.net/libusb/libusb-0.9.2.tar.bz2]
+md5=f28e7ae610147a057e481bc731749bc5
+sha256=d112f79489d5deabc0cbb48c6192353d488d9e62c28752eda091f585f2e41176
+
+[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta1.tar.bz2]
+md5=3d9f7c3966d24c6e2d58becac96e4e27
+sha256=9365108d71cecb78055de4df6eeb2fadf0fe9143ef105bcb6934dcf391983a49
+
+[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta2.tar.bz2]
+md5=1fd5b9457e662531a48993191c1dfb64
+sha256=4ab03b0d1d41db6a5c4e10c6dd819ad90876e712fd66a2de2b824a2fd3ce7dee
+
 [http://downloads.sourceforge.net/libvisual/libvisual-0.1.3.tar.gz]
 md5=e70e91d2e90831c0eb78944b6a9605ef
 sha256=fc04f2f2bae4b3eef7eb331330e2e3fd336d1894dbf4cae631c8b635622cdd52
@@ -7982,6 +8898,10 @@ sha256=ce959b7349de056205e992b05c9c914994bc269d2b1d02de85eacd398263aab6
 md5=c0a5a8478064287e167c15e3ec0e82a1
 sha256=e9d15538a0bb97f6a440b23a5b372c41387773065dac69cab9fd1dc1d22a432b
 
+[http://downloads.sourceforge.net/libwpd/libwpd-0.8.14.tar.gz]
+md5=64d66018897d759358f454010b6e75d2
+sha256=01744fa637ad16a8ffaefb1aa7b9b42a56e92f0a2a18753f6720a85aa289d4eb
+
 [http://downloads.sourceforge.net/libwpd/libwpd-0.8.4.tar.gz]
 md5=0461d4bf2da534b4bed041b67d7f7064
 sha256=b6393088bf6c49b72a07d2aec7d84d14f6cab0ab00ad177c17157f03095f2096
@@ -8138,6 +9058,10 @@ sha256=4e1f39ee16596fd2a83d28d6c3b065f742254f3336f93ce8ed1cae48ecbe49da
 md5=d775d6478391b95d841a1018c8db0b95
 sha256=62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739
 
+[http://www.lighttpd.net/download/lighttpd-1.4.18.tar.gz]
+md5=5db3204d57436a032f899ff9dbce793f
+sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c
+
 [http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-0.6.tar.gz]
 md5=c3e1b6c428218968e2963182c1df1fdc
 sha256=cba8ac22d77bbf8f6ed4a98933242b89ee2426cbc216f54415eafcac1274547a
@@ -8174,10 +9098,6 @@ sha256=9f141c606cc93d0550eeb3532626f26ced56687c2bc9f2b8dad387798b929340
 md5=fb345125e23c787df0818ff7caad5515
 sha256=ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b
 
-[http://developer.ezaurus.com/sl_j/source/c860/20031107/linux-2.4.18-rmk7-pxa3-embedix-slc860-20031107-rom1_10.bz2]
-md5=d74fc9ea01384bead3925434b932d6b7
-sha256=3dcafe41355fcc688f4a376a5dc71901ea2fbb95698397c87c6a6b12aa058c69
-
 [http://kernel.org//pub/linux/kernel/v2.4/linux-2.4.18.tar.bz2]
 md5=ad92859baaa837847b34d842b9f39d38
 sha256=90d9a45ba395f742050f791b6944f6263d0ab03c84aad8a32967ca866906490e
@@ -8238,10 +9158,22 @@ sha256=c55c52caa613d1f25718b35811e4614d9712b9e1de56a91aa73c867f351a540b
 md5=443c265b57e87eadc0c677c3acc37e20
 sha256=c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58
 
+[http://www.at91.com/repFichier/Project-217/linux-2.6.20-at91-exp.diff.bz2]
+md5=691a9fd94de318aebb4b241fcff22cc6
+sha256=4f8529718a45a570cfbf452760009960264028467f398769236b501c9338fc1e
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2]
 md5=34b0f354819217e6a345f48ebbd8f13e
 sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
 
+[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2]
+md5=34b0f354819217e6a345f48ebbd8f13e
+sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
+
+[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2]
+md5=1b515f588078dfa7f4bab2634bd17e80
+sha256=f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942
+
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2]
 md5=1b515f588078dfa7f4bab2634bd17e80
 sha256=f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942
@@ -8282,6 +9214,10 @@ sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
 md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472
 sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
 
+[http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.3.atmel.3.tar.bz2]
+md5=952715cc523f4a77e7c5f94f608594c0
+sha256=d26a1de101692958fbca1d1be40fe52bd605636baea616a3e8ed96e422a3648d
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2]
 md5=3f23ad4b69d0a552042d1ed0f4399857
 sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
@@ -8290,10 +9226,30 @@ sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
 md5=3f23ad4b69d0a552042d1ed0f4399857
 sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
 
+[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2]
+md5=3f23ad4b69d0a552042d1ed0f4399857
+sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
+
+[http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.10.atmel.2.patch.bz2]
+md5=9100112d9be5a696a31b131bf1eadff4
+sha256=f601cbb903b18219aafde2e75921553deb03612361aa06acfc82efd04daebdee
+
+[http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2]
+md5=816a3d8315ff089ddee3c22c04b403a9
+sha256=03dcb188379fa94cc109d2b7733031de51d6c53d2a7e6701c72ba2ea60e580bc
+
+[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2]
+md5=db95a49a656a3247d4995a797d333153
+sha256=108b2a3f2b05c0e57d1d0977619525e46f8d4b425aef4b38b47dcf94292f2dd2
+
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2]
 md5=db95a49a656a3247d4995a797d333153
 sha256=108b2a3f2b05c0e57d1d0977619525e46f8d4b425aef4b38b47dcf94292f2dd2
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2]
+md5=5169d01c405bc3f866c59338e217968c
+sha256=666488e2511393fdb901eaf1e67275bcc38ab37c930e8a9adb290a95c1721a2a
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -8338,6 +9294,10 @@ sha256=97004d6cefd1b5c5f37efc1603e4103f9a809d79f8cc0faf2397fa882cdd6ee6
 md5=b2b0ffd11d27c72a9c01b8a9ef3832b7
 sha256=9dbd0f6c92b33ae8b96c5a045a341a00b2454492c2229839d056e4fd1488bca5
 
+[http://linuxtv.org/downloads/linuxtv-dvb-apps-1.1.1.tar.bz2]
+md5=de958cdb8d00e74792dd69f3c945b037
+sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057
+
 [http://gpephone.linuxtogo.org/download/gpephone/liblipsevent-0.1/lips_event-0.1.tar.gz]
 md5=bd92cf7fae640c7807b53d082bfe1d92
 sha256=d0941b9947be08be440716c888b58cc6d088a214debefebe7bca99b84f387c02
@@ -8354,6 +9314,10 @@ sha256=4097abc39b928970ba3232942ac5a6db7ec4ed4164593b9223c90470c9c994dc
 md5=5687331324ff5fc551f37ce419b2a926
 sha256=d701ba12a96d913fc963eb7e5cc751bbd12fefb921dae4e70c8549a43a108dd6
 
+[http://downloads.sourceforge.net/lirc/lirc-0.8.3.tar.gz]
+md5=056d3ff0d855427da9628d2ff2ab4f57
+sha256=8bc1c6cfc6a9c312c8f5b8cc79b501e26b438c96a2d245f42e50bfb353617716
+
 [http://lisa-home.sourceforge.net/src/lisa-0.2.2.tar.bz2]
 md5=cba116a4880f77205e0813d93bf14310
 sha256=986a923a5247468db1d2a03e93268f4025ae5dc27e911dafc7b37e6a802122db
@@ -8414,10 +9378,18 @@ sha256=0c629eac7ba7fcfc86228d3070579eff774bf0d61ea9b1c4ed93d5c13af97b53
 md5=f80615d9020c2d56a4a41dfa93ba8429
 sha256=34202206b33ebab7c34be20bd41fc8249745011a355be690ba997aa8e7d77943
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo_spi-r3.patch]
+md5=e7773693243f7a7b4b0a76ae61e4881f
+sha256=2e5bd2c74f01832945a27400bfbc779633b0e679d0bfe967744795e39b5d3165
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomokeyb_suspendkey-2.patch]
 md5=1928476f81aa970b84aec7eee6d89b1e
 sha256=138b70379317b4d2962694879c26f7579f7771256bd67d462012bed17f1fcba5
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomokeyb_suspendkey.patch]
+md5=9b9b6da3612b629f40b97d295c8854f0
+sha256=aeab92eb4f81b3ae12a1d4e3d8d9b3650cc0f37ce7f9d1562c29364567d87acb
+
 [http://www.rpsys.net/openzaurus/patches/archive/logo_oh-r0.patch.bz2]
 md5=bda8ae4e55b99f1815987bde365c4585
 sha256=1eb0d211898a91a06063fb52a6d3e1ed45815e3b4563bc252b869e73af5bc1e7
@@ -8446,10 +9418,18 @@ sha256=c7cdd8ebffedf878e7b7d5d3848ecaacec4a7d57afd29602c2c9d64f0d8b5a63
 md5=7abcba853b45a8595333da9aa807623c
 sha256=f7614a14e2ae31b2ba22e419f78ba0d21afbb98fdeb24ae117327c3c8af05f1d
 
+[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.2.2.tar.gz]
+md5=b80fb99e263dc67c2e8270bc22db8155
+sha256=d7efb5a6c777ed0f375444a57e4de75e8406adb61d1f52829f84bc5404cfb03b
+
 [http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.2.3.tar.gz]
 md5=64daa4872972b85230b8746655ef5427
 sha256=e0daa5f5113d03f515aa918ec8b67b0cae5a21eff5e81e224d94f69174430743
 
+[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.4.0.tar.bz2]
+md5=d9504bb4251d4e5b32cb379debda634d
+sha256=67cad76c18a138b9b55bf6ff88a5796128371cf9339b3761b36f79fb4e7459d7
+
 [http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz]
 md5=b5ce6a74abc9b9eb2af94dffdfd372a4
 sha256=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1
@@ -8522,7 +9502,7 @@ sha256=2ac2154e3f66b5b32ca25d47e3977db115ac6dc52ddb7442ce16e65a4ac1afee
 md5=c703192481d94dfa3f4e24eed22c8182
 sha256=daa670b686f959ab15e457425e57c50f0b973ee4d24d6a4171c33f467961ad1d
 
-[http://www.7-zip.org/dl/lzma417.tar.bz2]
+[http://downloads.sourceforge.net/sevenzip/lzma417.tar.bz2]
 md5=b1ab85e4dc1eb1323d77fef47a2cb71c
 sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc
 
@@ -8534,6 +9514,10 @@ sha256=bcead46b0bd887c3987e977a0a7d4c547b0f70f926d45e253784137569f57b9a
 md5=6760e5819f4238328709bf93bf10071c
 sha256=a2fbecb4dd7c1dab498e3d8b5a0e574e6b8be09c63329b0d29c6fa9adb4a2fc5
 
+[http://www.rpsys.net/openzaurus/patches/archive/lzo_crypto-r0a.patch]
+md5=ed24c3496f8b1fd22360422ac4dfd42b
+sha256=9cd89808a3c63e48ea809510e25a0277a53c7cb2e039f35afae7d2db2ab25b4a
+
 [http://www.rpsys.net/openzaurus/patches/archive/lzo_crypto-r0b.patch]
 md5=7c4b0de088db249cd94ec0001c4d3edd
 sha256=f91accabee3408cc318affb01b1dd764cad555441a2c8ee23c598880f5825807
@@ -8590,6 +9574,10 @@ sha256=d7ee2e668455f9a092418e5475f32676eb0b37c54ae38a7fcdf2d14e0fb80c91
 md5=be2790a34349ab452dddbcfe4c95606a
 sha256=c1c67839d4af290aecd8f7743312aacc0a39ae99757f0910918531ef9a63e14f
 
+[ftp://ftp.gnu.org/gnu/m4/m4-1.4.11.tar.gz]
+md5=988aa098326d5f2b5b5aa4b3efe8d528
+sha256=c67b759d96471c9337d3b9f0ab2e1308f461a7dba445cfe0c3750db15b7ca77f
+
 [ftp://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz]
 md5=8d1d64dbecf1494690a0f3ba8db4482a
 sha256=a116c52d314c8e3365756cb1e14c6b460d6bd28769121f92373a362497359d88
@@ -8642,10 +9630,26 @@ sha256=46a30f2cd62c66099d4b87a32fb82751598758c213a1486ec7f44c23a33f5529
 md5=fe1758398de89fce57f05f9c1d1bb923
 sha256=70cfa5eacd27d46a5e6f562b01769c64794d20ce4636cf133def7db7f0715efb
 
+[http://repository.maemo.org/pool/maemo4.1/free/m/maemo-af-desktop-l10n-public/maemo-af-desktop-l10n-public_5.0+r6160.tar.gz]
+md5=5e13cc37619d6a79459ef1b36d671597
+sha256=28d1dbeb0c6db7a4155fb87c838b0d814e583147fb0cc23bdf64691014f69add
+
+[http://repository.maemo.org/pool/maemo4.1/free/m/maemo-launcher/maemo-launcher_0.30-1.diff.gz]
+md5=751fc2d7b3425b6e08ef2513418d8dce
+sha256=d711152bf23b96aa55c6db3af61650353e88e95ffb61ce73760e0fdfde67d1dd
+
+[http://repository.maemo.org/pool/maemo4.1/free/m/maemo-launcher/maemo-launcher_0.30.orig.tar.gz]
+md5=e188cd39bc29cdc27f60156961cd6328
+sha256=600b0284d6f2281d16307f176b45626891b2369ec2481b61885917daad86f46c
+
 [http://home.tal.org/%7Emilang/n770/maemo-mapper-desktop-20061114-001.patch]
 md5=b391fd0d13f5cabbcb2aba3237156f32
 sha256=7701fa20a835f3ae504a6e04d2e449b0be2d2380e7522fa5736791a55abacf4c
 
+[http://repository.maemo.org/extras/pool/chinook/free/source/m/maemosweeper/maemosweeper_0.2.0-7.tar.gz]
+md5=4ece4fdf0314b7310bc4228ca00d7d8e
+sha256=d9afa1fa7db43b66db22ebe7a98f8370f4935c53d0eeb54b7e166ab7f7d43f5f
+
 [http://handhelds.org/~zecke/oe_packages/mahjongg_V1.0.0.tar.gz]
 md5=83587af02f53eb222242d0d84380735a
 sha256=a059a2b0f438140a3bb1e30f410a28863eec61ebbb90c925209c7a473a89b76b
@@ -8662,6 +9666,10 @@ sha256=f066c03bfe4c8efb0c6a7ca2971cb03fb723fda9591e0c57a7afeec05f606adc
 md5=13a91cfd9b26182edbbdcd2a0d27c80f
 sha256=e41470fbea5322aabdca21b3ee7ebc2b3ddb1638d25902ee96fcb10698b35dd4
 
+[http://www.claws-mail.org/downloads/plugins/mailmbox-1.14.tar.gz]
+md5=62fb82a6e778d9788364a3cd1b78d609
+sha256=e59572e750baadad7d1baaf24b9e44d4fa5ab194ccf3faeb41c6061ca6b375a6
+
 [ftp://ftp.gnu.org/gnu/mailutils/mailutils-0.3.1.tar.bz2]
 md5=d2f0192b3dd95b33e764a0d480085cdd
 sha256=1d145c55cf9ef1cd9ad996bd7efe0df7765e0ec8ef60a0b95f5c239172efebdd
@@ -8898,6 +9906,10 @@ sha256=396a2de3eed6d5d3c4604b372e11f6c0f18644ef3d8ee14978b715ec26aa0974
 md5=18b20db6e40480a53bac2870c56fc3c4
 sha256=086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e
 
+[http://archive.ubuntu.com/ubuntu/pool/universe/m/mce-dev/mce-dev_1.5.6.tar.gz]
+md5=b3a28fe9bcec2fc7ae70f5d819bf3d1a
+sha256=aaaae4e3a25880d9f6af2dcf504b03f98946dcfb79e4c0a77adb9223aaa5cbc4
+
 [http://repository.maemo.org/pool/bora/free/source/mce-dev_1.5.6.tar.gz]
 md5=b3a28fe9bcec2fc7ae70f5d819bf3d1a
 sha256=aaaae4e3a25880d9f6af2dcf504b03f98946dcfb79e4c0a77adb9223aaa5cbc4
@@ -8962,6 +9974,18 @@ sha256=ebede057bf1c312182d069b958eccfafbb18fca4cbba0a41f0c5f35094cb15e2
 md5=203188db254cc418e9d9dd9791543b9a
 sha256=8253a341c3bdd49467ecfdb5ccc03b359eacec5aec0b35bd77cdce341e157399
 
+[http://software.twotoasts.de/media/midori/midori-0.0.15.tar.gz]
+md5=0b6eebdcedd224b2b9f437b706471762
+sha256=3b449713a164d574031843ca38f37be12e3ac40804995b3e5a252562a598482f
+
+[http://software.twotoasts.de/media/midori/midori-0.0.18.tar.gz]
+md5=aa9c10bbf6fe3502a65633c4fac0fb80
+sha256=36c20ca7c59e6c35deb04a9febde8aa8040c78c6ba21f595442b94ab78ec137c
+
+[http://downloads.sourceforge.net/midpath/midpath-0.1.tar.gz]
+md5=afed8ebe979ce2ea189b117062aaa011
+sha256=556729f60cf2de79a20627dd3f448a7b8dc164331576497f876a4a5c9179544f
+
 [http://mikmod.raphnet.net/files/mikmod-3.2.2-beta1.tar.bz2]
 md5=006378681d520fa8ee1dacca965bbd3c
 sha256=0e760acb85584ea3e828989c5588f827f0dd845d3dd6948e2aea12bb6278651d
@@ -9058,6 +10082,10 @@ sha256=94c4ab96ad858524b64864482f5623bd18f844b98788d7d4be1f8065a4f13a0d
 md5=75bbd1dc425849e415a60afd9e74d2ff
 sha256=e83b80b4ccd7863223fac4a2d54974a64a79c635d6bdda0c6e7039f966eae9e2
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mmc_spi-r4.patch]
+md5=85922650d2e640e2cb723e71fd00a471
+sha256=34cf9ceb9e811ee85c74ae2c217548e1d193741fbf9a43d37116f1d4e404f496
+
 [http://www.rpsys.net/openzaurus/patches/archive/mmcsd_large_cards-r0.patch]
 md5=e331b314ab194a87bdd23aac1ee43bbe
 sha256=5e1e6967a9a4784f802947cf8569903ed91d8444b5c197d9572aeaf704583751
@@ -9114,6 +10142,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e
 md5=b67ef657b83ca26249d7b9e9c5e7da69
 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5
 
+[http://go-mono.com/sources/mono/mono-1.2.5.1.tar.bz2]
+md5=dfede0c8c29384a8f8a6953a9bd06224
+sha256=434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96
+
 [http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2]
 md5=391f85b4f962269e044ceac2b5235310
 sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
@@ -9166,6 +10198,10 @@ sha256=57cc436480dd29ac7e751c4d5adbc2b0289ba2273bda388352be15446894bc56
 md5=cd636aba15508940e202ff43dc483aa3
 sha256=e17c283be0afa5abdf0be276e0240b3f1805afaea76537aacadc8e2ff626f9ef
 
+[http://downloads.sourceforge.net/motion/motion-3.2.10.1.tar.gz]
+md5=5ffdc958313345c69d3e0d5ec5c013cd
+sha256=2798b2a5e4d248244d5f40cce32dfb0f027e103dd8469a800b6b934467bf6117
+
 [http://downloads.sourceforge.net/motion/motion-3.2.6.tar.gz]
 md5=71e6bd13fcca70372e9b7c7806d62b30
 sha256=48c456dfcadec2db472320e317fa37dc697f184e12f99006a1ec0b6512d2ebcd
@@ -9214,6 +10250,10 @@ sha256=359f0d344f92d1f145ddcd37adf54f9b8069aa2ce89c4a19603d080ef17d2d48
 md5=8352b619e04dcc73411a38b39dd855f6
 sha256=d857f9df4a6cf50d0bc57dd11296dd1a8d1ac709442875ea4fcd757a89da8430
 
+[http://downloads.sourceforge.net/mpg123/mpg123-0.66.tar.bz2]
+md5=6753c7ce5bb35bd65c535b2b6322a9aa
+sha256=2cdcb3b78412034f787ae52e213d04455132f6c94c8b7f3f4b21c21c38d9afa5
+
 [http://downloads.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz]
 md5=bb403b35c2d25655d55f0f616b8f47bb
 sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
@@ -9250,6 +10290,10 @@ sha256=5e06d8ed89ba98092c2cda16ecd9cdfeaa08b6c0e77ac459f49ae6e5dd64d639
 md5=17aa3fa0601cbe172d18f53489141e5a
 sha256=17e3966a9da7acb0560af1d2c1a5c0162da8e01de195aa096d594ab6248c4930
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mtd-sharp-flash-hack-r2.patch]
+md5=8c63b0b47af4de62b48ea745faa11584
+sha256=7206aaf289cd349ed0c52bf081b9a29a25d03e83eaf3e6de4a6070c4de1abe9d
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mtd-sharp-flash-hack-r3.patch]
 md5=dd6ca5b6006aa03febb611f481cdd7ba
 sha256=c7b9cd542fd9076d9a7cd5c033665fb05c6f412b3b235cb4379b0f8fe84fb351
@@ -9258,6 +10302,14 @@ sha256=c7b9cd542fd9076d9a7cd5c033665fb05c6f412b3b235cb4379b0f8fe84fb351
 md5=442bdbdb024db27dc9c89207fac16f95
 sha256=c3ed189e314d0f1d106df3ecb80b1f1147e86fe6cd05ceb53652c1396b67ab2e
 
+[ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.1.0.tar.bz2]
+md5=05aa9b015625aa20afba728fb7ee47b3
+sha256=a74b0cc7ec668418389d9f56f85ca8a4619b8674a2d90f5e51bfb8ae9a0667de
+
+[ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.2.0.tar.bz2]
+md5=ca41f1fbaa056e8b8d71e8d52c0b1bad
+sha256=05c6ee9dd87d4a323c37b69009769f2912fe67e8f9a5c9f98b169b8b2bd9dbc4
+
 [http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch]
 md5=0f7cdd68da77a62e77f9012de052c513
 sha256=2e56fe35b6f3b93dac201c55764b8bf6d899c995e0d165381368cfca886c6739
@@ -9302,6 +10354,10 @@ sha256=d80142bfe7dd2c8ee9c2345c71fedded8b971267a9a29a853d48c562dd0605d4
 md5=a2db4edb3e1e3b8e0f8c2242225ea513
 sha256=7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd
 
+[http://www.mythtv.org/mc/mythtv-0.21.tar.bz2]
+md5=49fc135e1cde90cd935c1229467fa37e
+sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4
+
 [http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2]
 md5=2478bff31a9223afffcb74e4dd021770
 sha256=e8caa07c0a841fab2f11db43809c073485b0c1aa12be5dc1b90ca72fa6660175
@@ -9314,6 +10370,14 @@ sha256=f12483dbe029836cad6c58e53077281d9e71a062b1145e57342ea9671296ca40
 md5=8de48d0de02ed2332a4f7a07563c67af
 sha256=7052f6ce989040d9f16c50337c438d030f26e8d2bc90439d25e9c0ae1921eb20
 
+[http://www.nano-editor.org/dist/v2.0/nano-2.0.6.tar.gz]
+md5=619107f0fc3c4383d668cef15aa3ca32
+sha256=0d10d8f70a6fadfb9cfaa7b66c5fe7eba17e64ecb96104c4ddedc82f89765d5c
+
+[http://www.nano-editor.org/dist/v2.0/nano-2.0.7.tar.gz]
+md5=16187fed2bdefec6275ece6401ce4cd2
+sha256=5dc783c412c4d1ff463c450d2a2f9e1ea53a43d9ba1dda92bbf5182f60db532f
+
 [http://downloads.sourceforge.net/nasm/nasm-0.98.38.tar.bz2]
 md5=9f682490c132b070d54e395cb6ee145e
 sha256=87e64eff736196862ed46c04a3dffa612d765df980fa974fc65e026d811bd9d0
@@ -9438,6 +10502,10 @@ sha256=844ba97e745a0b9f37afc7daa323cafcef00108cd0254667da0a00558eb323a7
 md5=f17e9983457e1cf61c37f0be4493fce6
 sha256=aa99fcb016971290f9a871331eed60150ebdd84785dda1b252556a54760b97bf
 
+[http://downloads.sourceforge.net/nfs/nfs-utils-1.1.2.tar.gz]
+md5=76ee9274c2b867839427eba91b327f03
+sha256=1d09b1c133e4eed9d2df07ead4eba813e6993875c39e66d7b4081287029d4033
+
 [http://downloads.sourceforge.net/ngrep/ngrep-1.42.tar.bz2]
 md5=35e821cfd888e9523a90fb7e5074a072
 sha256=fd5a85b48613452fbfc9ce6d6e3fa3f37992731422eb2843235fbf4e02d6f1e9
@@ -9466,6 +10534,10 @@ sha256=f9c86a163bd27dc4fd05abb958bb857109a556a4a58f8d06663d49ac0559ac92
 md5=0b8b1a58bfdb60fa41df46771a464b82
 sha256=a99b07c2193eebeb766bc422dd2ebba6649680457d58a4f5a86f2567ce49b3fa
 
+[http://downloads.sourceforge.net/notecase/notecase-1.7.2_src.tar.gz]
+md5=ad8b93c16e740988b5114826c47a53bb
+sha256=763529033d4858285401d9e68c6412d21ed62624fb65e8150d8c703012a4ca49
+
 [http://www.holtschneider.com/notez/notez-1.1.0.tar.gz]
 md5=c348a626fc09265fa74a12470c83c113
 sha256=11ee0a660faca7993a2f525d2964391d135b9552d9e94abad6cb6c5f3983f964
@@ -9490,6 +10562,10 @@ sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173
 md5=a09542645b91ff60564b0f4db436af01
 sha256=8f486c4ef4d3f60fba4e0f855399184ca557f03a747cae6adde4cc2dffc53ff2
 
+[http://nslu.sf.net/downloads/nslu2-linksys-firmware-2.3r63.tar.bz2]
+md5=d4daf9d424a182e7ca2747d9db004581
+sha256=703c9083f2f114588eb54442f7e621cbf3e0f1398c3381b5ad8d1fc56f6468a5
+
 [http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.7.tar.gz]
 md5=f384fb230145f90fb75df1e33062583f
 sha256=3c45afef8390d8eae65e1415f7de159b7fdcef649218238a6cac8e9952fde7d5
@@ -9526,6 +10602,10 @@ sha256=3f515a043bcd3b778d33938da224214e727faa528256d4a1a213bc8617ac2d0b
 md5=40cec6ce8ca2e95a4fbc7a28879bf4a5
 sha256=7a6f7f2745cbcb02bf79cc7cd365a3f80679f2558dfaa378010675f40a7aff3b
 
+[http://wwwpub.zih.tu-dresden.de/~mkluge/numptyphysics_setup.tgz]
+md5=24a031f628cc91825bb80ee2aaa21b77
+sha256=3a60d6a6327f3ad8653e1de5dbf5c36f2a591d409d3e3ae7f6c84d25dbc3e7da
+
 [http://meshcube.org/download/nylon-statistics_20050909.tgz]
 md5=103c5c821474ae6df7a3055ee72f4d00
 sha256=c80d9ea7ebca32b63ea23d2a52ac799cff32f8f30c66b491d2b8f93da05585e4
@@ -9638,6 +10718,10 @@ sha256=25121b5dbd2b830929519325e033086ce45861cff2d0000d928f48261b1e0b7c
 md5=991615f73338a571b6a1be7d74906934
 sha256=e7e1a287141dd1be7f4b4fedd54ec29fa904655ed76a13ac87ae69a3fc76b062
 
+[http://www.openssl.org/source/openssl-0.9.7m.tar.gz]
+md5=74a4d1b87e1e6e1ec95dbe58cb4c5b9a
+sha256=c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572
+
 [http://www.openssl.org/source/openssl-0.9.8g.tar.gz]
 md5=acf70a16359bf3658bdfb74bda1c4419
 sha256=0e26886845de95716c9f1b9b75c0e06e9d4075d2bdc9e11504eaa5f7ee901cf0
@@ -9694,6 +10778,14 @@ sha256=4b3780ee09efe665a69151c994e0e5f01a56c57338660c18df30916904df83a6
 md5=bb91e4d5bd45ff0d5c3e6214653422b7
 sha256=4f86ab165dabcc7bc4008710a66fa0ed391c083e2a8bdf8a8f5bf11c0244b2cb
 
+[http://downloads.sourceforge.net/oprofile/oprofile-0.9.4.tar.gz]
+md5=82b059379895cf125261d7d773465915
+sha256=cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade
+
+[http://www.rpsys.net/openzaurus/patches/archive/oprofile_always_bt_arm-r0.patch]
+md5=9d1e6a9bd4d6dc9cae3c54c18c303ace
+sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae
+
 [http://ozlabs.org/people/dgibson/dldwd/orinoco-0.13e.tar.gz]
 md5=4cea186648c335752bc241418fd54038
 sha256=07fbed267421ee26ee4b6bc410b68a10a284072d78e1e495c74865db0470306e
@@ -9770,14 +10862,34 @@ sha256=53704f6b0aace1b2f24b5366530f6df51bf4ffea7209055e9eadee541c2c221f
 md5=7f110e130db541b1aa9fc428b2620602
 sha256=1a84b7d4939313e9b7ec0ce8f50934251fe1569e6144931dd323de8ee8dacccd
 
+[http://repository.maemo.org/pool/maemo4.1/free/o/osso-games-startup/osso-games-startup_1.5.18-0.tar.gz]
+md5=a3752aae572d3a621990d0b1db38a0eb
+sha256=9cf40c2e07cbc55576bb4b09fc406351533e0b06064e935c73f7c5aedde13b81
+
 [http://repository.maemo.org/pool/maemo/ossw/source/o/osso-gwconnect/osso-gwconnect_0.70.1.tar.gz]
 md5=e4a87e616807dfd8557663a28990e948
 sha256=1bebf4c6adf9d383014bf0da8f133c0dbb6aa420033347e8e1f307f79051bc86
 
+[http://repository.maemo.org/pool/maemo4.0/free/source/o/osso-gwconnect/osso-gwconnect_1.0.12.tar.gz]
+md5=067de342f812811e6585b58049895168
+sha256=015b5b318c74650d1e85319ee05e8c506dd7a30daf280d7c1e23b914c1e4c7f8
+
+[http://repository.maemo.org/pool/bora/free/source/osso-gwconnect_1.0.8.tar.gz]
+md5=23b4b9319dbe5b4f3818ddbd1548ead9
+sha256=02d0f7ac6a015a5183eca2c517aa50effbde19884e24f9e63c9daf530d2329e6
+
 [http://repository.maemo.org/pool/maemo/ossw/source/o/osso-gwobex/osso-gwobex_0.26.1.tar.gz]
 md5=804ad2ed142c9ef31bee42a68704315c
 sha256=f5e784be11151f927c68f09ba4e2881a95b67c99de9ba597b8155a6d5421598f
 
+[http://repository.maemo.org/pool/bora/free/source/osso-ic-oss_1.0.4.tar.gz]
+md5=6868cbd4dfc78abd7c651428d517e723
+sha256=16a0da4d947bd9c64379870646bf321853c7627d7894843a9e394182ae70315e
+
+[http://repository.maemo.org/pool/maemo4.1/free/o/osso-mahjong/osso-mahjong_1.5.15-0.tar.gz]
+md5=e304a3797ea19f5db3628f5891d97457
+sha256=6ca464db290b9576e55cb0a9b70cb3f592dca681023526e9997e90d977919213
+
 [http://repository.maemo.org/pool/maemo/ossw/source/o/osso-screenshot-tool/osso-screenshot-tool_1.20-1.tar.gz]
 md5=d07be50f058ef53fbdc5c1720f26b9ad
 sha256=c01553daef241e425afd17f421f0cd2b8bf8ba03f55f5a3e30192c36511aa199
@@ -9786,10 +10898,22 @@ sha256=c01553daef241e425afd17f421f0cd2b8bf8ba03f55f5a3e30192c36511aa199
 md5=27e905aad10d3e29f03a7d1d1180ea3a
 sha256=90c601d2ed52b2ce967e76678894e74569f59104614cf35de20dab78eb0144b5
 
+[http://repository.maemo.org/pool/maemo4.1/free/o/osso-systemui-dbus-dev/osso-systemui-dbus-dev_0.1.2.tar.gz]
+md5=f172f015008a10de78097b969c98f14b
+sha256=185e27dc0481056be87088b4abdade9f52e0be65e556565541567604703132e1
+
 [http://repository.maemo.org/pool/maemo/ossw/source/o/osso-thumbnail/osso-thumbnail_0.3.1-1.tar.gz]
 md5=95d35782e17404fa4c4b634ed7cd898d
 sha256=bec82e8b1b695f14403931a61ff438ebb62853a398598b540faabeea5fc774ad
 
+[http://repository.maemo.org/pool/bora/free/source/osso-thumbnail_0.7-1.tar.gz]
+md5=8873509c136c0a14105c0201ae792186
+sha256=dd9b3210a6f3168f7cf2c5ee1a36f7f19fd6f3dd834681cc561c813303077ebd
+
+[http://repository.maemo.org/pool/maemo4.1/free/o/osso-xterm/osso-xterm_0.14.mh12.tar.gz]
+md5=dadb84bbea954dfc1b38bc9760209fbc
+sha256=56f7a4c8ed79a7f00d171a83b6c0be7dc508c21f809d15dfa89887cfc9c40c2d
+
 [http://erlang.org/download/otp_src_R11B-1.tar.gz]
 md5=1fe3707d9bed898bc51444cb529fdd79
 sha256=d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7
@@ -9814,6 +10938,14 @@ sha256=8db9b3948c607315f0ba0df61b32f747bec5479c38051d3e0e55b31b82c81af5
 md5=7f54ae7ebe9adbefc2a2ad55c62589da
 sha256=2c23dac41ef0ec0b74b38c4c1dc4b0f6f21386c97a0062a745a2896cdf026e8d
 
+[http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz]
+md5=d2943e4469834b25afe62cc51adc025f
+sha256=06a17727d56d382a69036de2ed9aee9a15cac0329b995b8cfcd69b357f47bf2b
+
+[http://0pointer.de/lennart/projects/padevchooser/padevchooser-0.9.3.tar.gz]
+md5=6a9b52ad349f3fb3d5a3ccdf85958710
+sha256=3238f19ea5a3c54efef31e4f86c712232c92704d68c9d2bbef0339ba9b4cb674
+
 [http://handhelds.org/~zecke/oe_packages/pairs_V1.1.1.tar.gz]
 md5=399e794dde87508b4214f1312cd79d06
 sha256=7526d8de006817e5c6bc79826f810a15490611dcbd2d4fb9d8e9b9991c7ed506
@@ -9978,6 +11110,18 @@ sha256=b7cba2e38e81abb4d1d33c3f7f7c028310b392d5ee1ed5e3b2137e024598d903
 md5=b220d8b8489003f3df03d897fbefa432
 sha256=f85096df0acc179f676497e75b9ba8d9b8685b92b0b2b8b1d6871619ed879fbd
 
+[http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.20.bz2]
+md5=08b2c1e9759ca409a0d2ca49db1bbedb
+sha256=0417fc3609f5746bce6016862e7f83e83e98e17e5ae77887bf66b37748ab261c
+
+[http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.6.bz2]
+md5=a42300de8720552d70470dd3e4afc75f
+sha256=808ca62a66d7cfe40123301c2f51fc0dcd817ee3bb0df96d1e9e97cc3bad6a9c
+
+[http://kernel.org//pub/linux/kernel/v2.6/patch-2.6.21.7.bz2]
+md5=b9c8734471a454806c77f040fcf9869b
+sha256=5ee24e1c5636bcffed155b1c01d7d09fedb135fa2458c190a0da03a82c8c2f60
+
 [http://kernel.org//pub/linux/kernel/v2.6/patch-2.6.22.5.bz2]
 md5=27544a58763bbd4ce497a77658af744a
 sha256=0f96188e8d1c6e0934f8e8dc2455e1f94a47c10cb17268364bcd77df68c83c2a
@@ -9986,6 +11130,10 @@ sha256=0f96188e8d1c6e0934f8e8dc2455e1f94a47c10cb17268364bcd77df68c83c2a
 md5=e89c566908bb21e43937fe8bc33062c4
 sha256=126057524ae9707137b0c478753edc8072e1710160b0604a43e4625d0fde519e
 
+[http://www.muru.com/linux/omap/patches/patch-2.6.23-omap1.bz2]
+md5=d23e6c5bb8294d61f0d9a4957c22eb20
+sha256=c2085fc8fc6df586ef8c19a4562b84162f0b77956d691aa4fbee5e90c9800cb7
+
 [http://kernel.org//pub/linux/kernel/v2.6/patch-2.6.23.1.bz2]
 md5=896c5d4e7fd68d37b8c16e5d2842563b
 sha256=55e811b4d4b0cbfde500bdd5455b7180d3def3dbdc52314520b7327d32b23f42
@@ -10010,6 +11158,18 @@ sha256=95880162dd0839d9b509152e34cf9356b051dff7daf2216ff50474efbe68f6c3
 md5=527687c63f4252989dba6fb92baf9707
 sha256=1daafd156f00c2b3b7981f197465d78e689fda506054d011ba0da6513319fe2c
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2]
+md5=0c1c5d6d8cd82e18d62406d2f34d1d38
+sha256=b6bbb0dea427aa733c37d58a94b819b523c8649d7605f498348de159380c28a1
+
+[http://kernel.org//pub/linux/kernel/projects/rt/patch-2.6.25.4-rt6.bz2]
+md5=be6ff6fc5eb746e66a1a15629d05bedd
+sha256=513dd1ef58c6f3b2668731f078fb16df2e2152f5a7b66d153c2d41c4dca5b186
+
+[http://kernel.org//pub/linux/kernel/v2.6/patch-2.6.25.4.bz2]
+md5=f12f43dd78b765f3d1402aa9d2170cf5
+sha256=5bad39b0d28f294f10690d15bc1e54ba549324a7ce26db1406f3c3a50cd1d504
+
 [http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.26-rc4.bz2]
 md5=b5f96d823b1183ba0c4e61516e1a23c0
 sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc
@@ -10106,6 +11266,10 @@ sha256=6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925
 md5=89fc389191d9611b314c3fc23235377b
 sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094
 
+[http://downloads.sourceforge.net/pcre/pcre-4.4.tar.bz2]
+md5=89fc389191d9611b314c3fc23235377b
+sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094
+
 [http://downloads.sourceforge.net/pcre/pcre-7.6.tar.bz2]
 md5=2af38e083fb90ef60fa9eda7cc290e86
 sha256=362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735
@@ -10162,6 +11326,10 @@ sha256=3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
 md5=e6029fafcee029edcfa2ceed7a005333
 sha256=e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1
 
+[http://us2.php.net/distributions/php-5.2.5.tar.bz2]
+md5=1fe14ca892460b09f06729941a1bb605
+sha256=5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
+
 [http://efault.net/npat/hacks/picocom/dist/picocom-1.3.tar.gz]
 md5=21865bf2891222082afc44afdd80aeaa
 sha256=ed3e0190a1940cf08a167429aa3fd25b3ae7313fdf126f851a9abccc89845ee6
@@ -10170,6 +11338,14 @@ sha256=ed3e0190a1940cf08a167429aa3fd25b3ae7313fdf126f851a9abccc89845ee6
 md5=08fcc5f6bb9e7676a2569386d5ea9f70
 sha256=437c5fac2376e416b4427501d1b074da5aa6b8fea756a0d61aec22686f025721
 
+[http://downloads.sourceforge.net/pidgin/pidgin-2.2.1.tar.bz2]
+md5=f1703430d4b8ffc96b493fc36cd46131
+sha256=6efbefe325f6eab711a5fbdc4b758b4585a4cda68c98dd2e11ccfc8d98075823
+
+[http://downloads.sourceforge.net/pidgin/pidgin-2.4.2.tar.bz2]
+md5=2d10f9b6a5f0162cf88016ea2ca0a36d
+sha256=3f09878883c6980083e7774371ec57d8bdc320a325342965afb120d52780d15f
+
 [ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z]
 md5=75af127948cc0c701d424d22d621f792
 sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4
@@ -10186,6 +11362,14 @@ sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4
 md5=fb23e17a8a0308e8fad6dc153753ba9a
 sha256=2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4
 
+[http://cairographics.org/releases/pixman-0.10.0.tar.gz]
+md5=41804ac38025102dcc9891dfd4a3d105
+sha256=48625f6b5ce130672942503c683d306d957ee40f59f8e59be6ca30a245ad47d0
+
+[http://cairographics.org/releases/pixman-0.11.4.tar.gz]
+md5=8c8afc259af61d42aa9b3d8ec5a9a03b
+sha256=d034f4afb4329c38e8789a5a7a384194c7402094b4c2b7600d2d86d8589e8571
+
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.5.tar.bz2]
 md5=f9fea77e46ec7a3a16e925e137f146e7
 sha256=a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8
@@ -10234,6 +11418,10 @@ sha256=5ae5e9816bc8503b768f831f058bd1c379bb821e8c0776015ffeb998e1d912f8
 md5=65408ad948c0b9e21dd5813e68ef76ad
 sha256=74c83c3283178656a6fc1ee571fb1ebbddda8f3b7c32ad405477ae278b0cf867
 
+[http://downloads.sourceforge.net/cmusphinx/pocketsphinx-0.4.1.tar.bz2]
+md5=8c1bc9d5bdd6f6298222125669d16e1e
+sha256=5a31aa10668b93e8283c58592b46368c26aa92e097cea0bda9b0554042bd6643
+
 [http://www.rpsys.net/openzaurus/patches/archive/poodle_asoc_fix-r1.patch]
 md5=7c766563674dec668baa5f650a14b7cd
 sha256=3f78e714248cdaa0b83f530a3b7f80da02446b179e86fbb043d57c3e05ae0d7e
@@ -10270,6 +11458,10 @@ sha256=e87d44d5a77c591db83598295109c033708a458797247a31cfa20d54c52d7b41
 md5=e897eb0dc64c2862091f97e20f580de6
 sha256=66283a36122d77a4118a1b2e48af92c03ae09b3e53fe7875e7fe3db1486a522c
 
+[http://www.rpsys.net/openzaurus/patches/archive/poodle_serial_vcc-r0.patch]
+md5=6db3d4256756ae8d209a2d7623c6d71b
+sha256=796f210200129e478bcb0f9c40c09998f2c47b346d4c734d94756e84989fd8b3
+
 [http://www.rpsys.net/openzaurus/patches/archive/poodle_ssp-r1.patch]
 md5=8efe67bc46564512bd1de09fce5971ab
 sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8
@@ -10278,10 +11470,18 @@ sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8
 md5=053fdfd70533ecce1a06353fa945f061
 sha256=ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
 
+[http://poppler.freedesktop.org/poppler-0.6.4.tar.gz]
+md5=13d12ca4e349574cfbbcf4a9b2b3ae52
+sha256=54269075e4d611a61792a374986e920744c8ca39c2df45911233873c7e714354
+
 [http://poppler.freedesktop.org/poppler-0.6.tar.gz]
 md5=96883867572aa1e55e979ec75369c562
 sha256=ef4bb8fd1bb4dffd5dc689509bf3e33260774550425ee78995a8d0297f76bfae
 
+[http://poppler.freedesktop.org/poppler-0.8.4.tar.gz]
+md5=29d341f295d01bff64c63a29a6abb274
+sha256=45bd5740b07e6c15db9859a5ee82e2acc9eeec62be537735ae5872fc3648257a
+
 [http://poppler.freedesktop.org/poppler-data-0.1.tar.gz]
 md5=5c700eb06dda9dafec09cd85225e34d4
 sha256=6bd37c49ab4b22c67ab457c531f841968a3acdebbf9361acea7d7275c903dbc5
@@ -10338,6 +11538,10 @@ sha256=78c03b41d75f7402a63a5e5e13f3690005411a85299bc6ec9edbe04888db6d18
 md5=a65bdc5d833169d28bf6fbaaa8d57fcf
 sha256=ac7e7d311b07abd27b084041bcc943398df303bc86601f281891537bdf1a4e0b
 
+[ftp://ftp-archives.postgresql.org/pub/source/v8.1.8/postgresql-8.1.8.tar.bz2]
+md5=b05e1d7f0cac9cc4e096aa21409dee55
+sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3
+
 [ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v8.1.8/postgresql-8.1.8.tar.bz2]
 md5=b05e1d7f0cac9cc4e096aa21409dee55
 sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3
@@ -10354,6 +11558,10 @@ sha256=99a9737480224be47362387d2d2389bee61d7685510b3a161b2b1db6c0556c26
 md5=9c7131bce36bbb3e8b688478e8dc34c7
 sha256=44ea3e6777c471a514d1e0a53b60cd5a4e2e56802ba23ec67331b69f122ec3d7
 
+[http://www.lesswatts.org/projects/powertop/download/powertop-1.10.tar.gz]
+md5=e09f631f60d50299d8885193e6fd3756
+sha256=cc60000bbe5f4d7b9beae8a84e1cd1ba69339a489a7d1a7365a3d8fe8fd73d6b
+
 [http://www.linuxpowertop.org/download/powertop-1.9.tar.gz]
 md5=7e2cd799941350a45586edac43760ac9
 sha256=41899a12c3436a3e623744f41b459d4a7a7aa96da32b22a3b301037b54062594
@@ -10490,6 +11698,10 @@ sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
 md5=669d52a70fb9a7a83c2507005bfa2a6f
 sha256=b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64
 
+[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.9.tar.gz]
+md5=8fa6f7a9611bb194d94311764022b197
+sha256=9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
+
 [http://www.warmi.net/zaurus/files/puzz-le_2.0.0.tar.gz]
 md5=76535893b779926874f618d3fbf3e92b
 sha256=e4b4217b81ab0885db11cf7e0f18afdeaa969392fc15647a10c2aab9cbf583d8
@@ -10650,6 +11862,10 @@ sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1
 md5=8e00f5154401a6f6d99efd20606e2819
 sha256=9a444518252f6d747e76a219e5efbc05b4e1742260a7419da9ddf93a519b30c5
 
+[http://org.csail.mit.edu/pybluez/release/pybluez-src-0.13.tar.gz]
+md5=eb38d423b49255a7b9f5ba1f50844b53
+sha256=d8e41f48c86403cb7fc8d0880a207c53a9e4ba6b6eab2fe8870c346567fa3a03
+
 [http://org.csail.mit.edu/pybluez/release/pybluez-src-0.2.tar.gz]
 md5=f51efe7a299ce1ecbf1a017a4dda11c8
 sha256=c16ac8a27af4fae6ef3f07cbd4da70bcf5b1be11dc664312f5c1e4d69c587d0a
@@ -10706,6 +11922,10 @@ sha256=83787be6e11f6c7a45c111fa37f674a153274c45c2ab3f4b38b3b6dad933fcda
 md5=009986021225b7ea6e0ba848707785af
 sha256=efa81e0281668988b8cc2af9d0546befa4365662f1ebec37e0c7c863e969da41
 
+[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-2.14.2.tar.bz2]
+md5=0e9e9300e81847f4f7266f49d3bebbaf
+sha256=79c5d3ab8f072f1d0b102b2bd6410b0dc383a008b5efad1750d8b6dadfde8c6e
+
 [http://downloads.sourceforge.net/pygoogle/pygoogle-0.6.tar.gz]
 md5=334e2d9e5a765ffa9769e2c4cdfcd110
 sha256=ad3f4530977a15e52b379ef301a4a80cf69a883f24dd6cebc5b47b3009c092a4
@@ -10842,6 +12062,10 @@ sha256=5795b9d619142e2d01016130c7ac71298aa1cabda4806f11762bb8fd489293af
 md5=6591df8e9270eb358c881de4ebea1262
 sha256=4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5
 
+[http://www.bellard.org/qemu/qemu-0.9.1.tar.gz]
+md5=6591df8e9270eb358c881de4ebea1262
+sha256=4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5
+
 [http://taiga0818.hp.infoseek.co.jp/rpms/qfish2-1.1.0.tar.gz]
 md5=2a8219bcb375fac66cea66394c3c36fa
 sha256=1e097fdccda0fc914c8229aab7d83964c5944cc95eb053fd69e357dca69461b9
@@ -10958,6 +12182,14 @@ sha256=a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4
 md5=022d7a3c572b554f3c47b12cae71a8a4
 sha256=a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4
 
+[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.4.0.tar.bz2]
+md5=e17ad8c9dfecc95a3fd2bd5ed1d7bd3a
+sha256=79945d06de16736d14210139e8e68cf29f8ea312190d2375507511f367a2f872
+
+[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.4.1.tar.bz2]
+md5=491d41cae681a2bab2656f8adc3ba503
+sha256=37274eff0b7cfb6f5a01e2535639ccd3eb4e9c6b27902d1f3bdf68a705c438d0
+
 [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
 md5=05d04688c0c0230ed54e89102d689ca4
 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
@@ -10994,6 +12226,14 @@ sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
 md5=19678fe35170559cd6a6fa531c57799c
 sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570
 
+[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.0.tar.gz]
+md5=f13ad0aa75efad314715930e663bad55
+sha256=4d1a5bf6a4e85eea83ef3e73d994f74cc4dd979e1023eaedef8da931ea37833a
+
+[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.1.tar.gz]
+md5=b09decad252b5181f300135e3122481d
+sha256=5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386
+
 [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz]
 md5=9519eccf0638c9962f73a7b20da77e0e
 sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
@@ -11006,6 +12246,10 @@ sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
 md5=70b729dd5dd8b2b432d685918e1971f1
 sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
 
+[ftp://ftp.trolltech.com/pub/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz]
+md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f
+sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d
+
 [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz]
 md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f
 sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d
@@ -11030,6 +12274,10 @@ sha256=a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a
 md5=28405a79f488570bf4e2e8d453f856a0
 sha256=5cd896faae49268327231f299a1187a974cb85acb509fffe8a60b84693a7e3e8
 
+[http://katastrophos.net/zaurus/sources/quasar/quasar_0.9_beta3_sources.tar.bz2]
+md5=97814471766f333e8642d338406ac9c5
+sha256=8a1a1e67980fb664f12dd99851cb600b970371bf35bb5e3242ef4d341877e80f
+
 [http://download.savannah.gnu.org/releases/quilt/quilt-0.39.tar.gz]
 md5=34f0c654aefba0342db6c676988634b5
 sha256=06b32d6f8fe7065b4c2c8142a244374e1be963757125bac20ba016b92231b5bf
@@ -11094,10 +12342,18 @@ sha256=e754605b72b5498d11207920291d0eed6fa78ad46d3b9ad018cff9bb480224ea
 md5=37478b1d3e76ea521aac22216582ec58
 sha256=0cbfb4b3940ecc9e351bbd72b5a9c53af050f2f5f63d500e8ff714ab6c91e447
 
+[http://downloads.sourceforge.net/re2c/re2c-0.13.1.tar.gz]
+md5=d6168a6c18d5912e98d9343b33fdad97
+sha256=1a47035dd0f283dbc6c0964679afdf6f2c975b462419d1880ac379dc880ba74a
+
 [ftp://ftp.cwru.edu/pub/bash/readline-4.3.tar.gz]
 md5=f86f7cb717ab321fe15f1bbcb058c11e
 sha256=eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
 
+[ftp://ftp.gnu.org/gnu/readline/readline-4.3.tar.gz]
+md5=f86f7cb717ab321fe15f1bbcb058c11e
+sha256=eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
+
 [ftp://ftp.gnu.org/gnu/recode/recode-3.6.tar.gz]
 md5=be3f40ad2e93dae5cd5f628264bf1877
 sha256=e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf
@@ -11174,6 +12430,10 @@ sha256=72df7c8fe3ea2177adcb9442fcc49dfde75231abf0300844bf4551393cdd42b4
 md5=38f159681196b566f20bf837aff1e8f8
 sha256=4e5f63d8488b0fbd1a709429feb797c8c679de48f47ef93ab4741f8506830667
 
+[http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.1.tar.bz2]
+md5=255222b3ab3af671289a6b4844e9f393
+sha256=f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/rgb-X11R7.0-1.0.0.tar.bz2]
 md5=675e72f221714c3db8730daf0b50f69f
 sha256=97aa9c7c1f7f0ef29d6be741a421f92ca27662775c7a5dd7734c38137ff0f82a
@@ -11198,6 +12458,10 @@ sha256=c3ab591b02afbb5b3f76a0c1406c607b9561138bdb0a62105981de559d2920dc
 md5=63d503191eabed630324c104cc024475
 sha256=1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25ec2b1e
 
+[http://downloads.sourceforge.net/roadmap/roadmap-1.1.0-src.tar.gz]
+md5=773c1e4291177c5b7a887763f6cb83a6
+sha256=bfaa36f246dc01775268644c153a2c65f5e2009b45d19f72e3d06c83c59d3aed
+
 [http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz]
 md5=749f5923a146f0e29f2bce127f09c2af
 sha256=2d544f4205cc42b4da2cd39ca589f2c826f56ad106e571450fc2694666440a92
@@ -11230,6 +12494,10 @@ sha256=d6bfdee4fd31c0e0089c6edab594eefaa5b7b95f0b783f1156dffadf1a90d820
 md5=f25df2d1bc2d99536eba334778804632
 sha256=413523cd8ebd4429c192c5cab7a85d017655b32f21a9c261169597180889b370
 
+[http://www.claws-mail.org/downloads/plugins/rssyl-0.15.tar.gz]
+md5=1fa701df95bb538fd0f0bf18d51534c7
+sha256=ed783c3141176ae84b7caec3f76cb483b09cf5c6fbc675abcdaaf5970ff0a4f1
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/rstart-X11R7.0-1.0.1.tar.bz2]
 md5=6f33a1bd8e99372b7544ddfcad456369
 sha256=d662e932154df4d99ffcf29cd1efe5adb7b0eb1841ccffe9155b9c5d8055434c
@@ -11242,6 +12510,10 @@ sha256=9aaff97266bb7725c967abba81506644edee96748f5823bb1864ce8059874e97
 md5=996d8d8831dbca17910094e56dcb5942
 sha256=ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
 
+[http://rsync.samba.org/ftp/rsync/old-versions/rsync-3.0.0.tar.gz]
+md5=2122d460b4119749c6e5993938a9b501
+sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169
+
 [http://downloads.sourceforge.net/nogravity/rt-nogravity-data.zip]
 md5=c7536e907363ea1da63430b49e42931d
 sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29
@@ -11250,10 +12522,18 @@ sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29
 md5=f4131d670920a878b4d4a0f5d4d8b93a
 sha256=a677291149687339396fed06c46cc08fd76fcb62d0f4459cae02c6cf54b4eb39
 
+[http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt2570-k2wrlz-1.6.1.tar.bz2]
+md5=87947cf1868ac37d4d756f3585dbf1e6
+sha256=11d2c4a1b69a4b2b49811128a41c33f25c71e590b019ace392761598ca3d419f
+
 [http://files.chumby.com/source/ironforge/build396/rt73-chumby-1.2.tar.gz]
 md5=0340e1ceba72330111e6fc85679c75bf
 sha256=94beb93da6dabd16892c899f496eeec745fc69b856abd0d19896b2a4b0fb7c72
 
+[http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt73-k2wrlz-2.0.1.tar.bz2]
+md5=121e2ed57d01e04f82e942c502b1ca75
+sha256=e04718f3989bc567bf185cacfb27e324218cce5f5c87fca65328e49a3b56e603
+
 [http://music.mcgill.ca/~gary/rtaudio/release/rtaudio-3.0.1.tar.gz]
 md5=5b60500bc9605d2409b71124e48aa929
 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c
@@ -11290,6 +12570,10 @@ sha256=04ecd2577ee0c210df610b4a5d870f2bda57c80962fb5b51ae9c4a94098c726c
 md5=7a0c73ccf0e31808ad37b61e730cd10e
 sha256=33d2363d40b1db7568864dc063ce4af70e50a9f9292a16445f0b167618d8fbba
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-udc-r2.patch]
+md5=1b8cfd298b9fa10c4779c98fbe8e0bd3
+sha256=564d375388284d7f13003202cba9fc1976b045bd14b3f12adec1449cded33f26
+
 [http://sablevm.org/download/release/1.12/sablevm-classpath-1.12.tar.gz]
 md5=ae8788df73ee0c2dd1ba8ed0f6d9b817
 sha256=1e50e20b9f597235709eadda23e6d15d3cdd5e63dbfeed6f50aeb5a85b31c405
@@ -11318,6 +12602,10 @@ sha256=88049771c0d48e69b24f7234b2e4400bad53e6d9948d834aff9d563aac3ea8ca
 md5=9cf2bcef71509a81687dec8732545400
 sha256=550429c7b22e58f4874dece816003ee0b769edbf2030d95aaee8c58588fbd60f
 
+[http://samba.org/samba/ftp/stable/samba-3.2.0.tar.gz]
+md5=318d5b1ec0507f0f6077b1470f9fc028
+sha256=63b744141982d15691b23e3bbe2114d3724fe9bc96c4605d97720bbfa560794d
+
 [ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.15/sane-backends-1.0.15.tar.gz]
 md5=3b804f35cdfbc5ad2d201ffe078bbac9
 sha256=89106b5bc5a66ca0eaf4553371c89ac8542a757964d7a91c07b8fb77e040eebe
@@ -11370,6 +12658,10 @@ sha256=2068e0dc61189a37487dcf432909540e30579e452907ccbbd97d914fd0e06911
 md5=e9a69f7014cad332cc78667b07eebbce
 sha256=0e966359b9e1de31bf375b2a982b7f63cc6dd0c253bda480d1913c668791972a
 
+[http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.20.20-v22.patch]
+md5=0fd84a82c51f67d2d0531aab78f66d2a
+sha256=fc5cd165ecc07d2e254412f39a17a26a753bf081a0e02ed5db0b02d2f6bacc6f
+
 [http://downloads.sourceforge.net/schrodinger/schroedinger-0.2.0.0.tar.gz]
 md5=45f8d0efd9b76579a005e4ffe7f96ac3
 sha256=0b01f9fb9c869ecb6e066993d59e34789f82d445438480ac0e2dc30f29d047a0
@@ -11398,6 +12690,10 @@ sha256=c426660739a93f94364de29cde222f7c3621364d9843b52c91735ba8b6a81c62
 md5=8f8725fa9b3385042115e84a06866ce6
 sha256=c426660739a93f94364de29cde222f7c3621364d9843b52c91735ba8b6a81c62
 
+[ftp://ftp.debian.org/debian/pool/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz]
+md5=659bf15bbbb31817ebad9372c8827618
+sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/scripts-X11R7.0-1.0.1.tar.bz2]
 md5=b5b43aa53372b78f1d67c86301e3dc02
 sha256=b502bc765cffc23189b77ba4d22e843fe03404bfab4e24b97ff4daee58176b33
@@ -11430,6 +12726,10 @@ sha256=29007f54d9e5a37a3da9f51670de7828dde9a3559beddbdd5c2f59796fb220f6
 md5=5eede9c97d1883f80770a3e211419783
 sha256=5824f67aa37b00fc8b92ac4fcc413a9a7d868174dcd6df580c4d706807e4545e
 
+[http://downloads.sourceforge.net/scummvm/scummvm-0.9.1.tar.bz2]
+md5=30a82ad466bae223875e66ee14b94904
+sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
+
 [ftp://ftp.debian.org/debian/pool/main/s/scw/scw_0.4.3.orig.tar.gz]
 md5=4c9fb66fa496cf32542e92f32f821818
 sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45
@@ -11438,10 +12738,18 @@ sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45
 md5=c572e7842fe36348f5b2972c1025a75a
 sha256=138d2e59569f76f1a5d35bd5d85e7006eeebc4f48cd3dac902e2824ed50c3d80
 
+[http://downloads.sourceforge.net/sdcc/sdcc-src-2.8.0.tar.bz2]
+md5=1b9c2e581b92d5e3f13bca37c5784080
+sha256=cbb035699d8910c7ca2fa360a773504b44165e98042ed8c208fea2fe47a96557
+
 [http://repository.maemo.org/pool/maemo/ossw/source/s/sdk-default-icons/sdk-default-icons_0.2-1.tar.gz]
 md5=85ccc685b72f6f77da8a4b0ef7c5281b
 sha256=8dcd3aac06f24111461433353015cd36bfaaf45b74ff9aa336713759b6759b0c
 
+[http://repository.maemo.org/pool/diablo/free/s/sdk-default-icons/sdk-default-icons_2.1-2.tar.gz]
+md5=4c792ca02cb3cc971879ea0dcfd304f9
+sha256=96366d20b0fcc7b7be638b666635bc77666ff7f2acef33802d3a396806b87441
+
 [http://repository.maemo.org/pool/maemo/ossw/source/s/sdk-default-theme-config/sdk-default-theme-config_1.0-1.tar.gz]
 md5=ed7202fcabcce02a41225906deb0c682
 sha256=1bc620973aa9448c7374e5c673f21b11f60abbc1d887b9719dd4a90cb99bea64
@@ -11506,6 +12814,14 @@ sha256=7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a
 md5=c4867d72c41564318e0107745eb7a0f2
 sha256=7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a
 
+[http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-0.6c6.tar.gz]
+md5=e3d56d4d19776042607cbbecae823c8b
+sha256=075172b39f0933d3fbd1d4e90f29742c1402a29da26db04357eb18fd46ffd6b1
+
+[http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-0.6c8.tar.gz]
+md5=0e9bbe1466f3ee29588cc09d3211a010
+sha256=96667a84cd8c7af103ca07fe6b41f7c1494a0ab7300335f7ab18ab49c3203e37
+
 [http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.0.3.tar.bz2]
 md5=2b53542095a35a8a5731164118643883
 sha256=086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508
@@ -11534,6 +12850,10 @@ sha256=6febe616fb850f4319efa7017312abb796024e7ac20da37c4d2ce34afa41776c
 md5=b3b4b45ef3f76f720fd0c389f131dd4c
 sha256=d933caa25caacd57dc8b37f68d222acec3ba3c9d076828d34f006499f6301fb2
 
+[http://freedesktop.org/~hadess/shared-mime-info-0.51.tar.bz2]
+md5=01d72161f7d88123fbccd378871f02f0
+sha256=1c247e03418d6b90bcbc0da6c1abe6ac9cd5bacf9c3a2f3b6105376cf7b0eed8
+
 [http://www.do13.de/openzaurus/patches/sharpsl-pm-postresume-r0.patch]
 md5=bbca81d1c527d833b8e11a0d28275ab2
 sha256=947e7bfe44dad0caf8dc857b40fa840a316cc0d9b97aafefd134ef1fdb87753b
@@ -11546,6 +12866,10 @@ sha256=0e87278dcee1d69d3bc44a3f028b4a73b78ceed3c0ba5ab174e6d2f4066bc4db
 md5=416c6db0f2358ff9b88853dde2d6823f
 sha256=6c862826f6e0f72bb96ac7fca76c8118af65e65702dd55060d1ec06765f5add8
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sharpsl_pm.patch]
+md5=3cccf791dd1bc42fdb5a7a0e06086c09
+sha256=63028be5190d144538ab5fa8c1d74035424e5ae793d3abb4c5649665e31fd67b
+
 [http://www.rpsys.net/openzaurus/patches/archive/sharpsl_pm_fixes1-r0.patch]
 md5=aeea5a2614fd8f9ae7d729d1ea1dddba
 sha256=1bd129c7a68537533c77267992eaf490ff64bcc3d01c6f4b51343b8f266ae99e
@@ -11558,6 +12882,10 @@ sha256=0d48ffe4d801180c15466f20aaa5802adb9d22067e8941e051dc3c64717ec3c2
 md5=001103f5847e71b0198c3a11df7d62d0
 sha256=17cebdc8ae4374c3944a3233d86278f4d09aaf90279b48e98367e9387f7e6acc
 
+[http://repository.maemo.org/extras/pool/chinook/free/source/s/shishensho/shishensho_0.3.0-1.tar.gz]
+md5=5a1b79ca2441a6f4b32d294855f05c47
+sha256=feec48d2d79aad6d5c7daa911702fccb3dce18ac2e1ee23341d135275ce2a719
+
 [http://www.shorewall.net/pub/shorewall/2.0/shorewall-2.0.9/shorewall-2.0.9.tgz]
 md5=4d0f756b5b63a68593b2de560c1a5b35
 sha256=06064e929423b1bd60a31652d2a31763dccc48e86ea9cdefbcadf524df2bd3f2
@@ -11726,6 +13054,10 @@ sha256=b8049142742cc81bc945aadefb40d173aeb447e428ec62a93e781032ea9b40c2
 md5=c6f272e1f03e79add70f75fa52916005
 sha256=f7066bd1ed417200f975679fa8eb652a86381ae533a394d68fd73b911ed89a43
 
+[http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.6.6.tar.gz]
+md5=bbd7ebc5b0f1b3ec4d89ad66b20d5cea
+sha256=c664ee801d1bc0500ae75739fa98bcc8ad410474c98a6757d3d1ee24a8241462
+
 [http://downloads.us.xiph.org/releases/speex/speex-1.1.12.tar.gz]
 md5=1bd6cdf3a0ebabf818cd72a3401e2610
 sha256=77c8505bd9b73192789770299e0a727fba9c1d556d853b8cc473bfee393709f8
@@ -11746,6 +13078,10 @@ sha256=77a3609bf1762f533461c01ef3485d0c9382fa54ec05204f0ff157a4789ce7ab
 md5=5ff76b3a4799405ad91e88331eb938bb
 sha256=ffb5e646d98c058ad2f1f0d7738b39e29fbe432981b1b5d9c8a79cdcb168c3c6
 
+[http://downloads.sourceforge.net/cmusphinx/sphinxbase-0.3.tar.bz2]
+md5=17610af80be230e5760dbb25690a45f0
+sha256=b5817b8629f89e16ba88e1c62dce0321978f3aea038aa77cb61a1ff7fa3e0dbb
+
 [http://www.rpsys.net/openzaurus/patches/archive/spitzkbd_fix-r0.patch]
 md5=d69c74ab8e2d7664a48a09773450dd27
 sha256=59e2b9b2244c169c6580cbfffaf5e2bd2f453753f879036487ec6ed116cf851b
@@ -11798,10 +13134,18 @@ sha256=0ad86c4b26cd687122b158bf848f0a07d7cd644033d15c4f43b6d643bd74cd81
 md5=b4f631268d811189cfca1d5259cb5dd8
 sha256=af0b4ca361435e54316ddf715737b5b94c737c41e3c0b0e6d66ee8a8938f4500
 
+[http://www.sqlite.org/sqlite-3.5.4.tar.gz]
+md5=f17da840eed792e896c3408d0ce97718
+sha256=47daba209bd3bcffa1c5fcd5fdfc4f524eae619b4fa855aeeb1bbbc8bd2bb04f
+
 [http://www.sqlite.org/sqlite-3.5.6.tar.gz]
 md5=903c9e935c538af392364a9172a3d98d
 sha256=1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb
 
+[http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch]
+md5=cfdb5caec0326a3ced8b4159f602c94f
+sha256=a7e784b151b25ca724bb7c9611b07cd9a9f3de12014ee80fcada7dd9a8248f53
+
 [http://downloads.sourceforge.net/squashfs/squashfs2.0-r2.tar.gz]
 md5=0b7fcaab8e634ae2385984885c731082
 sha256=353b768294783959219f1203e76c128fb4c75fa37f3a3bb139603c5db55c6974
@@ -11858,6 +13202,10 @@ sha256=7071f0384a423a938dd542c1f08547a02824f6359acd3ef3f944b2c4c2d1ee09
 md5=9c05c1831449219d063e803e3cf1dd88
 sha256=06e1f846b47c3b3b702b65489bc7d4d4c6b9f499609f4aec4556cb5046729202
 
+[http://repository.maemo.org/extras/pool/chinook/free/source/s/statusbarclock/statusbarclock_0.8.tar.gz]
+md5=1d1a700b695798f2e88b63eb8e811e99
+sha256=262e2cb0e3f98891b3216df838a0257fb6675b0b98be8084bfd43843cfc234b4
+
 [http://downloads.sourceforge.net/strace/strace-4.5.11.tar.bz2]
 md5=28335e15c83456a3db055a0a0efcb4fe
 sha256=9de428477d4d3f383d58c2f16b2544da2a5ec0acc50ee90ecb81dfe38f56edb8
@@ -11922,6 +13270,22 @@ sha256=8f2275d9667909d3418213522d5d4ef3312c158190429062f79da6b982b9ce6b
 md5=157d31c9dc02aa22b5f27323e5a203fc
 sha256=c31d3bbee984c7971d2b24cddc279d8ad65edff8216778d617484c147ba3ae3d
 
+[http://swfdec.freedesktop.org/download/swfdec/0.7/swfdec-0.7.2.tar.gz]
+md5=7624b5642c947fb054273f091a1d970c
+sha256=c6b2ee967ae04776fd60a47dc283570917e387dbcffc907a0dfc91f567c139f7
+
+[http://swfdec.freedesktop.org/download/swfdec/0.7/swfdec-0.7.4.tar.gz]
+md5=08fcda4a46454bfc66b97fba2d385f8c
+sha256=4345da2a4790125bd7205bd10a3326bf94e36f97229850b99ec9e8f050a9ab4a
+
+[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/swfdec-mozilla-0.7.2.tar.gz]
+md5=3bc6a49357b4b8b478ce3dfb4f007f18
+sha256=84962251e647fdcdcf111bef0c478f7d3679ae104267ba72e59ad749c6955cc2
+
+[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/swfdec-mozilla-0.7.4.tar.gz]
+md5=c5958f3b003190b21977495021ac2b28
+sha256=0d7927f2e791321b2867c120eb4140d9017c59b77925eb909b2a03f3ef2a8fe4
+
 [http://downloads.sourceforge.net/swig/swig-1.3.29.tar.gz]
 md5=44c6f6d8d724cf7fa4a5109e6f63c9b1
 sha256=68b1b032cdc6297f068ef8c3c09abdd46a08512e17705d477cc0bf7b80a550e8
@@ -11950,6 +13314,10 @@ sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
 md5=e1f1af8c2add8310d0bbcddc9af523b8
 sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
 
+[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip]
+md5=9473375f7615814025a5b66ee6a8400d
+sha256=b9eaecd9edc58291c5b2c0d8de6a1ce0677b442d63edccd52dd3080da0bc55dc
+
 [http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-2.2.9.tar.bz2]
 md5=45e9e89775613b0afb732fbc11c73d26
 sha256=72a6ab7c8a0baf0d1d432929c19a7d096335ba4adc43e40488b6a77e5995a0f5
@@ -11970,6 +13338,10 @@ sha256=03e3dc79fd7b36266372de0d331d792c04d185e57495c6fb1d46a0ea0ed0b04d
 md5=b7857c045ef3b4810c9b8be965c05fb9
 sha256=d162ddc4f4a29c770549cb135da179e205480c065739dbe6c3c1bed6d84a3060
 
+[http://downloads.sourceforge.net/linux-diag/sysfsutils-2.1.0.tar.gz]
+md5=14e7dcd0436d2f49aa403f67e1ef7ddc
+sha256=e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a
+
 [http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-1.4.1.tar.gz]
 md5=d214aa40beabf7bdb0c9b3c64432c774
 sha256=44357e0fae8c8f0e315bf130b4e86a4f96b91d66eeb4e473def4ce8336fff102
@@ -12010,6 +13382,10 @@ sha256=035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8
 md5=cc5d4130b25bb8a1c930488b78930e9b
 sha256=34ff6a85d1dae64d06b5aca04fb17822dd26a734f40cd966e3dd980afa4a037a
 
+[http://repository.maemo.org/pool/maemo4.1/free/t/tablet-browser-interface/tablet-browser-interface_0.0.5-1.tar.gz]
+md5=930b83fa92154a2abb3d711b9e3af87a
+sha256=199fcaa5bc5b0b56537d43c522a9f0d839e61d7ffc58438da56574f642159519
+
 [http://developer.kde.org/~wheeler/files/src/taglib-1.4.tar.gz]
 md5=dcd50ddb2544faeae77f194804559404
 sha256=0ff805bb8dbf72a45d347f2310f7e5c86e2e7419a069d546e53cf5f221c196ab
@@ -12038,6 +13414,14 @@ sha256=d83dca75ba6088c90b993de9d30b4b0d3189e5efa84151c16d55ef0ec072c38a
 md5=71bfeab35c9935631fc133f9d272b041
 sha256=0ef70273b6a54357c7823ed1f11015523f5cc5fe16df097e0b5300ae725c44e1
 
+[ftp://ftp.gnu.org/gnu/tar/tar-1.18.tar.bz2]
+md5=70170208d7c1bb9ab40120579434b6a3
+sha256=44944ee0427c8e0d8dbaa0b8f900073a7456819610cc521c53630c3eb117cf5e
+
+[ftp://ftp.gnu.org/gnu/tar/tar-1.20.tar.bz2]
+md5=1a7e17f27abf583b3b0bc059a827e68b
+sha256=be8bf33afb5adc2377e45d94693ffd46b75f267f9b808df0c7006e51211f9deb
+
 [http://downloads.sourceforge.net/subapplet/tasklist-105.tar.gz]
 md5=dc62a061d83cf72d1eca7e8ae2c8e1a6
 sha256=4078c44beebfd298995983b9e2ea189167a1ab081d96a7c485a67b65a974e878
@@ -12094,6 +13478,10 @@ sha256=3c4eb81c9d516937565a295beb0e98ab5c2a04864a0a5c8cef32916c63056b05
 md5=94bbf929aceac7601421e60ba35683a5
 sha256=63cd37752d153d222fa4a1fe08f6188832341f41652482bd7891e3fbe0ff8dd7
 
+[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.6.tar.gz]
+md5=17564dcb79d886d527609c154834c1c7
+sha256=9ce73e484b2f2858d46ffea9893f9823b5de9c7310f7c26b027f73a1c8fde857
+
 [http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.5.10.tar.gz]
 md5=18b6cae979e438628a1032ff1f12b38e
 sha256=f779fbfd30ddc80e15c39f42fc9877725e829dfa19101c3762d6ae809760a3a9
@@ -12102,6 +13490,10 @@ sha256=f779fbfd30ddc80e15c39f42fc9877725e829dfa19101c3762d6ae809760a3a9
 md5=b4cb035a6e235be3179364341843e929
 sha256=e5cffebb02ad5c8192c7bd98aae90e65b008b03150b613659efa641d5f96c141
 
+[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.11.tar.gz]
+md5=8da7a9c43f3721aed982412854c4783e
+sha256=c587eeab36208da798203cd5997fb82c891136dcd18780cd06e3d27a1d6d4a58
+
 [http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.1.2.tar.gz]
 md5=21bfda9e1fa12e25b4173deb9ffd0b5d
 sha256=3ed0cb5dd687e4d9fa838a318f9ef12a8c221894ff188687c27625f0ac3bce82
@@ -12114,6 +13506,10 @@ sha256=926a8c047bd43a1fc21539c2ec5b9bf00426083ffe18c2db8c44964b80286b6a
 md5=463234dcf1182ba71a0d39f594922488
 sha256=c7cbaa8edec5c9be78aa954938c64b57e6c2c0f13de260c88fefdbf849e94d4d
 
+[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.61.tar.gz]
+md5=8b9de30643f759bf2e40ccc833dd2633
+sha256=76009d233a69b2d12c2aff94770dfe9fc0558e07071f941b738bab357f8fb7b9
+
 [http://gpe.linuxtogo.org/download/source/teleport-0.33.tar.gz]
 md5=f406e66bf6a1effc31abf150ea7b5da1
 sha256=f5e73b32337c2616114e0e45cdbd053975ffd38ec3fb28a411e165dbf27a583a
@@ -12186,6 +13582,10 @@ sha256=802e13e13cb0051e0b06e5f1e24e0cc613aa0f7c0ef742e5b90a667b40978c46
 md5=fbb6f446ea4ed18955e2714934e5b698
 sha256=be88f037080b93ce0a337b2b3ca5e8195f76885deb6c558cc3aa872ee848fc76
 
+[ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta2.tar.gz]
+md5=bf5f4a6892cc7015a9ae8b81eb0b63f7
+sha256=16d746a7bf057a9147756e15fdd7ce76a63ddde122294ce188dc8332da5118ba
+
 [http://downloads.sourceforge.net/vnc-tight/tightvnc-1.3dev7_unixsrc.tar.gz]
 md5=030903eeafc3c20ef1fb1610bfe6311d
 sha256=390fdd05d86e091300248a4f74a0ffe7b4169f75aa2c1a5461c997a4c2ed2c10
@@ -12310,6 +13710,10 @@ sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
 md5=84ab290758d2c177df5924e10bff4835
 sha256=522ded5292b80289e13dc8af9a0c11d35417f7079779969835cc8af55a38d006
 
+[ftp://mama.indstate.edu/linux/tree/tree-1.5.1.tgz]
+md5=274ca4d36ee6fb216fa6cf01ad5eaa84
+sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c
+
 [ftp://mama.indstate.edu/linux/tree/tree-1.5.2.tgz]
 md5=b86a3091ec93e1e13e81020fa33b6270
 sha256=d830f5c79fa86bd5b40ce99e70408e7e734361a14dc0bea5bffa0586cfde9715
@@ -12438,6 +13842,10 @@ sha256=b4c6367ab85de8f148c903bb25dc69de7a7d7d05f204f58880a16a8b81bf93de
 md5=f10b6954498bab5d08d0f50de381af50
 sha256=4f32cfd01f0678080f8e98009ba99ce37f1261d842e3af9a6b3add22005a80ca
 
+[ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2]
+md5=096cac66046326659b97eeded007ec73
+sha256=1af9d68adfe044cb8fe1b3efa5b661c4cb57edf90f4a8daf38f0fc19692677a7
+
 [http://downloads.sourceforge.net/u-boot/u-boot-1.1.4.tar.bz2]
 md5=096cac66046326659b97eeded007ec73
 sha256=1af9d68adfe044cb8fe1b3efa5b661c4cb57edf90f4a8daf38f0fc19692677a7
@@ -12466,6 +13874,10 @@ sha256=7e1d8239a5bd43c50f6091b484acbc8a7c5886cd4523f1e369504266cbaca50d
 md5=ebf58e04d72eab5c131c2c9118737024
 sha256=82342a5d6088421e79699dd7af614ebecf6dd335eabce07690902a379f5ea8de
 
+[http://www.uclibc.org/downloads/uClibc-0.9.28.tar.bz2]
+md5=1ada58d919a82561061e4741fb6abd29
+sha256=c8bc5383eafaa299e9874ae50acc6549f8b54bc29ed64a9a3387b3e4cd7f4bcb
+
 [http://www.uclibc.org/downloads/uClibc-0.9.29.tar.bz2]
 md5=61dc55f43b17a38a074f347e74095b20
 sha256=ca70501ae859cd86b387bb196908838275b4b06e6f4d692f9aa51b8a633334a7
@@ -12478,6 +13890,10 @@ sha256=c409609ce3bdf5bc4c040aa17ec28c6c214695a6aaaa408643edbda704142fcf
 md5=039d1215960b879d5b292e5b713ced8b
 sha256=7007261ad816938ee4824720eb08e9bff4ad6f796965ec928f56acfa3c24a1b9
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/ucb1x00-touch-audio-r1.patch]
+md5=958229e8a1cb706499eb75e5c8be804f
+sha256=2a45b4e4e667b99ad32f5b9b12671f77646cc04d5798b9b8af5f30806149f8bd
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/ucb1x00_suspend.patch]
 md5=8cf0f9e1158bf04cccb65a0926221888
 sha256=502e6c62fd930639987e34fbb1aaeb7b1456e2743e0d6986faf0990257921435
@@ -12514,10 +13930,18 @@ sha256=07b29dfdd2d63090c76df04c2dcde323640708c5a06b346cb299c0aba4351a3e
 md5=a8233f2afc62a8a8971f79df8878d57e
 sha256=4467f57484124b735450e05617c2aa0f75e0e56306e92c74f9dfe59bd028fcd9
 
+[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-124.tar.gz]
+md5=2ea9229208154229c5d6df6222f74ad7
+sha256=cc9f58ff58fbd3f5868e1f1e368e3c93e1f441afd0ac1dcbd5d01a9ce5b5b0d7
+
 [http://udhcp.busybox.net/source/udhcp-0.9.8.tar.gz]
 md5=2d7e548820d2ded5e183933cb701defb
 sha256=da0ca1e821e3fa7cfbe73ddb1480b921002ee992f5e5fbc611422c103b907443
 
+[http://downloads.sourceforge.net/ufraw/ufraw-0.12.tar.gz]
+md5=b2c104938c1c3eb47e7605432bbd3157
+sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
+
 [http://uim.freedesktop.org/releases/uim/stable/uim-1.3.1.tar.bz2]
 md5=2832e23d4778bbacbfa4b49bf642d667
 sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256
@@ -12530,6 +13954,10 @@ sha256=e35fcb9b14e7621dc32975872a5147137ff12cc71e16993702a49268d59c079c
 md5=4ba5657f3f7d71a818f3e6259b5d4fde
 sha256=e5b7b7c4b61f7b0affa5e3987e0127c695d2e512f39df68b97479b50cc39ed78
 
+[http://upir.cz/maemo/dists/chinook/main/source/ukeyboard_1.6.tar.gz]
+md5=78b8ab318d725b07c3c08c390290a556
+sha256=0ecaf4e174c5b8eb3c1225cc60917404e14ad613f57fd2ca290d31548f089bcf
+
 [http://downloads.sourceforge.net/ulxmlrpcpp/ulxmlrpcpp-1.5.2-src.tar.bz2]
 md5=cea56d3a1a7e4f1a4d12697330c4526b
 sha256=00f40bf3c8e4ed3ca169ec54352fc7499d443e443d91b7460997ddca5448905e
@@ -12598,6 +14026,10 @@ sha256=6d2ae5d70609df7d2c2b518eca0624c4a59328b277ed114b9e5b57dd030e6e94
 md5=c8193bc27642fa446d702cfdb9464c2a
 sha256=2101f292449cbacc277aecc5c649de895d501057f299e8e48a7ec50cfb0a200d
 
+[http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r3.patch]
+md5=59ce16ffe6362514e26540e1a08856b7
+sha256=eb8d02a6355a62790f511269d046269840f40f962b5f910a3a3f3047f5364b9c
+
 [http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r5.patch]
 md5=e312729c632e820bd9d651476ccec9bc
 sha256=94b8926463a996056b4cdff85f940f2f647be30c55fe998943de7e92bd0fee64
@@ -12630,6 +14062,14 @@ sha256=00385353242173b878413e0423c1dddcbbb50a3cadc3bb9d0a6adcf335794423
 md5=2ac1bdae03a858b965e895b211a75ad7
 sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd
 
+[http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz]
+md5=d669ae4a3567b0d5d3ff5db6351b4053
+sha256=651f040408a9dfe3ece1d490cd808fc80e878fd39876f50f6772f9e5f9ee3674
+
+[http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz]
+md5=7b407c7ff5a38216f85d648365d81894
+sha256=bfa16a53bf481178f0b1bb51fadf539e96312fc3b84f1e54c650d2bae6f1eccb
+
 [http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2]
 md5=e978c648f808cf1740b1583a78b922ff
 sha256=b09616934c21e10a9bac2d3941bd8585b075ccc10c2f5218a0f652b0e9386a4c
@@ -12658,6 +14098,10 @@ sha256=2e68a53d1393e97926340d9b21e1bde488aaef05ab3e8bcab4849d1859115c6d
 md5=af9d9e03038481fbf79ea3ac33f116f9
 sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
 
+[http://kernel.org//pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.tar.bz2]
+md5=23f227da49df36f33fe47e917e332cd8
+sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c
+
 [http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.bz2]
 md5=51952682d8b42aeda3af5cee0133ce2c
 sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b
@@ -12790,6 +14234,10 @@ sha256=9f84c8e8a2f7f5969bc771741b1db64aa44c1b919e8ddbeba37875ca089b66d9
 md5=9cd5ca752f7236167715ca1916da92ad
 sha256=d4e586a7475a0a2390ef9a7225e5146aa65ab70ec408cf9568c79c5aee0ca647
 
+[http://download.videolan.org/pub/videolan/vlc/0.8.6h/vlc-0.8.6h.tar.bz2]
+md5=4a6eece2f56d4ad5dfa786e934d2b4a8
+sha256=50ed87c869228274043b7fa468f908fe6ee571196510177593c701d99b357221
+
 [http://194.213.43.198/vmedit/vmedit-0.02.tar.gz]
 md5=7550ea1dd951d2f7fb1a54caa88860b2
 sha256=bca8b0073d9527c0293b831c9b8d8f89fc3dc7b5ab30898e7b748843af07a978
@@ -12810,6 +14258,10 @@ sha256=08d588ce0731d0c0e55a1cac35acf019e1b735d0f75f16962adfeb4fefd69441
 md5=80d3ae3bbae2a488d433d86b8fd64777
 sha256=4f1f6ba6410e5f2aeb473d0a09caaa528cc926866735ab66e05cdff9c5093a37
 
+[http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.1.1.tar.gz]
+md5=47845fd76f5f2354a3619c4097575487
+sha256=617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad
+
 [http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.3.2.tar.gz]
 md5=aaccdffc5656095a45dfe87c5bf612cb
 sha256=55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488
@@ -12818,6 +14270,10 @@ sha256=55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488
 md5=e7518cff21326fe7eb9795b60c25ae6a
 sha256=be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7
 
+[http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.5.1.tar.gz]
+md5=7a8e94dbe94f39a4fd89b72e0125f66f
+sha256=f63660bd020bbe6a39e8eb67ad60c54d719046c6198a6834371d098947f9a2ed
+
 [ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.5.tar.gz]
 md5=146062e8b2f93af43ff6c2c770feea94
 sha256=5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b
@@ -12826,6 +14282,10 @@ sha256=5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b
 md5=a9dc7b330d52ce384e3e5715d396c72f
 sha256=c31e1e930bce109cccd40dc0378b7ee28933482855918f46573e79d9db818be7
 
+[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.13.tar.bz2]
+md5=40480f20f6b7664f3d364e4f2ed27889
+sha256=edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d
+
 [http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.8.tar.bz2]
 md5=65344de3023c41c8dda2b35a415bf969
 sha256=1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
@@ -12854,6 +14314,10 @@ sha256=1be8f5179f37a56094ae712f9561b86bb4cd40cb5c55d7dbc680f34b77d0b1cf
 md5=2c958056e0a82da4d85810ea51b9e07b
 sha256=c8e0cf191fb60b26eb5481c24d162c3675c72bc940c42393af2f0b62897de90f
 
+[http://www.rpsys.net/openzaurus/patches/archive/w100_extmem-r0.patch]
+md5=a32cf8e91474d9ccfecb2a225ed326f7
+sha256=d6863b3ad5ecb465d217714ad474f2a9fb6e7890b4565184e8d5962d46850a31
+
 [http://www.rpsys.net/openzaurus/patches/archive/w100_extmem-r1.patch]
 md5=a17be90788c4ccd6ee8253659b9321f8
 sha256=56dfd5365848095793faa31ee1cf753c10891dd076944d3533b05c6547965134
@@ -12862,6 +14326,10 @@ sha256=56dfd5365848095793faa31ee1cf753c10891dd076944d3533b05c6547965134
 md5=eec0b301b32bc8e9f65a4e54248c9868
 sha256=96d659d916fafe555311068c9bf8662b93f10d099b12b17ed04d8a8fffbc72e0
 
+[http://wirbel.htpc-forum.de/w_scan/w_scan-20080720.tar.bz2]
+md5=29d20fec3febf96de43bc27db4b47cfd
+sha256=7107d31e05168febe4cd11bc7fb91ea8f6283b225c7c48a0e9579458d3b5de33
+
 [http://www.ibiblio.org/pub/Linux/system/network/misc/wakelan-1.1.tar.gz]
 md5=4a3a31d874967cd6ac761b7d4323e0d5
 sha256=3df5eb8f877648799ab623cf1718ecc6f86eb0c2f51d344d8e860442dcc5cd6f
@@ -13238,6 +14706,10 @@ sha256=eb7ea9a7917fa6d603529e76f793e56baefa87a3034602634c73f9b284adc8b7
 md5=242388ab65dde3a3dd313eeee265e429
 sha256=53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9
 
+[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.3.tar.bz2]
+md5=3a2e0252e853ab30b3bff05ac92ec61c
+sha256=3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xextproto-X11R7.0-7.0.2.tar.bz2]
 md5=c0e88fc3483d90a7fea6a399298d90ea
 sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
@@ -13318,6 +14790,14 @@ sha256=46d3d459821a321cf82252bd4130134b5ecab0984cc0ec5ce0f0f8b3b6e41908
 md5=24c33f833bb2db72a07c3d28bfc0aae9
 sha256=f1b7f84175d33f4d18c83cd0d37bd3962acd668922fa074a8ae29e18517cdda7
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-1.1.5.tar.bz2]
+md5=01705ea9a4d1699d5eeb17e7f297a581
+sha256=52b7daab86dade2d189f0378ddf196c018cdc9dd47ade0b3b8fc7591cb4bbe9e
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-1.99.4.tar.bz2]
+md5=f56d98ab11ef77cfcbafb5d93c697791
+sha256=71e896168819bcf50044c175482d03873c31bc6eb355305a87e94772580789dd
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2]
 md5=d982c6f185f4c75a4b65703ceed7be06
 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
@@ -13362,6 +14842,10 @@ sha256=240abf3bc4068f9823dbe6e8ff9c63e5aee1442fd85c80122f2ee44c00fe101e
 md5=babf094e37bdfc08076d4adb4c69c1d9
 sha256=b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.2.2.tar.bz2]
+md5=ab3122921f6359c54e250879288ffd47
+sha256=c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-keyboard-X11R7.0-1.0.1.3.tar.bz2]
 md5=8fb8a30fd9d7f152a1aef4eb8ef32b3f
 sha256=e82d510157d13be37eed604cfb0d9355c054c4d3ac39bdef0c6ef320f2973d77
@@ -13398,6 +14882,10 @@ sha256=2776fe554835a2be94e69cc40af7b4d4f7048d9a36a844ebaf1a792ba0868dea
 md5=d8bcd9fb1b4efb02acd251495f9a30c1
 sha256=7d4c2ecbe8f9327f7c8093c05401ab68b22f3343bcf04e4838cc40c21b7f8e0a
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.2.2.tar.bz2]
+md5=c47c598e55e7080b8ea30f70781f7ca3
+sha256=80e9cb52b2036b71289b2140bcd3ac202cf46fd42830761c53120ddac38e7edf
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mouse-X11R7.0-1.0.3.1.tar.bz2]
 md5=12a908e5a97b1b03e8717abf167f4f27
 sha256=183c1cda6550c8821ef4b8d13e681a32813bcd32b6cf34a75d3870e399fa292d
@@ -13498,6 +14986,10 @@ sha256=06c2462dfa65c32e31a972292531bf686c56c3f9cf21baf814ab0eda5cf26653
 md5=ac1595de8397efd740038994b1e9ef67
 sha256=f0020c88ca3f86b4826c556888b476f081b80010ba78239f95e5349835ad8811
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.6.193.tar.bz2]
+md5=102b781f543213852401f3422b18ccc7
+sha256=9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.6.3.tar.bz2]
 md5=f6d559f9d20f61567d381916b376590f
 sha256=d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
@@ -13922,6 +15414,10 @@ sha256=c66920f0ad6921a33098008cd01f05eb9a47f550d214065dc6c7072f176c82cf
 md5=e4a282cfd708b8892fca4425fee9cd7b
 sha256=111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6
 
+[http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.0.4.tar.bz2]
+md5=01470d088da3a8a3deefa8e1f45d69cb
+sha256=f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86driproto-X11R7.0-2.0.3.tar.bz2]
 md5=839a70dfb8d5b02bcfc24996ab99a618
 sha256=256fd04cbd97b2b96e7ef808b6752561da855ded3835a1bb0d7acbe07758e924
@@ -14170,6 +15666,10 @@ sha256=c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186
 md5=9df52a504dc04313a6650fae364ae04a
 sha256=1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52
 
+[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.5.tar.bz2]
+md5=9a2aad51042141a0e6ad066015397595
+sha256=95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d
+
 [http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.7.tar.bz2]
 md5=8b882d9e2deed9d85469a3beaec566a3
 sha256=15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774
@@ -14338,6 +15838,10 @@ sha256=a3adf1c61247254cc81c80a6c020fe6a9fe0abbdc5f66f8631ec87a1a356c4ae
 md5=a7c05bf0897ba99fe01af528c0831183
 sha256=5118569d9214c308b532cfb04df9cc14288f29b307adb00e3eed7f2ab5744efb
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.2.0.tar.bz2]
+md5=ea291c89e68832d570d9d5e007218bd6
+sha256=e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+
 [http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.3.0.0.tar.bz2]
 md5=a51a7d482e3c689394755bb17bda8526
 sha256=93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
@@ -14350,6 +15854,10 @@ sha256=b89f2d17be5ba71e3cc25379e18155c55ea36ba94ac1abae953214f13c020ffe
 md5=e548512ece2f2fd32e438fbbd8f5b857
 sha256=8c5b0f58a7f4382f052df0f4fb352c26953402d3298ee69d2d7077b510e09099
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.tar.bz2]
+md5=a06d9fe4f9f1d459ae02657f9ce64220
+sha256=51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -14542,6 +16050,10 @@ sha256=793e282c30c301ac5f2fd58f43dd59a691da1c18c7fbcbcbd9a08602f3ae8799
 md5=237d27a5b46d1fa88fb43fb1a40cf209
 sha256=c93e01cd754e8cafc6e02d32a7304d4b152e6aba9e6b0bcaea9ded12263f24b4
 
+[http://gpe.linuxtogo.org/download/source/xserver-common-1.18.tar.gz]
+md5=72c8b5c4c4aa18abe4f29308d2726e1e
+sha256=3e198bf84fac63cd5d93521c1646cf6dc2d959b4c84a16aa9cd1d9ca94ddd212
+
 [http://gpe.linuxtogo.org/download/source/xserver-common-1.22.tar.gz]
 md5=658badd22689cdde536050f740ec8319
 sha256=70a767f1109bf70353c58b0fb54626a1300fd0724017196bfd17d13a582ddd62
@@ -14750,6 +16262,10 @@ sha256=8288a1299f8c6f0176f2cd1b51f83b2c4b919460a2aa4fe98699b019e583bfc1
 md5=51691a15137fbc35515a630d45d03352
 sha256=dd71e82cd3df6ca60e629cc5655e7a380586b363a3d963482e9f151eb186dbad
 
+[http://downloads.sourceforge.net/zd1211/zd1211-firmware-1.4.tar.bz2]
+md5=19f28781d76569af8551c9d11294c870
+sha256=866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1
+
 [http://downloads.sourceforge.net/zd1211/zd1211-firmware1.3.tar.bz2]
 md5=cfff76ea35f4f93c37f6c99aa2058140
 sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index fd74d7581c..d0bd81b071 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -86,6 +86,9 @@ ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
 ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 
+# Blackfin has its on gcc
+ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
+
 #for proper NEON support we need a CSL toolchain 
 #ANGSTROM_GCC_VERSION_armv7a		 = "4.2.1+csl-arm-2007q3-53"
 ANGSTROM_GCC_VERSION_armv7a		= "4.3.1" 
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 103adb051e..29f44374e2 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -201,7 +201,7 @@ PREFERRED_VERSION_ctorrent ?= "1.3.4"
 PREFERRED_VERSION_ctrlproxy ?= "2.6.2"
 PREFERRED_VERSION_cumulus ?= "1.2.1"
 PREFERRED_VERSION_cups ?= "1.2.12"
-PREFERRED_VERSION_curl ?= "7.18.0"
+PREFERRED_VERSION_curl ?= "7.18.2"
 PREFERRED_VERSION_curl-native ?= "7.18.0"
 PREFERRED_VERSION_custominput ?= "1.1.0"
 PREFERRED_VERSION_cvs ?= "1.12.9"
@@ -1534,7 +1534,7 @@ PREFERRED_VERSION_python-pycairo ?= "1.4.0"
 PREFERRED_VERSION_python-pychecker ?= "0.8.17"
 PREFERRED_VERSION_python-pycodes ?= "1.2"
 PREFERRED_VERSION_python-pycrypto ?= "2.0.1"
-PREFERRED_VERSION_python-pycurl ?= "7.16.4"
+PREFERRED_VERSION_python-pycurl ?= "7.18.2"
 PREFERRED_VERSION_python-pyephem ?= "3.7.2a"
 PREFERRED_VERSION_python-pyfits ?= "1.1"
 PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
@@ -1933,6 +1933,8 @@ PREFERRED_VERSION_util-macros ?= "1.1.5"
 PREFERRED_VERSION_util-macros-native ?= "1.1.5"
 PREFERRED_VERSION_uucp ?= "1.07"
 PREFERRED_VERSION_v4l2apps ?= "20020317"
+PREFERRED_VERSION_vala ?= "0.1.5"
+PREFERRED_VERSION_vala-native ?= "0.1.5"
 PREFERRED_VERSION_vde ?= "2.0.2"
 PREFERRED_VERSION_vectoroids ?= "1.1.0"
 PREFERRED_VERSION_videoplayer ?= "0.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d8c3686b64..eed6e42df5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -49,7 +49,7 @@ SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-illume ?= "170"
 SRCREV_pn-illume-theme-asu ?= "170"
-SRCREV_pn-illume-theme-freesmartphone ?= "5cdedae0e45911ef10f6966587e7f3e842b5d2bd"
+SRCREV_pn-illume-theme-freesmartphone ?= "0f27c0b52b8dad255349e6c72d590fa787be8c3b"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
@@ -71,7 +71,7 @@ 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 ?= "d4b28ec4e2818207cc0e48b90dbce581e0b779e7"
+SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e"
 SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -146,13 +146,10 @@ SRCREV_pn-opkg-utils ?= "4534"
 SRCREV_pn-opkg-utils-native ?= "4534"
 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-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643"
-SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1"
-SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777"
-SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c"
-SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
diff --git a/conf/machine/adzs-bf548-ezlite.conf b/conf/machine/adzs-bf548-ezlite.conf
index 35c9217339..15074406ce 100644
--- a/conf/machine/adzs-bf548-ezlite.conf
+++ b/conf/machine/adzs-bf548-ezlite.conf
@@ -15,5 +15,5 @@ USE_VT = "0"
 MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "115200"
+SERIAL_CONSOLE = "57600 ttyBF0"
 
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 190d1d1049..57d81c2ade 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
-#@NAME: FIC GTA01 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
+#@NAME: FIC GTA01 (Neo 1973)
+#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
@@ -36,7 +36,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 ROOT_FLASH_SIZE = "60"
 
 # extra jffs2 tweaks
-IMAGE_FSTYPES ?= "jffs2"
+IMAGE_FSTYPES += "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 
 # build / upload tools
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 45dc0518a4..88aa3881c7 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
-#@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#@NAME: Openmoko GTA02 (NeoFreerunner)
+#@DESCRIPTION: Machine configuration for the Openmoko NeoFreerunner GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
@@ -29,6 +29,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-snd-soc-neo1973-gta02-wm8753 \
 "
 
+# no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
 SERIAL_CONSOLE = "115200 ttySAC2"
 
 # used by some images
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index e25d0d934a..044b64ef07 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -14,11 +14,6 @@ find */ -name  "*.ipk" -exec mv  '{}'  ./ \;
 # Make a list of ipkg files already present in feeds and in unsorted
 echo "Making a list of unsorted packages"
 for i in $(find . -name "*.ipk") ; do basename $i ; done > files-unsorted
-if [ "$1" != "--skip-sorted-list" ]; then
-    echo "Making a list of sorted packages (takes long)"
-    for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
-fi
-
 # Make a list of duplicates and delete those
 echo "Finding duplicate packages in unsorted"
 cat files-sorted files-unsorted | sort | uniq -d > files-duplicate
@@ -28,8 +23,9 @@ cat files-duplicate | xargs rm -f
 # Log remaining packages to a file 
 find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v angstrom-version | grep -v locale > new-files.txt
 for newfile in $(cat new-files.txt | sed s:./::g) ; do
-    echo "$(date -u +%s) $newfile $(basename ${PWD})" >> ../upload.txt
+    echo "$(date -u +%s) $newfile $(basename ${PWD})" >> ../upload-full.txt
 done    
+tail -n 100 ../upload-full.txt > ../upload.txt
 
 do_sort() {
 archdir=$arch
@@ -142,4 +138,9 @@ for arch in arm-oabi armv4t armv5teb armv5te armv6 armv7a armv7 avr32 bfin geode
 	do_sort
 done
 
+if [ "$1" != "--skip-sorted-list" ]; then
+    echo "Updating list of sorted packages (takes long)"
+    for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
+fi
+
 (cd ~/website/repo ; php update.php)
diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
index 1b457a5fc9..8942a0929c 100644
--- a/contrib/angstrom/upload-packages.sh
+++ b/contrib/angstrom/upload-packages.sh
@@ -14,22 +14,28 @@ REMOTED=website/feeds/2008/ipk/$(basename $PWD)
 mkdir -p upload-queue || true
 
 # Find and delete morgue dirs, we don't need them
+echo "Deleting morgue directories"
 find ipk/ -name "morgue" -exec rm -rf \{\} \;
 
 # Copy all packages to an upload queue
+echo "Copying packages to upload queue"
 find ipk/ -name "*.ipk" -exec cp \{\} upload-queue/ \;
 
 # Find file already present on webserver
-ssh $REMOTEM "find $REMOTED/ -name "*.ipk" -exec basename \{\} \;" > files-remote
+echo "Getting file list from server"
+scp $REMOTEM:$REMOTED/unsorted/files-sorted files-remote
 ls upload-queue/ | grep -v morgue > files-local
 
 # Check for files already present on webserver
+echo "Checking for duplicates"
 cat files-remote files-local | sort | uniq -u >files-uniq
 cat files-uniq files-local | sort | uniq -d > files-trans
 
 # Copy over non-duplicate files
+echo "Starting rsync..."
 rsync -vz --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/
 
 # Clean up temporary files
+echo "Removing upload queue"
 rm -rf files-remote files-local files-uniq files-trans upload-queue	
 
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index da5f7ccf8c..ee1b6753e3 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -22,16 +22,19 @@ class MakefileMaker:
         self.packages = {}
         self.targetPrefix = "${libdir}/python%s/" % VERSION[:3]
         self.output = outfile
-        self.out( "# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file." )
-        self.out( "# Generator: '%s' Version %s (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>" % ( sys.argv[0], __version__ ) )
-        self.out( "# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" )
+        self.out( """ \
+# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
+# Generator: '%s' Version %s (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
+""" % ( sys.argv[0], __version__ ) )
+
     #
     # helper functions
     #
 
     def out( self, data ):
         """print a line to the output file"""
-        print >> self.output, data
+        self.output.write( "%s\n" % data )
 
     def setPrefix( self, targetPrefix ):
         """set a file prefix for addPackage files"""
@@ -167,8 +170,8 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-audio", "Python Audio Handling", "python-core",
     "wave.* chunk.* sndhdr.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" )
 
-    m.addPackage( 0, "python-bsddb", "Python Berkeley Database Bindings", "python-core",
-    "bsddb" ) # package
+    m.addPackage( 1, "python-bsddb", "Python Berkeley Database Bindings", "python-core",
+    "bsddb lib-dynload/_bsddb.so" ) # package
 
     m.addPackage( 0, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core python-lang",
     "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" )
diff --git a/contrib/source-checker/oe-source-checker.py b/contrib/source-checker/oe-source-checker.py
index 9ac147b00b..0ae356395c 100644
--- a/contrib/source-checker/oe-source-checker.py
+++ b/contrib/source-checker/oe-source-checker.py
@@ -87,7 +87,7 @@ for source in checksums_parser.sections():
         if md5 != md5data:
             file_ok = False
 
-        shapipe = os.popen("oe_sha256sum " + localpath)
+        shapipe = os.popen("sha256sum " + localpath)
         shadata = (shapipe.readline().split() or [ "" ])[0]
         shapipe.close()
 
diff --git a/packages/angstrom/angstrom-led-config.bb b/packages/angstrom/angstrom-led-config.bb
index 83f5a1211b..36585f0b00 100644
--- a/packages/angstrom/angstrom-led-config.bb
+++ b/packages/angstrom/angstrom-led-config.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for runtime LED configuration" 
 
 #PV = "${DISTRO_VERSION}"
-PR = "r1"
+PR = "r2"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit update-rc.d
diff --git a/packages/angstrom/angstrom-led-config/beagleboard/leds b/packages/angstrom/angstrom-led-config/beagleboard/leds
index 19c73ebcf3..4a567996ee 100644
--- a/packages/angstrom/angstrom-led-config/beagleboard/leds
+++ b/packages/angstrom/angstrom-led-config/beagleboard/leds
@@ -1,3 +1,3 @@
 #file format: name trigger
-beagleboard::led0 mmc0
-beagleboard::led1 nand-disk
+beagleboard::usr0 mmc0
+beagleboard::usr1 nand-disk
diff --git a/packages/binutils/binutils-avr32.inc b/packages/binutils/binutils-avr32.inc
index 2767494940..bbae784011 100644
--- a/packages/binutils/binutils-avr32.inc
+++ b/packages/binutils/binutils-avr32.inc
@@ -18,6 +18,14 @@ do_avr32_reconf () {
 
 do_avr32_configure_bfd () {
         if test ${TARGET_ARCH} == avr32; then
+						# fix Makefile brokenness due to unmatched single quotes 
+						(cd ${B} && sed -i -e "s,'CC=ccache,'CC=${CC}'," Makefile) 
+						# *_alias options are not supported in binutils 2.17 and need
+						# to be removed
+						(cd ${B} && sed -i -e "s,'host_alias=.*',," Makefile)
+						(cd ${B} && sed -i -e "s,'build_alias=.*',," Makefile)
+						(cd ${B} && sed -i -e "s,'target_alias=*.',," Makefile)
+
             (cd ${B} && make configure-bfd) || die "Error running 'make configure-bfd'"
             (cd ${B}/bfd && make headers) || die "Error running 'make headers'"
         fi
diff --git a/packages/bluez/bluez-utils/hcid.conf b/packages/bluez/bluez-utils/hcid.conf
index bb935aa23d..a7164f6eb0 100644
--- a/packages/bluez/bluez-utils/hcid.conf
+++ b/packages/bluez/bluez-utils/hcid.conf
@@ -21,7 +21,7 @@ options {
 	pairing multi;
 
 	# Default PIN code for incoming connections
-	passkey "BlueZ";
+	passkey "1234";
 }
 
 # Default settings for HCI devices
@@ -29,7 +29,7 @@ device {
 	# Local device name
 	#   %d - device id
 	#   %h - host name
-	name "BlueZ (%d)";
+	name "%h (%d)";
 
 	# Local device class
 	class 0x120112;
diff --git a/packages/bluez/bluez-utils_3.33.bb b/packages/bluez/bluez-utils_3.33.bb
index e4b5f21a84..dc0ee8e739 100644
--- a/packages/bluez/bluez-utils_3.33.bb
+++ b/packages/bluez/bluez-utils_3.33.bb
@@ -1,5 +1,7 @@
 require bluez-utils3.inc
 
+PR = "r1"
+
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
                  --enable-bccmd \
diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc
index 04decf61b2..cc196ad767 100644
--- a/packages/busybox/busybox.inc
+++ b/packages/busybox/busybox.inc
@@ -35,7 +35,7 @@ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
 # We need this RRECOMMENDS because libc dlopens libgcc
 # and shlib mechanism can not detect it because its not
 # listed in the NEEDED field.
-RDEPENDS += "libgcc"
+RRECOMMENDS += "libgcc"
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
 FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
 
diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index c9440e7b4f..37cd2a86be 100644
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://udhcpscript.patch;patch=1 \
diff --git a/packages/cdk/.mtn2git_empty b/packages/cdk/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cdk/.mtn2git_empty
diff --git a/packages/cdk/cdk_5.0-20060507.bb b/packages/cdk/cdk_5.0-20060507.bb
new file mode 100644
index 0000000000..f3287c7b25
--- /dev/null
+++ b/packages/cdk/cdk_5.0-20060507.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Curses Development Kit"
+HOMEPAGE = "http://invisible-island.net/cdk/"
+SECTION = "devel/libs"
+LICENSE = "MIT"
+
+SRC_URI = "ftp://invisible-island.net/cdk/cdk-${PV}.tgz"
+
+inherit autotools
+
+EXTRA_OEMAKE += 'DOCUMENT_DIR="${D}${datadir}/doc/cdk"'
+
+# FIXME
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index cfb9f1c089..cee09857e4 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -30,6 +30,14 @@ EXTRA_OECONF = "\
 
 inherit autotools
 
+# hack to get config.rpath in, it comes from gettext
+do_configure_prepend () {
+
+        ${@['','cp ${STAGING_DATADIR_NATIVE}/automake-1.10/config.rpath ${S}'][bb.data.getVar('PREFERRED_VERSION_automake-native',d,1) == '1.10']}
+
+}
+	
+
 do_stage() {
 	install -d ${STAGING_INCDIR}/classpath
 	install -m 0644 include/jni* ${STAGING_INCDIR}/classpath
diff --git a/packages/curl/curl-native_7.18.0.bb b/packages/curl/curl-native_7.18.2.bb
index e056ec10c3..e056ec10c3 100644
--- a/packages/curl/curl-native_7.18.0.bb
+++ b/packages/curl/curl-native_7.18.2.bb
diff --git a/packages/curl/curl-sdk_7.18.0.bb b/packages/curl/curl-sdk_7.18.2.bb
index 816fe645bc..816fe645bc 100644
--- a/packages/curl/curl-sdk_7.18.0.bb
+++ b/packages/curl/curl-sdk_7.18.2.bb
diff --git a/packages/curl/curl_7.18.0.bb b/packages/curl/curl_7.18.2.bb
index ae2cff6e10..ae2cff6e10 100644
--- a/packages/curl/curl_7.18.0.bb
+++ b/packages/curl/curl_7.18.2.bb
diff --git a/packages/dsplink/codec-engine_2.10.bb b/packages/dsplink/codec-engine_2.10.bb
index 0e85d38a82..098d0054cd 100644
--- a/packages/dsplink/codec-engine_2.10.bb
+++ b/packages/dsplink/codec-engine_2.10.bb
@@ -18,13 +18,7 @@ SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz \
 
 S = "${WORKDIR}/codec_engine_2_10_01"
 
-# Path to the dir where the TI tools are unpacked
-TITOOLSDIR ?= "/OE/TI"
-# Path under TITOOLSDIR where dspbios is unpacked
-TIBIOSDIR ?= "bios_5_32_03"
-TIXDCTOOLSDIR ?= "${TIBIOSDIR}/xdctools"
-# Path under TITOOLSDIR where the dsp toolchain is unpacked
-TICGTOOLSDIR ?= "cg6x_6_1_2"
+require ti-paths.inc
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc
index 2347068379..f303b6e53f 100644
--- a/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@ -11,12 +11,7 @@ S = "${WORKDIR}/dsplink_1_50/dsplink"
 # Needed for buildscripts
 export DSPLINK = "${S}"
 
-# Path to the dir where the TI tools are unpacked
-TITOOLSDIR ?= "/OE/TI"
-# Path under TITOOLSDIR where dspbios is unpacked 
-TIBIOSDIR ?= "bios_5_32_03"
-# Path under TITOOLSDIR where the dsp toolchain is unpacked
-TICGTOOLSDIR ?= "cg6x_6_1_2"
+require ti-paths.inc
 
 DSPLINKPLATFORM ?= "Davinci"
 
diff --git a/packages/dsplink/ti-paths.inc b/packages/dsplink/ti-paths.inc
new file mode 100644
index 0000000000..83cbe683c0
--- /dev/null
+++ b/packages/dsplink/ti-paths.inc
@@ -0,0 +1,8 @@
+# Path to the dir where the TI tools are unpacked
+TITOOLSDIR ?= "/OE/TI"
+# Path under TITOOLSDIR where dspbios is unpacked
+TIBIOSDIR ?= "bios_5_32_03"
+TIXDCTOOLSDIR ?= "${TIBIOSDIR}/xdctools"
+# Path under TITOOLSDIR where the dsp toolchain is unpacked
+TICGTOOLSDIR ?= "cg6x_6_1_2"
+
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 0cbfce233c..1eb3b20ed7 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -3,18 +3,19 @@ require ffmpeg.inc
 DEPENDS += "libgsm"
 
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r23"
+PR = "r25"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"
 DEFAULT_PREFERENCE_armv6 = "1"
 DEFAULT_PREFERENCE_armv7a = "1"
 
-FFBRANCH_arm = "arm-neon"
+FFBRANCH_arm = "arm"
 FFBRANCH ?= "master"
 
+# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
 SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "3c4b8ba71b922be6559fcfea3cb990ea3ded234d"
+SRCREV_arm = "36c4918f7bc8ff6296d38ed0c9a5f1a8785fcd32"
 SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
 "
 
diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb
index 890ed31e20..25057072c2 100644
--- a/packages/ffmpeg/omapfbplay_git.bb
+++ b/packages/ffmpeg/omapfbplay_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
 DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
 LICENSE = "MIT"
 
-PR = "r9"
+PR = "r10"
 
 inherit module-base
 
diff --git a/packages/freedoom/freedoom_0.6.2.bb b/packages/freedoom/freedoom_0.6.2.bb
new file mode 100644
index 0000000000..0a3be04410
--- /dev/null
+++ b/packages/freedoom/freedoom_0.6.2.bb
@@ -0,0 +1,27 @@
+SECTION = "games"
+DESCRIPTION = "The Freedoom project aims at collaboratively creating a Free IWAD file.\
+	       Combined with the Free source code, this results in a complete game \
+	       based on the Doom engine which is Free Software."
+HOMEPAGE = "http://freedoom.sourceforge.net/"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/freedoom/freedoom-iwad-${PV}.zip"
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir}/games/doom/*"
+FILES_${PN}-doc = "${datadir}/doc/freedoom/*"
+
+do_install() {
+	install -d ${D}/${datadir}/games/doom
+	install -d ${D}/${datadir}/doc/freedoom
+
+	install -m 0644 ${WORKDIR}/freedoom-iwad-${PV}/doom2.wad ${D}/${datadir}/games/doom/
+	install -m 0644 ${WORKDIR}/freedoom-iwad-${PV}/* ${D}/${datadir}/doc/freedoom
+	rm ${D}/${datadir}/doc/freedoom/*.wad
+
+
+
+
+}
+
diff --git a/packages/freesmartphone/illume-theme-freesmartphone_git.bb b/packages/freesmartphone/illume-theme-freesmartphone_git.bb
index 2d881214a0..3beffce09e 100644
--- a/packages/freesmartphone/illume-theme-freesmartphone_git.bb
+++ b/packages/freesmartphone/illume-theme-freesmartphone_git.bb
@@ -2,11 +2,16 @@ DESCRIPTION = "Illume theme for the freesmartphone.org project"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
 PV = "0.0+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/illume"
 
+do_compile() {
+   cd illume && ./build.sh && cd ..
+   cd illume_init && ./build.sh && cd ..
+}
+
 do_install() {
     install -d ${D}${sysconfdir}/enlightenment
     install -d ${D}${datadir}/enlightenment/data/themes/
@@ -15,8 +20,8 @@ do_install() {
     # Make illume the default profile
     echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
 
-    install -m 0644 ${S}/illume.edj ${D}${datadir}/enlightenment/data/themes/
-    install -m 0644 ${S}/illume_init.edj ${D}${datadir}/enlightenment/data/init/
+    install -m 0644 ${S}/illume/illume.edj ${D}${datadir}/enlightenment/data/themes/
+    install -m 0644 ${S}/illume_init/illume_init.edj ${D}${datadir}/enlightenment/data/init/
 }
 
 RPROVIDES_${PN} = "illume-theme"
diff --git a/packages/gcc/gcc-configure-common.inc b/packages/gcc/gcc-configure-common.inc
index 878e2ba1ef..1b3f398789 100644
--- a/packages/gcc/gcc-configure-common.inc
+++ b/packages/gcc/gcc-configure-common.inc
@@ -12,6 +12,7 @@ JAVA_sh3 ?= ""
 # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
 FORTRAN ?= ",f77"
 LANGUAGES ?= "c,objc,c++${FORTRAN}${JAVA}"
+LANGUAGES_avr32 = "c,c++${FORTRAN}${JAVA}"
 
 EXTRA_OECONF_BASE ?= ""
 EXTRA_OECONF_PATHS ?= ""
diff --git a/packages/ggz/.mtn2git_empty b/packages/ggz/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ggz/.mtn2git_empty
diff --git a/packages/ggz/ggz-client-libs_0.0.14.1.bb b/packages/ggz/ggz-client-libs_0.0.14.1.bb
new file mode 100644
index 0000000000..df691dc7de
--- /dev/null
+++ b/packages/ggz/ggz-client-libs_0.0.14.1.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = " Client libraries for GamingZone"
+LICENSE = "LGPLv2"
+DEPENDS = "libggz" 
+
+SRC_URI = "http://ftp.belnet.be/packages/ggzgamingzone/ggz/${PV}/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
+                --with-libggz-libraries=${STAGING_LIBDIR} \
+               "
+
+do_configure_append() {
+	for i in $(find ${S} -name "Makefile") ; do 
+		sed -i -e s:'-I /usr/include -I /usr/local/include'::g $i
+	done
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/ggz/libggz_0.0.14.1.bb b/packages/ggz/libggz_0.0.14.1.bb
new file mode 100644
index 0000000000..ff96bd09af
--- /dev/null
+++ b/packages/ggz/libggz_0.0.14.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "GGZ Gaming Zone lib" 
+LICENSE = "LGPLv2"
+DEPENDS = "gnutls libgcrypt" 
+
+SRC_URI = "http://ftp.belnet.be/packages/ggzgamingzone/ggz/${PV}/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/gnome/gconf-editor_2.22.0.bb b/packages/gnome/gconf-editor_2.22.0.bb
new file mode 100644
index 0000000000..00f7b02544
--- /dev/null
+++ b/packages/gnome/gconf-editor_2.22.0.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Editor for the gnome registry"
+LICENSE = "GPLv2"
+DEPENDS = "gnome-doc-utils gconf-dbus"
+
+inherit gnome gconf
+
+
diff --git a/packages/gnome/gnome-games_2.23.6.bb b/packages/gnome/gnome-games_2.23.6.bb
new file mode 100644
index 0000000000..61e145a549
--- /dev/null
+++ b/packages/gnome/gnome-games_2.23.6.bb
@@ -0,0 +1,38 @@
+LICENSE = "GPL"
+DEPENDS = "libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common"
+
+PR = "r1"
+
+inherit gnome distutils-base gconf
+
+EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
+                --with-libggz-libraries=${STAGING_LIBDIR} \
+                --with-ggzmod-includes=${STAGING_INCDIR} \
+		--with-ggzmod-libraries=${STAGING_LIBDIR} \
+	        --enable-scalable \
+	       "
+
+do_configure_prepend() {
+	for i in $(find ${S} -name "Makefile.am") ; do
+		sed -i -e s:help::g $i
+	done
+}
+
+
+FILES_${PN}-doc += " ${datadir}/gnome/help"
+FILES_${PN}-dbg += " ${bindir}/.debug ${libdir}/gnome-games/.debug"
+
+FILES_${PN} += "/var/games \
+                ${datadir}/applications \
+                ${datadir}/g* \
+		${datadir}/ggz \
+		${datadir}/icons \
+		${datadir}/pixmaps \
+		${sysconfdir}"
+
+PACKAGES =+ "gnome-games-gnometris "
+FILES_gnome-games-gnometris = "${bindir}/gnometris ${datadir}/pixmaps/gnometris ${datadir}/pixmaps/gnome-gtetris.png ${datadir}/applications/gnometris.desktop ${sysconfdir}/gconf/schemas/gnometris.schemas"
+
+PACKAGES =+ "gnome-games-gnomine"
+FILES_gnome-games-gnomine = "${bindir}/gnomine ${datadir}/pixmaps/gnomine ${datadir}/pixmaps/gnome-gnomine.png ${datadir}/applications/gnomine.desktop ${sysconfdir}/gconf/schemas/gnomine.schemas"
+
diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb
index 59c6f3e6e0..933be7f811 100644
--- a/packages/gnome/gnome-panel_2.18.1.bb
+++ b/packages/gnome/gnome-panel_2.18.1.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus"
+DEPENDS = "startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus"
 
 PR = "r1"
 
diff --git a/packages/gnome/gnome-python-desktop/.mtn2git_empty b/packages/gnome/gnome-python-desktop/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/gnome-python-desktop/.mtn2git_empty
diff --git a/packages/gnome/gnome-python-desktop_2.23.0.bb b/packages/gnome/gnome-python-desktop_2.23.0.bb
new file mode 100644
index 0000000000..931e1be342
--- /dev/null
+++ b/packages/gnome/gnome-python-desktop_2.23.0.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk"
+
+inherit gnome distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+do_configure_prepend() {
+        install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_configure_prepend() {
+	sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac
+}	
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+	autotools_stage_all
+}	
+
+FILES_${PN}-dev += "${datadir}/pygtk"
diff --git a/packages/gnome/gnome-system-monitor_2.23.6.bb b/packages/gnome/gnome-system-monitor_2.23.6.bb
new file mode 100644
index 0000000000..0e27be5ffe
--- /dev/null
+++ b/packages/gnome/gnome-system-monitor_2.23.6.bb
@@ -0,0 +1,24 @@
+LICENSE = "GPLv2"
+DEPENDS = "libgtop gtkmm glibmm libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib " 
+
+inherit gnome
+
+do_configure_prepend() {
+        sed -i -e s:help::g ${S}/Makefile.am
+}
+
+
+PACKAGES =+ "${PN}-applets"
+
+FILES_${PN}-applets = "${bindir}/*applet* \
+                       ${libdir}/bonobo/servers \
+		       ${datadir}/gnome-2.0/ui"
+
+FILES_${PN} += "${datadir}/icons \
+                ${datadir}/dbus-1 \
+		${datadir}/gnome/autostart \
+		"
+
+FILE_{PN}-doc += "${datadir}/omf \
+                  ${datadir}/gnome/help "
+
diff --git a/packages/gnome/libgtop_2.23.4.bb b/packages/gnome/libgtop_2.23.4.bb
new file mode 100644
index 0000000000..02d1d9405c
--- /dev/null
+++ b/packages/gnome/libgtop_2.23.4.bb
@@ -0,0 +1,10 @@
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0"
+
+inherit gnome lib_package
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gpsbabel/gpsbabel_1.3.3.bb b/packages/gpsbabel/gpsbabel_1.3.5.bb
index b5ff6a8510..c46b9df81d 100644
--- a/packages/gpsbabel/gpsbabel_1.3.3.bb
+++ b/packages/gpsbabel/gpsbabel_1.3.5.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/gpsbabel/gpsbabel-${PV}.tar.gz"
+SRC_URI = "http://www.gpsbabel.org/plan9.php?dl=gpsbabel-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
index 5bd5f987b6..aa96026891 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
@@ -4,10 +4,11 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "ffmpeg gstreamer zlib"
-PR = "r2"
+PR = "r3"
 
 # This uses the systems ffmpeg, which is unsupported, but we can't build the internal one with the current autotools (ab)usage
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_armv6 = "1"
 DEFAULT_PREFERENCE_armv7a = "1"
 
 inherit autotools pkgconfig
diff --git a/packages/gstreamer/gst-plugins-good_0.10.7.bb b/packages/gstreamer/gst-plugins-good_0.10.7.bb
index fb551f5176..ac3a5e73c5 100644
--- a/packages/gstreamer/gst-plugins-good_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-good_0.10.7.bb
@@ -1,5 +1,10 @@
 require gst-plugins.inc
-PR = "r1"
+PR = "r2"
+
+inherit gconf 
 
 EXTRA_OECONF += "--with-check=no"
 DEPENDS += "gst-plugins-base esound"
+
+PACKAGES =+ "gst-plugin-gconfelements"
+FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf"
diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index eaba8343f3..177585340d 100644
--- a/packages/gstreamer/gst-plugins.inc
+++ b/packages/gstreamer/gst-plugins.inc
@@ -19,8 +19,8 @@ python populate_packages_prepend () {
 	gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
 	postinst = bb.data.getVar('plugin_postinst', d, 1)
 
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst)
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)')
+	do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst, extra_depends='')
+	do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)', extra_depends='')
 }
 
 ALLOW_EMPTY = "1"
diff --git a/packages/gtk-webcore/midori_0.0.19.bb b/packages/gtk-webcore/midori_0.0.19.bb
new file mode 100644
index 0000000000..ec81d7fd23
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.19.bb
@@ -0,0 +1,5 @@
+require midori.inc
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.bz2"
+
+
diff --git a/packages/gtkmm/gtkmm_2.12.7.bb b/packages/gtkmm/gtkmm_2.12.7.bb
index b8ba69f50e..9ef908db63 100644
--- a/packages/gtkmm/gtkmm_2.12.7.bb
+++ b/packages/gtkmm/gtkmm_2.12.7.bb
@@ -2,3 +2,8 @@ require gtkmm.inc
 
 PR = "r0"
 
+# Hack! Remove once gtkmm likes libtool 2x
+do_configure() {
+	gnu-configize
+	oe_runconf
+}	
diff --git a/packages/guile/files/configure-lossage.patch b/packages/guile/files/configure-lossage.patch
deleted file mode 100644
index da1d0de6e7..0000000000
--- a/packages/guile/files/configure-lossage.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- guile-1.6.4/configure.in~configure-lossage
-+++ guile-1.6.4/configure.in
-@@ -462,7 +462,9 @@
- # explicitly to LIBOBJS to make sure that it is translated to
- # `alloca.lo' for libtool later on.  This can and should be done more cleanly.
- AC_FUNC_ALLOCA
--if test "$ALLOCA" = "alloca.o"; then AC_LIBOBJ([alloca]); fi
-+if test "$ALLOCA" = "alloca.o"; then 
-+   AC_LIBOBJ([alloca])
-+fi
- 
- AC_CHECK_MEMBERS([struct stat.st_rdev])
- AC_CHECK_MEMBERS([struct stat.st_blksize])
---- guile-1.6.4/guile-readline/configure.in~configure-lossage
-+++ guile-1.6.4/guile-readline/configure.in
-@@ -2,6 +2,7 @@
- 
- AC_INIT
- AC_CONFIG_SRCDIR([readline.c])
-+AC_CONFIG_AUX_DIR([..])
- . $srcdir/../GUILE-VERSION
- PACKAGE=guile-readline
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
diff --git a/packages/guile/files/gcc4.patch b/packages/guile/files/gcc4.patch
deleted file mode 100644
index 2168683ad5..0000000000
--- a/packages/guile/files/gcc4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
-#
-
---- guile-1.6.4/libguile/guile.c~gcc4
-+++ guile-1.6.4/libguile/guile.c
-@@ -88,7 +88,7 @@
- {
- #ifdef DYNAMIC_LINKING
-   /* libtool automagically inserts this variable into your executable... */
--  extern const scm_lt_dlsymlist lt_preloaded_symbols[];
-+  extern const scm_lt_dlsymlist *lt_preloaded_symbols;
-   scm_lt_dlpreload_default (lt_preloaded_symbols);
- #endif
-   scm_boot_guile (argc, argv, inner_main, 0);
diff --git a/packages/guile/guile_1.6.4.bb b/packages/guile/guile_1.6.4.bb
deleted file mode 100644
index 092a44c27d..0000000000
--- a/packages/guile/guile_1.6.4.bb
+++ /dev/null
@@ -1,132 +0,0 @@
-DESCRIPTION = "Guile is an interpreter for the Scheme programming language, \
-packaged as a library which can be incorporated into your programs."
-HOMEPAGE = "http://www.gnu.org/software/guile/guile.html"
-SECTION = "devel/scheme"
-DEPENDS = "guile-native"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
-           file://configure-lossage.patch;patch=1 \
-           file://gcc4.patch;patch=1"
-
-inherit autotools
-
-acpaths = "-I ${S}/guile-config"
-
-do_compile() {
-	(cd libguile; oe_runmake CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" guile_filter_doc_snarfage)
-	oe_runmake preinstguile="`which guile`"
-}
-
-LIBGUILE_HEADERS = "\
-__scm.h \
-alist.h \
-arbiters.h \
-async.h \
-backtrace.h \
-boolean.h \
-chars.h \
-continuations.h \
-coop-defs.h \
-debug-malloc.h \
-debug.h \
-deprecation.h \
-dynl.h \
-dynwind.h \
-environments.h \
-eq.h \
-error.h \
-eval.h \
-evalext.h \
-extensions.h \
-feature.h \
-filesys.h \
-fluids.h \
-fports.h \
-gc.h \
-gdb_interface.h \
-gdbint.h \
-goops.h \
-gsubr.h \
-guardians.h \
-hash.h \
-hashtab.h \
-hooks.h \
-init.h \
-ioext.h \
-iselect.h \
-keywords.h \
-lang.h \
-list.h \
-load.h \
-macros.h \
-mallocs.h \
-modules.h \
-net_db.h \
-numbers.h \
-objects.h \
-objprop.h \
-options.h \
-pairs.h \
-ports.h \
-posix.h \
-print.h \
-procprop.h \
-procs.h \
-properties.h \
-ramap.h \
-random.h \
-rdelim.h \
-read.h \
-regex-posix.h \
-root.h \
-rw.h \
-scmconfig.h \
-scmsigs.h \
-script.h \
-simpos.h \
-smob.h \
-snarf.h \
-socket.h \
-sort.h \
-srcprop.h \
-stackchk.h \
-stacks.h \
-stime.h \
-strings.h \
-strop.h \
-strorder.h \
-strports.h \
-struct.h \
-symbols.h \
-tags.h \
-threads.h \
-throw.h \
-unif.h \
-validate.h \
-values.h \
-variable.h \
-vectors.h \
-version.h \
-vports.h \
-weaks.h \
-"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/libguile
-	for i in ${LIBGUILE_HEADERS}; do
-		install -m 0644 libguile/$i ${STAGING_INCDIR}/libguile/$i
-	done
-	install -m 0644 libguile.h ${STAGING_INCDIR}/libguile.h
-	install -d ${STAGING_INCDIR}/guile
-	install -m 0644 libguile/gh.h ${STAGING_INCDIR}/guile/
-	install -d ${STAGING_INCDIR}/guile/srfi
-	install -d ${STAGING_INCDIR}/guile-readline
-	install -m 0644 guile-readline/readline.h ${STAGING_INCDIR}/guile-readline/
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 guile-config/guile.m4 ${STAGING_DATADIR}/aclocal
-	oe_libinstall -C libguile -so -a libguile ${STAGING_LIBDIR}
-	oe_libinstall -C guile-readline -so -a libguilereadline-v-12 ${STAGING_LIBDIR}
-	oe_libinstall -C libguile-ltdl -so -a libguile-ltdl ${STAGING_LIBDIR}
-}
diff --git a/packages/guile/guile_1.8.5.bb b/packages/guile/guile_1.8.5.bb
new file mode 100644
index 0000000000..fa6e696896
--- /dev/null
+++ b/packages/guile/guile_1.8.5.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Guile is an interpreter for the Scheme programming language, \
+packaged as a library which can be incorporated into your programs."
+HOMEPAGE = "http://www.gnu.org/software/guile/guile.html"
+SECTION = "devel/scheme"
+DEPENDS = "guile-native"
+LICENSE = "GPL"
+
+PR = "r1"
+
+SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
+           file://configure-fix.patch;patch=1 "
+
+inherit autotools binconfig
+
+acpaths = "-I ${S}/guile-config"
+
+EXTRA_OECONF = " \
+		--without-threads \
+		--without-included-ltdl \
+               "		
+
+do_compile() {
+	(cd libguile; oe_runmake CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" guile_filter_doc_snarfage)
+	oe_runmake preinstguile="`which guile`"
+        
+        sed -i -e s:${STAGING_DIR_TARGET}::g \
+               -e s:/${TARGET_SYS}::g \
+                  guile-1.8.pc
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb
index f8000ccdd5..f741e20d45 100644
--- a/packages/images/beagleboard-demo-image.bb
+++ b/packages/images/beagleboard-demo-image.bb
@@ -1,6 +1,6 @@
 # Demo image for beagleboard
 
-XSERVER = "xserver-xorg \
+XSERVER ?= "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
            xf86-video-fbdev \
@@ -20,13 +20,13 @@ IMAGE_INSTALL = "\
     angstrom-gpe-task-settings \
     ${ANGSTROM_EXTRA_INSTALL} \
     angstrom-zeroconf-audio \
-   	angstrom-led-config \ 
-	gpe-scap \
+    angstrom-led-config \ 
+    gpe-scap \
     psplash \
     e-wm exhibit \
     xterm xmms epiphany-firefox-replacement \
     swfdec-mozilla \
-	hicolor-icon-theme gnome-icon-theme \
+    hicolor-icon-theme gnome-icon-theme \
     jaaa nmap iperf gnuplot \
     abiword \
 #    gnumeric \
@@ -35,6 +35,7 @@ IMAGE_INSTALL = "\
     pidgin \
 #    irssi \
     mplayer omapfbplay \
+    gnome-games \
 "
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index fb5026db2a..5495af9e1c 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -57,6 +57,7 @@ AUDIO_INSTALL = "\
   alsa-oss \
   alsa-state \
   alsa-utils-aplay \
+  alsa-utils-amixer \
   gst-meta-audio \
   gst-plugin-mad \
   gst-plugin-modplug \
diff --git a/packages/libopie/libopie2/spitz_rotate_fix.patch b/packages/libopie/libopie2/spitz_rotate_fix.patch
new file mode 100644
index 0000000000..428ec0d4cf
--- /dev/null
+++ b/packages/libopie/libopie2/spitz_rotate_fix.patch
@@ -0,0 +1,23 @@
+--- libopie2/opiecore/device/odevice_zaurus.cpp	30 Jul 2007 19:10:52 -0000	1.53
++++ libopie2/opiecore/device/odevice_zaurus.cpp	8 Aug 2008 23:15:15 -0000
+@@ -760,9 +760,18 @@
+         case Key_Up   :
+         case Key_Down :
+         {
+-            if (rotation()==Rot90) {
+-                newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
++            if (d->m_model == Model_Zaurus_SLC3000) {
++                // This ensures that the cursor keys work correctly and that the
++                // side wheel works as expected when the screen is flipped over
++                if (rotation() == Rot270)
++                    newkeycode = Key_Left + ( keycode - Key_Left + 1 ) % 4;
+             }
++            else {
++                if (rotation()==Rot90)
++                    newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
++            }
++            break;
++            
+         }
+         break;
+ 
diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb
index 288b689d52..522fe55f7c 100644
--- a/packages/libopie/libopie2_1.2.3.bb
+++ b/packages/libopie/libopie2_1.2.3.bb
@@ -1,11 +1,12 @@
 require ${PN}.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
            file://gcc-syntax-fix.patch;patch=1 \
            file://h4000_and_default_rot.patch;patch=1 \
-           file://ipaq_rotate_fix.patch;patch=1"
+           file://ipaq_rotate_fix.patch;patch=1 \
+           file://spitz_rotate_fix.patch;patch=1"
 
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/libsdl/files/sdl-cdfix.patch b/packages/libsdl/files/sdl-cdfix.patch
new file mode 100644
index 0000000000..a6a36483d4
--- /dev/null
+++ b/packages/libsdl/files/sdl-cdfix.patch
@@ -0,0 +1,11 @@
+--- /tmp/SDL_syscdrom.c	2008-08-11 21:56:58.000000000 +0200
++++ SDL-1.2.11/src/cdrom/linux/SDL_syscdrom.c	2008-08-11 21:57:07.813198000 +0200
+@@ -51,6 +51,8 @@
+ #ifdef __SVR4
+ #include <sys/cdio.h>
+ #endif
++#include <linux/cdrom.h>
++
+ 
+ /* Define this to use the alternative getmntent() code */
+ #ifndef __SVR4
diff --git a/packages/libsdl/libsdl-x11_1.2.11.bb b/packages/libsdl/libsdl-x11_1.2.11.bb
index 5b49898c01..5a309c57a8 100644
--- a/packages/libsdl/libsdl-x11_1.2.11.bb
+++ b/packages/libsdl/libsdl-x11_1.2.11.bb
@@ -3,15 +3,16 @@ require libsdl.inc
 # extra-keys.patch is missing
 DEFAULT_PREFERENCE = "-1" 
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
            file://acinclude.m4 \
            file://configure_tweak.patch;patch=1 \
            file://pagesize.patch;patch=1 \
-           file://kernel-asm-page.patch;patch=1 "
+           file://kernel-asm-page.patch;patch=1 \
+	   file://sdl-cdfix.patch;patch=1 "
 
-EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
+EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
                 --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
diff --git a/packages/libsigc++-2.0/libsigc++-2.0_2.2.2.bb b/packages/libsigc++-2.0/libsigc++-2.0_2.2.2.bb
new file mode 100644
index 0000000000..61d34840c9
--- /dev/null
+++ b/packages/libsigc++-2.0/libsigc++-2.0_2.2.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "A library for loose coupling of C++ method calls"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-${PV}.tar.gz \
+          "
+
+S = "${WORKDIR}/libsigc++-${PV}"
+
+inherit autotools 
+
+EXTRA_AUTORECONF = "--exclude=autoheader"
+
+FILES_${PN}-dev += "${libdir}/sigc++-*/"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/linux/linux-davinci/8250_davinci.patch b/packages/linux/linux-davinci/8250_davinci.patch
new file mode 100644
index 0000000000..3625ded357
--- /dev/null
+++ b/packages/linux/linux-davinci/8250_davinci.patch
@@ -0,0 +1,28 @@
+--- linux-2.6/drivers/serial/8250.c	2008-08-06 15:56:53.000000000 -0500
++++ linux-2.6-vanilla/drivers/serial/8250.c	2008-08-07 12:24:29.000000000 -0500
+@@ -1867,7 +1867,6 @@
+ 	}
+ 
+ 	if (is_real_interrupt(up->port.irq)) {
+-		unsigned char iir1;
+ 		/*
+ 		 * Test for UARTs that do not reassert THRE when the
+ 		 * transmitter is idle and the interrupt has already
+@@ -1881,7 +1880,7 @@
+ 		wait_for_xmitr(up, UART_LSR_THRE);
+ 		serial_out_sync(up, UART_IER, UART_IER_THRI);
+ 		udelay(1); /* allow THRE to set */
+-		iir1 = serial_in(up, UART_IIR);
++		serial_in(up, UART_IIR);
+ 		serial_out(up, UART_IER, 0);
+ 		serial_out_sync(up, UART_IER, UART_IER_THRI);
+ 		udelay(1); /* allow a working UART time to re-assert THRE */
+@@ -1894,7 +1893,7 @@
+ 		 * If the interrupt is not reasserted, setup a timer to
+ 		 * kick the UART on a regular basis.
+ 		 */
+-		if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
++		if (iir & UART_IIR_NO_INT) {
+ 			pr_debug("ttyS%d - using backup timer\n", port->line);
+ 			up->timer.function = serial8250_backup_timeout;
+ 			up->timer.data = (unsigned long)up;
diff --git a/packages/linux/linux-davinci_2.6.x+git-davinci.bb b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
index 5b5a55aaf3..6560fc9fbb 100644
--- a/packages/linux/linux-davinci_2.6.x+git-davinci.bb
+++ b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
@@ -13,6 +13,7 @@ PR = "r2"
 COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)"
 
 SRC_URI = "git://source.mvista.com/git/linux-davinci-2.6.git;protocol=git \
+           file://8250_davinci.patch;patch=1 \
            file://defconfig"
 
 SRC_URI_append_davinci-sffsdr = " file://sffsdr.patch;patch=1"
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 7c8e756060..e5d3cd1a07 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
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Fri Feb 15 01:08:07 2008
+# Thu Aug  7 19:32:15 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -938,7 +938,11 @@ CONFIG_HW_CONSOLE=y
 #
 # Serial drivers
 #
-# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
 
 #
 # Non-8250 serial port support
diff --git a/packages/linux/linux-omap2-git/beagleboard/01-beagle-cpufreq.diff b/packages/linux/linux-omap2-git/beagleboard/01-beagle-cpufreq.diff
new file mode 100644
index 0000000000..5343f3276b
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/01-beagle-cpufreq.diff
@@ -0,0 +1,178 @@
+--- /tmp/board-omap3beagle.h	2008-08-11 15:40:17.000000000 +0200
++++ git/include/asm-arm/arch-omap/board-omap3beagle.h	2008-08-11 15:41:32.433198000 +0200
+@@ -29,5 +29,41 @@
+ #ifndef __ASM_ARCH_OMAP3_BEAGLE_H
+ #define __ASM_ARCH_OMAP3_BEAGLE_H
+ 
++/* MPU speeds */
++#define S600M   600000000
++#define S550M   550000000
++#define S500M   500000000
++#define S250M   250000000
++#define S125M   125000000
++
++/* IVA speeds */
++#define S430M   430000000
++#define S400M   400000000
++#define S360M   360000000
++#define S180M   180000000
++#define S90M    90000000
++
++/* L3 speeds */
++#define S83M    83000000
++#define S166M   166000000
++
++/* VDD1 OPPS */
++#define VDD1_OPP1       0x1
++#define VDD1_OPP2       0x2
++#define VDD1_OPP3       0x3
++#define VDD1_OPP4       0x4
++#define VDD1_OPP5       0x5
++
++/* VDD2 OPPS */
++#define VDD2_OPP1       0x1
++#define VDD2_OPP2       0x2
++#define VDD2_OPP3       0x3
++
++#define MIN_VDD1_OPP    VDD1_OPP1
++#define MAX_VDD1_OPP    VDD1_OPP5
++#define MIN_VDD2_OPP    VDD2_OPP1
++#define MAX_VDD2_OPP    VDD2_OPP3
++
++
+ #endif /* __ASM_ARCH_OMAP3_BEAGLE_H */
+ 
+--- /tmp/resource34xx.c	2008-08-11 16:11:28.000000000 +0200
++++ git/arch/arm/mach-omap2/resource34xx.c	2008-08-11 16:20:18.803198000 +0200
+@@ -173,7 +173,7 @@
+ 
+ int set_opp(struct shared_resource *resp, u32 target_level)
+ {
+-#ifdef CONFIG_MACH_OMAP_3430SDP
++#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP3_BEAGLE)
+ 	unsigned long mpu_freq, l3_freq, tput;
+ 	int ind;
+ 	struct bus_throughput_db *tput_db;
+@@ -248,7 +248,7 @@
+  */
+ void init_freq(struct shared_resource *resp)
+ {
+-#ifdef CONFIG_MACH_OMAP_3430SDP
++#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP3_BEAGLE)
+ 	char *linked_res_name;
+ 	resp->no_of_users = 0;
+ 
+@@ -269,7 +269,7 @@
+ 
+ int set_freq(struct shared_resource *resp, u32 target_level)
+ {
+-#ifdef CONFIG_MACH_OMAP_3430SDP
++#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP3_BEAGLE)
+ 	unsigned int vdd1_opp;
+ 
+ 	if (strcmp(resp->name, "mpu_freq") == 0)
+--- /tmp/clock34xx.c	2008-08-11 15:57:48.000000000 +0200
++++ git/arch/arm/mach-omap2/clock34xx.c	2008-08-11 16:22:43.093198000 +0200
+@@ -773,7 +773,7 @@
+ 	dpll2_clk = clk_get(NULL, "dpll2_ck");
+ 	dpll3_clk = clk_get(NULL, "dpll3_ck");
+ 
+-#ifdef CONFIG_MACH_OMAP_3430SDP
++#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP3_BEAGLE)
+ 	mpu_speed = dpll1_clk->rate;
+ 	prcm_vdd = vdd1_rate_table + MAX_VDD1_OPP;
+ 	for (; prcm_vdd->speed; prcm_vdd--) {
+@@ -836,7 +836,7 @@
+ 	return (prcm_config+1)->opp;
+ }
+ 
+-#ifdef CONFIG_MACH_OMAP_3430SDP
++#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP3_BEAGLE)
+ static void omap3_table_recalc(struct clk *clk)
+ {
+ 	if ((clk != &virt_vdd1_prcm_set) && (clk != &virt_vdd2_prcm_set))
+--- /tmp/board-omap3beagle.c	2008-08-11 15:54:04.000000000 +0200
++++ git/arch/arm/mach-omap2/board-omap3beagle.c	2008-08-11 16:25:11.333198000 +0200
+@@ -39,9 +39,62 @@
+ #include <asm/arch/gpmc.h>
+ #include <asm/arch/nand.h>
+ 
++#include <asm/arch/clock.h>
++
+ #define GPMC_CS0_BASE  0x60
+ #define GPMC_CS_SIZE   0x30
+ 
++struct vdd_prcm_config vdd1_rate_table[] = {
++       {0, 0, 0},
++       /*OPP1*/
++       {S125M, VDD1_OPP1, 0},
++       /*OPP2*/
++       {S250M, VDD1_OPP2, 0},
++       /*OPP3*/
++       {S500M, VDD1_OPP3, 0},
++       /*OPP4*/
++       {S550M, VDD1_OPP4, 0},
++       /*OPP5*/
++       {S600M, VDD1_OPP5, 0},
++};
++
++struct vdd_prcm_config vdd2_rate_table[] = {
++       {0, 0, 0},
++       /*OPP1*/
++       {0, VDD2_OPP1, 0},
++       /*OPP2*/
++       {S83M, VDD2_OPP2, 0},
++       /*OPP3*/
++       {S166M, VDD2_OPP3, 0},
++};
++
++struct vdd_prcm_config iva2_rate_table[] = {
++       {0, 0, 0},
++       /*OPP1*/
++       {S90M, VDD1_OPP1, 0},
++       /*OPP2*/
++       {S180M, VDD1_OPP2, 0},
++       /*OPP3*/
++       {S360M, VDD1_OPP3, 0},
++       /*OPP4*/
++       {S400M, VDD1_OPP4, 0},
++       /*OPP5*/
++       {S430M, VDD1_OPP5, 0},
++};
++
++u8 vdd1_volts[MAX_VDD1_OPP] = {
++        /* Vsel corresponding to 0.9V (OPP1), 1.00V (OPP2),
++         * 1.20V (OPP3), 1.27V (OPP4), 1.35 (OPP5)
++         */
++        0x18, 0x20, 0x30, 0x36, 0x3C
++};
++
++u8 vdd2_volts[MAX_VDD2_OPP] = {
++        /* Vsel corresponding to 0.9V (OPP1), 1.00V (OPP2), 1.15 (OPP3) */
++        0x18, 0x20, 0x2C
++};
++
++
+ static struct mtd_partition omap3beagle_nand_partitions[] = {
+ 	/* All the partition sizes are listed in terms of NAND block size */
+ 	{
+--- /tmp/cpu-omap.c	2008-08-11 15:43:01.000000000 +0200
++++ git/arch/arm/plat-omap/cpu-omap.c	2008-08-11 16:31:24.943198000 +0200
+@@ -47,7 +47,7 @@
+ 
+ static struct clk *mpu_clk;
+ 
+-#ifdef CONFIG_MACH_OMAP_3430SDP
++#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP3_BEAGLE)
+ extern struct vdd_prcm_config vdd1_rate_table[];
+ extern struct vdd_prcm_config vdd2_rate_table[];
+ extern struct vdd_prcm_config iva2_rate_table[];
+@@ -127,7 +127,7 @@
+ 	ret = clk_set_rate(mpu_clk, freqs.new * 1000);
+ 	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+ #elif defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE)\
+-	&& defined(CONFIG_MACH_OMAP_3430SDP)
++	&& (defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP3_BEAGLE))
+ 	{
+ 		int ind;
+ 		for (ind = 1; ind <= MAX_VDD1_OPP; ind++) {
diff --git a/packages/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init b/packages/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init
deleted file mode 100644
index 5123bafe54..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init
+++ /dev/null
@@ -1,25 +0,0 @@
-clear
-
-From: Paul Walmsley <paul@pwsan.com>
-
-
----
-
- arch/arm/plat-omap/dmtimer.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
-index f22506a..e38a11e 100644
---- a/arch/arm/plat-omap/dmtimer.c
-+++ b/arch/arm/plat-omap/dmtimer.c
-@@ -703,6 +703,10 @@ int __init omap_dm_timer_init(void)
- 			timer->fclk = clk_get(NULL, clk_name);
- 		}
- #endif
-+		omap_dm_timer_write_status(timer, OMAP_TIMER_INT_OVERFLOW |
-+					   OMAP_TIMER_INT_MATCH | 
-+					   OMAP_TIMER_INT_CAPTURE);
-+
- 	}
- 
- 	return 0;
diff --git a/packages/linux/linux-omap2-git/beagleboard/01-make_tick_gptimer_configurable b/packages/linux/linux-omap2-git/beagleboard/01-make_tick_gptimer_configurable
new file mode 100644
index 0000000000..bcf0fa79f8
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/01-make_tick_gptimer_configurable
@@ -0,0 +1,58 @@
+OMAP2/3 GPTIMER: allow system tick GPTIMER to be configurable at build
+
+From: Paul Walmsley <paul@pwsan.com>
+
+Add Kbuild code to allow the builder to select which GPTIMER block to use
+for the Linux clockevents timer.  Practical choices at this point are
+GPTIMER1 or GPTIMER12.  Both of these timers are in the WKUP powerdomain,
+and so are unaffected by chip power management.  GPTIMER1 can use sys_clk
+as a source, for applications where a high-resolution timer is more important
+than power management.  GPTIMER12 has the special property that it has
+the secure 32kHz oscillator as its source clock, which may be less prone
+to glitches than the off-chip 32kHz oscillator.
+
+At this point, it appears that most boards are fine with GPTIMER1,
+but Beagle should use GPTIMER12.
+---
+
+ arch/arm/mach-omap2/Kconfig    |   16 ++++++++++++++++
+ arch/arm/mach-omap2/timer-gp.c |    2 +-
+ 2 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
+index bb6d695..0002cb6 100644
+--- a/arch/arm/mach-omap2/Kconfig
++++ b/arch/arm/mach-omap2/Kconfig
+@@ -122,3 +122,19 @@ config MACH_OMAP3EVM
+ config MACH_OMAP3_BEAGLE
+ 	bool "OMAP3 BEAGLE board"
+ 	depends on ARCH_OMAP3 && ARCH_OMAP34XX
++
++config OMAP_TICK_GPTIMER
++	int "GPTIMER used for system tick timer"
++	depends on ARCH_OMAP2 || ARCH_OMAP3
++	range 1 12
++	default 1
++	help
++	  Linux uses one of the twelve on-board OMAP GPTIMER blocks to generate
++	  system tick interrupts.  The twelve GPTIMERs have slightly
++	  different powerdomain, source clock, and security properties
++	  (mostly documented in the OMAP3 TRMs) that can affect the selection
++	  of which GPTIMER to use.  The historical default is GPTIMER1.
++	  If CONFIG_OMAP_32K_TIMER is selected, Beagle may require GPTIMER12 
++	  due to hardware sensitivity to glitches on the OMAP 32kHz clock
++	  input. 
++
+diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
+index 557603f..ec80af5 100644
+--- a/arch/arm/mach-omap2/timer-gp.c
++++ b/arch/arm/mach-omap2/timer-gp.c
+@@ -99,7 +99,7 @@ static void __init omap2_gp_clockevent_init(void)
+ {
+ 	u32 tick_rate;
+ 
+-	gptimer = omap_dm_timer_request_specific(1);
++	gptimer = omap_dm_timer_request_specific(CONFIG_OMAP_TICK_GPTIMER);
+ 	BUG_ON(gptimer == NULL);
+ 
+ #if defined(CONFIG_OMAP_32K_TIMER)
diff --git a/packages/linux/linux-omap2-git/beagleboard/01-omap3-cpufreq.eml b/packages/linux/linux-omap2-git/beagleboard/01-omap3-cpufreq.eml
new file mode 100644
index 0000000000..b45a81edce
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/01-omap3-cpufreq.eml
@@ -0,0 +1,319 @@
+CPUFreq driver for OMAP3
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/configs/omap_3430sdp_defconfig |   19 +++++++
+ arch/arm/mach-omap2/clock34xx.c         |   42 ++++++++++++++++-
+ arch/arm/mach-omap2/resource34xx.c      |    6 --
+ arch/arm/plat-omap/cpu-omap.c           |   78 ++++++++++++++++++++++++++++++--
+ drivers/cpufreq/cpufreq.c               |    2
+ 5 files changed, 136 insertions(+), 11 deletions(-)
+
+Index: linux-omap-2.6/arch/arm/mach-omap2/clock34xx.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/clock34xx.c	2008-08-11
+17:21:57.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/clock34xx.c	2008-08-11
+17:36:53.000000000 +0530
+@@ -31,6 +31,7 @@
+ #include <asm/arch/sram.h>
+ #include <asm/div64.h>
+ #include <asm/bitops.h>
++#include <linux/cpufreq.h>
+
+ #include <asm/arch/sdrc.h>
+ #include "clock.h"
+@@ -637,6 +638,35 @@ static void omap3_clkoutx2_recalc(struct
+  */
+ #if defined(CONFIG_ARCH_OMAP3)
+
++#ifdef CONFIG_CPU_FREQ
++static struct cpufreq_frequency_table freq_table[MAX_VDD1_OPP+1];
++
++void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
++{
++	struct vdd_prcm_config *prcm;
++	int i = 0;
++
++	prcm = vdd1_rate_table + MAX_VDD1_OPP;
++	for (; prcm->speed; prcm--) {
++		freq_table[i].index = i;
++		freq_table[i].frequency = prcm->speed / 1000;
++		i++;
++	}
++
++	if (i == 0) {
++		printk(KERN_WARNING "%s: failed to initialize frequency \
++								table\n",
++								__func__);
++		return;
++	}
++
++	freq_table[i].index = i;
++	freq_table[i].frequency = CPUFREQ_TABLE_END;
++
++	*table = &freq_table[0];
++}
++#endif
++
+ static struct clk_functions omap2_clk_functions = {
+ 	.clk_enable		= omap2_clk_enable,
+ 	.clk_disable		= omap2_clk_disable,
+@@ -644,6 +674,9 @@ static struct clk_functions omap2_clk_fu
+ 	.clk_set_rate		= omap2_clk_set_rate,
+ 	.clk_set_parent		= omap2_clk_set_parent,
+ 	.clk_disable_unused	= omap2_clk_disable_unused,
++#ifdef CONFIG_CPU_FREQ
++	.clk_init_cpufreq_table = omap2_clk_init_cpufreq_table,
++#endif
+ };
+
+ /*
+@@ -793,12 +826,11 @@ inline unsigned int get_opp(struct vdd_p
+
+ 	if (prcm_config->speed <= freq)
+ 		return prcm_config->opp; /* Return the Highest OPP */
+-	for (; prcm_config->speed; prcm_config--) {
++	for (; prcm_config->speed; prcm_config--)
+ 		if (prcm_config->speed < freq)
+ 			return (prcm_config+1)->opp;
+ 		else if (prcm_config->speed == freq)
+ 			return prcm_config->opp;
+-	}
+ 	/* Return the least OPP */
+ 	return (prcm_config+1)->opp;
+ }
+@@ -878,6 +910,10 @@ static int omap3_select_table_rate(struc
+ 		clk_set_rate(dpll1_clk, prcm_vdd->speed);
+ 		clk_set_rate(dpll2_clk, iva2_rate_table[index].speed);
+ 		curr_vdd1_prcm_set = prcm_vdd;
++		omap2_clksel_recalc(&mpu_ck);
++		propagate_rate(&mpu_ck);
++		omap2_clksel_recalc(&iva2_ck);
++		propagate_rate(&iva2_ck);
+ #ifndef CONFIG_CPU_FREQ
+ 		/*Update loops_per_jiffy if processor speed is being changed*/
+ 		loops_per_jiffy = compute_lpj(loops_per_jiffy,
+@@ -886,6 +922,8 @@ static int omap3_select_table_rate(struc
+ 	} else {
+ 		clk_set_rate(dpll3_clk, prcm_vdd->speed);
+ 		curr_vdd2_prcm_set = prcm_vdd;
++		omap2_clksel_recalc(&core_ck);
++		propagate_rate(&core_ck);
+ 	}
+ 	return 0;
+ }
+Index: linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/resource34xx.c	2008-08-11
+17:36:52.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c	2008-08-11
+17:36:53.000000000 +0530
+@@ -278,11 +278,7 @@ int set_freq(struct shared_resource *res
+ 	else if (strcmp(resp->name, "dsp_freq") == 0)
+ 		vdd1_opp = get_opp(iva2_rate_table + MAX_VDD1_OPP,
+ 							target_level);
+-
+-	if (vdd1_opp == MIN_VDD1_OPP)
+-		resource_release("vdd1_opp", &dummy_srf_dev);
+-	else
+-		resource_request("vdd1_opp", &dummy_srf_dev, vdd1_opp);
++	resource_request("vdd1_opp", &dummy_srf_dev, vdd1_opp);
+
+ 	resp->curr_level = target_level;
+ #endif
+Index: linux-omap-2.6/arch/arm/plat-omap/cpu-omap.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/plat-omap/cpu-omap.c	2008-08-11
+17:21:57.000000000 +0530
++++ linux-omap-2.6/arch/arm/plat-omap/cpu-omap.c	2008-08-11 17:36:53.000000000
++0530
+@@ -8,6 +8,10 @@
+  *
+  *  Based on cpu-sa1110.c, Copyright (C) 2001 Russell King
+  *
++ * Copyright (C) 2007-2008 Texas Instruments, Inc.
++ * Updated to support OMAP3
++ * Rajendra Nayak <rnayak@ti.com>
++ *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+@@ -25,6 +29,9 @@
+ #include <asm/io.h>
+ #include <asm/system.h>
+ #include <asm/arch/clock.h>
++#if defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE)
++#include <asm/arch/omap-pm.h>
++#endif
+
+ #define VERY_HI_RATE	900000000
+
+@@ -32,12 +39,34 @@ static struct cpufreq_frequency_table *f
+
+ #ifdef CONFIG_ARCH_OMAP1
+ #define MPU_CLK		"mpu"
++#elif CONFIG_ARCH_OMAP3
++#define MPU_CLK		"virt_vdd1_prcm_set"
+ #else
+ #define MPU_CLK		"virt_prcm_set"
+ #endif
+
+ static struct clk *mpu_clk;
+
++#ifdef CONFIG_MACH_OMAP_3430SDP
++extern struct vdd_prcm_config vdd1_rate_table[];
++extern struct vdd_prcm_config vdd2_rate_table[];
++extern struct vdd_prcm_config iva2_rate_table[];
++#endif
++
++#if defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE)
++int cpufreq_pre_func(struct notifier_block *n, unsigned long event, void *ptr);
++int cpufreq_post_func(struct notifier_block *n, unsigned long event, void *ptr);
++static struct notifier_block cpufreq_pre = {
++	cpufreq_pre_func,
++	NULL,
++};
++
++static struct notifier_block cpufreq_post = {
++	cpufreq_post_func,
++	NULL,
++};
++#endif
++
+ /* TODO: Add support for SDRAM timing changes */
+
+ int omap_verify_speed(struct cpufreq_policy *policy)
+@@ -89,7 +118,7 @@ static int omap_target(struct cpufreq_po
+
+ 	if (freqs.old == freqs.new)
+ 		return ret;
+-
++#ifdef CONFIG_ARCH_OMAP1
+ 	cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+ #ifdef CONFIG_CPU_FREQ_DEBUG
+ 	printk(KERN_DEBUG "cpufreq-omap: transition: %u --> %u\n",
+@@ -97,10 +126,50 @@ static int omap_target(struct cpufreq_po
+ #endif
+ 	ret = clk_set_rate(mpu_clk, freqs.new * 1000);
+ 	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+-
++#elif defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE)\
++	&& defined(CONFIG_MACH_OMAP_3430SDP)
++	{
++		int ind;
++		for (ind = 1; ind <= MAX_VDD1_OPP; ind++) {
++			if (vdd1_rate_table[ind].speed/1000 >= freqs.new) {
++				omap_pm_cpu_set_freq
++					(vdd1_rate_table[ind].speed);
++				break;
++			}
++		}
++	}
++#endif
+ 	return ret;
+ }
+
++#if defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE)
++static struct cpufreq_freqs freqs_notify;
++int cpufreq_pre_func(struct notifier_block *n, unsigned long event, void *ptr)
++{
++	struct clk_notifier_data *cnd;
++
++	cnd = (struct clk_notifier_data *)ptr;
++	freqs_notify.old = cnd->old_rate/1000;
++	freqs_notify.new = cnd->new_rate/1000;
++	/* HACK: The clk_notify_post_rate_chg currently
++	 * returns a zero for old_rate at bootup
++	 */
++	if (freqs_notify.old == 0)
++		freqs_notify.old = 500000;
++	cpufreq_notify_transition(&freqs_notify, CPUFREQ_PRECHANGE);
++	return 0;
++}
++
++int cpufreq_post_func(struct notifier_block *n, unsigned long event, void *ptr)
++{
++	struct clk_notifier_data *cnd;
++
++	cnd = (struct clk_notifier_data *)ptr;
++	cpufreq_notify_transition(&freqs_notify, CPUFREQ_POSTCHANGE);
++	return 0;
++}
++#endif
++
+ static int __init omap_cpu_init(struct cpufreq_policy *policy)
+ {
+ 	int result = 0;
+@@ -128,7 +197,10 @@ static int __init omap_cpu_init(struct c
+
+ 	/* FIXME: what's the actual transition time? */
+ 	policy->cpuinfo.transition_latency = 10 * 1000 * 1000;
+-
++#if defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE)
++	clk_notifier_register(mpu_clk, &cpufreq_pre);
++	clk_notifier_register(mpu_clk, &cpufreq_post);
++#endif
+ 	return 0;
+ }
+
+Index: linux-omap-2.6/drivers/cpufreq/cpufreq.c
+===================================================================
+--- linux-omap-2.6.orig/drivers/cpufreq/cpufreq.c	2008-08-11 17:21:57.000000000
++0530
++++ linux-omap-2.6/drivers/cpufreq/cpufreq.c	2008-08-11 17:36:53.000000000 +0530
+@@ -321,7 +321,9 @@ void cpufreq_notify_transition(struct cp
+ {
+ 	struct cpufreq_policy *policy;
+
++#if 0 /*This causes an issue if clk_notify_post_rate_chg is used*/
+ 	BUG_ON(irqs_disabled());
++#endif
+
+ 	freqs->flags = cpufreq_driver->flags;
+ 	dprintk("notification %u of frequency transition to %u kHz\n",
+Index: linux-omap-2.6/arch/arm/configs/omap_3430sdp_defconfig
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/configs/omap_3430sdp_defconfig	2008-08-11
+17:36:43.000000000 +0530
++++ linux-omap-2.6/arch/arm/configs/omap_3430sdp_defconfig	2008-08-11
+17:37:33.000000000 +0530
+@@ -193,6 +193,9 @@ CONFIG_OMAP_LL_DEBUG_UART1=y
+ # CONFIG_OMAP_LL_DEBUG_UART2 is not set
+ # CONFIG_OMAP_LL_DEBUG_UART3 is not set
+ CONFIG_OMAP_SERIAL_WAKE=y
++# CONFIG_OMAP_PM_NONE is not set
++# CONFIG_OMAP_PM_NOOP is not set
++CONFIG_OMAP_PM_SRF=y
+ CONFIG_ARCH_OMAP34XX=y
+ CONFIG_ARCH_OMAP3430=y
+
+@@ -288,7 +291,21 @@ CONFIG_CMDLINE="root=/dev/nfs nfsroot=19
+ #
+ # CPU Frequency scaling
+ #
+-# CONFIG_CPU_FREQ is not set
++CONFIG_CPU_FREQ=y
++CONFIG_CPU_FREQ_TABLE=y
++# CONFIG_CPU_FREQ_DEBUG is not set
++CONFIG_CPU_FREQ_STAT=y
++CONFIG_CPU_FREQ_STAT_DETAILS=y
++CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
++# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
++# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
++# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
++# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
++CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
++# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
++# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
++CONFIG_CPU_FREQ_GOV_ONDEMAND=y
++# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+
+ #
+ # Floating point emulation
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/01-omappm-srf.eml b/packages/linux/linux-omap2-git/beagleboard/01-omappm-srf.eml
new file mode 100644
index 0000000000..8b8b183808
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/01-omappm-srf.eml
@@ -0,0 +1,513 @@
+Adds Generic Shared Resource Framework structures and API's
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/plat-omap/resource.c        |  389 +++++++++++++++++++++++++++++++++++
+ include/asm-arm/arch-omap/resource.h |   97 ++++++++
+ 2 files changed, 486 insertions(+)
+
+Index: linux-omap-2.6/arch/arm/plat-omap/resource.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-omap-2.6/arch/arm/plat-omap/resource.c	2008-08-07 15:06:58.000000000
++0530
+@@ -0,0 +1,389 @@
++/*
++ * linux/arch/arm/plat-omap/resource.c
++ * Shared Resource Framework API implementation
++ *
++ * Copyright (C) 2007-2008 Texas Instruments, Inc.
++ * Written by Rajendra Nayak <rnayak@ti.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
++ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++ * History:
++ *
++ */
++
++#include <linux/errno.h>
++#include <linux/err.h>
++#include <asm/arch/resource.h>
++#include <linux/slab.h>
++
++/* res_list contains all registered struct shared_resource */
++static LIST_HEAD(res_list);
++
++/* res_mutex protects res_list add and del ops */
++static DEFINE_MUTEX(res_mutex);
++
++/* Static Pool of users for a resource */
++/* used till kmalloc becomes availabel */
++struct  users_list usr_list[MAX_USERS];
++
++/* Private/Internal functions */
++
++/**
++ * resource_lookup - loop up a resource by its name, return a pointer
++ * @name: The name of the resource to lookup
++ *
++ * Looks for a registered resource by its name. Returns a pointer to
++ * the struct shared_resource if found, else returns NULL.
++ */
++static struct shared_resource *resource_lookup(const char *name)
++{
++	struct shared_resource *res, *tmp_res;
++
++	if (!name)
++		return NULL;
++
++	res = NULL;
++
++	srf_mutex_lock(&res_mutex);
++	list_for_each_entry(tmp_res, &res_list, node) {
++		if (!strcmp(name, tmp_res->name)) {
++			res = tmp_res;
++			break;
++		}
++	}
++	srf_mutex_unlock(&res_mutex);
++	return res;
++}
++
++/**
++ * update_resource_level - Regenerates and updates the curr_level of the res
++ * @resp: Pointer to the resource
++ *
++ * This function looks at all the users of the given resource and the levels
++ * requested by each of them, and recomputes a target level for the resource
++ * acceptable to all its current usres. It then calls platform specific
++ * change_level to change the level of the resource.
++ * Returns 0 on success, else a non-zero value returned by the platform
++ * specific change_level function.
++ **/
++static int update_resource_level(struct shared_resource *resp)
++{
++	struct users_list *user;
++	unsigned long target_level;
++	int ret;
++
++	/* Regenerate the target_value for the resource */
++	target_level = RES_DEFAULTLEVEL;
++	list_for_each_entry(user, &resp->users_list, node)
++		if (user->level > target_level)
++			target_level = user->level;
++
++	pr_debug("SRF: Changing Level for resource %s to %ld\n",
++				resp->name, target_level);
++	ret = resp->ops->change_level(resp, target_level);
++	if (ret) {
++		printk(KERN_ERR "Unable to Change"
++					"level for resource %s to %ld\n",
++		resp->name, target_level);
++		return ret;
++	}
++	return ret;
++}
++
++/**
++ * get_user - gets a new users_list struct from static pool or dynamically
++ *
++ * This function initally looks for availability in the static pool and
++ * tries to dynamcially allocate only once the static pool is empty.
++ * We hope that during bootup by the time we hit a case of dynamic allocation
++ * slab initialization would have happened.
++ * Returns a pointer users_list struct on success. On dynamic allocation failure
++ * returns a ERR_PTR(-ENOMEM).
++ */
++static struct users_list *get_user(void)
++{
++	int ind = 0;
++	struct users_list *user;
++
++	/* See if something available in the static pool */
++	while (ind < MAX_USERS) {
++		if (usr_list[ind].usage == UNUSED)
++			break;
++		else
++			ind++;
++	}
++	if (ind < MAX_USERS) {
++		/* Pick from the static pool */
++		user = &usr_list[ind];
++		user->usage = STATIC_ALLOC;
++	} else {
++		/* By this time we hope slab is initialized */
++		if (slab_is_available()) {
++			user = kmalloc(sizeof(struct  users_list), GFP_KERNEL);
++			if (!user) {
++				printk(KERN_ERR "SRF:FATAL ERROR: kmalloc"
++							"failed\n");
++				return ERR_PTR(-ENOMEM);
++			}
++			user->usage = DYNAMIC_ALLOC;
++		} else {
++			/* Dynamic alloc not available yet */
++			printk(KERN_ERR "SRF: FATAL ERROR: users_list"
++				"initial POOL EMPTY before slab init\n");
++			return ERR_PTR(-ENOMEM);
++		}
++	}
++	return user;
++}
++
++/**
++ * free_user - frees the dynamic users_list and marks the static one unused
++ * @user: The struct users_list to be freed
++ *
++ * Looks at the usage flag and either frees the users_list if it was
++ * dynamically allocated, and if its from the static pool, marks it unused.
++ * No return value.
++ */
++void free_user(struct users_list *user)
++{
++	if (user->usage == DYNAMIC_ALLOC)
++		kfree(user);
++	else {
++		user->usage = UNUSED;
++		user->level = RES_DEFAULTLEVEL;
++		user->dev = NULL;
++	}
++}
++
++/**
++ * resource_init - Initializes the Shared resource framework.
++ * @resources: List of all the resources modelled
++ *
++ * Loops through the list of resources and registers all that
++ * are available for the current CPU.
++ * No return value
++ */
++void resource_init(struct shared_resource **resources)
++{
++	struct shared_resource **resp;
++	int ind;
++
++	pr_debug("Initializing Shared Resource Framework\n");
++
++	if (!cpu_is_omap343x()) {
++		/* This CPU is not supported */
++		printk(KERN_WARNING "Shared Resource Framework does not"
++			"support this CPU type.\n");
++		WARN_ON(1);
++	}
++
++	/* Init the users_list POOL */
++	for (ind = 0; ind < MAX_USERS; ind++) {
++		usr_list[ind].usage = UNUSED;
++		usr_list[ind].dev = NULL;
++		usr_list[ind].level = RES_DEFAULTLEVEL;
++	}
++
++	if (resources)
++		for (resp = resources; *resp; resp++)
++			resource_register(*resp);
++}
++
++/**
++ * resource_register - registers and initializes a resource
++ * @res: struct shared_resource * to register
++ *
++ * Initializes the given resource and adds it to the resource list
++ * for the current CPU.
++ * Returns 0 on success, -EINVAL if given a NULL pointer, -EEXIST if the
++ * resource is already registered.
++ */
++int resource_register(struct shared_resource *resp)
++{
++	if (!resp)
++		return -EINVAL;
++
++	if (!omap_chip_is(resp->omap_chip))
++		return -EINVAL;
++
++	/* Verify that the resource is not already registered */
++	if (resource_lookup(resp->name))
++		return -EEXIST;
++
++	INIT_LIST_HEAD(&resp->users_list);
++	mutex_init(&resp->res_mutex);
++
++	srf_mutex_lock(&res_mutex);
++	/* Add the resource to the resource list */
++	list_add(&resp->node, &res_list);
++	srf_mutex_unlock(&res_mutex);
++
++	/* Call the resource specific init*/
++	if (resp->ops->init)
++		resp->ops->init(resp);
++
++	pr_debug("resource: registered %s\n", resp->name);
++
++	return 0;
++}
++EXPORT_SYMBOL(resource_register);
++
++/**
++ * resource_unregister - unregister a resource
++ * @res: struct shared_resource * to unregister
++ *
++ * Removes a resource from the resource list.
++ * Returns 0 on success, -EINVAL if passed a NULL pointer.
++ */
++int resource_unregister(struct shared_resource *resp)
++{
++	if (!resp)
++		return -EINVAL;
++
++	srf_mutex_lock(&res_mutex);
++	/* delete the resource from the resource list */
++	list_del(&resp->node);
++	srf_mutex_unlock(&res_mutex);
++
++	pr_debug("resource: unregistered %s\n", resp->name);
++
++	return 0;
++}
++EXPORT_SYMBOL(resource_unregister);
++
++/**
++ * resource_request - Request for a required level of a resource
++ * @name: The name of the resource requested
++ * @dev: Uniquely identifes the caller
++ * @level: The requested level for the resource
++ *
++ * This function recomputes the target level of the resource based on
++ * the level requested by the user. The level of the resource is
++ * changed to the target level, if it is not the same as the existing level
++ * of the resource. Multiple calls to this function by the same device will
++ * replace the previous level requested
++ * Returns 0 on success, -EINVAL if the resource name passed in invalid.
++ * -ENOMEM if no static pool available or dynamic allocations fails.
++ * Else returns a non-zero error value returned by one of the failing
++ * shared_resource_ops.
++ */
++int resource_request(const char *name, struct device *dev,
++					unsigned long level)
++{
++	struct shared_resource *resp;
++	struct  users_list *user;
++	int 	found = 0, ret = 0;
++
++	resp = resource_lookup(name);
++	if (!resp) {
++		printk(KERN_ERR "resource_request: Invalid resource name\n");
++		return -EINVAL;
++	}
++
++	/* Call the resource specific validate function */
++	if (resp->ops->validate_level)
++		ret = resp->ops->validate_level(resp, level);
++		if (ret)
++			return ret;
++
++	srf_mutex_lock(&resp->res_mutex);
++	list_for_each_entry(user, &(resp->users_list), node)
++		if (user->dev == dev) {
++			found = 1;
++			break;
++		}
++	if (!found) {
++		/* First time user */
++		user = get_user();
++		if (IS_ERR(user)) {
++			srf_mutex_unlock(&resp->res_mutex);
++			return -ENOMEM;
++		}
++		user->dev = dev;
++		list_add(&user->node, &resp->users_list);
++		resp->no_of_users++;
++	}
++	user->level = level;
++	srf_mutex_unlock(&resp->res_mutex);
++
++	/* Recompute and set the current level for the resource */
++	return update_resource_level(resp);
++}
++EXPORT_SYMBOL(resource_request);
++
++/**
++ * resource_release - Release a previously requested level of a resource
++ * @name: The name of the resource to be released
++ * @dev: Uniquely identifes the caller
++ *
++ * This function recomputes the target level of the resource after removing
++ * the level requested by the user. The level of the resource is
++ * changed to the target level, if it is not the same as the existing level
++ * of the resource.
++ * Returns 0 on success, -EINVAL if the resource name or dev structure
++ * is invalid.
++ */
++int resource_release(const char *name, struct device *dev)
++{
++	struct shared_resource *resp;
++	struct users_list *user;
++	int found = 0;
++
++	resp = resource_lookup(name);
++	if (!resp) {
++		printk(KERN_ERR "resource_release: Invalid resource name\n");
++		return -EINVAL;
++	}
++
++	srf_mutex_lock(&resp->res_mutex);
++	list_for_each_entry(user, &(resp->users_list), node)
++		if (user->dev == dev) {
++			found = 1;
++			break;
++		}
++
++	if (!found) {
++		srf_mutex_unlock(&resp->res_mutex);
++		/* No such user exists */
++		return -EINVAL;
++	}
++
++	resp->no_of_users--;
++	list_del(&user->node);
++	free_user(user);
++	srf_mutex_unlock(&resp->res_mutex);
++
++	/* Recompute and set the current level for the resource */
++	return update_resource_level(resp);
++}
++EXPORT_SYMBOL(resource_release);
++
++/**
++ * resource_get_level - Returns the current level of the resource
++ * @name: Name of the resource
++ *
++ * Returns the current level of the resource if found, else returns
++ * -EINVAL if the resource name is invalid.
++ */
++int resource_get_level(const char *name)
++{
++	struct shared_resource *resp;
++	u32 ret;
++
++	resp = resource_lookup(name);
++	if (!resp) {
++		printk(KERN_ERR "resource_release: Invalid resource name\n");
++		return -EINVAL;
++	}
++
++	srf_mutex_lock(&resp->res_mutex);
++	ret = resp->curr_level;
++	srf_mutex_unlock(&resp->res_mutex);
++	return ret;
++}
++EXPORT_SYMBOL(resource_get_level);
+Index: linux-omap-2.6/include/asm-arm/arch-omap/resource.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-omap-2.6/include/asm-arm/arch-omap/resource.h	2008-08-07
+15:06:58.000000000 +0530
+@@ -0,0 +1,97 @@
++/*
++ * linux/include/asm-arm/arch-omap/resource.h
++ * Structure definitions for Shared resource Framework
++ *
++ * Copyright (C) 2007-2008 Texas Instruments, Inc.
++ * Written by Rajendra Nayak <rnayak@ti.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
++ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++ *
++ * History:
++ *
++ */
++
++#ifndef __ARCH_ARM_OMAP_RESOURCE_H
++#define __ARCH_ARM_OMAP_RESOURCE_H
++
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/device.h>
++#include <asm/arch/cpu.h>
++
++#define srf_mutex_lock(x)	{ \
++				if (!(in_atomic() || irqs_disabled()))	\
++					mutex_lock(x); \
++				}
++#define srf_mutex_unlock(x)	{ \
++				if (!(in_atomic() || irqs_disabled()))  \
++					mutex_unlock(x); \
++				}
++
++#define RES_DEFAULTLEVEL	0x0
++
++struct shared_resource_ops; /* forward declaration */
++
++/* Used to model a Shared Multilevel Resource */
++struct shared_resource {
++	/* Resource name */
++	const char *name;
++	/* Used to represent the OMAP chip types containing this res */
++	const struct omap_chip_id omap_chip;
++	/* Total no of users at any point of this resource */
++	u8 no_of_users;
++	/* Current level of this resource */
++	u32 curr_level;
++	/* Used to store any resource specific data */
++	void  *resource_data;
++	/* List of all the current users for this resource */
++	struct list_head users_list;
++	/* Used to guard the resource */
++	struct mutex res_mutex;
++	/* Shared resource operations */
++	struct shared_resource_ops *ops;
++	struct list_head node;
++};
++
++struct shared_resource_ops {
++	/* Init function for the resource */
++	void (*init)(struct shared_resource *res);
++	/* Function to change the level of the resource */
++	int (*change_level)(struct shared_resource *res, u32 target_level);
++	/* Function to validate the requested level of the resource */
++	int (*validate_level)(struct shared_resource *res, u32 target_level);
++};
++
++/* This is to statically defining the users pool */
++/* This static pool is used till kmalloc becomes available */
++#define MAX_USERS	10
++#define UNUSED		0x0
++#define	DYNAMIC_ALLOC	0x1
++#define STATIC_ALLOC	0x2
++
++/* Used to represent a user of a shared resource */
++struct users_list {
++	/* Device pointer used to uniquely identify the user */
++	struct device *dev;
++	/* Current level as requested for the resource by the user */
++	u32 level;
++	struct list_head node;
++	u8 usage;
++};
++
++/* Shared resource Framework API's */
++void resource_init(struct shared_resource **resources);
++int resource_register(struct shared_resource *res);
++int resource_unregister(struct shared_resource *res);
++int resource_request(const char *name, struct device *dev,
++						 unsigned long level);
++int resource_release(const char *name, struct device *dev);
++int resource_get_level(const char *name);
++
++#endif /* __ARCH_ARM_OMAP_RESOURCE_H */
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/01-postrate-notifier.eml b/packages/linux/linux-omap2-git/beagleboard/01-postrate-notifier.eml
new file mode 100644
index 0000000000..8e72afeb3f
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/01-postrate-notifier.eml
@@ -0,0 +1,392 @@
+Add the infrastructure necessary to support clock post-rate-change notifiers
+in the OMAP clock framework.  This includes:
+
+- adding the clk_notify_post_rate_chg() function, which will trigger a
+  notifier call chain when a clock rate is changed (but which currently
+  does nothing); and
+
+- adding calls to clk_notify_post_rate_chg() everywhere clk->rate is
+  assigned (mostly *_recalc() functions).
+
+This patch has no functional effect by itself; the actual notifier
+implementation follows in a separate patch.
+
+One item to note is that the post-rate-change notifier is called even
+if the new clock rate is identical to the old rate.  This is because
+the process of changing the rate may have temporarily disabled or
+glitched the clock or one of its parents, and some devices may be
+sensitive to such changes.
+
+Signed-off-by: Paul Walmsley <paul@pwsan.com>
+---
+
+ arch/arm/mach-omap2/clock.c       |   37 +++++++++++++++++++++++++++------
+ arch/arm/mach-omap2/clock24xx.c   |   42 +++++++++++++++++++++++++++++++++++--
+ arch/arm/mach-omap2/clock34xx.c   |   10 +++++++++
+ arch/arm/plat-omap/clock.c        |   32 ++++++++++++++++++++++++++++
+ include/asm-arm/arch-omap/clock.h |   21 +++++++++++++++++++
+ 5 files changed, 134 insertions(+), 8 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
+index ed15868..bd3c1f8 100644
+--- a/arch/arm/mach-omap2/clock.c
++++ b/arch/arm/mach-omap2/clock.c
+@@ -165,10 +165,15 @@ u32 omap2_get_dpll_rate(struct clk *clk)
+  */
+ void omap2_fixed_divisor_recalc(struct clk *clk)
+ {
++	unsigned long orig_rate;
++
+ 	WARN_ON(!clk->fixed_div);
+ 
++	orig_rate = clk->rate;
+ 	clk->rate = clk->parent->rate / clk->fixed_div;
+ 
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
+ 	if (clk->flags & RATE_PROPAGATES)
+ 		propagate_rate(clk);
+ }
+@@ -376,6 +381,7 @@ int omap2_clk_enable(struct clk *clk)
+ void omap2_clksel_recalc(struct clk *clk)
+ {
+ 	u32 div = 0;
++	unsigned long orig_rate;
+ 
+ 	pr_debug("clock: recalc'ing clksel clk %s\n", clk->name);
+ 
+@@ -385,10 +391,13 @@ void omap2_clksel_recalc(struct clk *clk)
+ 
+ 	if (clk->rate == (clk->parent->rate / div))
+ 		return;
++	orig_rate = clk->rate;
+ 	clk->rate = clk->parent->rate / div;
+ 
+ 	pr_debug("clock: new clock rate is %ld (div %d)\n", clk->rate, div);
+ 
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
+ 	if (clk->flags & RATE_PROPAGATES)
+ 		propagate_rate(clk);
+ }
+@@ -662,6 +671,8 @@ int omap2_clksel_set_rate(struct clk *clk, unsigned long rate)
+ 		wmb();
+ 	}
+ 
++	/* post-rate-change notifier will be called by omap2_clk_set_rate() */
++
+ 	return 0;
+ }
+ 
+@@ -670,20 +681,30 @@ int omap2_clksel_set_rate(struct clk *clk, unsigned long rate)
+ int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
+ {
+ 	int ret = -EINVAL;
+-
+-	pr_debug("clock: set_rate for clock %s to rate %ld\n", clk->name, rate);
++	unsigned long orig_rate;
+ 
+ 	/* CONFIG_PARTICIPANT clocks are changed only in sets via the
+ 	   rate table mechanism, driven by mpu_speed  */
+ 	if (clk->flags & CONFIG_PARTICIPANT)
+ 		return -EINVAL;
+ 
++	if (!clk->set_rate)
++		return -EINVAL;
++
++	orig_rate = clk->rate;
++
++	pr_debug("clock: set_rate for clock %s from %ld Hz to %ld Hz\n",
++		 clk->name, orig_rate, rate);
++
+ 	/* dpll_ck, core_ck, virt_prcm_set; plus all clksel clocks */
+-	if (clk->set_rate)
+-		ret = clk->set_rate(clk, rate);
++	ret = clk->set_rate(clk, rate);
+ 
+-	if (ret == 0 && (clk->flags & RATE_PROPAGATES))
+-		propagate_rate(clk);
++	if (ret == 0) {
++		clk_notify_post_rate_chg(clk, orig_rate, rate);
++
++		if (clk->flags & RATE_PROPAGATES)
++			propagate_rate(clk);
++	}
+ 
+ 	return ret;
+ }
+@@ -732,6 +753,7 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
+ {
+ 	void __iomem *src_addr;
+ 	u32 field_val, field_mask, reg_val, parent_div;
++	unsigned long orig_rate;
+ 
+ 	if (clk->flags & CONFIG_PARTICIPANT)
+ 		return -EINVAL;
+@@ -765,11 +787,14 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
+ 	clk->parent = new_parent;
+ 
+ 	/* CLKSEL clocks follow their parents' rates, divided by a divisor */
++	orig_rate = clk->rate;
+ 	clk->rate = new_parent->rate;
+ 
+ 	if (parent_div > 0)
+ 		clk->rate /= parent_div;
+ 
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
+ 	pr_debug("clock: set parent of %s to %s (new rate %ld)\n",
+ 		 clk->name, clk->parent->name, clk->rate);
+ 
+diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
+index 54cc6e1..e001549 100644
+--- a/arch/arm/mach-omap2/clock24xx.c
++++ b/arch/arm/mach-omap2/clock24xx.c
+@@ -172,11 +172,22 @@ static long omap2_dpllcore_round_rate(unsigned long target_rate)
+ 
+ static void omap2_dpllcore_recalc(struct clk *clk)
+ {
++	unsigned long orig_rate;
++
++	orig_rate = clk->rate;
+ 	clk->rate = omap2_get_dpll_rate_24xx(clk);
+ 
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
+ 	propagate_rate(clk);
+ }
+ 
++/*
++ * XXX REVISIT: This code needs to keep track of the underlying struct
++ * clocks that it is changing, so it can call post-rate-change notifiers
++ * on them.  This function probably should be rewritten to use the clock
++ * fw.
++ */
+ static int omap2_reprogram_dpllcore(struct clk *clk, unsigned long rate)
+ {
+ 	u32 cur_rate, low, mult, div, valid_rate, done_rate;
+@@ -259,7 +270,14 @@ dpll_exit:
+  */
+ static void omap2_table_mpu_recalc(struct clk *clk)
+ {
++	unsigned long orig_rate;
++
++	orig_rate = clk->rate;
+ 	clk->rate = curr_prcm_set->mpu_speed;
++
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
++	/* No rate propagation since table clocks have no children */
+ }
+ 
+ /*
+@@ -294,7 +312,14 @@ static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate)
+ 	return highest_rate;
+ }
+ 
+-/* Sets basic clocks based on the specified rate */
++/*
++ * Sets basic clocks based on the specified rate
++ *
++ * XXX REVISIT: This code needs to keep track of the underlying struct
++ * clocks that it is changing, so it can call post-rate-change notifiers
++ * on them.  This function probably should be rewritten to use the clock
++ * fw.
++ */
+ static int omap2_select_table_rate(struct clk *clk, unsigned long rate)
+ {
+ 	u32 cur_rate, done_rate, bypass = 0, tmp;
+@@ -353,7 +378,8 @@ static int omap2_select_table_rate(struct clk *clk, unsigned long rate)
+ 		cm_write_mod_reg(prcm->cm_clksel_gfx, GFX_MOD, CM_CLKSEL);
+ 
+ 		/* Major subsystem dividers */
+-		tmp = cm_read_mod_reg(CORE_MOD, CM_CLKSEL1) & OMAP24XX_CLKSEL_DSS2_MASK;
++		tmp = cm_read_mod_reg(CORE_MOD, CM_CLKSEL1) &
++			OMAP24XX_CLKSEL_DSS2_MASK;
+ 		cm_write_mod_reg(prcm->cm_clksel1_core | tmp, CORE_MOD,
+ 				 CM_CLKSEL1);
+ 
+@@ -460,13 +486,25 @@ static u32 omap2_get_sysclkdiv(void)
+ 
+ static void omap2_osc_clk_recalc(struct clk *clk)
+ {
++	unsigned long orig_rate;
++
++	orig_rate = clk->rate;
+ 	clk->rate = omap2_get_apll_clkin() * omap2_get_sysclkdiv();
++
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
+ 	propagate_rate(clk);
+ }
+ 
+ static void omap2_sys_clk_recalc(struct clk *clk)
+ {
++	unsigned long orig_rate;
++
++	orig_rate = clk->rate;
+ 	clk->rate = clk->parent->rate / omap2_get_sysclkdiv();
++
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
+ 	propagate_rate(clk);
+ }
+ 
+diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
+index 408b51a..7b89b61 100644
+--- a/arch/arm/mach-omap2/clock34xx.c
++++ b/arch/arm/mach-omap2/clock34xx.c
+@@ -53,8 +53,13 @@
+  */
+ static void omap3_dpll_recalc(struct clk *clk)
+ {
++	unsigned long orig_rate;
++
++	orig_rate = clk->rate;
+ 	clk->rate = omap2_get_dpll_rate(clk);
+ 
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
+ 	propagate_rate(clk);
+ }
+ 
+@@ -500,6 +505,7 @@ static void omap3_clkoutx2_recalc(struct clk *clk)
+ 	const struct dpll_data *dd;
+ 	u32 v;
+ 	struct clk *pclk;
++	unsigned long orig_rate;
+ 
+ 	/* Walk up the parents of clk, looking for a DPLL */
+ 	pclk = clk->parent;
+@@ -513,6 +519,8 @@ static void omap3_clkoutx2_recalc(struct clk *clk)
+ 
+ 	WARN_ON(!dd->control_reg || !dd->enable_mask);
+ 
++	orig_rate = clk->rate;
++
+ 	v = __raw_readl(dd->control_reg) & dd->enable_mask;
+ 	v >>= __ffs(dd->enable_mask);
+ 	if (v != DPLL_LOCKED)
+@@ -520,6 +528,8 @@ static void omap3_clkoutx2_recalc(struct clk *clk)
+ 	else
+ 		clk->rate = clk->parent->rate * 2;
+ 
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
+ 	if (clk->flags & RATE_PROPAGATES)
+ 		propagate_rate(clk);
+ }
+diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
+index c2e741d..421d076 100644
+--- a/arch/arm/plat-omap/clock.c
++++ b/arch/arm/plat-omap/clock.c
+@@ -254,10 +254,16 @@ __setup("mpurate=", omap_clk_setup);
+ /* Used for clocks that always have same value as the parent clock */
+ void followparent_recalc(struct clk *clk)
+ {
++	unsigned long orig_rate;
++
+ 	if (clk == NULL || IS_ERR(clk))
+ 		return;
+ 
++	orig_rate = clk->rate;
+ 	clk->rate = clk->parent->rate;
++
++	clk_notify_post_rate_chg(clk, orig_rate, clk->rate);
++
+ 	if (unlikely(clk->flags & RATE_PROPAGATES))
+ 		propagate_rate(clk);
+ }
+@@ -373,6 +379,32 @@ void clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
+ EXPORT_SYMBOL(clk_init_cpufreq_table);
+ #endif
+ 
++/**
++ * clk_notify_post_rate_chg - call post-clk-rate-change notifier chain
++ * @clk: struct clk * that is changing rate
++ * @old_rate: old rate
++ * @new_rate: new rate
++ *
++ * Triggers a notifier call chain on the post-clk-rate-change notifier
++ * for clock 'clk'.  Passes a pointer to the struct clk and the
++ * previous and current rates to the notifier callback.  Intended to be
++ * called by internal clock code only.  No return value.
++ */
++void clk_notify_post_rate_chg(struct clk *clk, unsigned long old_rate,
++			      unsigned long new_rate)
++{
++	struct clk_notifier *cn;
++	struct clk_notifier_data cnd;
++
++	cnd.clk = clk;
++	cnd.old_rate = old_rate;
++	cnd.new_rate = new_rate;
++
++	/* XXX Call notifier here */
++
++}
++
++
+ /*-------------------------------------------------------------------------*/
+ 
+ #ifdef CONFIG_OMAP_RESET_CLOCKS
+diff --git a/include/asm-arm/arch-omap/clock.h b/include/asm-arm/arch-omap/clock.h
+index bfaf7b6..e3c9aeb 100644
+--- a/include/asm-arm/arch-omap/clock.h
++++ b/include/asm-arm/arch-omap/clock.h
+@@ -10,6 +10,8 @@
+  * published by the Free Software Foundation.
+  */
+ 
++#include <linux/notifier.h>
++
+ #ifndef __ARCH_ARM_OMAP_CLOCK_H
+ #define __ARCH_ARM_OMAP_CLOCK_H
+ 
+@@ -58,6 +60,19 @@ struct dpll_data {
+ 
+ #endif
+ 
++struct clk_notifier {
++	struct clk			*clk;
++	struct atomic_notifier_head	notifier_head;
++	struct list_head		node;
++};
++
++struct clk_notifier_data {
++	struct clk			*clk;
++	unsigned long			old_rate;
++	unsigned long			new_rate;
++};
++
++
+ struct clk {
+ 	struct list_head	node;
+ 	struct module		*owner;
+@@ -121,6 +136,10 @@ extern void clk_allow_idle(struct clk *clk);
+ extern void clk_deny_idle(struct clk *clk);
+ extern int clk_get_usecount(struct clk *clk);
+ extern void clk_enable_init_clocks(void);
++extern int clk_notifier_register(struct clk *clk, struct notifier_block *nb);
++extern int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb);
++extern void clk_notify_post_rate_chg(struct clk *clk, unsigned long old_rate,
++				     unsigned long new_rate);
+ #ifdef CONFIG_CPU_FREQ
+ extern void clk_init_cpufreq_table(struct cpufreq_frequency_table **table);
+ #endif
+@@ -161,6 +180,8 @@ extern void clk_init_cpufreq_table(struct cpufreq_frequency_table **table);
+ 
+ #define RATE_IN_24XX		(RATE_IN_242X | RATE_IN_243X)
+ 
++/* Clk rate change notifier callback type */
++#define CLK_POST_RATE_CHANGE		1
+ 
+ /* CM_CLKSEL2_PLL.CORE_CLK_SRC options (24XX) */
+ #define CORE_CLK_SRC_32K		0
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/02-beagle_use_gptimer12 b/packages/linux/linux-omap2-git/beagleboard/02-beagle_use_gptimer12
new file mode 100644
index 0000000000..51d2c8cff0
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/02-beagle_use_gptimer12
@@ -0,0 +1,38 @@
+BeagleBoard: make Beagle use GPTIMER12 for system ticks
+
+From: Paul Walmsley <paul@pwsan.com>
+
+There is suspicion that the 32kHz input clock to the OMAP may be noisy
+on BeagleBoards.  On OMAP2/3 GPTIMER1, this can cause the timer
+counter register to warp to unknown values or miss interrupt
+conditions.  So, use GPTIMER12 instead, which apparently has its own
+secure 32kHz oscillator and will hopefully not be prone to the 32kHz
+glitches.
+---
+
+ arch/arm/configs/omap3_beagle_defconfig |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig
+index e1b16d0..7805995 100644
+--- a/arch/arm/configs/omap3_beagle_defconfig
++++ defconfig
+@@ -182,8 +182,8 @@ CONFIG_OMAP_BOOT_REASON=y
+ # CONFIG_OMAP_MCBSP is not set
+ # CONFIG_OMAP_MMU_FWK is not set
+ # CONFIG_OMAP_MBOX_FWK is not set
+-CONFIG_OMAP_MPU_TIMER=y
+-# CONFIG_OMAP_32K_TIMER is not set
++# CONFIG_OMAP_MPU_TIMER is not set
++CONFIG_OMAP_32K_TIMER=y
+ CONFIG_OMAP_DM_TIMER=y
+ # CONFIG_OMAP_LL_DEBUG_UART1 is not set
+ # CONFIG_OMAP_LL_DEBUG_UART2 is not set
+@@ -198,6 +198,7 @@ CONFIG_ARCH_OMAP3430=y
+ # CONFIG_MACH_OMAP_3430SDP is not set
+ # CONFIG_MACH_OMAP3EVM is not set
+ CONFIG_MACH_OMAP3_BEAGLE=y
++CONFIG_OMAP_TICK_GPTIMER=12
+ 
+ #
+ # Boot options
diff --git a/packages/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick b/packages/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick
deleted file mode 100644
index 6eb6c9b477..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick
+++ /dev/null
@@ -1,97 +0,0 @@
-OMAP2/3 system tick GPTIMER: use match interrupts rather than overflow interrupts
-
-From: Paul Walmsley <paul@pwsan.com>
-
-On some OMAP3 chips, GPTIMER1 will occasionally decline to interrupt
-the MPU when a timer overflow event occurs.  The timer stops running;
-and TOCR is sometimes incremented; but the MPU apparently never receives
-the interrupt.  This patch was an experiment in using the GPTIMER
-match interrupt to determine if it resolves the problem.
-Unfortunately, it does not; the same problem occurs with match
-interrupts; but this patch is preserved as the base for a
-match+overflow interrupt workaround used in a following patch.
----
-
- arch/arm/mach-omap2/timer-gp.c |   32 ++++++++++----------------------
- 1 files changed, 10 insertions(+), 22 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
-index 557603f..51996ba 100644
---- a/arch/arm/mach-omap2/timer-gp.c
-+++ b/arch/arm/mach-omap2/timer-gp.c
-@@ -36,6 +36,8 @@
- #include <asm/mach/time.h>
- #include <asm/arch/dmtimer.h>
- 
-+#define GPTIMER_MATCH_VAL      0xffff0000
-+
- static struct omap_dm_timer *gptimer;
- static struct clock_event_device clockevent_gpt;
- 
-@@ -44,7 +46,7 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
- 	struct omap_dm_timer *gpt = (struct omap_dm_timer *)dev_id;
- 	struct clock_event_device *evt = &clockevent_gpt;
- 
--	omap_dm_timer_write_status(gpt, OMAP_TIMER_INT_OVERFLOW);
-+	omap_dm_timer_write_status(gpt, OMAP_TIMER_INT_MATCH);
- 
- 	evt->event_handler(evt);
- 	return IRQ_HANDLED;
-@@ -59,7 +61,7 @@ static struct irqaction omap2_gp_timer_irq = {
- static int omap2_gp_timer_set_next_event(unsigned long cycles,
- 					 struct clock_event_device *evt)
- {
--	omap_dm_timer_set_load_start(gptimer, 0, 0xffffffff - cycles);
-+	omap_dm_timer_set_load_start(gptimer, 0, GPTIMER_MATCH_VAL - cycles);
- 
- 	return 0;
- }
-@@ -67,29 +69,12 @@ static int omap2_gp_timer_set_next_event(unsigned long cycles,
- static void omap2_gp_timer_set_mode(enum clock_event_mode mode,
- 				    struct clock_event_device *evt)
- {
--	u32 period;
--
- 	omap_dm_timer_stop(gptimer);
--
--	switch (mode) {
--	case CLOCK_EVT_MODE_PERIODIC:
--		period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ;
--		period -= 1;
--
--		omap_dm_timer_set_load_start(gptimer, 1, 0xffffffff - period);
--		break;
--	case CLOCK_EVT_MODE_ONESHOT:
--		break;
--	case CLOCK_EVT_MODE_UNUSED:
--	case CLOCK_EVT_MODE_SHUTDOWN:
--	case CLOCK_EVT_MODE_RESUME:
--		break;
--	}
- }
- 
- static struct clock_event_device clockevent_gpt = {
- 	.name		= "gp timer",
--	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-+	.features	= CLOCK_EVT_FEAT_ONESHOT,
- 	.shift		= 32,
- 	.set_next_event	= omap2_gp_timer_set_next_event,
- 	.set_mode	= omap2_gp_timer_set_mode,
-@@ -111,12 +96,15 @@ static void __init omap2_gp_clockevent_init(void)
- 
- 	omap2_gp_timer_irq.dev_id = (void *)gptimer;
- 	setup_irq(omap_dm_timer_get_irq(gptimer), &omap2_gp_timer_irq);
--	omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_OVERFLOW);
-+	omap_dm_timer_stop(gptimer);
-+	/*	omap_dm_timer_set_load(gptimer, 0, 0);*/
-+	omap_dm_timer_set_match(gptimer, 1, GPTIMER_MATCH_VAL);
-+	omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_MATCH);
- 
- 	clockevent_gpt.mult = div_sc(tick_rate, NSEC_PER_SEC,
- 				     clockevent_gpt.shift);
- 	clockevent_gpt.max_delta_ns =
--		clockevent_delta2ns(0xffffffff, &clockevent_gpt);
-+		clockevent_delta2ns(GPTIMER_MATCH_VAL, &clockevent_gpt);
- 	clockevent_gpt.min_delta_ns =
- 		clockevent_delta2ns(1, &clockevent_gpt);
- 
diff --git a/packages/linux/linux-omap2-git/beagleboard/02-omappm-mpu-latency-modeling.eml b/packages/linux/linux-omap2-git/beagleboard/02-omappm-mpu-latency-modeling.eml
new file mode 100644
index 0000000000..35ef87bdf0
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/02-omappm-mpu-latency-modeling.eml
@@ -0,0 +1,245 @@
+Adds resource def's for mpu/core/powerdomain latencies for OMAP3
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/mach-omap2/resource34xx.h |  226 +++++++++++++++++++++++++++++++++++++
+ 1 files changed, 226 insertions(+)
+
+Index: linux-omap-2.6/arch/arm/mach-omap2/resource34xx.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-omap-2.6/arch/arm/mach-omap2/resource34xx.h	2008-08-07
+15:07:02.000000000 +0530
+@@ -0,0 +1,226 @@
++/*
++ * linux/arch/arm/mach-omap2/resource34xx.h
++ *
++ * OMAP3 resource definitions
++ *
++ * Copyright (C) 2007-2008 Texas Instruments, Inc.
++ * Written by Rajendra Nayak <rnayak@ti.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
++ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++ *
++ * History:
++ *
++ */
++
++#ifndef __ARCH_ARM_MACH_OMAP2_RESOURCE_H
++#define __ARCH_ARM_MACH_OMAP2_RESOURCE_H
++
++#include <asm/arch/resource.h>
++#include <asm/arch/powerdomain.h>
++
++/**
++ * mpu_latency/core_latency are used to control the cpuidle C state.
++ */
++void init_latency(struct shared_resource *resp);
++int set_latency(struct shared_resource *resp, u32 target_level);
++
++static u8 mpu_qos_req_added;
++static u8 core_qos_req_added;
++
++static struct shared_resource_ops lat_res_ops = {
++	.init 		= init_latency,
++	.change_level   = set_latency,
++};
++
++static struct shared_resource mpu_latency = {
++	.name 		= "mpu_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data  = &mpu_qos_req_added,
++	.ops 		= &lat_res_ops,
++};
++
++static struct shared_resource core_latency = {
++	.name 		= "core_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data	= &core_qos_req_added,
++	.ops 		= &lat_res_ops,
++};
++
++/**
++ * Power domain Latencies are used to control the target Power
++ * domain state once all clocks for the power domain
++ * are released.
++ */
++void init_pd_latency(struct shared_resource *resp);
++int set_pd_latency(struct shared_resource *resp, u32 target_level);
++
++/* Power Domain Latency levels */
++#define PD_LATENCY_OFF		0x0
++#define PD_LATENCY_RET		0x1
++#define PD_LATENCY_INACT	0x2
++#define PD_LATENCY_ON		0x3
++
++#define PD_LATENCY_MAXLEVEL 	0x4
++
++struct pd_latency_db {
++	char *pwrdm_name;
++	struct powerdomain *pd;
++	/* Latencies for each state transition, stored in us */
++	unsigned long latency[PD_LATENCY_MAXLEVEL];
++};
++
++static struct shared_resource_ops pd_lat_res_ops = {
++	.init		= init_pd_latency,
++	.change_level 	= set_pd_latency,
++};
++
++static struct pd_latency_db iva2_pwrdm_lat_db = {
++	.pwrdm_name = "iva2_pwrdm",
++	.latency[PD_LATENCY_OFF] = 1000,
++	.latency[PD_LATENCY_RET] = 100,
++	.latency[PD_LATENCY_INACT] = 0,
++	.latency[PD_LATENCY_ON] = 0
++};
++
++static struct shared_resource iva2_pwrdm_latency = {
++	.name		= "iva2_pwrdm_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data	= &iva2_pwrdm_lat_db,
++	.ops		= &pd_lat_res_ops,
++};
++
++static struct pd_latency_db gfx_pwrdm_lat_db = {
++	.pwrdm_name = "gfx_pwrdm",
++	.latency[PD_LATENCY_OFF] = 1000,
++	.latency[PD_LATENCY_RET] = 100,
++	.latency[PD_LATENCY_INACT] = 0,
++	.latency[PD_LATENCY_ON]	 = 0
++};
++
++static struct shared_resource gfx_pwrdm_latency = {
++	.name		= "gfx_pwrdm_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES1),
++	.resource_data	= &gfx_pwrdm_lat_db,
++	.ops		= &pd_lat_res_ops,
++};
++
++static struct shared_resource sgx_pwrdm_latency = {
++	.name 		= "sgx_pwrdm_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
++	.resource_data  = &gfx_pwrdm_lat_db,
++	.ops		= &pd_lat_res_ops,
++};
++
++static struct pd_latency_db dss_pwrdm_lat_db = {
++	.pwrdm_name = "dss_pwrdm",
++	.latency[PD_LATENCY_OFF] = 70,
++	.latency[PD_LATENCY_RET] = 20,
++	.latency[PD_LATENCY_INACT] = 0,
++	.latency[PD_LATENCY_ON]	 = 0
++};
++
++static struct shared_resource dss_pwrdm_latency = {
++	.name		= "dss_pwrdm_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data	= &dss_pwrdm_lat_db,
++	.ops		= &pd_lat_res_ops,
++};
++
++static struct pd_latency_db cam_pwrdm_lat_db = {
++	.pwrdm_name = "cam_pwrdm",
++	.latency[PD_LATENCY_OFF] = 850,
++	.latency[PD_LATENCY_RET] = 35,
++	.latency[PD_LATENCY_INACT] = 0,
++	.latency[PD_LATENCY_ON]	 = 0
++};
++
++static struct shared_resource cam_pwrdm_latency = {
++	.name		= "cam_pwrdm_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data	= &cam_pwrdm_lat_db,
++	.ops		= &pd_lat_res_ops,
++};
++
++static struct pd_latency_db per_pwrdm_lat_db = {
++	.pwrdm_name = "per_pwrdm",
++	.latency[PD_LATENCY_OFF] = 200,
++	.latency[PD_LATENCY_RET] = 110,
++	.latency[PD_LATENCY_INACT] = 0,
++	.latency[PD_LATENCY_ON]	 = 0
++};
++
++static struct shared_resource per_pwrdm_latency = {
++	.name		= "per_pwrdm_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data	= &per_pwrdm_lat_db,
++	.ops		= &pd_lat_res_ops,
++};
++
++static struct pd_latency_db neon_pwrdm_lat_db = {
++	.pwrdm_name = "neon_pwrdm",
++	.latency[PD_LATENCY_OFF] = 1000,
++	.latency[PD_LATENCY_RET] = 100,
++	.latency[PD_LATENCY_INACT] = 0,
++	.latency[PD_LATENCY_ON]	 = 0
++};
++
++static struct shared_resource neon_pwrdm_latency = {
++	.name		= "neon_pwrdm_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data	= &neon_pwrdm_lat_db,
++	.ops		= &pd_lat_res_ops,
++};
++
++static struct pd_latency_db usbhost_pwrdm_lat_db = {
++	.pwrdm_name = "usbhost_pwrdm",
++	.latency[PD_LATENCY_OFF] = 1000,
++	.latency[PD_LATENCY_RET] = 100,
++	.latency[PD_LATENCY_INACT] = 0,
++	.latency[PD_LATENCY_ON]	 = 0
++};
++
++static struct shared_resource usbhost_pwrdm_latency = {
++	.name		= "usbhost_pwrdm_latency",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2),
++	.resource_data  = &usbhost_pwrdm_lat_db,
++	.ops		= &pd_lat_res_ops,
++};
++
++static struct pd_latency_db emu_pwrdm_lat_db = {
++	.pwrdm_name = "emu_pwrdm",
++	.latency[PD_LATENCY_OFF] = 1000,
++	.latency[PD_LATENCY_RET] = 100,
++	.latency[PD_LATENCY_INACT] = 0,
++	.latency[PD_LATENCY_ON]  = 0
++};
++
++static struct shared_resource emu_pwrdm_latency = {
++	.name           = "emu_pwrdm",
++	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data  = &emu_pwrdm_lat_db,
++	.ops		= &pd_lat_res_ops,
++};
++
++struct shared_resource *resources_omap[] __initdata = {
++	&mpu_latency,
++	&core_latency,
++	/* Power Domain Latency resources */
++	&iva2_pwrdm_latency,
++	&gfx_pwrdm_latency,
++	&sgx_pwrdm_latency,
++	&dss_pwrdm_latency,
++	&cam_pwrdm_latency,
++	&per_pwrdm_latency,
++	&neon_pwrdm_latency,
++	&usbhost_pwrdm_latency,
++	&emu_pwrdm_latency,
++	NULL
++};
++
++#endif /* __ARCH_ARM_MACH_OMAP2_RESOURCE_H */
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/02-postrate-notifier.eml b/packages/linux/linux-omap2-git/beagleboard/02-postrate-notifier.eml
new file mode 100644
index 0000000000..97058f99e1
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/02-postrate-notifier.eml
@@ -0,0 +1,186 @@
+This patch implements the remaining code for notification of clock
+rate changes via the clock framework:
+
+- a notifier registration function, clk_notifier_register()
+
+- a notifier unregistration function, clk_notifier_unregister()
+
+- the clk_notify_post_rate_chg() call-chain function, has been fleshed out
+
+The implementation is via an atomic notifier, called with the clockfw
+spinlock held.  Callback functions must not sleep and must not re-enter
+the clock framework, and should execute quickly.
+
+In the medium-term future, there are likely to be few users of these
+notifiers.  So, rather than storing one notifier per struct clk,
+notifiers are stored in a separate, dynamically allocated list,
+effectively trading execution speed (in terms of a sequential scan of
+the notifier list) for memory savings.  The implementation is
+completely hidden from the callbacks and is easily changed if
+necessary.
+
+Signed-off-by: Paul Walmsley <paul@pwsan.com>
+---
+
+ arch/arm/plat-omap/clock.c |  118 +++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 115 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
+index 421d076..354f45f 100644
+--- a/arch/arm/plat-omap/clock.c
++++ b/arch/arm/plat-omap/clock.c
+@@ -22,6 +22,7 @@
+ #include <linux/mutex.h>
+ #include <linux/platform_device.h>
+ #include <linux/cpufreq.h>
++#include <linux/notifier.h>
+ #include <linux/debugfs.h>
+ 
+ #include <asm/io.h>
+@@ -34,6 +35,8 @@ static DEFINE_SPINLOCK(clockfw_lock);
+ 
+ static struct clk_functions *arch_clock;
+ 
++static LIST_HEAD(clk_notifier_list);
++
+ /*-------------------------------------------------------------------------
+  * Standard clock functions defined in include/linux/clk.h
+  *-------------------------------------------------------------------------*/
+@@ -380,6 +383,110 @@ EXPORT_SYMBOL(clk_init_cpufreq_table);
+ #endif
+ 
+ /**
++<<<<<<< current:arch/arm/plat-omap/clock.c
++=======
++ * clk_notifier_register - add a clock rate change notifier
++ * @clk: struct clk * to watch for rate echanges
++ * @nb: struct notifier_block * with callback info
++ *
++ * Request notification after a frequency change on clock 'clk'.  This
++ * uses an atomic notifier.  The callback will be called with
++ * interrupts disabled; therefore callback code should be very
++ * lightweight.  Callback code must not call back into the clock
++ * framework.  Callback code will be passed the previous and new rate
++ * of the clock.
++ *
++ * clk_notifier_register() must be called from process
++ * context.  Returns -EINVAL if called with null arguments, -ENOMEM
++ * upon allocation failure; otherwise, passes along the return value
++ * of atomic_notifier_chain_register().
++ */
++int clk_notifier_register(struct clk *clk, struct notifier_block *nb)
++{
++	struct clk_notifier *cn = NULL, *cn_new = NULL;
++	int r;
++	unsigned long flags;
++
++	if (!clk || !nb)
++		return -EINVAL;
++
++	/* Allocate this here speculatively so we can avoid GFP_ATOMIC */
++	cn_new = kzalloc(sizeof(struct clk_notifier), GFP_KERNEL);
++	if (!cn_new)
++		return -ENOMEM;
++
++	spin_lock_irqsave(&clockfw_lock, flags);
++
++	list_for_each_entry(cn, &clk_notifier_list, node) {
++		if (cn->clk == clk)
++			break;
++	}
++
++	if (cn->clk != clk) {
++		cn_new->clk = clk;
++		ATOMIC_INIT_NOTIFIER_HEAD(&cn_new->notifier_head);
++
++		list_add(&cn_new->node, &clk_notifier_list);
++		cn = cn_new;
++	} else {
++		kfree(cn_new); /* didn't need it after all */
++	}
++
++	r = atomic_notifier_chain_register(&cn->notifier_head, nb);
++
++	spin_unlock_irqrestore(&clockfw_lock, flags);
++
++	return r;
++}
++
++/**
++ * clk_notifier_unregister - remove a clock rate change notifier
++ * @clk: struct clk *
++ * @nb: struct notifier_block * with callback info
++ *
++ * Request no further notification for frequency changes on clock
++ * 'clk'.  This function presently does not release memory allocated
++ * by its corresponding _register function; see inline comments for
++ * more informations.  Returns -EINVAL if called with null arguments;
++ * otherwise, passes along the return value of
++ * atomic_notifier_chain_unregister().
++ */
++int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb)
++{
++	struct clk_notifier *cn = NULL;
++	int r = -EINVAL;
++	unsigned long flags;
++
++	if (!clk || !nb)
++		return -EINVAL;
++
++	spin_lock_irqsave(&clockfw_lock, flags);
++
++	list_for_each_entry(cn, &clk_notifier_list, node) {
++		if (cn->clk == clk)
++			break;
++	}
++
++	if (cn->clk == clk) {
++		r = atomic_notifier_chain_unregister(&cn->notifier_head, nb);
++
++		/*
++		 * XXX unfortunately it seems that there is no polite
++		 * way to test if a notifier has zero users.  So once
++		 * a post-notifier has been registered on a clock,
++		 * that struct clk_notifier will not be freed, even if
++		 * all of its users unregister.
++		 */
++	} else {
++		r = -ENOENT;
++	}
++
++	spin_unlock_irqrestore(&clockfw_lock, flags);
++
++	return r;
++}
++
++/**
+  * clk_notify_post_rate_chg - call post-clk-rate-change notifier chain
+  * @clk: struct clk * that is changing rate
+  * @old_rate: old rate
+@@ -400,11 +507,16 @@ void clk_notify_post_rate_chg(struct clk *clk, unsigned long old_rate,
+ 	cnd.old_rate = old_rate;
+ 	cnd.new_rate = new_rate;
+ 
+-	/* XXX Call notifier here */
+-
++	list_for_each_entry(cn, &clk_notifier_list, node) {
++		if (cn->clk == clk) {
++			atomic_notifier_call_chain(&cn->notifier_head,
++						   CLK_POST_RATE_CHANGE,
++						   &cnd);
++			break;
++		}
++	}
+ }
+ 
+-
+ /*-------------------------------------------------------------------------*/
+ 
+ #ifdef CONFIG_OMAP_RESET_CLOCKS
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf b/packages/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf
deleted file mode 100644
index 3de6e05042..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf
+++ /dev/null
@@ -1,94 +0,0 @@
-OMAP2/3 system tick GPTIMER: use overflow interrupts to detect missing match interrupts
-
-From: Paul Walmsley <paul@pwsan.com>
-
-GPTIMER1 on some OMAP3 chips occasionally misses match conditions
-between the timer counter and the target register value, and does not
-interrupt to the MPU.  This patch adds another line of defense by
-setting the timer to generate an overflow interrupt 0.5 seconds after the
-timer passes the original comparison value.
-
-If interrupts are masked for a long period of time, one would expect
-both a match and an overflow interrupt to be logged.  This is considered
-a normal condition.  However, if only an overflow interrupt is logged,
-this is considered evidence of a hardware bug and the kernel will issue
-a warning.
-
-This workaround is unlikely to be 100% effective, since GPTIMER1 has
-also been observed to lose overflow interrupts occasionally.  It is
-hoped that the probability of losing both will be significantly lower
-than the probability of losing either one.
----
-
- arch/arm/mach-omap2/timer-gp.c |   36 ++++++++++++++++++++++++++++++++----
- 1 files changed, 32 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
-index 51996ba..ce5c2b4 100644
---- a/arch/arm/mach-omap2/timer-gp.c
-+++ b/arch/arm/mach-omap2/timer-gp.c
-@@ -36,17 +36,43 @@
- #include <asm/mach/time.h>
- #include <asm/arch/dmtimer.h>
- 
--#define GPTIMER_MATCH_VAL      0xffff0000
-+/* 
-+ * The number of timer ticks to delay will be subtracted from
-+ * GPTIMER_MATCH_VAL before loading into the timer.  So GPTIMER_MATCH_VAL
-+ * constrains the longest delay that can be generated with the timer.
-+ * Since the current code uses overflow interrupts as protection against
-+ * missed comparison interrupts, this value should also be sufficiently
-+ * large such that there is not an excessively long delay between ticks
-+ * if the comparison interrupt fails to arrive.  The 0xfffff800 value 
-+ * below results in a half-second delay in such a case when using
-+ * the 32kHz timer as source.
-+ */
-+#define GPTIMER_MATCH_VAL	(0xffffffff - (32768/2))
- 
- static struct omap_dm_timer *gptimer;
- static struct clock_event_device clockevent_gpt;
- 
-+static u32 last_load;
-+
- static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
- {
- 	struct omap_dm_timer *gpt = (struct omap_dm_timer *)dev_id;
- 	struct clock_event_device *evt = &clockevent_gpt;
--
--	omap_dm_timer_write_status(gpt, OMAP_TIMER_INT_MATCH);
-+	u32 v;
-+
-+	v = omap_dm_timer_read_status(gpt);
-+	if ((v & OMAP_TIMER_INT_OVERFLOW) && !(v & OMAP_TIMER_INT_MATCH)) {
-+		/*
-+		 * Should never happen.  Current belief is that this is
-+		 * due to a hardware bug in the GPTIMER block on some 
-+		 * OMAP3 revisions.
-+		 */
-+		pr_err("*** GPTIMER missed match interrupt! last load: %08x\n",
-+			last_load);
-+		WARN_ON(1);
-+	}
-+
-+	omap_dm_timer_write_status(gpt, v);
- 
- 	evt->event_handler(evt);
- 	return IRQ_HANDLED;
-@@ -61,6 +87,7 @@ static struct irqaction omap2_gp_timer_irq = {
- static int omap2_gp_timer_set_next_event(unsigned long cycles,
- 					 struct clock_event_device *evt)
- {
-+	last_load = GPTIMER_MATCH_VAL - cycles;
- 	omap_dm_timer_set_load_start(gptimer, 0, GPTIMER_MATCH_VAL - cycles);
- 
- 	return 0;
-@@ -99,7 +126,8 @@ static void __init omap2_gp_clockevent_init(void)
- 	omap_dm_timer_stop(gptimer);
- 	/*	omap_dm_timer_set_load(gptimer, 0, 0);*/
- 	omap_dm_timer_set_match(gptimer, 1, GPTIMER_MATCH_VAL);
--	omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_MATCH);
-+	omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_MATCH | 
-+				     OMAP_TIMER_INT_OVERFLOW);
- 
- 	clockevent_gpt.mult = div_sc(tick_rate, NSEC_PER_SEC,
- 				     clockevent_gpt.shift);
diff --git a/packages/linux/linux-omap2-git/beagleboard/03-omappm-omap3srf.eml b/packages/linux/linux-omap2-git/beagleboard/03-omappm-omap3srf.eml
new file mode 100644
index 0000000000..d052023f12
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/03-omappm-omap3srf.eml
@@ -0,0 +1,167 @@
+Adds init/change_level/validate_level calls for OMAP3 resources
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/mach-omap2/resource34xx.c |  148 +++++++++++++++++++++++++++++++++++++
+ 1 files changed, 148 insertions(+)
+
+Index: linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c	2008-08-07
+15:07:04.000000000 +0530
+@@ -0,0 +1,148 @@
++/*
++ * linux/arch/arm/mach-omap2/resource34xx.c
++ * OMAP3 resource init/change_level/validate_level functions
++ *
++ * Copyright (C) 2007-2008 Texas Instruments, Inc.
++ * Written by Rajendra Nayak <rnayak@ti.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
++ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
++ * History:
++ *
++ */
++
++#include <linux/pm_qos_params.h>
++#include <asm/arch/powerdomain.h>
++#include <asm/arch/clockdomain.h>
++#include "resource34xx.h"
++
++/**
++ * init_latency - Initializes the mpu/core latency resource.
++ * @resp: Latency resource to be initalized
++ *
++ * No return value.
++ */
++void init_latency(struct shared_resource *resp)
++{
++	resp->no_of_users = 0;
++	resp->curr_level = RES_DEFAULTLEVEL;
++	*((u8 *)resp->resource_data) = 0;
++	return;
++}
++
++/**
++ * set_latency - Adds/Updates and removes the CPU_DMA_LATENCY in *pm_qos_params.
++ * @resp: resource pointer
++ * @latency: target latency to be set
++ *
++ * Returns 0 on success, or error values as returned by
++ * pm_qos_update_requirement/pm_qos_add_requirement.
++ */
++int set_latency(struct shared_resource *resp, u32 latency)
++{
++	u8 *pm_qos_req_added;
++
++	if (resp->curr_level == latency)
++		return 0;
++	else
++		/* Update the resources current level */
++		resp->curr_level = latency;
++
++	pm_qos_req_added = resp->resource_data;
++	if (latency == RES_DEFAULTLEVEL)
++		/* No more users left, remove the pm_qos_req if present */
++		if (*pm_qos_req_added) {
++			pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
++							resp->name);
++			*pm_qos_req_added = 0;
++			return 0;
++		}
++
++	if (*pm_qos_req_added) {
++		return pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY,
++						resp->name, latency);
++	} else {
++		*pm_qos_req_added = 1;
++		return pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY,
++						resp->name, latency);
++	}
++}
++
++/**
++ * init_pd_latency - Initializes the power domain latency resource.
++ * @resp: Power Domain Latency resource to be initialized.
++ *
++ * No return value.
++ */
++void init_pd_latency(struct shared_resource *resp)
++{
++	struct pd_latency_db *pd_lat_db;
++
++	resp->no_of_users = 0;
++	resp->curr_level = PD_LATENCY_OFF;
++	pd_lat_db = resp->resource_data;
++	/* Populate the power domain associated with the latency resource */
++	pd_lat_db->pd = pwrdm_lookup(pd_lat_db->pwrdm_name);
++	return;
++}
++
++/**
++ * set_pd_latency - Updates the curr_level of the power domain resource.
++ * @resp: Power domain latency resource.
++ * @latency: New latency value acceptable.
++ *
++ * This function maps the latency in microsecs to the acceptable
++ * Power domain state using the latency DB.
++ * It then programs the power domain to enter the target state.
++ * Always returns 0.
++ */
++int set_pd_latency(struct shared_resource *resp, u32 latency)
++{
++	u32 pd_lat_level, ind, i;
++	struct pd_latency_db *pd_lat_db;
++	struct powerdomain *pwrdm;
++
++	pd_lat_db = resp->resource_data;
++	pwrdm = pd_lat_db->pd;
++	pd_lat_level = PD_LATENCY_OFF;
++	/* using the latency db map to the appropriate PD state */
++	for (ind = 0; ind < PD_LATENCY_MAXLEVEL; ind++)
++		if (pd_lat_db->latency[ind] < latency)
++			pd_lat_level = ind;
++
++	resp->curr_level = pd_lat_level;
++	switch (pd_lat_level) {
++	case PWRDM_POWER_OFF:
++	case PWRDM_POWER_RET:
++		/* Errata 1.29: No transitions from INACTIVE to RET/OFF
++		 * possible.
++		 * Need to be taken care of here.
++		 */
++		if (pwrdm_read_pwrst(pwrdm) != PWRDM_POWER_ON) {
++			/* Force the clock domains to ON */
++			for (i = 0; pwrdm->pwrdm_clkdms[i]; i++) {
++				omap2_clkdm_deny_idle(pwrdm->pwrdm_clkdms[i]);
++				omap2_clkdm_wakeup(pwrdm->pwrdm_clkdms[i]);
++			}
++			pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_ON);
++			pwrdm_set_next_pwrst(pwrdm, pd_lat_level);
++			for (i = 0; pwrdm->pwrdm_clkdms[i]; i++) {
++				omap2_clkdm_sleep(pwrdm->pwrdm_clkdms[i]);
++				omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[i]);
++			}
++		} else
++			pwrdm_set_next_pwrst(pwrdm, pd_lat_level);
++		break;
++	case PWRDM_POWER_ON:
++		pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_ON);
++		break;
++	default:
++		break;
++	}
++	return 0;
++}
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q b/packages/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q
deleted file mode 100644
index aa9f09811a..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q
+++ /dev/null
@@ -1,110 +0,0 @@
-Add extra debug for the q_d_w_o() when work fn is already active.
-
-From: Paul Walmsley <paul@pwsan.com>
-
-
----
-
- arch/arm/mach-omap2/timer-gp.c      |    3 ++-
- arch/arm/plat-omap/dmtimer.c        |   20 ++++++++++++++++++++
- include/asm-arm/arch-omap/dmtimer.h |    1 +
- kernel/time/timer_list.c            |    8 ++++++++
- 4 files changed, 31 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
-index ce5c2b4..e3ed368 100644
---- a/arch/arm/mach-omap2/timer-gp.c
-+++ b/arch/arm/mach-omap2/timer-gp.c
-@@ -50,6 +50,7 @@
- #define GPTIMER_MATCH_VAL	(0xffffffff - (32768/2))
- 
- static struct omap_dm_timer *gptimer;
-+struct omap_dm_timer *gptimer_pub;
- static struct clock_event_device clockevent_gpt;
- 
- static u32 last_load;
-@@ -111,7 +112,7 @@ static void __init omap2_gp_clockevent_init(void)
- {
- 	u32 tick_rate;
- 
--	gptimer = omap_dm_timer_request_specific(1);
-+	gptimer = gptimer_pub = omap_dm_timer_request_specific(1);
- 	BUG_ON(gptimer == NULL);
- 
- #if defined(CONFIG_OMAP_32K_TIMER)
-diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
-index e38a11e..b10f8ac 100644
---- a/arch/arm/plat-omap/dmtimer.c
-+++ b/arch/arm/plat-omap/dmtimer.c
-@@ -614,6 +614,26 @@ void omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,
- 	omap_dm_timer_write_reg(timer, OMAP_TIMER_WAKEUP_EN_REG, value);
- }
- 
-+void omap_dm_timer_dump_int_enable(struct omap_dm_timer *timer)
-+{
-+	u32 l;
-+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_COUNTER_REG);
-+	pr_err("GPT TCRR: %08x\n", l);
-+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_MATCH_REG);
-+	pr_err("GPT TMAT: %08x\n", l);
-+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_STAT_REG);
-+	pr_err("GPT TISR: %08x\n", l);
-+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_INT_EN_REG);
-+	pr_err("GPT TIER: %08x\n", l);
-+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
-+	pr_err("GPT TCLR: %08x\n", l);
-+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_TICK_INT_MASK_SET_REG);
-+	pr_err("GPT TOCR: %08x\n", l);
-+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_TICK_INT_MASK_COUNT_REG);
-+	pr_err("GPT TOWR: %08x\n", l);
-+}
-+
-+
- unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)
- {
- 	unsigned int l;
-diff --git a/include/asm-arm/arch-omap/dmtimer.h b/include/asm-arm/arch-omap/dmtimer.h
-index 02b29e8..a8123e9 100644
---- a/include/asm-arm/arch-omap/dmtimer.h
-+++ b/include/asm-arm/arch-omap/dmtimer.h
-@@ -73,6 +73,7 @@ void omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler);
- 
- void omap_dm_timer_set_int_enable(struct omap_dm_timer *timer, unsigned int value);
- 
-+void omap_dm_timer_dump_int_enable(struct omap_dm_timer *timer);
- unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer);
- void omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value);
- unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer);
-diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
-index a40e20f..452eab7 100644
---- a/kernel/time/timer_list.c
-+++ b/kernel/time/timer_list.c
-@@ -18,6 +18,8 @@
- #include <linux/kallsyms.h>
- #include <linux/tick.h>
- 
-+#include <asm/arch/dmtimer.h>
-+
- #include <asm/uaccess.h>
- 
- typedef void (*print_fn_t)(struct seq_file *m, unsigned int *classes);
-@@ -239,6 +241,8 @@ static void timer_list_show_tickdevices(struct seq_file *m)
- static void timer_list_show_tickdevices(struct seq_file *m) { }
- #endif
- 
-+extern struct omap_dm_timer *gptimer_pub;
-+
- static int timer_list_show(struct seq_file *m, void *v)
- {
- 	u64 now = ktime_to_ns(ktime_get());
-@@ -254,6 +258,10 @@ static int timer_list_show(struct seq_file *m, void *v)
- 	SEQ_printf(m, "\n");
- 	timer_list_show_tickdevices(m);
- 
-+	SEQ_printf(m, "\n");
-+	
-+	omap_dm_timer_dump_int_enable(gptimer_pub);
-+
- 	return 0;
- }
- 
diff --git a/packages/linux/linux-omap2-git/beagleboard/04-omappm-srf-noop.eml b/packages/linux/linux-omap2-git/beagleboard/04-omappm-srf-noop.eml
new file mode 100644
index 0000000000..32d767a342
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/04-omappm-srf-noop.eml
@@ -0,0 +1,497 @@
+Adds SRF calls into OMAP PM skeleton layer developed by Paul W.
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/mach-omap2/Makefile            |    1
+ arch/arm/mach-omap2/clockdomain.c       |    7
+ arch/arm/plat-omap/Kconfig              |    3
+ arch/arm/plat-omap/Makefile             |    4
+ arch/arm/plat-omap/omap-pm-srf.c        |  367 ++++++++++++++++++++++++++++++++
+ include/asm-arm/arch-omap/powerdomain.h |    1
+ include/asm-arm/arch-omap/resource.h    |    1
+ 7 files changed, 383 insertions(+), 1 deletion(-)
+
+Index: linux-omap-2.6/arch/arm/plat-omap/omap-pm-srf.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-omap-2.6/arch/arm/plat-omap/omap-pm-srf.c	2008-08-11
+17:38:37.000000000 +0530
+@@ -0,0 +1,367 @@
++/*
++ * omap-pm-srf.c - OMAP power management interface implemented
++ * using Shared resource framework
++ *
++ * This code implements the OMAP power management interface to
++ * drivers, CPUIdle, CPUFreq, and DSP Bridge.  It is strictly for
++ * debug/demonstration use, as it does nothing but printk() whenever a
++ * function is called (when DEBUG is defined, below)
++ *
++ * Copyright (C) 2008 Texas Instruments, Inc.
++ * Copyright (C) 2008 Nokia Corporation
++ * Paul Walmsley
++ *
++ * Interface developed by (in alphabetical order):
++ * Karthik Dasu, Amish Lakhani, Tony Lindgren, Rajendra Nayak, Sakari
++ * Poussa, Veeramanikandan Raju, Igor Stoppa, Paul Walmsley, Richard
++ * Woodruff
++ *
++ * Interfaces defined by Paul Walmsley
++ * Updated with SRF calls by Rajendra Nayak
++ */
++
++#undef DEBUG
++
++#include <linux/init.h>
++#include <linux/cpufreq.h>
++#include <linux/device.h>
++
++/* Interface documentation is in asm/arch/omap-pm.h */
++#include <asm/arch/omap-pm.h>
++
++#include <asm/arch/powerdomain.h>
++#include <asm/arch/resource.h>
++/*
++#include <asm/arch/tiocp.h>
++*/
++
++#define LAT_RES_POSTAMBLE "_latency"
++char latency_res_name[30];
++/* lat_name_mutex protects latency_res_name*/
++static DEFINE_MUTEX(lat_name_mutex);
++
++
++/**
++ * get_lat_res_name - gets the latency resource name given a power domain name
++ * @pwrdm_name: Name of the power domain.
++ *
++ * Returns a pointer to the latency resource name.
++ */
++static char *get_lat_res_name(const char *pwrdm_name)
++{
++	strcpy(latency_res_name, "");
++	if (!(in_atomic() || irqs_disabled()))
++		mutex_lock(&lat_name_mutex);
++	WARN_ON(strlen(pwrdm_name) + strlen(LAT_RES_POSTAMBLE) >
++					 sizeof(latency_res_name));
++	strcpy(latency_res_name, pwrdm_name);
++	strcat(latency_res_name, LAT_RES_POSTAMBLE);
++	if (!(in_atomic() || irqs_disabled()))
++		mutex_unlock(&lat_name_mutex);
++	return latency_res_name;
++}
++
++static struct omap_opp *dsp_opps;
++static struct omap_opp *mpu_opps;
++
++/*
++ * Device-driver-originated constraints (via board-*.c files)
++ */
++
++void omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t)
++{
++	if (!dev || t < -1) {
++		WARN_ON(1);
++		return;
++	};
++
++	if (t == -1) {
++		pr_debug("OMAP PM: remove max MPU wakeup latency constraint: "
++			 "dev %s\n", dev_name(dev));
++		resource_release("mpu_latency", dev);
++	} else {
++		pr_debug("OMAP PM: add max MPU wakeup latency constraint: "
++			 "dev %s, t = %ld usec\n", dev_name(dev), t);
++		resource_request("mpu_latency", dev, t);
++	}
++}
++
++void omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r)
++{
++	if (!dev || agent_id != OCP_INITIATOR_AGENT ||
++	    agent_id != OCP_TARGET_AGENT) {
++		WARN_ON(1);
++		return;
++	};
++
++	if (r == 0)
++		pr_debug("OMAP PM: remove min bus tput constraint: "
++			 "dev %s for agent_id %d\n", dev_name(dev), agent_id);
++	else
++		pr_debug("OMAP PM: add min bus tput constraint: "
++			 "dev %s for agent_id %d: rate %ld KiB\n",
++			 dev_name(dev), agent_id, r);
++
++	/*
++	 * This code should model the interconnect and compute the
++	 * required clock frequency, convert that to a VDD2 OPP ID, then
++	 * set the VDD2 OPP appropriately.
++	 *
++	 * TI CDP code can call constraint_set here on the VDD2 OPP.
++	 */
++}
++
++void omap_pm_set_max_dev_wakeup_lat(struct device *dev, long t)
++{
++	/* struct tiocp *tiocp_dev; */
++	struct powerdomain *pwrdm_dev;
++	char *res_name;
++
++	if (!dev || t < -1) {
++		WARN_ON(1);
++		return;
++	};
++	/* Look for the devices Power Domain */
++	/* TODO: Put this back in once tiocp layer is available
++	tiocp_dev = container_of(dev, struct tiocp, dev);
++	pwrdm_dev = tiocp_dev->pwrdm;
++	*/
++
++	if (t == -1) {
++		pr_debug("OMAP PM: remove max device latency constraint: "
++			 "dev %s\n", dev_name(dev));
++		res_name = get_lat_res_name(pwrdm_dev->name);
++		resource_release(res_name, dev);
++	} else {
++		pr_debug("OMAP PM: add max device latency constraint: "
++			 "dev %s, t = %ld usec\n", dev_name(dev), t);
++		res_name = get_lat_res_name(pwrdm_dev->name);
++		resource_request(res_name, dev, t);
++	}
++
++	/*
++	 * For current Linux, this needs to map the device to a
++	 * powerdomain, then go through the list of current max lat
++	 * constraints on that powerdomain and find the smallest.  If
++	 * the latency constraint has changed, the code should
++	 * recompute the state to enter for the next powerdomain
++	 * state.  Conceivably, this code should also determine
++	 * whether to actually disable the device clocks or not,
++	 * depending on how long it takes to re-enable the clocks.
++	 *
++	 * TI CDP code can call constraint_set here.
++	 */
++}
++
++void omap_pm_set_max_sdma_lat(struct device *dev, long t)
++{
++	if (!dev || t < -1) {
++		WARN_ON(1);
++		return;
++	};
++
++	if (t == -1) {
++		pr_debug("OMAP PM: remove max DMA latency constraint: "
++			 "dev %s\n", dev_name(dev));
++		resource_release("core_latency", dev);
++	} else {
++		pr_debug("OMAP PM: add max DMA latency constraint: "
++			 "dev %s, t = %ld usec\n", dev_name(dev), t);
++		resource_request("core_latency", dev, t);
++	}
++
++	/*
++	 * For current Linux PM QOS params, this code should scan the
++	 * list of maximum CPU and DMA latencies and select the
++	 * smallest, then set cpu_dma_latency pm_qos_param
++	 * accordingly.
++	 *
++	 * For future Linux PM QOS params, with separate CPU and DMA
++	 * latency params, this code should just set the dma_latency param.
++	 *
++	 * TI CDP code can call constraint_set here.
++	 */
++
++}
++
++
++/*
++ * DSP Bridge-specific constraints
++ */
++
++const struct omap_opp *omap_pm_dsp_get_opp_table(void)
++{
++	pr_debug("OMAP PM: DSP request for OPP table\n");
++
++	/*
++	 * Return DSP frequency table here:  The final item in the
++	 * array should have .rate = .opp_id = 0.
++	 */
++
++	return NULL;
++}
++
++void omap_pm_dsp_set_min_opp(u8 opp_id)
++{
++	if (opp_id == 0) {
++		WARN_ON(1);
++		return;
++	}
++
++	pr_debug("OMAP PM: DSP requests minimum VDD1 OPP to be %d\n", opp_id);
++
++	/*
++	 *
++	 * For l-o dev tree, our VDD1 clk is keyed on OPP ID, so we
++	 * can just test to see which is higher, the CPU's desired OPP
++	 * ID or the DSP's desired OPP ID, and use whichever is
++	 * highest.
++	 *
++	 * In CDP12.14+, the VDD1 OPP custom clock that controls the DSP
++	 * rate is keyed on MPU speed, not the OPP ID.  So we need to
++	 * map the OPP ID to the MPU speed for use with clk_set_rate()
++	 * if it is higher than the current OPP clock rate.
++	 *
++	 */
++}
++
++
++u8 omap_pm_dsp_get_opp(void)
++{
++	pr_debug("OMAP PM: DSP requests current DSP OPP ID\n");
++
++	/*
++	 * For l-o dev tree, call clk_get_rate() on VDD1 OPP clock
++	 *
++	 * CDP12.14+:
++	 * Call clk_get_rate() on the OPP custom clock, map that to an
++	 * OPP ID using the tables defined in board-*.c/chip-*.c files.
++	 */
++
++	return 0;
++}
++
++/*
++ * CPUFreq-originated constraint
++ *
++ * In the future, this should be handled by custom OPP clocktype
++ * functions.
++ */
++
++struct cpufreq_frequency_table **omap_pm_cpu_get_freq_table(void)
++{
++	pr_debug("OMAP PM: CPUFreq request for frequency table\n");
++
++	/*
++	 * Return CPUFreq frequency table here: loop over
++	 * all VDD1 clkrates, pull out the mpu_ck frequencies, build
++	 * table
++	 */
++
++	return NULL;
++}
++
++void omap_pm_cpu_set_freq(unsigned long f)
++{
++	if (f == 0) {
++		WARN_ON(1);
++		return;
++	}
++
++	pr_debug("OMAP PM: CPUFreq requests CPU frequency to be set to %lu\n",
++		 f);
++
++	/*
++	 * For l-o dev tree, determine whether MPU freq or DSP OPP id
++	 * freq is higher.  Find the OPP ID corresponding to the
++	 * higher frequency.  Call clk_round_rate() and clk_set_rate()
++	 * on the OPP custom clock.
++	 *
++	 * CDP should just be able to set the VDD1 OPP clock rate here.
++	 */
++}
++
++unsigned long omap_pm_cpu_get_freq(void)
++{
++	pr_debug("OMAP PM: CPUFreq requests current CPU frequency\n");
++
++	/*
++	 * Call clk_get_rate() on the mpu_ck.
++	 */
++
++	return 0;
++}
++
++struct device omap_pm_dev;
++
++/*
++ * Powerdomain usecounting hooks
++ */
++
++void omap_pm_pwrdm_active(struct powerdomain *pwrdm)
++{
++	char *res_name;
++
++	if (!pwrdm) {
++		WARN_ON(1);
++		return;
++	};
++
++	if (!strcmp(pwrdm->name, "wkup_pwrdm") ||
++			 !strcmp(pwrdm->name, "core_pwrdm"))
++		return;
++
++	pr_debug("OMAP PM: powerdomain %s is becoming active\n", pwrdm->name);
++
++	res_name = get_lat_res_name(pwrdm->name);
++	/* Request for a zero latency which puts the Power Domain in ON state*/
++	resource_request(res_name, &omap_pm_dev, 0);
++	return;
++}
++
++void omap_pm_pwrdm_inactive(struct powerdomain *pwrdm)
++{
++	char *res_name;
++
++	if (!pwrdm) {
++		WARN_ON(1);
++		return;
++	};
++
++	if (!strcmp(pwrdm->name, "wkup_pwrdm") ||
++			!strcmp(pwrdm->name, "core_pwrdm"))
++		return;
++
++	pr_debug("OMAP PM: powerdomain %s is becoming inactive\n",
++		 pwrdm->name);
++
++	res_name = get_lat_res_name(pwrdm->name);
++	/* Release the latency requested */
++	resource_release(res_name, &omap_pm_dev);
++	return;
++}
++
++/*
++ * Should be called before clk framework since clk fw will call
++ * omap_pm_pwrdm_{in,}active()
++ */
++int __init omap_pm_if_early_init(void)
++{
++	return 0;
++}
++
++/* Must be called after clock framework is initialized */
++int __init omap_pm_if_init(struct omap_opp *mpu_opp_table,
++			   struct omap_opp *dsp_opp_table)
++{
++	mpu_opps = mpu_opp_table;
++	dsp_opps = dsp_opp_table;
++	resource_init(resources_omap);
++	return 0;
++}
++
++void omap_pm_if_exit(void)
++{
++	/* Deallocate CPUFreq frequency table here */
++}
++
+Index: linux-omap-2.6/arch/arm/mach-omap2/clockdomain.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/clockdomain.c	2008-08-11
+17:12:19.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/clockdomain.c	2008-08-11
+17:14:31.000000000 +0530
+@@ -35,6 +35,7 @@
+
+ #include <asm/arch/powerdomain.h>
+ #include <asm/arch/clockdomain.h>
++#include <asm/arch/omap-pm.h>
+
+ /* clkdm_list contains all registered struct clockdomains */
+ static LIST_HEAD(clkdm_list);
+@@ -561,6 +562,9 @@ int omap2_clkdm_clk_enable(struct clockd
+ 	else
+ 		omap2_clkdm_wakeup(clkdm);
+
++	/*Hook to inform the OMAP PM layer that the pwrdm has become active */
++	omap_pm_pwrdm_active(clkdm->pwrdm.ptr);
++
+ 	return 0;
+ }
+
+@@ -612,6 +616,9 @@ int omap2_clkdm_clk_disable(struct clock
+ 	else
+ 		omap2_clkdm_sleep(clkdm);
+
++	/*Hook to inform the OMAP PM layer that the pwrdm has become inactive */
++	omap_pm_pwrdm_inactive(clkdm->pwrdm.ptr);
++
+ 	return 0;
+ }
+
+Index: linux-omap-2.6/include/asm-arm/arch-omap/powerdomain.h
+===================================================================
+--- linux-omap-2.6.orig/include/asm-arm/arch-omap/powerdomain.h	2008-08-11
+17:12:19.000000000 +0530
++++ linux-omap-2.6/include/asm-arm/arch-omap/powerdomain.h	2008-08-11
+17:14:31.000000000 +0530
+@@ -148,6 +148,7 @@ int pwrdm_read_next_pwrst(struct powerdo
+ int pwrdm_read_pwrst(struct powerdomain *pwrdm);
+ int pwrdm_read_prev_pwrst(struct powerdomain *pwrdm);
+ int pwrdm_clear_all_prev_pwrst(struct powerdomain *pwrdm);
++int pwrdm_read_pwrst(struct powerdomain *pwrdm);
+
+ int pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst);
+ int pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank, u8 pwrst);
+Index: linux-omap-2.6/arch/arm/mach-omap2/Makefile
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/Makefile	2008-08-11
+17:12:19.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/Makefile	2008-08-11 17:14:31.000000000
++0530
+@@ -34,6 +34,7 @@ obj-$(CONFIG_OMAP_SMARTREFLEX)		+= smart
+ # Clock framework
+ obj-$(CONFIG_ARCH_OMAP2)		+= clock24xx.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o
++obj-$(CONFIG_OMAP_PM_SRF)		+=  resource34xx.o
+
+ # DSP
+ obj-$(CONFIG_OMAP_MMU_FWK)	+= mmu_mach.o
+Index: linux-omap-2.6/arch/arm/plat-omap/Kconfig
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/plat-omap/Kconfig	2008-08-11
+17:12:25.000000000 +0530
++++ linux-omap-2.6/arch/arm/plat-omap/Kconfig	2008-08-11 17:14:31.000000000 +0530
+@@ -258,6 +258,9 @@ config OMAP_PM_NONE
+ config OMAP_PM_NOOP
+ 	bool "No-op/debug PM layer"
+
++config OMAP_PM_SRF
++	bool "PM layer implemented using SRF"
++
+ endchoice
+
+ endif
+Index: linux-omap-2.6/arch/arm/plat-omap/Makefile
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/plat-omap/Makefile	2008-08-11
+17:12:25.000000000 +0530
++++ linux-omap-2.6/arch/arm/plat-omap/Makefile	2008-08-11 17:14:31.000000000 +0530
+@@ -29,4 +29,6 @@ obj-$(CONFIG_OMAP_MMU_FWK) += mmu.o
+ # OMAP mailbox framework
+ obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
+
+-obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o
+\ No newline at end of file
++obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o
++obj-$(CONFIG_OMAP_PM_SRF) += omap-pm-srf.o \
++				resource.o
+Index: linux-omap-2.6/include/asm-arm/arch-omap/resource.h
+===================================================================
+--- linux-omap-2.6.orig/include/asm-arm/arch-omap/resource.h	2008-08-11
+17:12:30.000000000 +0530
++++ linux-omap-2.6/include/asm-arm/arch-omap/resource.h	2008-08-11
+17:14:31.000000000 +0530
+@@ -85,6 +85,7 @@ struct users_list {
+ 	u8 usage;
+ };
+
++extern struct shared_resource *resources_omap[];
+ /* Shared resource Framework API's */
+ void resource_init(struct shared_resource **resources);
+ int resource_register(struct shared_resource *res);
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/05-omappm-virtualclocks.eml b/packages/linux/linux-omap2-git/beagleboard/05-omappm-virtualclocks.eml
new file mode 100644
index 0000000000..0aaed7b91c
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/05-omappm-virtualclocks.eml
@@ -0,0 +1,456 @@
+The patch defines virtual nodes for VDD1 and VDD2
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/mach-omap2/board-3430sdp.c       |   38 +++++
+ arch/arm/mach-omap2/clock34xx.c           |  206 +++++++++++++++++++++++++-----
+ arch/arm/mach-omap2/clock34xx.h           |   29 ++++
+ include/asm-arm/arch-omap/board-3430sdp.h |   35 +++++
+ include/asm-arm/arch-omap/clock.h         |    8 +
+ 5 files changed, 287 insertions(+), 29 deletions(-)
+
+Index: linux-omap-2.6/arch/arm/mach-omap2/clock34xx.h
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/clock34xx.h	2008-08-06
+14:55:12.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/clock34xx.h	2008-08-07
+15:07:19.000000000 +0530
+@@ -36,6 +36,14 @@ static int omap3_noncore_dpll_enable(str
+ static void omap3_noncore_dpll_disable(struct clk *clk);
+ static int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate);
+ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate);
++static void omap3_table_recalc(struct clk *clk);
++static long omap3_round_to_table_rate(struct clk *clk, unsigned long rate);
++static int omap3_select_table_rate(struct clk *clk, unsigned long rate);
++
++extern struct vdd_prcm_config vdd1_rate_table[];
++extern struct vdd_prcm_config vdd2_rate_table[];
++extern struct vdd_prcm_config iva2_rate_table[];
++
+
+ /* Maximum DPLL multiplier, divider values for OMAP3 */
+ #define OMAP3_MAX_DPLL_MULT		2048
+@@ -3064,6 +3072,24 @@ static struct clk wdt1_fck = {
+ 	.recalc		= &followparent_recalc,
+ };
+
++static struct clk virt_vdd1_prcm_set = {
++	.name = "virt_vdd1_prcm_set",
++	.flags = CLOCK_IN_OMAP343X | VIRTUAL_CLOCK | ALWAYS_ENABLED,
++	.parent = &mpu_ck, /* Indexed by mpu speed, no parent */
++	.recalc = &omap3_table_recalc, /*sets are keyed on mpu rate */
++	.set_rate = &omap3_select_table_rate,
++	.round_rate = &omap3_round_to_table_rate,
++};
++
++static struct clk virt_vdd2_prcm_set = {
++	.name = "virt_vdd2_prcm_set",
++	.flags = CLOCK_IN_OMAP343X | VIRTUAL_CLOCK | ALWAYS_ENABLED,
++	.parent = &core_ck,
++	.recalc = &omap3_table_recalc,
++	.set_rate = &omap3_select_table_rate,
++	.round_rate = &omap3_round_to_table_rate,
++};
++
+ static struct clk *onchip_34xx_clks[] __initdata = {
+ 	&omap_32k_fck,
+ 	&virt_12m_ck,
+@@ -3276,6 +3302,9 @@ static struct clk *onchip_34xx_clks[] __
+ 	&secure_32k_fck,
+ 	&gpt12_fck,
+ 	&wdt1_fck,
++	/* virtual group clock */
++	&virt_vdd1_prcm_set,
++	&virt_vdd2_prcm_set,
+ };
+
+ #endif
+Index: linux-omap-2.6/arch/arm/mach-omap2/clock34xx.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/clock34xx.c	2008-08-07
+14:34:23.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/clock34xx.c	2008-08-07
+15:07:19.000000000 +0530
+@@ -25,6 +25,7 @@
+ #include <linux/clk.h>
+ #include <linux/io.h>
+ #include <linux/limits.h>
++#include <linux/err.h>
+
+ #include <asm/arch/clock.h>
+ #include <asm/arch/sram.h>
+@@ -45,6 +46,32 @@
+
+ #define MAX_DPLL_WAIT_TRIES		1000000
+
++struct vdd_prcm_config *curr_vdd1_prcm_set;
++struct vdd_prcm_config *curr_vdd2_prcm_set;
++static struct clk *dpll1_clk, *dpll2_clk, *dpll3_clk;
++
++#ifndef CONFIG_CPU_FREQ
++static unsigned long compute_lpj(unsigned long ref, u_int div, u_int mult)
++{
++	unsigned long new_jiffy_l, new_jiffy_h;
++
++	/*
++	 * Recalculate loops_per_jiffy.  We do it this way to
++	 * avoid math overflow on 32-bit machines.  Maybe we
++	 * should make this architecture dependent?  If you have
++	 * a better way of doing this, please replace!
++	 *
++	 *    new = old * mult / div
++	 */
++	new_jiffy_h = ref / div;
++	new_jiffy_l = (ref % div) / 100;
++	new_jiffy_h *= mult;
++	new_jiffy_l = new_jiffy_l * mult / div;
++
++	return new_jiffy_h + new_jiffy_l * 100;
++}
++#endif
++
+ /**
+  * omap3_dpll_recalc - recalculate DPLL rate
+  * @clk: DPLL struct clk
+@@ -644,15 +671,6 @@ void omap2_clk_prepare_for_reboot(void)
+  */
+ static int __init omap2_clk_arch_init(void)
+ {
+-	if (!mpurate)
+-		return -EINVAL;
+-
+-	/* REVISIT: not yet ready for 343x */
+-#if 0
+-	if (omap2_select_table_rate(&virt_prcm_set, mpurate))
+-		printk(KERN_ERR "Could not find matching MPU rate\n");
+-#endif
+-
+ 	recalculate_root_clocks();
+
+ 	printk(KERN_INFO "Switched to new clocking rate (Crystal/DPLL3/MPU): "
+@@ -670,6 +688,9 @@ int __init omap2_clk_init(void)
+ 	struct clk **clkp;
+ 	/* u32 clkrate; */
+ 	u32 cpu_clkflg;
++	unsigned long mpu_speed, core_speed;
++	struct vdd_prcm_config *prcm_vdd;
++
+
+ 	/* REVISIT: Ultimately this will be used for multiboot */
+ #if 0
+@@ -712,22 +733,31 @@ int __init omap2_clk_init(void)
+ 		}
+ 	}
+
+-	/* REVISIT: Not yet ready for OMAP3 */
+-#if 0
+-	/* Check the MPU rate set by bootloader */
+-	clkrate = omap2_get_dpll_rate_24xx(&dpll_ck);
+-	for (prcm = rate_table; prcm->mpu_speed; prcm++) {
+-		if (!(prcm->flags & cpu_mask))
+-			continue;
+-		if (prcm->xtal_speed != sys_ck.rate)
+-			continue;
+-		if (prcm->dpll_speed <= clkrate)
+-			 break;
++	recalculate_root_clocks();
++
++	dpll1_clk = clk_get(NULL, "dpll1_ck");
++	dpll2_clk = clk_get(NULL, "dpll2_ck");
++	dpll3_clk = clk_get(NULL, "dpll3_ck");
++
++#ifdef CONFIG_MACH_OMAP_3430SDP
++	mpu_speed = dpll1_clk->rate;
++	prcm_vdd = vdd1_rate_table + MAX_VDD1_OPP;
++	for (; prcm_vdd->speed; prcm_vdd--) {
++		if (prcm_vdd->speed <= mpu_speed) {
++			curr_vdd1_prcm_set = prcm_vdd;
++			break;
++		}
+ 	}
+-	curr_prcm_set = prcm;
+-#endif
+
+-	recalculate_root_clocks();
++	core_speed = dpll3_clk->rate;
++	prcm_vdd = vdd2_rate_table + MAX_VDD2_OPP;
++	for (; prcm_vdd->speed; prcm_vdd--) {
++		if (prcm_vdd->speed <= core_speed) {
++			curr_vdd2_prcm_set = prcm_vdd;
++			break;
++		}
++	}
++#endif
+
+ 	printk(KERN_INFO "Clocking rate (Crystal/DPLL/ARM core): "
+ 	       "%ld.%01ld/%ld/%ld MHz\n",
+@@ -740,13 +770,131 @@ int __init omap2_clk_init(void)
+ 	 */
+ 	clk_enable_init_clocks();
+
+-	/* Avoid sleeping during omap2_clk_prepare_for_reboot() */
+-	/* REVISIT: not yet ready for 343x */
+-#if 0
+-	vclk = clk_get(NULL, "virt_prcm_set");
+-	sclk = clk_get(NULL, "sys_ck");
+-#endif
+ 	return 0;
+ }
+
++inline unsigned int get_freq(struct vdd_prcm_config *opp_freq_table,
++							 unsigned long opp)
++{
++	struct vdd_prcm_config *prcm_config;
++	prcm_config = opp_freq_table;
++
++	for (; prcm_config->opp; prcm_config--)
++		if (prcm_config->opp == opp)
++			return prcm_config->speed;
++	return 0;
++}
++
++inline unsigned int get_opp(struct vdd_prcm_config *opp_freq_table,
++						 unsigned long freq)
++{
++	struct vdd_prcm_config *prcm_config;
++	prcm_config = opp_freq_table;
++
++	if (prcm_config->speed <= freq)
++		return prcm_config->opp; /* Return the Highest OPP */
++	for (; prcm_config->speed; prcm_config--) {
++		if (prcm_config->speed < freq)
++			return (prcm_config+1)->opp;
++		else if (prcm_config->speed == freq)
++			return prcm_config->opp;
++	}
++	/* Return the least OPP */
++	return (prcm_config+1)->opp;
++}
++
++#ifdef CONFIG_MACH_OMAP_3430SDP
++static void omap3_table_recalc(struct clk *clk)
++{
++	if ((clk != &virt_vdd1_prcm_set) && (clk != &virt_vdd2_prcm_set))
++		return;
++
++	if ((curr_vdd1_prcm_set) && (clk == &virt_vdd1_prcm_set))
++		clk->rate = curr_vdd1_prcm_set->speed;
++	else if ((curr_vdd2_prcm_set) && (clk == &virt_vdd2_prcm_set))
++		clk->rate = curr_vdd2_prcm_set->speed;
++	pr_debug("CLK RATE:%lu\n", clk->rate);
++}
++
++static long omap3_round_to_table_rate(struct clk *clk, unsigned long rate)
++{
++	struct vdd_prcm_config *ptr;
++	long highest_rate;
++
++	if ((clk != &virt_vdd1_prcm_set) && (clk != &virt_vdd2_prcm_set))
++		return -EINVAL;
++
++	highest_rate = -EINVAL;
++
++	if (clk == &virt_vdd1_prcm_set)
++		ptr = vdd1_rate_table + MAX_VDD1_OPP;
++	else
++		ptr = vdd2_rate_table + MAX_VDD2_OPP;
++
++	for (; ptr->speed; ptr--) {
++		highest_rate = ptr->speed;
++		pr_debug("Highest speed : %lu, rate: %lu\n", highest_rate,
++								rate);
++		if (ptr->speed <= rate)
++			break;
++	}
++	return highest_rate;
++}
++
++static int omap3_select_table_rate(struct clk *clk, unsigned long rate)
++{
++	struct vdd_prcm_config *prcm_vdd;
++	unsigned long found_speed = 0, curr_mpu_speed;
++	int index;
++
++	if ((clk != &virt_vdd1_prcm_set) && (clk != &virt_vdd2_prcm_set))
++		return -EINVAL;
++
++	if (clk == &virt_vdd1_prcm_set) {
++		prcm_vdd = vdd1_rate_table + MAX_VDD1_OPP;
++		index = MAX_VDD1_OPP;
++	} else if (clk == &virt_vdd2_prcm_set) {
++		prcm_vdd = vdd2_rate_table + MAX_VDD2_OPP;
++		index = MAX_VDD2_OPP;
++	}
++
++	for (; prcm_vdd->speed; prcm_vdd--, index--) {
++		if (prcm_vdd->speed <= rate) {
++			found_speed = prcm_vdd->speed;
++			pr_debug("Found speed = %lu\n", found_speed);
++			break;
++		}
++	}
++
++	if (!found_speed) {
++		printk(KERN_INFO "Could not set table rate to %luMHz\n",
++		       rate / 1000000);
++		return -EINVAL;
++	}
++
++
++	if (clk == &virt_vdd1_prcm_set) {
++		curr_mpu_speed = curr_vdd1_prcm_set->speed;
++		clk_set_rate(dpll1_clk, prcm_vdd->speed);
++		clk_set_rate(dpll2_clk, iva2_rate_table[index].speed);
++		curr_vdd1_prcm_set = prcm_vdd;
++#ifndef CONFIG_CPU_FREQ
++		/*Update loops_per_jiffy if processor speed is being changed*/
++		loops_per_jiffy = compute_lpj(loops_per_jiffy,
++					curr_mpu_speed/1000, found_speed/1000);
+ #endif
++	} else {
++		clk_set_rate(dpll3_clk, prcm_vdd->speed);
++		curr_vdd2_prcm_set = prcm_vdd;
++	}
++	return 0;
++}
++#else /* CONFIG_MACH_OMAP_3430SDP */
++static void omap3_table_recalc(struct clk *clk) {}
++static long omap3_round_to_table_rate(struct clk *clk, unsigned long rate)
++{ return 0; }
++static int omap3_select_table_rate(struct clk *clk, unsigned long rate)
++{ return 0; }
++#endif /* CONFIG_MACH_OMAP_3430SDP */
++
++#endif /* CONFIG_ARCH_OMAP3 */
+Index: linux-omap-2.6/include/asm-arm/arch-omap/clock.h
+===================================================================
+--- linux-omap-2.6.orig/include/asm-arm/arch-omap/clock.h	2008-08-07
+14:34:23.000000000 +0530
++++ linux-omap-2.6/include/asm-arm/arch-omap/clock.h	2008-08-07
+15:07:19.000000000 +0530
+@@ -126,6 +126,14 @@ struct clk_functions {
+ #endif
+ };
+
++#ifdef CONFIG_ARCH_OMAP3
++struct vdd_prcm_config {
++	unsigned long speed;
++	unsigned long opp;
++	unsigned long flags;
++};
++#endif
++
+ extern unsigned int mpurate;
+
+ extern int clk_init(struct clk_functions *custom_clocks);
+Index: linux-omap-2.6/arch/arm/mach-omap2/board-3430sdp.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/board-3430sdp.c	2008-08-06
+14:55:12.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/board-3430sdp.c	2008-08-07
+15:07:50.000000000 +0530
+@@ -40,6 +40,7 @@
+ #include <asm/arch/keypad.h>
+ #include <asm/arch/dma.h>
+ #include <asm/arch/gpmc.h>
++#include <asm/arch/clock.h>
+ #include <linux/i2c/twl4030-rtc.h>
+
+ #include <asm/io.h>
+@@ -53,6 +54,43 @@
+ #define ENABLE_VAUX3_DEDICATED	0x03
+ #define ENABLE_VAUX3_DEV_GRP	0x20
+
++struct vdd_prcm_config vdd1_rate_table[] = {
++	{0, 0, 0},
++	/*OPP1*/
++	{S125M, VDD1_OPP1, 0},
++	/*OPP2*/
++	{S250M, VDD1_OPP2, 0},
++	/*OPP3*/
++	{S500M, VDD1_OPP3, 0},
++	/*OPP4*/
++	{S550M, VDD1_OPP4, 0},
++	/*OPP5*/
++	{S600M, VDD1_OPP5, 0},
++};
++
++struct vdd_prcm_config vdd2_rate_table[] = {
++	{0, 0, 0},
++	/*OPP1*/
++	{0, VDD2_OPP1, 0},
++	/*OPP2*/
++	{S83M, VDD2_OPP2, 0},
++	/*OPP3*/
++	{S166M, VDD2_OPP3, 0},
++};
++
++struct vdd_prcm_config iva2_rate_table[] = {
++	{0, 0, 0},
++	/*OPP1*/
++	{S90M, VDD1_OPP1, 0},
++	/*OPP2*/
++	{S180M, VDD1_OPP2, 0},
++	/*OPP3*/
++	{S360M, VDD1_OPP3, 0},
++	/*OPP4*/
++	{S400M, VDD1_OPP4, 0},
++	/*OPP5*/
++	{S430M, VDD1_OPP5, 0},
++};
+
+ #define TWL4030_MSECURE_GPIO 22
+
+Index: linux-omap-2.6/include/asm-arm/arch-omap/board-3430sdp.h
+===================================================================
+--- linux-omap-2.6.orig/include/asm-arm/arch-omap/board-3430sdp.h	2008-08-06
+14:55:22.000000000 +0530
++++ linux-omap-2.6/include/asm-arm/arch-omap/board-3430sdp.h	2008-08-07
+15:07:19.000000000 +0530
+@@ -68,5 +68,40 @@ extern void twl4030_bci_battery_init(voi
+ #define FLASH_SIZE_SDPV1	SZ_64M
+ #define FLASH_SIZE_SDPV2	SZ_128M
+
++/* MPU speeds */
++#define S600M   600000000
++#define S550M   550000000
++#define S500M   500000000
++#define S250M   250000000
++#define S125M   125000000
++
++/* IVA speeds */
++#define S430M   430000000
++#define S400M   400000000
++#define S360M   360000000
++#define S180M   180000000
++#define S90M    90000000
++
++/* L3 speeds */
++#define S83M    83000000
++#define S166M   166000000
++
++/* VDD1 OPPS */
++#define VDD1_OPP1       0x1
++#define VDD1_OPP2       0x2
++#define VDD1_OPP3       0x3
++#define VDD1_OPP4       0x4
++#define VDD1_OPP5       0x5
++
++/* VDD2 OPPS */
++#define VDD2_OPP1       0x1
++#define VDD2_OPP2       0x2
++#define VDD2_OPP3       0x3
++
++#define MIN_VDD1_OPP    VDD1_OPP1
++#define MAX_VDD1_OPP    VDD1_OPP5
++#define MIN_VDD2_OPP    VDD2_OPP1
++#define MAX_VDD2_OPP    VDD2_OPP3
++
+ #endif /* __ASM_ARCH_OMAP_3430SDP_H */
+
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/06-omappm-opp-resource-modeling.eml b/packages/linux/linux-omap2-git/beagleboard/06-omappm-opp-resource-modeling.eml
new file mode 100644
index 0000000000..69ed0f748c
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/06-omappm-opp-resource-modeling.eml
@@ -0,0 +1,228 @@
+Adds OPP/Frequency resources to SRF
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/mach-omap2/resource34xx.c |  101 +++++++++++++++++++++++++++++++++++++
+ arch/arm/mach-omap2/resource34xx.h |   74 +++++++++++++++++++++++++++
+ 2 files changed, 175 insertions(+)
+
+Index: linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/resource34xx.c	2008-08-07
+15:07:08.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c	2008-08-07
+15:09:01.000000000 +0530
+@@ -146,3 +146,104 @@ int set_pd_latency(struct shared_resourc
+ 	}
+ 	return 0;
+ }
++
++static struct clk *vdd1_clk;
++static struct clk *vdd2_clk;
++static struct device dummy_srf_dev;
++
++/**
++ * init_opp - Initialize the OPP resource
++ */
++void init_opp(struct shared_resource *resp)
++{
++	resp->no_of_users = 0;
++	/* Initialize the current level of the OPP resource
++	* to the  opp set by u-boot.
++	*/
++	if (strcmp(resp->name, "vdd1_opp") == 0) {
++		resp->curr_level = curr_vdd1_prcm_set->opp;
++		vdd1_clk = clk_get(NULL, "virt_vdd1_prcm_set");
++	} else if (strcmp(resp->name, "vdd2_opp") == 0) {
++		resp->curr_level = curr_vdd2_prcm_set->opp;
++		vdd2_clk = clk_get(NULL, "virt_vdd2_prcm_set");
++	}
++	return;
++}
++
++int set_opp(struct shared_resource *resp, u32 target_level)
++{
++#ifdef CONFIG_MACH_OMAP_3430SDP
++	unsigned long mpu_freq;
++	if (strcmp(resp->name, "vdd1_opp") == 0) {
++		mpu_freq = get_freq(vdd1_rate_table + MAX_VDD1_OPP,
++					target_level);
++		clk_set_rate(vdd1_clk, mpu_freq);
++		resp->curr_level = curr_vdd1_prcm_set->opp;
++	} else if (strcmp(resp->name, "vdd2_opp") == 0) {
++		/* Not supported yet */
++	}
++#endif
++	return 0;
++}
++
++/**
++ * validate_opp - Validates if valid VDD1 OPP's are passed as the
++ * target_level.
++ * VDD2 OPP levels are passed as L3 throughput, which are then mapped
++ * to an appropriate OPP.
++ */
++int validate_opp(struct shared_resource *resp, u32 target_level)
++{
++	return 0;
++}
++
++/**
++ * init_freq - Initialize the frequency resource.
++ */
++void init_freq(struct shared_resource *resp)
++{
++#ifdef CONFIG_MACH_OMAP_3430SDP
++	char *linked_res_name;
++	resp->no_of_users = 0;
++
++	linked_res_name = (char *)resp->resource_data;
++	/* Initialize the current level of the Freq resource
++	* to the frequency set by u-boot.
++	*/
++	if (strcmp(resp->name, "mpu_freq") == 0)
++		/* MPU freq in Mhz */
++		resp->curr_level = curr_vdd1_prcm_set->speed;
++	else if (strcmp(resp->name, "dsp_freq") == 0)
++		/* DSP freq in Mhz */
++		resp->curr_level = get_freq(iva2_rate_table + MAX_VDD2_OPP,
++						curr_vdd1_prcm_set->opp);
++#endif
++	return;
++}
++
++int set_freq(struct shared_resource *resp, u32 target_level)
++{
++#ifdef CONFIG_MACH_OMAP_3430SDP
++	unsigned int vdd1_opp;
++
++	if (strcmp(resp->name, "mpu_freq") == 0)
++		vdd1_opp = get_opp(vdd1_rate_table + MAX_VDD1_OPP,
++							target_level);
++	else if (strcmp(resp->name, "dsp_freq") == 0)
++		vdd1_opp = get_opp(iva2_rate_table + MAX_VDD1_OPP,
++							target_level);
++
++	if (vdd1_opp == MIN_VDD1_OPP)
++		resource_release("vdd1_opp", &dummy_srf_dev);
++	else
++		resource_request("vdd1_opp", &dummy_srf_dev, vdd1_opp);
++
++	resp->curr_level = target_level;
++#endif
++	return 0;
++}
++
++int validate_freq(struct shared_resource *resp, u32 target_level)
++{
++	return 0;
++}
+Index: linux-omap-2.6/arch/arm/mach-omap2/resource34xx.h
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/resource34xx.h	2008-08-07
+15:07:02.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/resource34xx.h	2008-08-07
+15:31:42.000000000 +0530
+@@ -22,8 +22,17 @@
+ #define __ARCH_ARM_MACH_OMAP2_RESOURCE_H
+
+ #include <asm/arch/resource.h>
++#include <linux/clk.h>
++#include <asm/arch/clock.h>
+ #include <asm/arch/powerdomain.h>
+
++extern struct vdd_prcm_config *curr_vdd1_prcm_set;
++extern struct vdd_prcm_config *curr_vdd2_prcm_set;
++extern unsigned int get_freq(struct  vdd_prcm_config *, unsigned long);
++extern unsigned int get_opp(struct vdd_prcm_config *, unsigned long);
++extern struct vdd_prcm_config vdd1_rate_table[];
++extern struct vdd_prcm_config vdd2_rate_table[];
++extern struct vdd_prcm_config iva2_rate_table[];
+ /**
+  * mpu_latency/core_latency are used to control the cpuidle C state.
+  */
+@@ -207,6 +216,66 @@ static struct shared_resource emu_pwrdm_
+ 	.ops		= &pd_lat_res_ops,
+ };
+
++void init_opp(struct shared_resource *resp);
++int set_opp(struct shared_resource *resp, u32 target_level);
++int validate_opp(struct shared_resource *resp, u32 target_level);
++void init_freq(struct shared_resource *resp);
++int set_freq(struct shared_resource *resp, u32 target_level);
++int validate_freq(struct shared_resource *resp, u32 target_level);
++
++struct bus_throughput_db {
++	/* Throughput for each OPP/Freq of the bus */
++	unsigned long throughput[3];
++};
++
++static struct shared_resource_ops opp_res_ops = {
++	.init           = init_opp,
++	.change_level   = set_opp,
++	.validate_level = validate_opp,
++};
++
++static struct shared_resource vdd1_opp = {
++	.name           = "vdd1_opp",
++	.omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.ops            = &opp_res_ops,
++};
++
++/* Throughput in KiB/s */
++static struct bus_throughput_db l3_throughput_db = {
++	.throughput[0] = 0,
++	.throughput[1] = 100,
++	.throughput[2] = 250,
++};
++
++static struct shared_resource vdd2_opp = {
++	.name           = "vdd2_opp",
++	.omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data  = &l3_throughput_db,
++	.ops            = &opp_res_ops,
++};
++
++static char linked_res[] = "vdd1_opp";
++
++static struct shared_resource_ops freq_res_ops = {
++	.init           = init_freq,
++	.change_level   = set_freq,
++	.validate_level = validate_freq,
++};
++
++static struct shared_resource mpu_freq = {
++	.name           = "mpu_freq",
++	.omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data  = &linked_res,
++	.ops            = &freq_res_ops,
++};
++
++static struct shared_resource dsp_freq = {
++	.name           = "dsp_freq",
++	.omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
++	.resource_data  = &linked_res,
++	.ops            = &freq_res_ops,
++};
++
+ struct shared_resource *resources_omap[] __initdata = {
+ 	&mpu_latency,
+ 	&core_latency,
+@@ -220,6 +289,11 @@ struct shared_resource *resources_omap[]
+ 	&neon_pwrdm_latency,
+ 	&usbhost_pwrdm_latency,
+ 	&emu_pwrdm_latency,
++	/* OPP/frequency resources */
++	&vdd1_opp,
++	&vdd2_opp,
++	&mpu_freq,
++	&dsp_freq,
+ 	NULL
+ };
+
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/07-omappm-srf-updates.eml b/packages/linux/linux-omap2-git/beagleboard/07-omappm-srf-updates.eml
new file mode 100644
index 0000000000..735e991298
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/07-omappm-srf-updates.eml
@@ -0,0 +1,173 @@
+Updates the omap-pm apis with calls to SRF implementation
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/plat-omap/omap-pm-srf.c |   84 +++++++++------------------------------
+ 1 files changed, 20 insertions(+), 64 deletions(-)
+
+Index: linux-omap-2.6/arch/arm/plat-omap/omap-pm-srf.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/plat-omap/omap-pm-srf.c	2008-07-21
+12:10:19.824596984 +0530
++++ linux-omap-2.6/arch/arm/plat-omap/omap-pm-srf.c	2008-07-21
+12:10:21.626540178 +0530
+@@ -25,6 +25,7 @@
+ #include <linux/init.h>
+ #include <linux/cpufreq.h>
+ #include <linux/device.h>
++#include <linux/module.h>
+
+ /* Interface documentation is in asm/arch/omap-pm.h */
+ #include <asm/arch/omap-pm.h>
+@@ -121,6 +122,7 @@ void omap_pm_set_max_dev_wakeup_lat(stru
+ 		WARN_ON(1);
+ 		return;
+ 	};
++
+ 	/* Look for the devices Power Domain */
+ 	/* TODO: Put this back in once tiocp layer is available
+ 	tiocp_dev = container_of(dev, struct tiocp, dev);
+@@ -138,19 +140,6 @@ void omap_pm_set_max_dev_wakeup_lat(stru
+ 		res_name = get_lat_res_name(pwrdm_dev->name);
+ 		resource_request(res_name, dev, t);
+ 	}
+-
+-	/*
+-	 * For current Linux, this needs to map the device to a
+-	 * powerdomain, then go through the list of current max lat
+-	 * constraints on that powerdomain and find the smallest.  If
+-	 * the latency constraint has changed, the code should
+-	 * recompute the state to enter for the next powerdomain
+-	 * state.  Conceivably, this code should also determine
+-	 * whether to actually disable the device clocks or not,
+-	 * depending on how long it takes to re-enable the clocks.
+-	 *
+-	 * TI CDP code can call constraint_set here.
+-	 */
+ }
+
+ void omap_pm_set_max_sdma_lat(struct device *dev, long t)
+@@ -169,21 +158,9 @@ void omap_pm_set_max_sdma_lat(struct dev
+ 			 "dev %s, t = %ld usec\n", dev_name(dev), t);
+ 		resource_request("core_latency", dev, t);
+ 	}
+-
+-	/*
+-	 * For current Linux PM QOS params, this code should scan the
+-	 * list of maximum CPU and DMA latencies and select the
+-	 * smallest, then set cpu_dma_latency pm_qos_param
+-	 * accordingly.
+-	 *
+-	 * For future Linux PM QOS params, with separate CPU and DMA
+-	 * latency params, this code should just set the dma_latency param.
+-	 *
+-	 * TI CDP code can call constraint_set here.
+-	 */
+-
+ }
+
++static struct device dummy_dsp_dev;
+
+ /*
+  * DSP Bridge-specific constraints
+@@ -200,6 +177,7 @@ const struct omap_opp *omap_pm_dsp_get_o
+
+ 	return NULL;
+ }
++EXPORT_SYMBOL(omap_pm_dsp_get_opp_table);
+
+ void omap_pm_dsp_set_min_opp(u8 opp_id)
+ {
+@@ -210,36 +188,21 @@ void omap_pm_dsp_set_min_opp(u8 opp_id)
+
+ 	pr_debug("OMAP PM: DSP requests minimum VDD1 OPP to be %d\n", opp_id);
+
+-	/*
+-	 *
+-	 * For l-o dev tree, our VDD1 clk is keyed on OPP ID, so we
+-	 * can just test to see which is higher, the CPU's desired OPP
+-	 * ID or the DSP's desired OPP ID, and use whichever is
+-	 * highest.
+-	 *
+-	 * In CDP12.14+, the VDD1 OPP custom clock that controls the DSP
+-	 * rate is keyed on MPU speed, not the OPP ID.  So we need to
+-	 * map the OPP ID to the MPU speed for use with clk_set_rate()
+-	 * if it is higher than the current OPP clock rate.
+-	 *
+-	 */
+-}
++	/* For now pass a dummy_dev struct for SRF to identify the caller.
++	* Maybe its good to have DSP pass this as an argument
++	*/
++	resource_request("vdd1_opp", &dummy_dsp_dev, opp_id);
++	return;
+
++}
++EXPORT_SYMBOL(omap_pm_dsp_set_min_opp);
+
+ u8 omap_pm_dsp_get_opp(void)
+ {
+ 	pr_debug("OMAP PM: DSP requests current DSP OPP ID\n");
+-
+-	/*
+-	 * For l-o dev tree, call clk_get_rate() on VDD1 OPP clock
+-	 *
+-	 * CDP12.14+:
+-	 * Call clk_get_rate() on the OPP custom clock, map that to an
+-	 * OPP ID using the tables defined in board-*.c/chip-*.c files.
+-	 */
+-
+-	return 0;
++	return resource_get_level("vdd1_opp");
+ }
++EXPORT_SYMBOL(omap_pm_dsp_get_opp);
+
+ /*
+  * CPUFreq-originated constraint
+@@ -261,6 +224,8 @@ struct cpufreq_frequency_table **omap_pm
+ 	return NULL;
+ }
+
++static struct device dummy_cpufreq_dev;
++
+ void omap_pm_cpu_set_freq(unsigned long f)
+ {
+ 	if (f == 0) {
+@@ -271,26 +236,17 @@ void omap_pm_cpu_set_freq(unsigned long
+ 	pr_debug("OMAP PM: CPUFreq requests CPU frequency to be set to %lu\n",
+ 		 f);
+
+-	/*
+-	 * For l-o dev tree, determine whether MPU freq or DSP OPP id
+-	 * freq is higher.  Find the OPP ID corresponding to the
+-	 * higher frequency.  Call clk_round_rate() and clk_set_rate()
+-	 * on the OPP custom clock.
+-	 *
+-	 * CDP should just be able to set the VDD1 OPP clock rate here.
+-	 */
++	resource_request("mpu_freq", &dummy_cpufreq_dev, f);
++	return;
+ }
++EXPORT_SYMBOL(omap_pm_cpu_set_freq);
+
+ unsigned long omap_pm_cpu_get_freq(void)
+ {
+ 	pr_debug("OMAP PM: CPUFreq requests current CPU frequency\n");
+-
+-	/*
+-	 * Call clk_get_rate() on the mpu_ck.
+-	 */
+-
+-	return 0;
++	return resource_get_level("mpu_freq");
+ }
++EXPORT_SYMBOL(omap_pm_cpu_get_freq);
+
+ struct device omap_pm_dev;
+
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/08-omappm-voltagescaling.eml b/packages/linux/linux-omap2-git/beagleboard/08-omappm-voltagescaling.eml
new file mode 100644
index 0000000000..a7885774f4
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/08-omappm-voltagescaling.eml
@@ -0,0 +1,96 @@
+Adds Voltage scaling support
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/mach-omap2/board-3430sdp.c |   12 ++++++++++++
+ arch/arm/mach-omap2/resource34xx.c  |   17 ++++++++++++++++-
+ arch/arm/mach-omap2/resource34xx.h  |    3 +++
+ 3 files changed, 31 insertions(+), 1 deletion(-)
+
+Index: linux-omap-2.6/arch/arm/mach-omap2/board-3430sdp.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/board-3430sdp.c	2008-08-11
+17:16:07.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/board-3430sdp.c	2008-08-11
+17:17:58.000000000 +0530
+@@ -94,6 +94,18 @@ struct vdd_prcm_config iva2_rate_table[]
+
+ #define TWL4030_MSECURE_GPIO 22
+
++u8 vdd1_volts[MAX_VDD1_OPP] = {
++	/* Vsel corresponding to 0.9V (OPP1), 1.00V (OPP2),
++	 * 1.20V (OPP3), 1.27V (OPP4), 1.35 (OPP5)
++	 */
++	0x18, 0x20, 0x30, 0x36, 0x3C
++};
++
++u8 vdd2_volts[MAX_VDD2_OPP] = {
++	/* Vsel corresponding to 0.9V (OPP1), 1.00V (OPP2), 1.15 (OPP3) */
++	0x18, 0x20, 0x2C
++};
++
+ static struct resource sdp3430_smc91x_resources[] = {
+ 	[0] = {
+ 		.start	= OMAP34XX_ETHR_START,
+Index: linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/resource34xx.c	2008-08-11
+17:17:23.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c	2008-08-11
+17:22:02.000000000 +0530
+@@ -19,6 +19,7 @@
+ #include <linux/pm_qos_params.h>
+ #include <asm/arch/powerdomain.h>
+ #include <asm/arch/clockdomain.h>
++#include "smartreflex.h"
+ #include "resource34xx.h"
+
+ /**
+@@ -174,10 +175,24 @@ int set_opp(struct shared_resource *resp
+ {
+ #ifdef CONFIG_MACH_OMAP_3430SDP
+ 	unsigned long mpu_freq;
++
++	if (resp->curr_level == target_level)
++		return 0;
++
+ 	if (strcmp(resp->name, "vdd1_opp") == 0) {
+ 		mpu_freq = get_freq(vdd1_rate_table + MAX_VDD1_OPP,
+ 					target_level);
+-		clk_set_rate(vdd1_clk, mpu_freq);
++		if (resp->curr_level > target_level) {
++			/* Scale Frequency and then voltage */
++			clk_set_rate(vdd1_clk, mpu_freq);
++			sr_voltagescale_vcbypass(PRCM_VDD1,
++					vdd1_volts[target_level-1]);
++		} else {
++			/* Scale Voltage and then frequency */
++			sr_voltagescale_vcbypass(PRCM_VDD1,
++					vdd1_volts[target_level-1]);
++			clk_set_rate(vdd1_clk, mpu_freq);
++		}
+ 		resp->curr_level = curr_vdd1_prcm_set->opp;
+ 	} else if (strcmp(resp->name, "vdd2_opp") == 0) {
+ 		/* Not supported yet */
+Index: linux-omap-2.6/arch/arm/mach-omap2/resource34xx.h
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/resource34xx.h	2008-08-11
+17:17:23.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/resource34xx.h	2008-08-11
+17:17:58.000000000 +0530
+@@ -33,6 +33,9 @@ extern unsigned int get_opp(struct vdd_p
+ extern struct vdd_prcm_config vdd1_rate_table[];
+ extern struct vdd_prcm_config vdd2_rate_table[];
+ extern struct vdd_prcm_config iva2_rate_table[];
++extern u8 vdd1_volts[];
++extern u8 vdd2_volts[];
++extern int sr_voltagescale_vcbypass(u32 target_opp, u8 vsel);
+ /**
+  * mpu_latency/core_latency are used to control the cpuidle C state.
+  */
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/09-omappm-vdd2-scaling.eml b/packages/linux/linux-omap2-git/beagleboard/09-omappm-vdd2-scaling.eml
new file mode 100644
index 0000000000..532a9f7975
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/09-omappm-vdd2-scaling.eml
@@ -0,0 +1,102 @@
+Adds VDD2 scaling support
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/mach-omap2/resource34xx.c |   35 +++++++++++++++++++++++++++++++++--
+ arch/arm/plat-omap/omap-pm-srf.c   |   15 +++++----------
+ 2 files changed, 38 insertions(+), 12 deletions(-)
+
+Index: linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/resource34xx.c	2008-07-21
+12:10:22.032527379 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c	2008-07-21
+12:10:22.479513287 +0530
+@@ -174,7 +174,9 @@ void init_opp(struct shared_resource *re
+ int set_opp(struct shared_resource *resp, u32 target_level)
+ {
+ #ifdef CONFIG_MACH_OMAP_3430SDP
+-	unsigned long mpu_freq;
++	unsigned long mpu_freq, l3_freq, tput;
++	int ind;
++	struct bus_throughput_db *tput_db;
+
+ 	if (resp->curr_level == target_level)
+ 		return 0;
+@@ -195,7 +197,36 @@ int set_opp(struct shared_resource *resp
+ 		}
+ 		resp->curr_level = curr_vdd1_prcm_set->opp;
+ 	} else if (strcmp(resp->name, "vdd2_opp") == 0) {
+-		/* Not supported yet */
++		tput_db = resp->resource_data;
++		tput = target_level;
++		/* using the throughput db map to the appropriate L3 Freq */
++		for (ind = 1; ind < MAX_VDD2_OPP; ind++)
++			if (tput_db->throughput[ind] > tput)
++				target_level = ind;
++
++		/* Set the highest OPP possible */
++		if (ind == MAX_VDD2_OPP)
++			target_level = ind-1;
++
++		if (resp->curr_level == target_level)
++			return 0;
++
++		resp->curr_level = target_level;
++
++		l3_freq = get_freq(vdd2_rate_table + MAX_VDD2_OPP,
++					target_level);
++		if (resp->curr_level > target_level) {
++			/* Scale Frequency and then voltage */
++			clk_set_rate(vdd2_clk, l3_freq);
++			sr_voltagescale_vcbypass(PRCM_VDD2,
++					vdd2_volts[target_level-1]);
++		} else {
++			/* Scale Voltage and then frequency */
++			sr_voltagescale_vcbypass(PRCM_VDD2,
++					vdd2_volts[target_level-1]);
++			clk_set_rate(vdd1_clk, l3_freq);
++		}
++		resp->curr_level = curr_vdd2_prcm_set->opp;
+ 	}
+ #endif
+ 	return 0;
+Index: linux-omap-2.6/arch/arm/plat-omap/omap-pm-srf.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/plat-omap/omap-pm-srf.c	2008-07-21
+12:10:21.626540178 +0530
++++ linux-omap-2.6/arch/arm/plat-omap/omap-pm-srf.c	2008-07-21
+12:10:22.479513287 +0530
+@@ -95,21 +95,16 @@ void omap_pm_set_min_bus_tput(struct dev
+ 		return;
+ 	};
+
+-	if (r == 0)
++	if (r == 0) {
+ 		pr_debug("OMAP PM: remove min bus tput constraint: "
+ 			 "dev %s for agent_id %d\n", dev_name(dev), agent_id);
+-	else
++		resource_release("vdd2_opp", r);
++	} else {
+ 		pr_debug("OMAP PM: add min bus tput constraint: "
+ 			 "dev %s for agent_id %d: rate %ld KiB\n",
+ 			 dev_name(dev), agent_id, r);
+-
+-	/*
+-	 * This code should model the interconnect and compute the
+-	 * required clock frequency, convert that to a VDD2 OPP ID, then
+-	 * set the VDD2 OPP appropriately.
+-	 *
+-	 * TI CDP code can call constraint_set here on the VDD2 OPP.
+-	 */
++		resource_request("vdd2_opp", dev, r);
++	}
+ }
+
+ void omap_pm_set_max_dev_wakeup_lat(struct device *dev, long t)
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/10-omappm-off-mode.eml b/packages/linux/linux-omap2-git/beagleboard/10-omappm-off-mode.eml
new file mode 100644
index 0000000000..3728440159
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/10-omappm-off-mode.eml
@@ -0,0 +1,35 @@
+A Temp patch needed only till OFF mode is implemented.
+
+Signed-off-by: Rajendra Nayak <rnayak@ti.com>
+---
+ arch/arm/mach-omap2/resource34xx.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c
+===================================================================
+--- linux-omap-2.6.orig/arch/arm/mach-omap2/resource34xx.c	2008-08-11
+17:39:00.000000000 +0530
++++ linux-omap-2.6/arch/arm/mach-omap2/resource34xx.c	2008-08-11
+17:39:00.000000000 +0530
+@@ -131,13 +131,13 @@ int set_pd_latency(struct shared_resourc
+ 				omap2_clkdm_wakeup(pwrdm->pwrdm_clkdms[i]);
+ 			}
+ 			pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_ON);
+-			pwrdm_set_next_pwrst(pwrdm, pd_lat_level);
++			pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_RET);
+ 			for (i = 0; pwrdm->pwrdm_clkdms[i]; i++) {
+ 				omap2_clkdm_sleep(pwrdm->pwrdm_clkdms[i]);
+ 				omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[i]);
+ 			}
+ 		} else
+-			pwrdm_set_next_pwrst(pwrdm, pd_lat_level);
++			pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_RET);
+ 		break;
+ 	case PWRDM_POWER_ON:
+ 		pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_ON);
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig
index d01d473ed5..b3ea5f9557 100644
--- a/packages/linux/linux-omap2-git/beagleboard/defconfig
+++ b/packages/linux/linux-omap2-git/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.26-omap1
-# Tue Aug  5 20:34:54 2008
+# Mon Aug 11 16:37:34 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -187,12 +187,16 @@ CONFIG_OMAP_BOOT_REASON=y
 CONFIG_OMAP_MCBSP=y
 # CONFIG_OMAP_MMU_FWK is not set
 # CONFIG_OMAP_MBOX_FWK is not set
-CONFIG_OMAP_MPU_TIMER=y
-# CONFIG_OMAP_32K_TIMER is not set
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_32K_TIMER_HZ=128
 CONFIG_OMAP_DM_TIMER=y
 # CONFIG_OMAP_LL_DEBUG_UART1 is not set
 # CONFIG_OMAP_LL_DEBUG_UART2 is not set
 CONFIG_OMAP_LL_DEBUG_UART3=y
+# CONFIG_OMAP_PM_NONE is not set
+# CONFIG_OMAP_PM_NOOP is not set
+CONFIG_OMAP_PM_SRF=y
 CONFIG_ARCH_OMAP34XX=y
 CONFIG_ARCH_OMAP3430=y
 
@@ -203,6 +207,7 @@ CONFIG_ARCH_OMAP3430=y
 # CONFIG_MACH_OMAP_3430SDP is not set
 # CONFIG_MACH_OMAP3EVM is not set
 CONFIG_MACH_OMAP3_BEAGLE=y
+CONFIG_OMAP_TICK_GPTIMER=12
 
 #
 # Boot options
@@ -255,7 +260,7 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_PREEMPT is not set
-CONFIG_HZ=100
+CONFIG_HZ=128
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -306,19 +311,19 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
-# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 
 #
 # Floating point emulation
diff --git a/packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch b/packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch
new file mode 100644
index 0000000000..968cc6cf73
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch
@@ -0,0 +1,275 @@
+From: Gadiyar, Anand <gadiyar@ti.com>
+Date: Wed, 13 Aug 2008 07:05:29 +0000 (+0530)
+Subject: MUSB: Workaround for simultaneous TX and RX usage
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=2e6aa4efb0e14c51ff0427927b1b38136911fa93
+
+MUSB: Workaround for simultaneous TX and RX usage
+
+MUSB: Workaround for simultaneous TX and RX usage
+
+MUSB RTL V1.4 has a hardware issue which results in a DMA controller
+hang when TX and RX DMA channels are simultaneously enabled. This
+affects at least OMAP2430 and OMAP34XX.
+
+Since RX transfers are in Mode 0 and anyway result in one DMA interrupt
+per packet, we can use System DMA to unload the RX fifos. MUSB DMA can
+be used for all TX channels as before.
+
+Tested with full-duplex TX and RX transfers using g_ether. Runs for 24
+hours without a hang. Without this patch, the hang occurs within minutes.
+
+This issue was first reported by Jon Hunter on [1]
+
+[1] http://marc.info/?l=linux-omap&m=119634480534453&w=2
+
+Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
+---
+
+diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
+index a485a86..8583e54 100644
+--- a/drivers/usb/musb/Kconfig
++++ b/drivers/usb/musb/Kconfig
+@@ -150,6 +150,14 @@ config USB_INVENTRA_DMA
+ 	help
+ 	  Enable DMA transfers using Mentor's engine.
+ 
++config MUSB_USE_SYSTEM_DMA_RX
++	bool 'Use System DMA for RX endpoints'
++	depends on USB_MUSB_HDRC && USB_INVENTRA_DMA
++	help
++	  MUSB RTL version 1.4 has a hardware issue when TX and RX DMA
++	  channels are simultaneously enabled. To work around this issue,
++	  you can choose to use System DMA for RX channels.
++
+ config USB_TI_CPPI_DMA
+ 	bool
+ 	depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
+diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
+index 32bb1e2..d1c1ea0 100644
+--- a/drivers/usb/musb/musbhsdma.c
++++ b/drivers/usb/musb/musbhsdma.c
+@@ -34,6 +34,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/platform_device.h>
+ #include "musb_core.h"
++#include <asm/arch/dma.h>
+ 
+ #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
+ #include "omap2430.h"
+@@ -64,6 +65,9 @@
+ 
+ #define MUSB_HSDMA_CHANNELS		8
+ 
++#define MUSB_FIFO_ADDRESS(epnum)	\
++	((unsigned long) (OMAP_HSOTG_BASE + MUSB_FIFO_OFFSET(epnum)))
++
+ struct musb_dma_controller;
+ 
+ struct musb_dma_channel {
+@@ -75,6 +79,8 @@ struct musb_dma_channel {
+ 	u8				bIndex;
+ 	u8				epnum;
+ 	u8				transmit;
++
++	int				sysdma_channel;
+ };
+ 
+ struct musb_dma_controller {
+@@ -93,6 +99,42 @@ static int dma_controller_start(struct dma_controller *c)
+ 	return 0;
+ }
+ 
++#ifdef CONFIG_MUSB_USE_SYSTEM_DMA_RX
++static void musb_sysdma_completion(int lch, u16 ch_status, void *data)
++{
++	u32 dwAddress;
++	unsigned long flags;
++
++	struct dma_channel *pChannel;
++
++	struct musb_dma_channel *pImplChannel =
++					(struct musb_dma_channel *) data;
++	struct musb_dma_controller *controller = pImplChannel->controller;
++	struct musb *musb = controller->pDmaPrivate;
++	pChannel = &pImplChannel->Channel;
++
++	DBG(2, "lch = 0x%d, ch_status = 0x%x\n", lch, ch_status);
++	spin_lock_irqsave(&musb->lock, flags);
++
++	dwAddress = (u32) omap_get_dma_dst_pos(pImplChannel->sysdma_channel);
++	pChannel->actual_len = dwAddress - pImplChannel->dwStartAddress;
++
++	DBG(2, "ch %p, 0x%x -> 0x%x (%d / %d) %s\n",
++		pChannel, pImplChannel->dwStartAddress, dwAddress,
++		pChannel->actual_len, pImplChannel->len,
++		(pChannel->actual_len < pImplChannel->len) ?
++		"=> reconfig 0": "=> complete");
++
++	pChannel->status = MUSB_DMA_STATUS_FREE;
++	musb_dma_completion(musb, pImplChannel->epnum, pImplChannel->transmit);
++
++	spin_unlock_irqrestore(&musb->lock, flags);
++	return;
++}
++#else
++#define musb_sysdma_completion NULL
++#endif
++
+ static void dma_channel_release(struct dma_channel *pChannel);
+ 
+ static int dma_controller_stop(struct dma_controller *c)
+@@ -144,6 +186,29 @@ static struct dma_channel *dma_channel_allocate(struct dma_controller *c,
+ 			/* Tx => mode 1; Rx => mode 0 */
+ 			pChannel->desired_mode = transmit;
+ 			pChannel->actual_len = 0;
++			pImplChannel->sysdma_channel = -1;
++
++#ifdef CONFIG_MUSB_USE_SYSTEM_DMA_RX
++			if (!transmit) {
++				int ret;
++				ret = omap_request_dma(OMAP24XX_DMA_NO_DEVICE,
++					"MUSB SysDMA", musb_sysdma_completion,
++					(void *) pImplChannel,
++					&(pImplChannel->sysdma_channel));
++
++				if (ret) {
++					printk(KERN_ERR "request_dma failed:"
++							" %d\n", ret);
++					controller->bmUsedChannels &=
++								~(1 << bBit);
++					pChannel->status =
++							MUSB_DMA_STATUS_UNKNOWN;
++					pImplChannel->sysdma_channel = -1;
++					pChannel = NULL;
++				}
++			}
++#endif
++
+ 			break;
+ 		}
+ 	}
+@@ -163,6 +228,12 @@ static void dma_channel_release(struct dma_channel *pChannel)
+ 		~(1 << pImplChannel->bIndex);
+ 
+ 	pChannel->status = MUSB_DMA_STATUS_UNKNOWN;
++
++	if (pImplChannel->sysdma_channel != -1) {
++		omap_stop_dma(pImplChannel->sysdma_channel);
++		omap_free_dma(pImplChannel->sysdma_channel);
++		pImplChannel->sysdma_channel = -1;
++	}
+ }
+ 
+ static void configure_channel(struct dma_channel *pChannel,
+@@ -179,41 +250,69 @@ static void configure_channel(struct dma_channel *pChannel,
+ 	DBG(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n",
+ 			pChannel, packet_sz, dma_addr, len, mode);
+ 
+-	if (mode) {
+-		csr |= 1 << MUSB_HSDMA_MODE1_SHIFT;
+-		BUG_ON(len < packet_sz);
++	if (pImplChannel->sysdma_channel != -1) {
++	/* System DMA */
++	/* RX: set src = FIFO */
++
++		omap_set_dma_transfer_params(pImplChannel->sysdma_channel,
++					OMAP_DMA_DATA_TYPE_S8,
++					len, 1, /* One frame */
++					OMAP_DMA_SYNC_ELEMENT,
++					OMAP24XX_DMA_NO_DEVICE,
++					0); /* Src Sync */
++
++		omap_set_dma_src_params(pImplChannel->sysdma_channel, 0,
++					OMAP_DMA_AMODE_CONSTANT,
++					MUSB_FIFO_ADDRESS(pImplChannel->epnum),
++					0, 0);
+ 
+-		if (packet_sz >= 64) {
+-			csr |= MUSB_HSDMA_BURSTMODE_INCR16
++		omap_set_dma_dest_params(pImplChannel->sysdma_channel, 0,
++					OMAP_DMA_AMODE_POST_INC, dma_addr,
++					0, 0);
++
++		omap_set_dma_dest_data_pack(pImplChannel->sysdma_channel, 1);
++		omap_set_dma_dest_burst_mode(pImplChannel->sysdma_channel,
++					OMAP_DMA_DATA_BURST_16);
++
++		omap_start_dma(pImplChannel->sysdma_channel);
++
++	} else { /* Mentor DMA */
++		if (mode) {
++			csr |= 1 << MUSB_HSDMA_MODE1_SHIFT;
++			BUG_ON(len < packet_sz);
++
++			if (packet_sz >= 64) {
++				csr |= MUSB_HSDMA_BURSTMODE_INCR16
+ 					<< MUSB_HSDMA_BURSTMODE_SHIFT;
+-		} else if (packet_sz >= 32) {
+-			csr |= MUSB_HSDMA_BURSTMODE_INCR8
++			} else if (packet_sz >= 32) {
++				csr |= MUSB_HSDMA_BURSTMODE_INCR8
+ 					<< MUSB_HSDMA_BURSTMODE_SHIFT;
+-		} else if (packet_sz >= 16) {
+-			csr |= MUSB_HSDMA_BURSTMODE_INCR4
++			} else if (packet_sz >= 16) {
++				csr |= MUSB_HSDMA_BURSTMODE_INCR4
+ 					<< MUSB_HSDMA_BURSTMODE_SHIFT;
++			}
+ 		}
+-	}
+ 
+-	csr |= (pImplChannel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT)
+-		| (1 << MUSB_HSDMA_ENABLE_SHIFT)
+-		| (1 << MUSB_HSDMA_IRQENABLE_SHIFT)
+-		| (pImplChannel->transmit
+-				? (1 << MUSB_HSDMA_TRANSMIT_SHIFT)
+-				: 0);
+-
+-	/* address/count */
+-	musb_writel(mbase,
+-		MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS),
+-		dma_addr);
+-	musb_writel(mbase,
+-		MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT),
+-		len);
+-
+-	/* control (this should start things) */
+-	musb_writew(mbase,
+-		MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL),
+-		csr);
++		csr |= (pImplChannel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT)
++			| (1 << MUSB_HSDMA_ENABLE_SHIFT)
++			| (1 << MUSB_HSDMA_IRQENABLE_SHIFT)
++			| (pImplChannel->transmit
++					? (1 << MUSB_HSDMA_TRANSMIT_SHIFT)
++					: 0);
++
++		/* address/count */
++		musb_writel(mbase,
++			MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS),
++			dma_addr);
++		musb_writel(mbase,
++			MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT),
++			len);
++
++		/* control (this should start things) */
++		musb_writew(mbase,
++			MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL),
++			csr);
++	} /* Mentor DMA */
+ }
+ 
+ static int dma_channel_program(struct dma_channel *pChannel,
+@@ -265,6 +364,12 @@ static int dma_channel_abort(struct dma_channel *pChannel)
+ 				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR),
+ 				csr);
+ 		} else {
++			if (pImplChannel->sysdma_channel != -1) {
++				omap_stop_dma(pImplChannel->sysdma_channel);
++				omap_free_dma(pImplChannel->sysdma_channel);
++				pImplChannel->sysdma_channel = -1;
++			}
++
+ 			csr = musb_readw(mbase,
+ 				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR));
+ 			csr &= ~(MUSB_RXCSR_AUTOCLEAR |
diff --git a/packages/linux/linux-omap2-git/beagleboard/omap23-pm-noop.eml b/packages/linux/linux-omap2-git/beagleboard/omap23-pm-noop.eml
new file mode 100644
index 0000000000..48ff5da822
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/omap23-pm-noop.eml
@@ -0,0 +1,894 @@
+The interface provides device drivers, CPUFreq, and DSP Bridge with a
+means of controlling OMAP power management parameters that are not yet
+supported by the Linux PM PMQOS interface.  Copious documentation and
+rationale is in the patch in Documentation/arm/OMAP/omap_pm and the
+interface header file, include/asm-arm/arch-omap/omap-pm.h.
+
+Signed-off-by: Paul Walmsley <paul@pwsan.com>
+---
+
+ Documentation/arm/OMAP/omap_pm      |  185 +++++++++++++++++++++
+ arch/arm/mach-omap2/io.c            |    4 
+ arch/arm/plat-omap/Kconfig          |   13 +
+ arch/arm/plat-omap/Makefile         |    1 
+ arch/arm/plat-omap/omap-pm-noop.c   |  309 +++++++++++++++++++++++++++++++++++
+ include/asm-arm/arch-omap/omap-pm.h |  300 ++++++++++++++++++++++++++++++++++
+ 6 files changed, 812 insertions(+), 0 deletions(-)
+ create mode 100644 Documentation/arm/OMAP/omap_pm
+ create mode 100644 arch/arm/plat-omap/omap-pm-noop.c
+ create mode 100644 include/asm-arm/arch-omap/omap-pm.h
+
+diff --git a/Documentation/arm/OMAP/omap_pm b/Documentation/arm/OMAP/omap_pm
+new file mode 100644
+index 0000000..2ec2034
+--- /dev/null
++++ b/Documentation/arm/OMAP/omap_pm
+@@ -0,0 +1,185 @@
++
++Rationale: the OMAP PM interface
++================================
++
++
++Existing PM interfaces are currently not ideal for OMAP
++-------------------------------------------------------
++
++There are two PM interfaces in use with publicly-distributed OMAP
++Linux code: the TI Shared Resource Framework (SRF) and the Linux PM
++QoS parameters code.  Neither interface is ideal for Linux OMAP code.
++
++TI Shared Resource Framework:
++
++The TI CDP 12.14 tree drivers currently use the TI Shared Resource
++Framework (SRF) to control chip power management.  Use of the SRF
++allowed TI to get the drivers up and running quickly with considerable
++power savings; and the SRF provided debugging support.  However, many
++of the SRF parameters are specified in OMAP-specific terms, such as
++target OPPs, rather than in terms of actual latency or throughput
++requirements.  OPPs change depending on OMAP silicon revisions or OMAP
++types, and are meaningless for other architectures, so drivers shared
++between OMAP and other architectures would also have to #ifdef out the
++SRF constraints.
++
++Linux PM QoS parameters:
++
++In February 2008, the mainline Linux kernel added code that is
++somewhat similar to the SRF: the Linux PM QoS parameters code, located
++in kernel/pm_qos_params.c.  (This code replaced the latency management
++code that was present in earlier kernels.)  Ideally, OMAP drivers
++would be able to use this Linux PM QoS code directly, but the PM QoS
++code has some drawbacks:
++
++- It combines some power management parameters that should be kept
++  separate for maximum power savings on OMAP3.  For example, in the PM
++  QoS code, CPU and system DMA wakeup latency are combined into one
++  parameter; but on OMAP3, these are distinct parameters.  The Linux
++  PM QoS code also combines all network power management knobs into
++  two non-device-specific parameters.  OMAP2/3 systems can have
++  different network devices with different power management
++  requirements - for example, a wired Ethernet interface may have
++  different latency and throughput constraints than a WiFi interface.
++
++- It does not yet cover all of the power management capabilities of
++  the OMAP3 architecture.  It does not express latency constraints on
++  a per-device or per-powerdomain basis; it only covers
++  cpu_dma_latency and network throughput and latency, which would not
++  cover most of the OMAP3 devices.
++
++The result is that drivers using the current Linux PM QoS layer
++directly are unlikely to reach the same level of power efficiency as
++driver code using the Shared Resource Framework.
++
++To summarize, the SRF provides significant power savings, but
++expresses power constraints in an OMAP- and silicon-revision-specific
++way; and the PM QoS layer expresses PM constraints in a cross-platform
++manner (in terms of fundamental physical units), but does not support
++per-powerdomain constraints and does not cover many of the OMAP power
++management features.
++
++
++A medium-term alternative: the OMAP PM interface
++------------------------------------------------
++
++We need a way for driver code to express PM parameters which:
++
++- supports the range of power management parameters present in the TI SRF;
++
++- separates the drivers from the underlying PM parameter
++  implementation, whether it is the TI SRF or Linux PM QoS or Linux
++  latency framework or something else;
++
++- specifies PM parameters in terms of fundamental units, such as
++  latency and throughput, rather than units which are specific to OMAP
++  or to particular OMAP variants;
++
++- allows drivers which are shared with other architectures (e.g.,
++  DaVinci) to add these constraints in a way which won't affect non-OMAP
++  systems,
++
++- can be implemented immediately with minimal disruption of other
++  architectures.
++
++
++We therefore propose the OMAP PM interface, including the following
++four power management functions for driver code:
++
++1. Set the maximum MPU wakeup latency:
++   (*pdata->set_max_mpu_wakeup_lat)(struct device *dev, unsigned long t)
++
++2. Set the maximum device wakeup latency:
++   (*pdata->set_max_dev_wakeup_lat)(struct device *dev, unsigned long t)
++
++3. Set the maximum system DMA transfer start latency (CORE pwrdm):
++   (*pdata->set_max_sdma_lat)(struct device *dev, long t)
++
++4. Set the minimum bus throughput needed by a device:
++   (*pdata->set_min_bus_tput)(struct device *dev, u8 agent_id, unsigned long r)
++
++
++These functions are extensively documented in the OMAP PM interface header
++file, included in the patch.
++
++
++The OMAP PM layer is intended to be temporary
++---------------------------------------------
++
++The intention is that, in time, the Linux PM QoS layer should support
++the range of power management features present in OMAP3.  As this
++happens, existing drivers using the OMAP PM interface can be modified
++to use the Linux PM QoS code; and the OMAP PM interface can disappear.
++
++
++Driver usage of the OMAP PM functions
++-------------------------------------
++
++As the 'pdata' in the above examples indicates, these functions are
++exposed to drivers through function pointers in driver .platform_data
++structures.  The function pointers are initialized by the board-*.c
++files to point to the corresponding OMAP PM functions:
++.set_max_dev_wakeup_lat will point to
++omap_pm_set_max_dev_wakeup_lat(), etc.  Other architectures which do
++not support these functions should leave these function pointers set
++to NULL.  Drivers should use the following idiom:
++
++        if (pdata->set_max_dev_wakeup_lat)
++            (*pdata->set_max_dev_wakeup_lat)(dev, t);
++
++The most common usage of these functions will probably be to specify
++the maximum time from when an interrupt occurs, to when the device
++becomes accessible.  To accomplish this, driver writers should use the
++set_max_mpu_wakeup_lat() function to to constrain the MPU wakeup
++latency, and the set_max_dev_wakeup_lat() function to constrain the
++device wakeup latency (from clk_enable() to accessibility).  For
++example,
++
++        /* Limit MPU wakeup latency */
++        if (pdata->set_max_mpu_wakeup_lat)
++            (*pdata->set_max_mpu_wakeup_lat)(dev, tc);
++
++        /* Limit device powerdomain wakeup latency */
++        if (pdata->set_max_dev_wakeup_lat)
++            (*pdata->set_max_dev_wakeup_lat)(dev, td);
++
++        /* total wakeup latency in this example: (tc + td) */
++
++
++The PM parameters can be overwritten by calling the function again
++with the new value.  The settings can be removed by calling the
++function with a t argument of -1 (except in the case of
++set_max_bus_tput(), which should be called with an r argument of 0).
++
++
++Other specialized interface functions
++-------------------------------------
++
++The four functions listed above are intended to be usable by any
++device driver.  However, DSPBridge and CPUFreq have special
++requirements.  DSPBridge expresses target DSP performance levels in
++terms of OPP IDs.  CPUFreq expresses target MPU performance levels in
++terms of MPU frequency.  The OMAP PM interface contains functions for
++these specialized cases to convert that input information (OPPs/MPU
++frequency) into the form that the underlying power management
++implementation needs:
++
++5. (*pdata->omap_pm_dsp_get_opp_table)(void)
++
++6. (*pdata->omap_pm_dsp_set_min_opp)(u8 opp_id)
++
++7. (*pdata->omap_pm_dsp_get_opp)(void)
++
++8. (*pdata->omap_pm_cpu_get_freq_table)(void)
++
++9. (*pdata->omap_pm_cpu_set_freq)(unsigned long f)
++
++10. (*pdata->omap_pm_cpu_get_freq)(void)
++
++
++There are also functions for use by the clockdomain layer to indicate
++that a powerdomain should wake up or be put to sleep:
++
++11. (*pdata->omap_pm_pwrdm_active)(struct powerdomain *pwrdm)
++
++12. (*pdata->omap_pm_pwrdm_inactive)(struct powerdomain *pwrdm)
+diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
+index 960c13f..ca790ac 100644
+--- a/arch/arm/plat-omap/Kconfig
++++ b/arch/arm/plat-omap/Kconfig
+@@ -247,4 +247,17 @@ config OMAP_SERIAL_WAKE
+ 
+ endmenu
+ 
++choice
++	prompt "OMAP PM layer selection"
++	depends on ARCH_OMAP
++	default OMAP_PM_NOOP
++
++config OMAP_PM_NONE
++	bool "No PM layer"
++
++config OMAP_PM_NOOP
++	bool "No-op/debug PM layer"
++
++endchoice
++
+ endif
+diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
+index 93bbb64..d5453d5 100644
+--- a/arch/arm/plat-omap/Makefile
++++ b/arch/arm/plat-omap/Makefile
+@@ -29,3 +29,4 @@ obj-$(CONFIG_OMAP_MMU_FWK) += mmu.o
+ # OMAP mailbox framework
+ obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
+ 
++obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o
+\ No newline at end of file
+diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-pm-noop.c
+new file mode 100644
+index 0000000..5ff7962
+--- /dev/null
++++ b/arch/arm/plat-omap/omap-pm-noop.c
+@@ -0,0 +1,309 @@
++/*
++ * omap-pm-noop.c - OMAP power management interface - dummy version
++ *
++ * This code implements the OMAP power management interface to
++ * drivers, CPUIdle, CPUFreq, and DSP Bridge.  It is strictly for
++ * debug/demonstration use, as it does nothing but printk() whenever a
++ * function is called (when DEBUG is defined, below)
++ *
++ * Copyright (C) 2008 Texas Instruments, Inc.
++ * Copyright (C) 2008 Nokia Corporation
++ * Paul Walmsley
++ *
++ * Interface developed by (in alphabetical order):
++ * Karthik Dasu, Amish Lakhani, Tony Lindgren, Rajendra Nayak, Sakari
++ * Poussa, Veeramanikandan Raju, Igor Stoppa, Paul Walmsley, Richard
++ * Woodruff
++ */
++
++#undef DEBUG
++
++#include <linux/init.h>
++#include <linux/cpufreq.h>
++#include <linux/device.h>
++
++/* Interface documentation is in asm/arch/omap-pm.h */
++#include <asm/arch/omap-pm.h>
++
++#include <asm/arch/powerdomain.h>
++
++static struct omap_opp *dsp_opps;
++static struct omap_opp *mpu_opps;
++
++/*
++ * Device-driver-originated constraints (via board-*.c files)
++ */
++
++void omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t)
++{
++	if (!dev || t < -1) {
++		WARN_ON(1);
++		return;
++	};
++
++	if (t == -1)
++		pr_debug("OMAP PM: remove max MPU wakeup latency constraint: "
++			 "dev %s\n", dev_name(dev));
++	else
++		pr_debug("OMAP PM: add max MPU wakeup latency constraint: "
++			 "dev %s, t = %ld usec\n", dev_name(dev), t);
++
++	/*
++	 * For current Linux, this needs to map the MPU to a
++	 * powerdomain, then go through the list of current max lat
++	 * constraints on the MPU and find the smallest.  If
++	 * the latency constraint has changed, the code should
++	 * recompute the state to enter for the next powerdomain
++	 * state.
++	 *
++	 * TI CDP code can call constraint_set here.
++	 */
++}
++
++void omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r)
++{
++	if (!dev || agent_id != OCP_INITIATOR_AGENT ||
++	    agent_id != OCP_TARGET_AGENT) {
++		WARN_ON(1);
++		return;
++	};
++
++	if (r == 0)
++		pr_debug("OMAP PM: remove min bus tput constraint: "
++			 "dev %s for agent_id %d\n", dev_name(dev), agent_id);
++	else
++		pr_debug("OMAP PM: add min bus tput constraint: "
++			 "dev %s for agent_id %d: rate %ld KiB\n",
++			 dev_name(dev), agent_id, r);
++
++	/*
++	 * This code should model the interconnect and compute the
++	 * required clock frequency, convert that to a VDD2 OPP ID, then
++	 * set the VDD2 OPP appropriately.
++	 *
++	 * TI CDP code can call constraint_set here on the VDD2 OPP.
++	 */
++}
++
++void omap_pm_set_max_dev_wakeup_lat(struct device *dev, long t)
++{
++	if (!dev || t < -1) {
++		WARN_ON(1);
++		return;
++	};
++
++	if (t == -1)
++		pr_debug("OMAP PM: remove max device latency constraint: "
++			 "dev %s\n", dev_name(dev));
++	else
++		pr_debug("OMAP PM: add max device latency constraint: "
++			 "dev %s, t = %ld usec\n", dev_name(dev), t);
++
++	/*
++	 * For current Linux, this needs to map the device to a
++	 * powerdomain, then go through the list of current max lat
++	 * constraints on that powerdomain and find the smallest.  If
++	 * the latency constraint has changed, the code should
++	 * recompute the state to enter for the next powerdomain
++	 * state.  Conceivably, this code should also determine
++	 * whether to actually disable the device clocks or not,
++	 * depending on how long it takes to re-enable the clocks.
++	 *
++	 * TI CDP code can call constraint_set here.
++	 */
++}
++
++void omap_pm_set_max_sdma_lat(struct device *dev, long t)
++{
++	if (!dev || t < -1) {
++		WARN_ON(1);
++		return;
++	};
++
++	if (t == -1)
++		pr_debug("OMAP PM: remove max DMA latency constraint: "
++			 "dev %s\n", dev_name(dev));
++	else
++		pr_debug("OMAP PM: add max DMA latency constraint: "
++			 "dev %s, t = %ld usec\n", dev_name(dev), t);
++
++	/*
++	 * For current Linux PM QOS params, this code should scan the
++	 * list of maximum CPU and DMA latencies and select the
++	 * smallest, then set cpu_dma_latency pm_qos_param
++	 * accordingly.
++	 *
++	 * For future Linux PM QOS params, with separate CPU and DMA
++	 * latency params, this code should just set the dma_latency param.
++	 *
++	 * TI CDP code can call constraint_set here.
++	 */
++
++}
++
++
++/*
++ * DSP Bridge-specific constraints
++ */
++
++const struct omap_opp *omap_pm_dsp_get_opp_table(void)
++{
++	pr_debug("OMAP PM: DSP request for OPP table\n");
++
++	/*
++	 * Return DSP frequency table here:  The final item in the
++	 * array should have .rate = .opp_id = 0.
++	 */
++
++	return NULL;
++}
++
++void omap_pm_dsp_set_min_opp(u8 opp_id)
++{
++	if (opp_id == 0) {
++		WARN_ON(1);
++		return;
++	}
++
++	pr_debug("OMAP PM: DSP requests minimum VDD1 OPP to be %d\n", opp_id);
++
++	/*
++	 *
++	 * For l-o dev tree, our VDD1 clk is keyed on OPP ID, so we
++	 * can just test to see which is higher, the CPU's desired OPP
++	 * ID or the DSP's desired OPP ID, and use whichever is
++	 * highest.
++	 *
++	 * In CDP12.14+, the VDD1 OPP custom clock that controls the DSP
++	 * rate is keyed on MPU speed, not the OPP ID.  So we need to
++	 * map the OPP ID to the MPU speed for use with clk_set_rate()
++	 * if it is higher than the current OPP clock rate.
++	 *
++	 */
++}
++
++
++u8 omap_pm_dsp_get_opp(void)
++{
++	pr_debug("OMAP PM: DSP requests current DSP OPP ID\n");
++
++	/*
++	 * For l-o dev tree, call clk_get_rate() on VDD1 OPP clock
++	 *
++	 * CDP12.14+:
++	 * Call clk_get_rate() on the OPP custom clock, map that to an
++	 * OPP ID using the tables defined in board-*.c/chip-*.c files.
++	 */
++
++	return 0;
++}
++
++/*
++ * CPUFreq-originated constraint
++ *
++ * In the future, this should be handled by custom OPP clocktype
++ * functions.
++ */
++
++struct cpufreq_frequency_table **omap_pm_cpu_get_freq_table(void)
++{
++	pr_debug("OMAP PM: CPUFreq request for frequency table\n");
++
++	/*
++	 * Return CPUFreq frequency table here: loop over
++	 * all VDD1 clkrates, pull out the mpu_ck frequencies, build
++	 * table
++	 */
++
++	return NULL;
++}
++
++void omap_pm_cpu_set_freq(unsigned long f)
++{
++	if (f == 0) {
++		WARN_ON(1);
++		return;
++	}
++
++	pr_debug("OMAP PM: CPUFreq requests CPU frequency to be set to %lu\n",
++		 f);
++
++	/*
++	 * For l-o dev tree, determine whether MPU freq or DSP OPP id
++	 * freq is higher.  Find the OPP ID corresponding to the
++	 * higher frequency.  Call clk_round_rate() and clk_set_rate()
++	 * on the OPP custom clock.
++	 *
++	 * CDP should just be able to set the VDD1 OPP clock rate here.
++	 */
++}
++
++unsigned long omap_pm_cpu_get_freq(void)
++{
++	pr_debug("OMAP PM: CPUFreq requests current CPU frequency\n");
++
++	/*
++	 * Call clk_get_rate() on the mpu_ck.
++	 */
++
++	return 0;
++}
++
++/*
++ * Powerdomain usecounting hooks
++ */
++
++void omap_pm_pwrdm_active(struct powerdomain *pwrdm)
++{
++	if (!pwrdm) {
++		WARN_ON(1);
++		return;
++	};
++
++	pr_debug("OMAP PM: powerdomain %s is becoming active\n", pwrdm->name);
++
++	/*
++	 * CDP code apparently will need these for the enable_power_domain()
++	 * and disable_power_domain() functions.
++	 */
++}
++
++void omap_pm_pwrdm_inactive(struct powerdomain *pwrdm)
++{
++	if (!pwrdm) {
++		WARN_ON(1);
++		return;
++	};
++
++	pr_debug("OMAP PM: powerdomain %s is becoming inactive\n",
++		 pwrdm->name);
++
++	/*
++	 * CDP code apparently will need these for the enable_power_domain()
++	 * and disable_power_domain() functions.
++	 */
++}
++
++/*
++ * Should be called before clk framework since clk fw will call
++ * omap_pm_pwrdm_{in,}active()
++ */
++int __init omap_pm_if_early_init(void)
++{
++	return 0;
++}
++
++/* Must be called after clock framework is initialized */
++int __init omap_pm_if_init(struct omap_opp *mpu_opp_table,
++			   struct omap_opp *dsp_opp_table)
++{
++	mpu_opps = mpu_opp_table;
++	dsp_opps = dsp_opp_table;
++	return 0;
++}
++
++void omap_pm_if_exit(void)
++{
++	/* Deallocate CPUFreq frequency table here */
++}
++
+diff --git a/include/asm-arm/arch-omap/omap-pm.h b/include/asm-arm/arch-omap/omap-pm.h
+new file mode 100644
+index 0000000..d272dba
+--- /dev/null
++++ b/include/asm-arm/arch-omap/omap-pm.h
+@@ -0,0 +1,300 @@
++/*
++ * omap-pm.h - OMAP power management interface
++ *
++ * Copyright (C) 2008 Texas Instruments, Inc.
++ * Copyright (C) 2008 Nokia Corporation
++ * Paul Walmsley
++ *
++ * Interface developed by (in alphabetical order): Karthik Dasu, Jouni
++ * Högander, Tony Lindgren, Rajendra Nayak, Sakari Poussa,
++ * Veeramanikandan Raju, Anand Sawant, Igor Stoppa, Paul Walmsley,
++ * Richard Woodruff
++ */
++
++#ifndef ASM_ARM_ARCH_OMAP_OMAP_PM_H
++#define ASM_ARM_ARCH_OMAP_OMAP_PM_H
++
++#include <linux/device.h>
++#include <linux/cpufreq.h>
++
++#include "powerdomain.h"
++
++/**
++ * struct omap_opp - clock frequency-to-OPP ID table for DSP, MPU
++ * @rate: target clock rate
++ * @opp_id: OPP ID
++ * @min_vdd: minimum VDD1 voltage (in millivolts) for this OPP
++ *
++ * Operating performance point data.  Can vary by OMAP chip and board.
++ */
++struct omap_opp {
++	unsigned long rate;
++	u8 opp_id;
++	u16 min_vdd;
++};
++
++/*
++ * agent_id values for use with omap_pm_set_min_bus_tput():
++ *
++ * OCP_INITIATOR_AGENT is only valid for devices that can act as
++ * initiators -- it represents the device's L3 interconnect
++ * connection.  OCP_TARGET_AGENT represents the device's L4
++ * interconnect connection.
++ */
++#define OCP_TARGET_AGENT		1
++#define OCP_INITIATOR_AGENT		2
++
++/**
++ * omap_pm_if_early_init - OMAP PM init code called before clock fw init
++ *
++ * Initialize anything that must be configured before the clock
++ * framework starts.  The "_if_" is to avoid name collisions with the
++ * PM idle-loop code.
++ */
++int __init omap_pm_if_early_init(void);
++
++/**
++ * omap_pm_if_init - OMAP PM init code called after clock fw init
++ * @mpu_opp_table: array ptr to struct omap_opp for MPU
++ * @dsp_opp_table: array ptr to struct omap_opp for DSP
++ *
++ * The main initialization code.  OPP tables are passed in here.  The
++ * "_if_" is to avoid name collisions with the PM idle-loop code.
++ */
++int __init omap_pm_if_init(struct omap_opp *mpu_opp_table,
++			   struct omap_opp *dsp_opp_table);
++
++/**
++ * omap_pm_if_exit - OMAP PM exit code
++ *
++ * Exit code; currently unused.  The "_if_" is to avoid name
++ * collisions with the PM idle-loop code.
++ */
++void omap_pm_if_exit(void);
++
++/*
++ * Device-driver-originated constraints (via board-*.c files, platform_data)
++ */
++
++
++/**
++ * omap_pm_set_max_mpu_wakeup_lat - set the maximum MPU wakeup latency
++ * @dev: struct device * requesting the constraint
++ * @t: maximum MPU wakeup latency in microseconds
++ *
++ * Request that the maximum interrupt latency for the MPU to be no
++ * greater than 't' microseconds. "Interrupt latency" in this case is
++ * defined as the elapsed time from the occurrence of a hardware or
++ * timer interrupt to the time when the device driver's interrupt
++ * service routine has been entered by the MPU.
++ *
++ * It is intended that underlying PM code will use this information to
++ * determine what power state to put the MPU powerdomain into, and
++ * possibly the CORE powerdomain as well, since interrupt handling
++ * code currently runs from SDRAM.  Advanced PM or board*.c code may
++ * also configure interrupt controller priorities, OCP bus priorities,
++ * CPU speed(s), etc.
++ *
++ * This function will not affect device wakeup latency, e.g., time
++ * elapsed from when a device driver enables a hardware device with
++ * clk_enable(), to when the device is ready for register access or
++ * other use.  To control this device wakeup latency, use
++ * set_max_dev_wakeup_lat()
++ *
++ * Multiple calls to set_max_mpu_wakeup_lat() will replace the
++ * previous t value.  To remove the latency target for the MPU, call
++ * with t = -1.
++ *
++ * No return value.
++ */
++void omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t);
++
++
++/**
++ * omap_pm_set_min_bus_tput - set minimum bus throughput needed by device
++ * @dev: struct device * requesting the constraint
++ * @tbus_id: interconnect to operate on (OCP_{INITIATOR,TARGET}_AGENT)
++ * @r: minimum throughput (in KiB/s)
++ *
++ * Request that the minimum data throughput on the OCP interconnect
++ * attached to device 'dev' interconnect agent 'tbus_id' be no less
++ * than 'r' KiB/s.
++ *
++ * It is expected that the OMAP PM or bus code will use this
++ * information to set the interconnect clock to run at the lowest
++ * possible speed that satisfies all current system users.  The PM or
++ * bus code will adjust the estimate based on its model of the bus, so
++ * device driver authors should attempt to specify an accurate
++ * quantity for their device use case, and let the PM or bus code
++ * overestimate the numbers as necessary to handle request/response
++ * latency, other competing users on the system, etc.  On OMAP2/3, if
++ * a driver requests a minimum L4 interconnect speed constraint, the
++ * code will also need to add an minimum L3 interconnect speed
++ * constraint,
++ *
++ * Multiple calls to set_min_bus_tput() will replace the previous rate
++ * value for this device.  To remove the interconnect throughput
++ * restriction for this device, call with r = 0.
++ *
++ * No return value.
++ */
++void omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r);
++
++
++/**
++ * omap_pm_set_max_dev_wakeup_lat - set the maximum device enable latency
++ * @dev: struct device *
++ * @t: maximum device wakeup latency in microseconds
++ *
++ * Request that the maximum amount of time necessary for a device to
++ * become accessible after its clocks are enabled should be no greater
++ * than 't' microseconds.  Specifically, this represents the time from
++ * when a device driver enables device clocks with clk_enable(), to
++ * when the register reads and writes on the device will succeed.
++ * This function should be called before clk_disable() is called,
++ * since the power state transition decision may be made during
++ * clk_disable().
++ *
++ * It is intended that underlying PM code will use this information to
++ * determine what power state to put the powerdomain enclosing this
++ * device into.
++ *
++ * Multiple calls to set_max_dev_wakeup_lat() will replace the
++ * previous wakeup latency values for this device.  To remove the wakeup
++ * latency restriction for this device, call with t = -1.
++ *
++ * No return value.
++ */
++void omap_pm_set_max_dev_wakeup_lat(struct device *dev, long t);
++
++
++/**
++ * omap_pm_set_max_sdma_lat - set the maximum system DMA transfer start latency
++ * @dev: struct device *
++ * @t: maximum DMA transfer start latency in microseconds
++ *
++ * Request that the maximum system DMA transfer start latency for this
++ * device 'dev' should be no greater than 't' microseconds.  "DMA
++ * transfer start latency" here is defined as the elapsed time from
++ * when a device (e.g., McBSP) requests that a system DMA transfer
++ * start or continue, to the time at which data starts to flow into
++ * that device from the system DMA controller.
++ *
++ * It is intended that underlying PM code will use this information to
++ * determine what power state to put the CORE powerdomain into.
++ *
++ * Since system DMA transfers may not involve the MPU, this function
++ * will not affect MPU wakeup latency.  Use set_max_cpu_lat() to do
++ * so.  Similarly, this function will not affect device wakeup latency
++ * -- use set_max_dev_wakeup_lat() to affect that.
++ *
++ * Multiple calls to set_max_sdma_lat() will replace the previous t
++ * value for this device.  To remove the maximum DMA latency for this
++ * device, call with t = -1.
++ *
++ * No return value.
++ */
++void omap_pm_set_max_sdma_lat(struct device *dev, long t);
++
++
++/*
++ * DSP Bridge-specific constraints
++ */
++
++/**
++ * omap_pm_dsp_get_opp_table - get OPP->DSP clock frequency table
++ *
++ * Intended for use by DSPBridge.  Returns an array of OPP->DSP clock
++ * frequency entries.  The final item in the array should have .rate =
++ * .opp_id = 0.
++ */
++const struct omap_opp *omap_pm_dsp_get_opp_table(void);
++
++/**
++ * omap_pm_dsp_set_min_opp - receive desired OPP target ID from DSP Bridge
++ * @opp_id: target DSP OPP ID
++ *
++ * Set a minimum OPP ID for the DSP.  This is intended to be called
++ * only from the DSP Bridge MPU-side driver.  Unfortunately, the only
++ * information that code receives from the DSP/BIOS load estimator is the
++ * target OPP ID; hence, this interface.  No return value.
++ */
++void omap_pm_dsp_set_min_opp(u8 opp_id);
++
++/**
++ * omap_pm_dsp_get_opp - report the current DSP OPP ID
++ *
++ * Report the current OPP for the DSP.  Since on OMAP3, the DSP and
++ * MPU share a single voltage domain, the OPP ID returned back may
++ * represent a higher DSP speed than the OPP requested via
++ * omap_pm_dsp_set_min_opp().
++ *
++ * Returns the current VDD1 OPP ID, or 0 upon error.
++ */
++u8 omap_pm_dsp_get_opp(void);
++
++
++/*
++ * CPUFreq-originated constraint
++ *
++ * In the future, this should be handled by custom OPP clocktype
++ * functions.
++ */
++
++/**
++ * omap_pm_cpu_get_freq_table - return a cpufreq_frequency_table array ptr
++ *
++ * Provide a frequency table usable by CPUFreq for the current chip/board.
++ * Returns a pointer to a struct cpufreq_frequency_table array or NULL
++ * upon error.
++ */
++struct cpufreq_frequency_table **omap_pm_cpu_get_freq_table(void);
++
++/**
++ * omap_pm_cpu_set_freq - set the current minimum MPU frequency
++ * @f: MPU frequency in Hz
++ *
++ * Set the current minimum CPU frequency.  The actual CPU frequency
++ * used could end up higher if the DSP requested a higher OPP.
++ * Intended to be called by plat-omap/cpu_omap.c:omap_target().  No
++ * return value.
++ */
++void omap_pm_cpu_set_freq(unsigned long f);
++
++/**
++ * omap_pm_cpu_get_freq - report the current CPU frequency
++ *
++ * Returns the current MPU frequency, or 0 upon error.
++ */
++unsigned long omap_pm_cpu_get_freq(void);
++
++
++/*
++ * Powerdomain usecounting hooks
++ */
++
++/**
++ * omap_pm_pwrdm_active - indicate that a power domain has become active
++ * @pwrdm: struct powerdomain *
++ *
++ * Notify the OMAP PM layer that the power domain 'pwrdm' has become active,
++ * presumably due to a device driver enabling an underlying clock.  This
++ * function is intended to be called by a clockdomain node in the clock
++ * framework.  No return value.
++ */
++void omap_pm_pwrdm_active(struct powerdomain *pwrdm);
++
++
++/**
++ * omap_pm_pwrdm_inactive - indicate that a power domain has become inactive
++ * @pwrdm: struct powerdomain *
++ *
++ * Notify the OMAP PM layer that the power domain 'pwrdm' has become
++ * inactive, presumably due to a device driver disabling an underlying
++ * clock.  This function is intended to be called by a clockdomain
++ * node in the clock framework.  No return value.
++ */
++void omap_pm_pwrdm_inactive(struct powerdomain *pwrdm);
++
++
++#endif
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
+--- /tmp/io.c	2008-08-11 15:29:32.000000000 +0200
++++ git/arch/arm/mach-omap2/io.c	2008-08-11 15:30:20.083198000 +0200
+@@ -38,6 +38,8 @@
+ #include <asm/arch/clockdomain.h>
+ #include "clockdomains.h"
+ 
++#include <asm/arch/omap-pm.h>
++
+ /*
+  * The machine specific code may provide the extra mapping besides the
+  * default mapping provided here.
+@@ -197,9 +199,11 @@
+ void __init omap2_init_common_hw(struct omap_sdrc_params *sp)
+ {
+ 	omap2_mux_init();
++	omap_pm_if_early_init();
+ 	pwrdm_init(powerdomains_omap);
+ 	clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps);
+ 	omap2_clk_init();
++	omap_pm_if_init(NULL, NULL);
+ 	omap2_sdrc_init(sp);
+ 	gpmc_init();
+ }
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 1c47bd95b4..f032f076e8 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,13 +2,13 @@ require linux-omap.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
 
-SRCREV = "040378c1b24ace3b8945318a8c24ef218200912c"
+SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848"
 
 PV = "2.6.26"
 #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}"
-PR = "r57"
+PR = "r61"
 
-SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
 
 SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
@@ -35,11 +35,24 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://mru-clocks3.diff;patch=1 \	
            file://4bitmmc.diff;patch=1 \
            file://no-cortex-deadlock.patch;patch=1 \
-           file://01-gptimer_clear_isrs_on_init;patch=1 \
-           file://02-gptimer_use_match_for_tick;patch=1 \
-           file://03-gptimer_match_plus_ovf;patch=1 \
-           file://04-gptimer_add_debug_to_sysrq_q;patch=1 \
+           file://01-make_tick_gptimer_configurable;patch=1 \
            file://read_die_ids.patch;patch=1 \
+           file://omap23-pm-noop.eml;patch=1 \
+           file://01-omappm-srf.eml;patch=1 \
+           file://02-omappm-mpu-latency-modeling.eml;patch=1 \
+           file://03-omappm-omap3srf.eml;patch=1 \
+           file://04-omappm-srf-noop.eml;patch=1 \
+           file://05-omappm-virtualclocks.eml;patch=1 \
+           file://06-omappm-opp-resource-modeling.eml;patch=1 \
+           file://07-omappm-srf-updates.eml;patch=1 \
+           file://08-omappm-voltagescaling.eml;patch=1 \
+           file://09-omappm-vdd2-scaling.eml;patch=1 \
+           file://10-omappm-off-mode.eml;patch=1 \
+           file://01-postrate-notifier.eml;patch=1 \
+           file://02-postrate-notifier.eml;patch=1 \
+           file://01-omap3-cpufreq.eml;patch=1 \
+           file://01-beagle-cpufreq.diff;patch=1 \
+           file://musb-dmafix.patch;patch=1 \ 
 "
 
 SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index b4863ca0c8..3a6589791e 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -4,12 +4,12 @@
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
 
-FILES_kernel-image = ""
-ALLOW_EMPTY = "1"
-
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = 'om-gta01|om-gta02'
 
+CONFIG_NAME_om-gta01 = "gta01"
+CONFIG_NAME_om-gta02 = "gta02"
+
 CMDLINE = "unused -- bootloader passes ATAG list"
 
 ###############################################################
@@ -66,6 +66,10 @@ else
 			exit 1
 		fi
 
+		if [ ! -f /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ] ; then
+			exit 1
+		fi
+
 		${bindir}/flash_eraseall $MTD_KERNEL_PARTITION
 		${bindir}/nandwrite -p $MTD_KERNEL_PARTITION /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
 	else
diff --git a/packages/linux/linux-openmoko/defconfig-oe b/packages/linux/linux-openmoko/defconfig-oe
index 4154639d3e..174f0a544d 100644
--- a/packages/linux/linux-openmoko/defconfig-oe
+++ b/packages/linux/linux-openmoko/defconfig-oe
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24
-# Mon Feb 25 07:03:56 2008
+# Sat Aug  9 09:51:30 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -569,20 +569,20 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
+CONFIG_BT=y
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
+CONFIG_BT_HIDP=y
 
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB=y
 CONFIG_BT_HCIUSB_SCO=y
 # CONFIG_BT_HCIBTSDIO is not set
 # CONFIG_BT_HCIUART is not set
@@ -891,9 +891,6 @@ CONFIG_INPUT_MOUSE=y
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_FILTER=y
-CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y
-CONFIG_TOUCHSCREEN_FILTER_MEAN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 CONFIG_TOUCHSCREEN_S3C2410=y
@@ -1137,13 +1134,13 @@ CONFIG_SOUND=y
 #
 # Advanced Linux Sound Architecture
 #
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_DYNAMIC_MINORS is not set
 CONFIG_SND_SUPPORT_OLD_API=y
@@ -1176,16 +1173,17 @@ CONFIG_SND_VERBOSE_PROCFS=y
 #
 # System on Chip audio support
 #
-CONFIG_SND_SOC=m
-CONFIG_SND_S3C24XX_SOC=m
-CONFIG_SND_S3C24XX_SOC_I2S=m
-CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
+CONFIG_SND_SOC=y
+CONFIG_SND_S3C24XX_SOC=y
+CONFIG_SND_S3C24XX_SOC_I2S=y
+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG is not set
+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
 
 #
 # SoC Audio support for SuperH
 #
-CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8753=y
 
 #
 # Open Sound System
@@ -1230,7 +1228,7 @@ CONFIG_USB_SUSPEND=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -1568,6 +1566,9 @@ CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_CRAMFS=y
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
@@ -1604,7 +1605,6 @@ CONFIG_CIFS_WEAK_PW_HASH=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-CONFIG_SQUASHFS=m
 
 #
 # Partition Types
diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 79e2cde8dc..8520adc3e1 100644
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -6,8 +6,8 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/
 KERNEL_RELEASE = "2.6.24"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-PV = "${KERNEL_RELEASE}+gitr${SRCREV}"
-PR = "r4"
+PV = "${KERNEL_RELEASE}+${PR}+gitr${SRCREV}"
+PR = "r5"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-akita b/packages/linux/linux-rp-2.6.26/defconfig-akita
index e630a9abff..27f5dcb781 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.26/defconfig-akita
@@ -1255,7 +1255,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86 b/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
index 35e9b5cd22..397468a366 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
+++ b/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
@@ -1612,7 +1612,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-c7x0 b/packages/linux/linux-rp-2.6.26/defconfig-c7x0
index 6c188e7b57..4c3cbf499c 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.26/defconfig-c7x0
@@ -1260,7 +1260,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-hx2000 b/packages/linux/linux-rp-2.6.26/defconfig-hx2000
index 0f2557c0f7..d023ffecac 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.26/defconfig-hx2000
@@ -1249,7 +1249,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-poodle b/packages/linux/linux-rp-2.6.26/defconfig-poodle
index 7d41252b15..4d7acb382f 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.26/defconfig-poodle
@@ -1270,7 +1270,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-qemuarm b/packages/linux/linux-rp-2.6.26/defconfig-qemuarm
index e636b6c671..ae7ef52d31 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.26/defconfig-qemuarm
@@ -1155,7 +1155,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-qemux86 b/packages/linux/linux-rp-2.6.26/defconfig-qemux86
index 42f6740201..975dbdd85b 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.26/defconfig-qemux86
@@ -1611,7 +1611,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-spitz b/packages/linux/linux-rp-2.6.26/defconfig-spitz
index 9c8f0ae8a1..5b5db16979 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.26/defconfig-spitz
@@ -1318,7 +1318,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-zylonite b/packages/linux/linux-rp-2.6.26/defconfig-zylonite
index cc2fc482ae..bdf6a3be8a 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-zylonite
+++ b/packages/linux/linux-rp-2.6.26/defconfig-zylonite
@@ -1257,7 +1257,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index b56746880f..7e7548491f 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -14,7 +14,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            ftp://ftp.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \
            ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \
-           http://developer.ezaurus.com/sl_j/source/c860/${SHARPV}/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;patch=1 \
+           http://openzaurus.org/mirror/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;patch=1 \
            file://piro.patch;patch=1 \
            file://swap-performance.patch;patch=1 \
            file://bluetooth-2.4.18-mh15.patch;patch=1 \
diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb
index 1ccf005182..24664b32e4 100644
--- a/packages/lzma/lzma-native_4.17.bb
+++ b/packages/lzma/lzma-native_4.17.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress
 HOMEPAGE = "http://www.7-zip.org/"
 LICENSE = "LGPL"
 DEPENDS = "zlib-native"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \
+PVNODOT = "${@bb.data.getVar('PV',d,1).split('.')[0]}${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/sevenzip/lzma${PVNODOT}.tar.bz2 \
            file://lzma-406-zlib-stream.patch;patch=1;pnum=2"
 
 S = "${WORKDIR}/SRC"
diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb
index cd32f929e3..2017463c36 100644
--- a/packages/mysql/mysql_4.1.18.bb
+++ b/packages/mysql/mysql_4.1.18.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS += "ncurses mysql-native"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
@@ -28,7 +28,7 @@ EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
 EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
 
 do_stage() {
-	autotools_stage_includes
+	autotools_stage_all
 	oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR}
 	oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR}
 }
diff --git a/packages/mythtv/gmyth-upnp_0.7.0.bb b/packages/mythtv/gmyth-upnp_0.7.0.bb
new file mode 100644
index 0000000000..3f20b3dd83
--- /dev/null
+++ b/packages/mythtv/gmyth-upnp_0.7.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "GMyth is a library to access MythTV backend services."
+LICENSE = "LGPLv2""
+HOMEPAGE = "http://gmyth.sourceforge.net/wiki/index.php/Main_Page"
+
+PR = "r2"
+
+DEPENDS = "glib-2.0 mysql gmyth libupnp"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gmyth/${PN}_0.7-indt1.tar.gz"
+S = "${WORKDIR}/${PN}"
+
+inherit autotools
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_compile_append() {
+        sed -i -e s:${STAGING_DIR_TARGET}::g \
+	       -e s,Version:,Version:\ 0\.7\.0,g \
+	       -e s:/${TARGET_SYS}::g \   
+               -e s:clinkc::g \
+                  gmyth-upnp.pc
+}
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/mythtv/gmyth_0.7.1.bb b/packages/mythtv/gmyth_0.7.1.bb
new file mode 100644
index 0000000000..71c5ddb143
--- /dev/null
+++ b/packages/mythtv/gmyth_0.7.1.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "GMyth is a library to access MythTV backend services."
+LICENSE = "LGPLv2""
+HOMEPAGE = "http://gmyth.sourceforge.net/wiki/index.php/Main_Page"
+DEPENDS = "mythtv curl libxml2 glib-2.0"
+
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gmyth/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_compile_append() {
+        sed -i -e s:${STAGING_DIR_TARGET}::g \
+               -e s:/${TARGET_SYS}::g \
+                  gmyth.pc
+}
+
+do_stage() {
+	autotools_stage_all
+}	
+
diff --git a/packages/nandlogical/nandlogical_1.0.0.bb b/packages/nandlogical/nandlogical_1.0.0.bb
index 7d8fc04b4e..a868576add 100644
--- a/packages/nandlogical/nandlogical_1.0.0.bb
+++ b/packages/nandlogical/nandlogical_1.0.0.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Nandlogical for Sharp mtd1"
 LICENSE = "GPL"
 DEPENDS = "mtd-utils"
-COMPATIBLE_MACHINE = "(c7x0)"
-PR = "r0"
+COMPATIBLE_MACHINE = "(poodle|c7x0|akita|spitz|tosa)"
+PR = "r1"
 
 SRC_URI = "file://nandlogical.c"
 
diff --git a/packages/netbase/netbase/om-gta01/interfaces b/packages/netbase/netbase/om-gta01/interfaces
index 39f45af734..090c18aa07 100644
--- a/packages/netbase/netbase/om-gta01/interfaces
+++ b/packages/netbase/netbase/om-gta01/interfaces
@@ -22,7 +22,6 @@ iface usb0 inet static
 	netmask 255.255.255.0
 	network 192.168.0.0
 	gateway 192.168.0.200
-	up echo nameserver 192.168.0.200 >/etc/resolv.conf
 
 # Bluetooth networking
 iface bnep0 inet dhcp
diff --git a/packages/netbase/netbase/om-gta02/interfaces b/packages/netbase/netbase/om-gta02/interfaces
index 39f45af734..090c18aa07 100644
--- a/packages/netbase/netbase/om-gta02/interfaces
+++ b/packages/netbase/netbase/om-gta02/interfaces
@@ -22,7 +22,6 @@ iface usb0 inet static
 	netmask 255.255.255.0
 	network 192.168.0.0
 	gateway 192.168.0.200
-	up echo nameserver 192.168.0.200 >/etc/resolv.conf
 
 # Bluetooth networking
 iface bnep0 inet dhcp
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 73e765376c..2fc352f547 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r27"
+PR = "r28"
 
 inherit update-rc.d
 
diff --git a/packages/numptyphysics/numptyphysics/.mtn2git_empty b/packages/numptyphysics/numptyphysics/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/numptyphysics/numptyphysics/.mtn2git_empty
diff --git a/packages/numptyphysics/numptyphysics/gcc43.diff b/packages/numptyphysics/numptyphysics/gcc43.diff
new file mode 100644
index 0000000000..2658771555
--- /dev/null
+++ b/packages/numptyphysics/numptyphysics/gcc43.diff
@@ -0,0 +1,50 @@
+--- /tmp/Common.h	2008-08-08 15:47:57.000000000 +0200
++++ trunk/Common.h	2008-08-08 15:48:08.403198000 +0200
+@@ -14,6 +14,7 @@
+  *
+  */
+ 
++#include <cstring>
+ #ifndef COMMON_H
+ #define COMMON_H
+ 
+--- /tmp/b2Body.h	2008-08-08 15:51:13.000000000 +0200
++++ trunk/Box2D/Source/Dynamics/b2Body.h	2008-08-08 15:52:26.583198000 +0200
+@@ -24,6 +24,7 @@
+ #include "../Collision/b2Shape.h"
+ 
+ #include <memory>
++#include <cstring>
+ 
+ class b2Joint;
+ class b2Contact;
+--- /tmp/b2BroadPhase.cpp	2008-08-08 15:53:43.000000000 +0200
++++ trunk/Box2D/Source/Collision/b2BroadPhase.cpp	2008-08-08 15:54:04.913198000 +0200
+@@ -18,6 +18,7 @@
+ 
+ #include "b2BroadPhase.h"
+ #include <algorithm>
++#include <cstring>
+ 
+ // Notes:
+ // - we use bound arrays instead of linked lists for cache coherence.
+--- /tmp/b2PolyContact.cpp	2008-08-08 15:55:01.000000000 +0200
++++ trunk/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-08-08 15:56:15.553198000 +0200
+@@ -21,6 +21,7 @@
+ 
+ #include <memory>
+ #include <new>
++#include <cstring>
+ 
+ b2Contact* b2PolyContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
+ {
+--- /tmp/b2BlockAllocator.cpp	2008-08-08 15:57:02.000000000 +0200
++++ trunk/Box2D/Source/Common/b2BlockAllocator.cpp	2008-08-08 15:57:35.833198000 +0200
+@@ -20,6 +20,7 @@
+ #include <cstdlib>
+ #include <memory>
+ #include <climits>
++#include <cstring>
+ 
+ int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] = 
+ {
diff --git a/packages/numptyphysics/numptyphysics_svn.bb b/packages/numptyphysics/numptyphysics_svn.bb
index 976028befe..6c833c2f01 100644
--- a/packages/numptyphysics/numptyphysics_svn.bb
+++ b/packages/numptyphysics/numptyphysics_svn.bb
@@ -9,6 +9,7 @@ PV = "0.2+svnr${SRCREV}"
 SRC_URI = "\
   svn://garage.maemo.org/svn/${PN};module=trunk;proto=https \
   http://wwwpub.zih.tu-dresden.de/~mkluge/numptyphysics_setup.tgz \
+  file://gcc43.diff;patch=1 \
 "
 S = "${WORKDIR}/trunk"
 
@@ -16,7 +17,7 @@ EXTRA_S = "${WORKDIR}/local/packages/numptyphysics"
 
 # what an ugly buildsystem... handcrafted Makefiles... back to the stoneage
 export CCOPTS = "${CFLAGS} -I Box2D/Include"
-export LDOPTS = "${LDFLAGS} -lSDL -lSDL_image"
+export LDOPTS = "${LDFLAGS} -lSDL -lSDL_image -lX11"
 
 do_configure() {
 	for i in Config.h Makefile Game.cpp; do
diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb
index af14ef14e9..6656ed3e27 100644
--- a/packages/openmax/libomxil-bellagio_0.9.0.bb
+++ b/packages/openmax/libomxil-bellagio_0.9.0.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multim
 LICENSE = "LGPLv2"
 DEPENDS = "libmad alsa-lib ffmpeg"
 
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz"
 
 inherit autotools
diff --git a/packages/openmoko2/openmoko-appmanager2_svn.bb b/packages/openmoko2/openmoko-appmanager2_svn.bb
index c299564205..fe5e227d8f 100644
--- a/packages/openmoko2/openmoko-appmanager2_svn.bb
+++ b/packages/openmoko2/openmoko-appmanager2_svn.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "The Openmoko Application Manager"
 SECTION = "openmoko/applications"
-DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm ipkg"
+DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm opkg"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2 
 
 FILES_${PN} += "/usr/share/openmoko-appmanager"
-
diff --git a/packages/oprofile/oprofile/0.9.4-armv7a.diff b/packages/oprofile/oprofile/0.9.4-armv7a.diff
new file mode 100644
index 0000000000..dd95ec732b
--- /dev/null
+++ b/packages/oprofile/oprofile/0.9.4-armv7a.diff
@@ -0,0 +1,451 @@
+Index: oprofile-0.9.4/ChangeLog
+===================================================================
+--- oprofile-0.9.4.orig/ChangeLog	2008-07-18 01:04:22.000000000 +0200
++++ oprofile-0.9.4/ChangeLog	2008-08-08 15:32:15.226950589 +0200
+@@ -1,3 +1,14 @@
++2008-08-08  Jean Pihet <jpihet@mvista.com>
++
++	* events/arm/armv7/events:
++	* events/arm/armv7/unit_masks:
++	* libop/op_cpu_type.c:
++	* libop/op_cpu_type.h:
++	* libop/op_events.c:
++	* utils/ophelp.c: Added ARMv7 support to be consistent with the
++	kernel, remove some duplicate code and add some extra events
++	* event/Makefile.am: Install armv7 stuff.
++
+ 2008-07-17  Maynard Johnson  <maynardj@us.ibm.com>
+ 
+ 	* configure.in: bump version in AM_INIT_AUTOMAKE to 0.9.4
+Index: oprofile-0.9.4/events/arm/armv7/events
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ oprofile-0.9.4/events/arm/armv7/events	2008-08-08 15:32:15.226950589 +0200
+@@ -0,0 +1,53 @@
++# ARM V7 events
++# From Cortex A8 DDI (ARM DDI 0344B, revision r1p1)
++#
++event:0x00 counters:1,2,3,4 um:zero minimum:500 name:PMNC_SW_INCR : Software increment of PMNC registers
++event:0x01 counters:1,2,3,4 um:zero minimum:500 name:IFETCH_MISS : Instruction fetch misses from cache or normal cacheable memory
++event:0x02 counters:1,2,3,4 um:zero minimum:500 name:ITLB_MISS : Instruction fetch misses from TLB
++event:0x03 counters:1,2,3,4 um:zero minimum:500 name:DCACHE_REFILL : Data R/W operation that causes a refill from cache or normal cacheable memory
++event:0x04 counters:1,2,3,4 um:zero minimum:500 name:DCACHE_ACCESS : Data R/W from cache
++event:0x05 counters:1,2,3,4 um:zero minimum:500 name:DTLB_REFILL : Data R/W that causes a TLB refill
++event:0x06 counters:1,2,3,4 um:zero minimum:500 name:DREAD : Data read architecturally executed (note: architecturally executed = for instructions that are unconditional or that pass the condition code)
++event:0x07 counters:1,2,3,4 um:zero minimum:500 name:DWRITE : Data write architecturally executed
++event:0x08 counters:1,2,3,4 um:zero minimum:500 name:INSTR_EXECUTED : All executed instructions
++event:0x09 counters:1,2,3,4 um:zero minimum:500 name:EXC_TAKEN : Exception taken
++event:0x0A counters:1,2,3,4 um:zero minimum:500 name:EXC_EXECUTED : Exception return architecturally executed
++event:0x0B counters:1,2,3,4 um:zero minimum:500 name:CID_WRITE : Instruction that writes to the Context ID Register architecturally executed
++event:0x0C counters:1,2,3,4 um:zero minimum:500 name:PC_WRITE : SW change of PC, architecturally executed (not by exceptions)
++event:0x0D counters:1,2,3,4 um:zero minimum:500 name:PC_IMM_BRANCH : Immediate branch instruction executed (taken or not)
++event:0x0E counters:1,2,3,4 um:zero minimum:500 name:PC_PROC_RETURN : Procedure return architecturally executed (not by exceptions)
++event:0x0F counters:1,2,3,4 um:zero minimum:500 name:UNALIGNED_ACCESS : Unaligned access architecturally executed
++event:0x10 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_MIS_PRED : Branch mispredicted or not predicted. Counts pipeline flushes because of misprediction
++event:0x12 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_MIS_USED : Branch or change in program flow that could have been predicted
++event:0x40 counters:1,2,3,4 um:zero minimum:500 name:WRITE_BUFFER_FULL : Any write buffer full cycle
++event:0x41 counters:1,2,3,4 um:zero minimum:500 name:L2_STORE_MERGED : Any store that is merged in L2 cache
++event:0x42 counters:1,2,3,4 um:zero minimum:500 name:L2_STORE_BUFF : Any bufferable store from load/store to L2 cache
++event:0x43 counters:1,2,3,4 um:zero minimum:500 name:L2_ACCESS : Any access to L2 cache
++event:0x44 counters:1,2,3,4 um:zero minimum:500 name:L2_CACH_MISS : Any cacheable miss in L2 cache
++event:0x45 counters:1,2,3,4 um:zero minimum:500 name:AXI_READ_CYCLES : Number of cycles for an active AXI read
++event:0x46 counters:1,2,3,4 um:zero minimum:500 name:AXI_WRITE_CYCLES : Number of cycles for an active AXI write
++event:0x47 counters:1,2,3,4 um:zero minimum:500 name:MEMORY_REPLAY : Any replay event in the memory subsystem
++event:0x48 counters:1,2,3,4 um:zero minimum:500 name:UNALIGNED_ACCESS_REPLAY : Unaligned access that causes a replay
++event:0x49 counters:1,2,3,4 um:zero minimum:500 name:L1_DATA_MISS : L1 data cache miss as a result of the hashing algorithm
++event:0x4A counters:1,2,3,4 um:zero minimum:500 name:L1_INST_MISS : L1 instruction cache miss as a result of the hashing algorithm
++event:0x4B counters:1,2,3,4 um:zero minimum:500 name:L1_DATA_COLORING : L1 data access in which a page coloring alias occurs
++event:0x4C counters:1,2,3,4 um:zero minimum:500 name:L1_NEON_DATA : NEON data access that hits L1 cache
++event:0x4D counters:1,2,3,4 um:zero minimum:500 name:L1_NEON_CACH_DATA : NEON cacheable data access that hits L1 cache
++event:0x4E counters:1,2,3,4 um:zero minimum:500 name:L2_NEON : L2 access as a result of NEON memory access
++event:0x4F counters:1,2,3,4 um:zero minimum:500 name:L2_NEON_HIT : Any NEON hit in L2 cache
++event:0x50 counters:1,2,3,4 um:zero minimum:500 name:L1_INST : Any L1 instruction cache access, excluding CP15 cache accesses
++event:0x51 counters:1,2,3,4 um:zero minimum:500 name:PC_RETURN_MIS_PRED : Return stack misprediction at return stack pop (incorrect target address)
++event:0x52 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_FAILED : Branch prediction misprediction
++event:0x53 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_TAKEN : Any predicted branch that is taken
++event:0x54 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_EXECUTED : Any taken branch that is executed
++event:0x55 counters:1,2,3,4 um:zero minimum:500 name:OP_EXECUTED : Number of operations executed (in instruction or mutli-cycle instruction)
++event:0x56 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_INST_STALL : Cycles where no instruction available
++event:0x57 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_INST : Number of instructions issued in a cycle
++event:0x58 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_NEON_DATA_STALL : Number of cycles the processor waits on MRC data from NEON
++event:0x59 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_NEON_INST_STALL : Number of cycles the processor waits on NEON instruction queue or NEON load queue
++event:0x5A counters:1,2,3,4 um:zero minimum:500 name:NEON_CYCLES : Number of cycles NEON and integer processors are not idle
++event:0x70 counters:1,2,3,4 um:zero minimum:500 name:PMU0_EVENTS : Number of events from external input source PMUEXTIN[0]
++event:0x71 counters:1,2,3,4 um:zero minimum:500 name:PMU1_EVENTS : Number of events from external input source PMUEXTIN[1]
++event:0x72 counters:1,2,3,4 um:zero minimum:500 name:PMU_EVENTS : Number of events from both external input sources PMUEXTIN[0] and PMUEXTIN[1]
++event:0xFF counters:0 um:zero minimum:500 name:CPU_CYCLES : Number of CPU cycles
++
+Index: oprofile-0.9.4/events/arm/armv7/unit_masks
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ oprofile-0.9.4/events/arm/armv7/unit_masks	2008-08-08 15:32:15.273760932 +0200
+@@ -0,0 +1,4 @@
++# ARM V7 PMNC possible unit masks
++#
++name:zero type:mandatory default:0x00
++	0x00 No unit mask
+Index: oprofile-0.9.4/events/Makefile.in
+===================================================================
+--- oprofile-0.9.4.orig/events/Makefile.in	2008-07-18 01:14:45.000000000 +0200
++++ oprofile-0.9.4/events/Makefile.in	2008-08-08 15:32:34.971961074 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -38,20 +34,8 @@
+ subdir = events
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/binutils.m4 \
+-	$(top_srcdir)/m4/builtinexpect.m4 \
+-	$(top_srcdir)/m4/cellspubfdsupport.m4 \
+-	$(top_srcdir)/m4/compileroption.m4 \
+-	$(top_srcdir)/m4/configmodule.m4 \
+-	$(top_srcdir)/m4/copyifchange.m4 $(top_srcdir)/m4/docbook.m4 \
+-	$(top_srcdir)/m4/extradirs.m4 $(top_srcdir)/m4/findkernel.m4 \
+-	$(top_srcdir)/m4/kerneloption.m4 \
+-	$(top_srcdir)/m4/kernelversion.m4 \
+-	$(top_srcdir)/m4/mallocattribute.m4 \
+-	$(top_srcdir)/m4/poptconst.m4 \
+-	$(top_srcdir)/m4/precompiledheader.m4 $(top_srcdir)/m4/qt.m4 \
+-	$(top_srcdir)/m4/resultyn.m4 $(top_srcdir)/m4/sstream.m4 \
+-	$(top_srcdir)/m4/typedef.m4 $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(install_sh) -d
+@@ -61,8 +45,6 @@
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -70,10 +52,7 @@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ BFD_LIBS = @BFD_LIBS@
+-BUILD_JVMPI_AGENT_FALSE = @BUILD_JVMPI_AGENT_FALSE@
+-BUILD_JVMPI_AGENT_TRUE = @BUILD_JVMPI_AGENT_TRUE@
+-BUILD_JVMTI_AGENT_FALSE = @BUILD_JVMTI_AGENT_FALSE@
+-BUILD_JVMTI_AGENT_TRUE = @BUILD_JVMTI_AGENT_TRUE@
++BUILD_HAMMER = @BUILD_HAMMER@
+ CAT_ENTRY_END = @CAT_ENTRY_END@
+ CAT_ENTRY_START = @CAT_ENTRY_START@
+ CC = @CC@
+@@ -90,16 +69,17 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DOCBOOK_ROOT = @DOCBOOK_ROOT@
+-ECHO = @ECHO@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ EXTRA_CFLAGS_MODULE = @EXTRA_CFLAGS_MODULE@
+-F77 = @F77@
+-FFLAGS = @FFLAGS@
++FGREP = @FGREP@
+ GREP = @GREP@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -114,17 +94,23 @@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
++LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MOC = @MOC@
+ MODINSTALLDIR = @MODINSTALLDIR@
++NM = @NM@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ OPROFILE_DIR = @OPROFILE_DIR@
+ OPROFILE_MODULE_ARCH = @OPROFILE_MODULE_ARCH@
+ OP_CFLAGS = @OP_CFLAGS@
+ OP_CXXFLAGS = @OP_CXXFLAGS@
+ OP_DOCDIR = @OP_DOCDIR@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -139,13 +125,13 @@
+ QT_LIB = @QT_LIB@
+ QT_VERSION = @QT_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SIZE_T_TYPE = @SIZE_T_TYPE@
+ STRIP = @STRIP@
+ UIC = @UIC@
+ VERSION = @VERSION@
+-XMKMF = @XMKMF@
+ XML_CATALOG = @XML_CATALOG@
+ XSLTPROC = @XSLTPROC@
+ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
+@@ -153,13 +139,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -171,15 +157,12 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-have_qt_FALSE = @have_qt_FALSE@
+-have_qt_TRUE = @have_qt_TRUE@
+-have_xsltproc_FALSE = @have_xsltproc_FALSE@
+-have_xsltproc_TRUE = @have_xsltproc_TRUE@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -189,12 +172,11 @@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-kernel_support_FALSE = @kernel_support_FALSE@
+-kernel_support_TRUE = @kernel_support_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -204,8 +186,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ topdir = @topdir@
+ event_files = \
+ 	alpha/ev4/events alpha/ev4/unit_masks \
+@@ -298,10 +283,6 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-
+-distclean-libtool:
+-	-rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
+@@ -310,23 +291,21 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/avr32 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e300 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -371,7 +350,7 @@
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ 
+ dvi: dvi-am
+ 
+@@ -385,12 +364,20 @@
+ 
+ install-data-am: install-data-local
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am:
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -409,17 +396,21 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-local
++uninstall-am: uninstall-local
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ 	distclean distclean-generic distclean-libtool distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-data-local install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	install-data install-data-am install-data-local install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	uninstall uninstall-am uninstall-info-am uninstall-local
++	uninstall uninstall-am uninstall-local
+ 
+ 
+ install-data-local:
+Index: oprofile-0.9.4/libop/op_cpu_type.c
+===================================================================
+--- oprofile-0.9.4.orig/libop/op_cpu_type.c	2008-02-22 17:17:48.000000000 +0100
++++ oprofile-0.9.4/libop/op_cpu_type.c	2008-08-08 15:32:15.307120161 +0200
+@@ -71,6 +71,7 @@
+ 	{ "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 },
+ 	{ "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 },
+ 	{ "ARM V6 PMU", "arm/armv6", CPU_ARM_V6, 3 },
++	{ "ARM V7 PMNC", "arm/armv7", CPU_ARM_V7, 5 },
+ 	{ "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 },
+ 	{ "e300", "ppc/e300", CPU_PPC_E300, 4 },
+ 	{ "AVR32", "avr32", CPU_AVR32, 3 },
+Index: oprofile-0.9.4/libop/op_cpu_type.h
+===================================================================
+--- oprofile-0.9.4.orig/libop/op_cpu_type.h	2008-02-22 17:17:48.000000000 +0100
++++ oprofile-0.9.4/libop/op_cpu_type.h	2008-08-08 15:32:15.322934386 +0200
+@@ -69,6 +69,7 @@
+  	CPU_PPC64_PA6T, /**< ppc64 PA6T */
+ 	CPU_ARM_MPCORE, /**< ARM MPCore */
+ 	CPU_ARM_V6, /**< ARM V6 */
++	CPU_ARM_V7, /**< ARM V7 */
+ 	CPU_PPC64_POWER5pp,  /**< ppc64 Power5++ family */
+ 	CPU_PPC_E300, /**< e300 */
+ 	CPU_AVR32, /**< AVR32 */
+Index: oprofile-0.9.4/libop/op_events.c
+===================================================================
+--- oprofile-0.9.4.orig/libop/op_events.c	2008-02-22 17:17:48.000000000 +0100
++++ oprofile-0.9.4/libop/op_events.c	2008-08-08 15:32:15.347934528 +0200
+@@ -793,6 +793,7 @@
+ 		case CPU_ARM_XSCALE2:
+ 		case CPU_ARM_MPCORE:
+ 		case CPU_ARM_V6:
++		case CPU_ARM_V7:
+ 		case CPU_AVR32:
+ 			descr->name = "CPU_CYCLES";
+ 			break;
+Index: oprofile-0.9.4/utils/ophelp.c
+===================================================================
+--- oprofile-0.9.4.orig/utils/ophelp.c	2008-02-22 17:17:49.000000000 +0100
++++ oprofile-0.9.4/utils/ophelp.c	2008-08-08 15:32:15.362934395 +0200
+@@ -433,6 +433,11 @@
+ 		printf("See ARM11 Technical Reference Manual\n");
+   		break;
+ 
++	case CPU_ARM_V7:
++		printf("See ARM11 Technical Reference Manual\n"
++			"Cortex A8 DDI (ARM DDI 0344B, revision r1p1)\n");
++  		break;
++
+ 	case CPU_PPC64_PA6T:
+ 		printf("See PA6T Power Implementation Features Book IV\n"
+ 			   "Chapter 7 Performance Counters\n");
+Index: oprofile-0.9.4/events/Makefile.am
+===================================================================
+--- oprofile-0.9.4.orig/events/Makefile.am	2008-08-08 15:35:37.318966302 +0200
++++ oprofile-0.9.4/events/Makefile.am	2008-08-08 15:35:57.259878132 +0200
+@@ -31,6 +31,7 @@
+ 	arm/xscale1/events arm/xscale1/unit_masks \
+ 	arm/xscale2/events arm/xscale2/unit_masks \
+ 	arm/armv6/events arm/armv6/unit_masks \
++	arm/armv7/events arm/armv7/unit_masks \
+ 	arm/mpcore/events arm/mpcore/unit_masks \
+ 	avr32/events avr32/unit_masks \
+ 	mips/20K/events mips/20K/unit_masks \
diff --git a/packages/oprofile/oprofile/armv7a.diff b/packages/oprofile/oprofile/armv7a.diff
index cb53e5e791..d6dccc16c6 100644
--- a/packages/oprofile/oprofile/armv7a.diff
+++ b/packages/oprofile/oprofile/armv7a.diff
@@ -1,6 +1,7 @@
-diff -urN oprofile-0.9.3/ChangeLog oprofile-0.9.3.armv7/ChangeLog
---- oprofile-0.9.3/ChangeLog	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3.armv7/ChangeLog	2008-04-23 18:38:40.000000000 +0200
+Index: oprofile-0.9.3/ChangeLog
+===================================================================
+--- oprofile-0.9.3.orig/ChangeLog	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3/ChangeLog	2008-08-08 15:41:09.194935711 +0200
 @@ -1,3 +1,14 @@
 +
 +2008-04-23  Jean Pihet <jpihet@mvista.com>
@@ -16,9 +17,10 @@ diff -urN oprofile-0.9.3/ChangeLog oprofile-0.9.3.armv7/ChangeLog
  2007-07-09  Maynard Johnson <maynardj@us.ibm.com>
  
          * doc/opreport.xsd:
-diff -urN oprofile-0.9.3/events/arm/armv7/events oprofile-0.9.3.armv7/events/arm/armv7/events
---- oprofile-0.9.3/events/arm/armv7/events	1970-01-01 01:00:00.000000000 +0100
-+++ oprofile-0.9.3.armv7/events/arm/armv7/events	2008-04-24 15:06:48.000000000 +0200
+Index: oprofile-0.9.3/events/arm/armv7/events
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ oprofile-0.9.3/events/arm/armv7/events	2008-08-08 15:41:09.198936463 +0200
 @@ -0,0 +1,53 @@
 +# ARM V7 events
 +# From Cortex A8 DDI (ARM DDI 0344B, revision r1p1) 
@@ -73,37 +75,19 @@ diff -urN oprofile-0.9.3/events/arm/armv7/events oprofile-0.9.3.armv7/events/arm
 +event:0x72 counters:1,2,3,4 um:zero minimum:500 name:PMU_EVENTS : Number of events from both external input sources PMUEXTIN[0] and PMUEXTIN[1]
 +event:0xFF counters:0 um:zero minimum:500 name:CPU_CYCLES : Number of CPU cycles
 +
-diff -urN oprofile-0.9.3/events/arm/armv7/unit_masks oprofile-0.9.3.armv7/events/arm/armv7/unit_masks
---- oprofile-0.9.3/events/arm/armv7/unit_masks	1970-01-01 01:00:00.000000000 +0100
-+++ oprofile-0.9.3.armv7/events/arm/armv7/unit_masks	2008-04-01 10:52:00.000000000 +0200
+Index: oprofile-0.9.3/events/arm/armv7/unit_masks
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ oprofile-0.9.3/events/arm/armv7/unit_masks	2008-08-08 15:41:09.210955689 +0200
 @@ -0,0 +1,4 @@
 +# ARM V7 PMNC possible unit masks
 +#
 +name:zero type:mandatory default:0x00
 +	0x00 No unit mask
-diff -urN oprofile-0.9.3/events/Makefile.in oprofile-0.9.3.armv7/events/Makefile.in
---- oprofile-0.9.3/events/Makefile.in	2007-07-16 20:23:28.000000000 +0200
-+++ oprofile-0.9.3.armv7/events/Makefile.in	2008-04-24 15:11:52.000000000 +0200
-@@ -211,6 +211,7 @@
- 	arm/xscale1/events arm/xscale1/unit_masks \
- 	arm/xscale2/events arm/xscale2/unit_masks \
- 	arm/armv6/events arm/armv6/unit_masks \
-+	arm/armv7/events arm/armv7/unit_masks \
- 	arm/mpcore/events arm/mpcore/unit_masks \
- 	mips/20K/events mips/20K/unit_masks \
- 	mips/24K/events mips/24K/unit_masks \
-@@ -270,7 +271,7 @@
- 
- 
- distdir: $(DISTFILES)
--	$(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer
-+	$(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/armv7 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- 	list='$(DISTFILES)'; for file in $$list; do \
-diff -urN oprofile-0.9.3/libop/op_cpu_type.c oprofile-0.9.3.armv7/libop/op_cpu_type.c
---- oprofile-0.9.3/libop/op_cpu_type.c	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3.armv7/libop/op_cpu_type.c	2008-04-23 18:31:56.000000000 +0200
+Index: oprofile-0.9.3/libop/op_cpu_type.c
+===================================================================
+--- oprofile-0.9.3.orig/libop/op_cpu_type.c	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3/libop/op_cpu_type.c	2008-08-08 15:41:09.242955608 +0200
 @@ -71,6 +71,7 @@
  	{ "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 },
  	{ "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 },
@@ -112,9 +96,10 @@ diff -urN oprofile-0.9.3/libop/op_cpu_type.c oprofile-0.9.3.armv7/libop/op_cpu_t
  	{ "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 },
  };
   
-diff -urN oprofile-0.9.3/libop/op_cpu_type.h oprofile-0.9.3.armv7/libop/op_cpu_type.h
---- oprofile-0.9.3/libop/op_cpu_type.h	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3.armv7/libop/op_cpu_type.h	2008-04-23 18:34:37.000000000 +0200
+Index: oprofile-0.9.3/libop/op_cpu_type.h
+===================================================================
+--- oprofile-0.9.3.orig/libop/op_cpu_type.h	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3/libop/op_cpu_type.h	2008-08-08 15:41:09.262956072 +0200
 @@ -69,6 +69,7 @@
   	CPU_PPC64_PA6T, /**< ppc64 PA6T */
  	CPU_ARM_MPCORE, /**< ARM MPCore */
@@ -123,9 +108,10 @@ diff -urN oprofile-0.9.3/libop/op_cpu_type.h oprofile-0.9.3.armv7/libop/op_cpu_t
  	CPU_PPC64_POWER5pp,  /**< ppc64 Power5++ family */
  	MAX_CPU_TYPE
  } op_cpu;
-diff -urN oprofile-0.9.3/libop/op_events.c oprofile-0.9.3.armv7/libop/op_events.c
---- oprofile-0.9.3/libop/op_events.c	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3.armv7/libop/op_events.c	2008-04-23 18:39:30.000000000 +0200
+Index: oprofile-0.9.3/libop/op_events.c
+===================================================================
+--- oprofile-0.9.3.orig/libop/op_events.c	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3/libop/op_events.c	2008-08-08 15:41:09.278955619 +0200
 @@ -788,6 +788,7 @@
  		case CPU_ARM_XSCALE2:
  		case CPU_ARM_MPCORE:
@@ -134,9 +120,10 @@ diff -urN oprofile-0.9.3/libop/op_events.c oprofile-0.9.3.armv7/libop/op_events.
  			descr->name = "CPU_CYCLES";
  			break;
  
-diff -urN oprofile-0.9.3/utils/ophelp.c oprofile-0.9.3.armv7/utils/ophelp.c
---- oprofile-0.9.3/utils/ophelp.c	2007-07-16 20:22:17.000000000 +0200
-+++ oprofile-0.9.3.armv7/utils/ophelp.c	2008-04-23 19:17:51.000000000 +0200
+Index: oprofile-0.9.3/utils/ophelp.c
+===================================================================
+--- oprofile-0.9.3.orig/utils/ophelp.c	2007-07-16 20:22:17.000000000 +0200
++++ oprofile-0.9.3/utils/ophelp.c	2008-08-08 15:41:09.294934552 +0200
 @@ -433,6 +433,11 @@
  		printf("See ARM11 Technical Reference Manual\n");
    		break;
@@ -149,3 +136,15 @@ diff -urN oprofile-0.9.3/utils/ophelp.c oprofile-0.9.3.armv7/utils/ophelp.c
  	case CPU_PPC64_PA6T:
  		printf("See PA6T Power Implementation Features Book IV\n"
  			   "Chapter 7 Performance Counters\n");
+Index: oprofile-0.9.3/events/Makefile.am
+===================================================================
+--- oprofile-0.9.3.orig/events/Makefile.am	2008-08-08 15:41:24.746955563 +0200
++++ oprofile-0.9.3/events/Makefile.am	2008-08-08 15:41:43.465544495 +0200
+@@ -31,6 +31,7 @@
+ 	arm/xscale1/events arm/xscale1/unit_masks \
+ 	arm/xscale2/events arm/xscale2/unit_masks \
+ 	arm/armv6/events arm/armv6/unit_masks \
++	arm/armv7/events arm/armv7/unit_masks \
+ 	arm/mpcore/events arm/mpcore/unit_masks \
+ 	mips/20K/events mips/20K/unit_masks \
+ 	mips/24K/events mips/24K/unit_masks \
diff --git a/packages/oprofile/oprofile/opjitconv-execvp-fix.diff b/packages/oprofile/oprofile/opjitconv-execvp-fix.diff
new file mode 100644
index 0000000000..5e6d271cc5
--- /dev/null
+++ b/packages/oprofile/oprofile/opjitconv-execvp-fix.diff
@@ -0,0 +1,23 @@
+status: applied upstream http://sourceforge.net/tracker/index.php?func=detail&aid=2040417&group_id=16191&atid=116191
+applied in: >0.9.4
+Index: oprofile-0.9.4/daemon/init.c
+===================================================================
+--- oprofile-0.9.4.orig/daemon/init.c	2008-08-06 17:59:43.126578165 +0200
++++ oprofile-0.9.4/daemon/init.c	2008-08-06 18:00:10.694789667 +0200
+@@ -170,14 +170,14 @@
+ 			sprintf(end_time_str, "%llu", end_time);
+ 			sprintf(opjitconv_path, "%s/%s", OP_BINDIR, "opjitconv");
+ 			arg_num = 0;
+-			exec_args[arg_num++] = opjitconv_path;
++			exec_args[arg_num++] = "opjitconv";
+ 			if (vmisc)
+ 				exec_args[arg_num++] = "-d";
+ 			exec_args[arg_num++] = session_dir;
+ 			exec_args[arg_num++] = start_time_str;
+ 			exec_args[arg_num++] = end_time_str;
+ 			exec_args[arg_num] = (char *) NULL;
+-			execvp("opjitconv", exec_args);
++			execvp(opjitconv_path, exec_args);
+ 			fprintf(stderr, "Failed to exec %s: %s\n",
+ 			        exec_args[0], strerror(errno));
+ 			/* We don't want any cleanup in the child */
diff --git a/packages/oprofile/oprofile_0.9.3.bb b/packages/oprofile/oprofile_0.9.3.bb
index 4d6af997af..7ffcec3b99 100644
--- a/packages/oprofile/oprofile_0.9.3.bb
+++ b/packages/oprofile/oprofile_0.9.3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "popt binutils"
 RDEPENDS = "binutils-symlinks"
 RRECOMMENDS = "kernel-vmlinux"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
            file://armv6_fix.patch;patch=1 \
diff --git a/packages/oprofile/oprofile_0.9.4.bb b/packages/oprofile/oprofile_0.9.4.bb
new file mode 100644
index 0000000000..f8fb744fcc
--- /dev/null
+++ b/packages/oprofile/oprofile_0.9.4.bb
@@ -0,0 +1,40 @@
+SECTION = "devel"
+DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
+of profiling all running code at low overhead."
+LICENSE = "GPL"
+DEPENDS = "popt binutils"
+RDEPENDS = "binutils-symlinks"
+RRECOMMENDS = "kernel-vmlinux"
+PR = "r0"
+
+SRC_URI = "\
+	${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
+	file://opjitconv-execvp-fix.diff;patch=1 \
+	file://0.9.4-armv7a.diff;patch=1 \
+	file://acinclude.m4 \
+	"
+
+inherit autotools
+
+EXTRA_OECONF = " \
+	--with-kernel-support \
+	--without-x \
+	"
+
+do_configure () {
+	cp ${WORKDIR}/acinclude.m4 ${S}/
+	autotools_do_configure
+}
+
+do_stage () {
+	# As of 0.9.4 there is a libopagent library to compile and link against.
+	autotools_stage_all
+}
+
+PACKAGES = "${PN}-dev ${PN}-doc ${PN}-dbg ${PN}"
+
+FILES_${PN}-dev += "\
+	${libdir}/oprofile/lib*.so \
+	${libdir}/oprofile/lib*.a \
+	${libdir}/oprofile/lib*.la \
+"
diff --git a/packages/phoneme/.mtn2git_empty b/packages/phoneme/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/phoneme/.mtn2git_empty
diff --git a/packages/phoneme/files/.mtn2git_empty b/packages/phoneme/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/phoneme/files/.mtn2git_empty
diff --git a/packages/phoneme/files/phoneme-makefile-fix.patch b/packages/phoneme/files/phoneme-makefile-fix.patch
new file mode 100644
index 0000000000..9dc80428f1
--- /dev/null
+++ b/packages/phoneme/files/phoneme-makefile-fix.patch
@@ -0,0 +1,144 @@
+Index: cdc/build/share/rules_zoneinfo.mk
+===================================================================
+--- cdc/build/share/rules_zoneinfo.mk.orig
++++ cdc/build/share/rules_zoneinfo.mk
+@@ -45,7 +45,7 @@ $(ZONEINFO_CLASSES_DIR):
+ .compile.classlist:
+ 	$(AT)if [ -s $(ZONEINFO_CLASSES_DIR)/.classes.list ] ; then	\
+ 	     echo "Compiling zic classes... ";				\
+-	     $(JAVAC_CMD)						\
++	     $(JAVAC_CMD) -sourcepath $(CVM_SHAREROOT)/classes		\
+ 			-d $(ZONEINFO_CLASSES_DIR)			\
+ 			@$(ZONEINFO_CLASSES_DIR)/.classes.list ;	\
+ 	fi
+Index: cdc/build/share/jcc.mk
+===================================================================
+--- cdc/build/share/jcc.mk.orig
++++ cdc/build/share/jcc.mk
+@@ -93,7 +93,7 @@ $(CVM_GENOPCODE_DEPEND) :: $(CVM_JCC_SRC
+ 		 $(CVM_JCC_SRCPATH)/JCCMessage.properties
+ 	@echo "... $@"
+ 	$(AT)CLASSPATH=$(CVM_JCC_SRCPATH); export CLASSPATH; \
+-	$(CVM_JAVAC) $(JAVAC_OPTIONS) -d $(CVM_JCC_CLASSPATH) \
++	$(CVM_JAVAC) $(JAVAC_OPTIONS) -sourcepath $(CVM_JCC_SRCPATH) -d $(CVM_JCC_CLASSPATH) \
+ 	    $(subst /,$(CVM_FILESEP),$(CVM_JCC_SRCPATH)/GenOpcodes.java)
+ 	$(AT)rm -f $(CVM_JCC_CLASSPATH)/JCCMessage.properties; \
+ 	cp $(CVM_JCC_SRCPATH)/JCCMessage.properties $(CVM_JCC_CLASSPATH)/JCCMessage.properties
+@@ -253,7 +253,7 @@ $(CVM_JCC_DEPEND) :: $(CVM_JCC_SRCPATH)/
+ 		 $(CVM_JCC_SRCPATH)/JCCMessage.properties
+ 	@echo "... $@"
+ 	@CLASSPATH=$(CVM_JCC_CLASSPATH)$(PS)$(CVM_JCC_SRCPATH)$(PS)$(CVM_DERIVEDROOT)/javavm/runtime; export CLASSPATH; \
+-	$(CVM_JAVAC) $(JAVAC_OPTIONS) -d $(CVM_JCC_CLASSPATH) \
++	$(CVM_JAVAC) $(JAVAC_OPTIONS) -classpath $(CVM_JCC_CLASSPATH)$(PS)$(CVM_JCC_SRCPATH)$(PS)$(CVM_DERIVEDROOT)/javavm/runtime -d $(CVM_JCC_CLASSPATH) \
+ 	    $(CVM_JCC_CLASSES)
+ 	@rm -f $(CVM_JCC_CLASSPATH)/JCCMessage.properties; \
+ 	cp $(CVM_JCC_SRCPATH)/JCCMessage.properties $(CVM_JCC_CLASSPATH)/JCCMessage.properties
+Index: cdc/build/share/defs.mk
+===================================================================
+--- cdc/build/share/defs.mk.orig
++++ cdc/build/share/defs.mk
+@@ -1187,7 +1187,7 @@ BUNDLE_PRODUCT_NAME  = $(subst $(TM),$(e
+ BUNDLE_VERSION	= $(subst -,_,$(J2ME_BUILD_VERSION_STRING))
+ BUNDLE_TARGET	= $(subst -,_,$(CVM_TARGET))
+ 
+-BINARY_BUNDLE_NAME	= \
++BINARY_BUNDLE_NAME	?= \
+ 	$(BUNDLE_PRODUCT_NAME)-$(BUNDLE_VERSION)-$(BUNDLE_TARGET)-bin
+ BINARY_BUNDLE_DIRNAME	= $(BINARY_BUNDLE_NAME)
+ 
+@@ -2153,11 +2153,11 @@ endif
+ 
+ # Note, ALL_INCLUDE_FLAGS flags is setup in rules.mk so
+ # abs2rel only needs to be called on it once.
+-CPPFLAGS 	+= $(CVM_DEFINES) $(ALL_INCLUDE_FLAGS)
+-CFLAGS_SPEED   	= $(CFLAGS) $(CCFLAGS_SPEED) $(CPPFLAGS)
+-CFLAGS_SPACE   	= $(CFLAGS) $(CCFLAGS_SPACE) $(CPPFLAGS)
+-CFLAGS_LOOP    	= $(CFLAGS) $(CCFLAGS_LOOP)  $(CPPFLAGS)
+-CFLAGS_FDLIB   	= $(CFLAGS) $(CCFLAGS_FDLIB) $(CPPFLAGS)
++CVM_CPPFLAGS 	+= $(CVM_DEFINES) $(ALL_INCLUDE_FLAGS)
++CFLAGS_SPEED   	= $(CFLAGS) $(CCFLAGS_SPEED) $(CVM_CPPFLAGS)
++CFLAGS_SPACE   	= $(CFLAGS) $(CCFLAGS_SPACE) $(CVM_CPPFLAGS)
++CFLAGS_LOOP    	= $(CFLAGS) $(CCFLAGS_LOOP)  $(CVM_CPPFLAGS)
++CFLAGS_FDLIB   	= $(CFLAGS) $(CCFLAGS_FDLIB) $(CVM_CPPFLAGS)
+ CFLAGS_JCS	= 
+ 
+ LINKFLAGS       += -g -Wl,-export-dynamic $(LINK_ARCH_FLAGS)
+@@ -2165,13 +2165,13 @@ LINKLIBS     	+= -lpthread -ldl $(LINK_A
+ LINKLIBS_JCS    +=
+ 
+ SO_CCFLAGS   	= $(CCFLAGS_SPEED)
+-SO_CFLAGS	= $(CFLAGS) $(SO_CCFLAGS) $(CPPFLAGS)
++SO_CFLAGS	= $(CFLAGS) $(SO_CCFLAGS) $(CVM_CPPFLAGS)
+ SO_LINKFLAGS 	= $(LINKFLAGS) -shared
+ 
+ #
+ # commands for running the tools
+ #
+-ASM_CMD 	= $(AT)$(TARGET_AS) $(ASM_FLAGS) -D_ASM $(CPPFLAGS) \
++ASM_CMD 	= $(AT)$(TARGET_AS) $(ASM_FLAGS) -D_ASM $(CVM_CPPFLAGS) \
+ 			-o $@ $(call abs2rel,$<)
+ 
+ # compileCCC(flags, objfile, srcfiles)
+Index: cdc/build/share/rules.mk
+===================================================================
+--- cdc/build/share/rules.mk.orig
++++ cdc/build/share/rules.mk
+@@ -521,7 +521,7 @@ endif
+ # As a performance improvement, evaluate some flags in case
+ # they contain shell commands.
+ # FIXME: Disabled because this causes GCI build failures
+-#$(J2ME_CLASSLIB):: CPPFLAGS := $(CPPFLAGS)
++#$(J2ME_CLASSLIB):: CVM_CPPFLAGS := $(CVM_CPPFLAGS)
+ 
+ $(J2ME_CLASSLIB):: initbuild
+ $(J2ME_CLASSLIB):: btclasses $(CVM_BUILDTIME_CLASSESZIP)
+@@ -708,14 +708,14 @@ $(CVM_OBJDIR)/executejava.o: $(CVM_DERIV
+ # command to use to generate dependency makefiles if requested
+ ifeq ($(GENERATEMAKEFILES), true)
+ GENERATEMAKEFILES_CMD = \
+-	@$(TARGET_CC) $(CCDEPEND) $(CC_ARCH_FLAGS) $(CPPFLAGS) $< \
++	@$(TARGET_CC) $(CCDEPEND) $(CC_ARCH_FLAGS) $(CVM_CPPFLAGS) $< \
+ 		2> /dev/null | sed 's!$*\.o!$(dir $@)&!g' > $(@:.o=.d)
+ endif
+ 
+ # command to use to generate stack map analysis files if requested
+ ifeq ($(CVM_CSTACKANALYSIS), true)
+ CSTACKANALYSIS_CMD = \
+-	$(AT)$(TARGET_CC) -S $(CCFLAGS) $(CPPFLAGS) -o $(@:.o=.asm) $<
++	$(AT)$(TARGET_CC) -S $(CCFLAGS) $(CVM_CPPFLAGS) -o $(@:.o=.asm) $<
+ endif
+ 
+ #
+@@ -751,7 +753,7 @@ $(CVM_OBJDIR)/%.o: %.S
+ 	@echo "as  $<"
+ 	$(ASM_CMD)
+ ifeq ($(GENERATEMAKEFILES), true)
+-	@$(TARGET_CC) $(ASM_ARCH_FLAGS) $(CCDEPEND) $(CPPFLAGS) $< \
++	@$(TARGET_CC) $(ASM_ARCH_FLAGS) $(CCDEPEND) $(CVM_CPPFLAGS) $< \
+ 		2> /dev/null | sed 's!$*\.o!$(dir $@)&!g' > $(@:.o=.d)
+ endif
+ ifeq ($(CVM_CSTACKANALYSIS), true)
+@@ -772,7 +774,7 @@ $(CVM_FDLIB_FILES): $(CVM_OBJDIR)/%.o: $
+ 	@echo "cc  $<"
+ 	$(CC_CMD_FDLIB)
+ ifeq ($(GENERATEMAKEFILES), true)
+-	@$(TARGET_CC) $(CC_ARCH_FLAGS) $(CCDEPEND) $(CPPFLAGS) $< \
++	@$(TARGET_CC) $(CC_ARCH_FLAGS) $(CCDEPEND) $(CVM_CPPFLAGS) $< \
+ 		2> /dev/null | sed 's!$*\.o!$(dir $@)&!g' > $(@:.o=.d)
+ endif
+ 
+Index: cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c
+===================================================================
+--- cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c.orig
++++ cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c
+@@ -41,8 +41,8 @@
+ #include <dlfcn.h>
+ #include <stddef.h>
+ /* avoid conflicting ucontext definitions */
+-#define ucontext asm_ucontext
+-#include <asm/ucontext.h>
++/*#define ucontext asm_ucontext*/
++#include <ucontext.h>
+ #include <unistd.h>
+ 
+ #define MAXSIGNUM 32
diff --git a/packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb b/packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb
new file mode 100644
index 0000000000..59dbfb7a3b
--- /dev/null
+++ b/packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb
@@ -0,0 +1,26 @@
+require phoneme-advanced.inc
+
+BUILDREV = "b73"
+SRCREV = "11560"
+
+SRC_URI += "file://phoneme-makefile-fix.patch;patch=1;pnum=0"
+
+FILES_${PN} += "\
+	${COMMON_DIR}/bin/cvm \ 
+	${COMMON_DIR}/lib/btclasses.zip \
+	${COMMON_DIR}/lib/content-types.properties \
+	${COMMON_DIR}/lib/foundation.jar \
+	${COMMON_DIR}/lib/security/java.security \
+	${COMMON_DIR}/lib/security/java.policy \
+	${COMMON_DIR}/lib/zi/Asia/Novosibirsk \
+	${COMMON_DIR}/lib/zi/Asia/Calcutta \
+	${COMMON_DIR}/lib/zi/ZoneInfoMappings \
+	${COMMON_DIR}/lib/zi/GMT \
+	${COMMON_DIR}/lib/zi/America/Los_Angeles \
+	${COMMON_DIR}/democlasses.jar \
+	${COMMON_DIR}/testclasses.zip \
+	${COMMON_DIR}/legal/license.txt \
+	${COMMON_DIR}/legal/thirdpartylicensereadme.txt \
+	${COMMON_DIR}/legal/copyright.txt \
+"
+
diff --git a/packages/phoneme/phoneme-advanced.inc b/packages/phoneme/phoneme-advanced.inc
new file mode 100644
index 0000000000..aad82cfe42
--- /dev/null
+++ b/packages/phoneme/phoneme-advanced.inc
@@ -0,0 +1,160 @@
+DESCRIPTION = "A free CDC JavaVM and class library from Sun Microsystems."
+LICENSE = "GPLv2"
+HOMEPAGE = "https://phoneme.dev.java.net"
+AUTHOR = "Sun Microsystems, Inc."
+
+DEPENDS = "classpath-native virtual/javac-native linux-libc-headers"
+
+inherit java update-alternatives
+
+# The PhoneME Advanced build system is documented here: http://java.sun.com/javame/reference/docs/cdc_build_system.pdf
+# NOTE: We need to provide an empty password. pswd='' seems not to be the correct way.
+SRC_URI = "\
+	svn://phoneme.dev.java.net/svn/phoneme/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=cdc;proto=https;localdir=cdc;user=guest;pswd='' \
+	svn://phoneme.dev.java.net/svn/phoneme/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=tools;proto=https;localdir=tools;user=guest;pswd='' \
+	svn://phoneme.dev.java.net/svn/phoneme;module=legal;localdir=legal;proto=https;user=guest;pswd='' \
+	"
+
+PROVIDES = "virtual/java-cdc java-cdc-runtime"
+PRIORITY = "optional"
+SECTION  = "interpreters"
+
+# PhoneME builds currently cannot be parallel
+PARALLEL_MAKE = ""
+
+S = "${WORKDIR}"
+
+BUILDREV = ${@bb.fatal('BUILDREV is not defined in this phoneme-advanced recipe!')}
+SRCREV = ${@bb.fatal('SRCREV is not defined in this phoneme-advanced recipe!')}
+
+COMMON_DIR  = "${libdir_jvm}/${PN}"
+
+do_compile() {
+	set_arch
+	oe_runmake -C cdc/build/linux-$ARCH-generic bin
+}
+
+do_install() {
+	install -d ${D}/${libdir_jvm}
+
+	unzip cdc/install/${PN}.zip -d ${D}/${libdir_jvm}
+
+	# Additional link named cvm
+	install -d ${D}/${bindir}
+	ln -sf ${libdir_jvm}/${PN}/bin/cvm ${D}${bindir}/cvm
+}
+
+do_configure() {
+  set_arch
+  test ! -d cdc/build/linux-$ARCH-generic && mkdir -p cdc/build/linux-$ARCH-generic
+  cd cdc/build/linux-$ARCH-generic
+
+  echo "Configuring PhoneME Advanced build"
+  # At the moment we do not support anything else than the foundation 
+  #profiles.
+  pmo_start J2ME_CLASSLIB foundation
+
+  # Dispatch to arch-specific functions.
+  oe_phoneme_config$ARCH
+
+  oe_phoneme_configbase
+
+  pmo "# Misc locations and file names."
+  pmo BINARY_BUNDLE_NAME ${PN}
+  pmo BINARY_BUNDLE_APPEND_REVISION false
+  pmo JAVAME_LEGAL_DIR ${WORKDIR}/legal
+
+  pmo "# Java toolchain binaries"
+  pmo JDK_HOME $JAVA_HOME
+  pmo CVM_TARGET_TOOLS_PREFIX ${CROSS_DIR}/bin/
+  pmo CVM_JAVA java
+  pmo CVM_JAVAC javac
+  pmo CVM_JAVADOC true
+  pmo CVM_JAVAH gjavah
+  pmo CVM_JAR gjar
+  pmo CVM_INCLUDE_DIR ${STAGING_INCDIR}/classpath
+
+  pmo JAVAC_OPTIONS -nowarn
+
+  pmo "# Host C/C++ toolchain binaries"
+  pmo HOST_CC "${BUILD_CC}"
+  pmo HOST_CC_PATH "${BUILD_CC}"
+  pmo HOST_CCC "${BUILD_CXX}"
+  pmo HOST_PATH "${BUILD_CXX}"
+  pmo HOST_LD "${BUILD_LD}"
+  pmo HOST_RANLIB "${BUILD_RANLIB}"
+
+  pmo "# C/C++ toolchain binaries"
+  pmo TARGET_CC "${CC}"
+  pmo TARGET_CC_PATH "${CC}"
+  pmo CCFLAGS "${CFLAGS}"
+  pmo TARGET_CCC "${CXX}"
+  pmo TARGET_PATH "${CXX}"
+  pmo CCCFLAGS "${CXXFLAGS}"
+  pmo TARGET_AR "${AR}"
+  pmo TARGET_LD "${CC}"
+  pmo TARGET_RANLIB "${RANLIB}"
+
+  pmo USE_GCC2 false
+
+  pmo "include ../share/top.mk"
+}
+
+pmo_start() {
+	echo "$1 = $2" > GNUmakefile
+	echo "$1 = $2"
+}
+
+pmo() {
+	if [ "$2" ]
+	then
+		echo "$1 = $2" >> GNUmakefile
+		echo "$1 = $2"
+	else
+		echo "$1" >> GNUmakefile
+		echo "$1"
+	fi
+}
+
+set_arch() {
+	case ${TARGET_ARCH} in
+		arm*)     ARCH=arm ;;
+		i*86*)    ARCH=x86 ;;
+		mips*)    ARCH=mips ;;
+		powerpc*) ARCH=powerpc ;;
+		sparc*)   ARCH=sparc ;;
+		x86_64*)  ARCH=x86 ;;
+		*)    die "Sorry, your target architecture is not supported!" ;;
+	esac
+}
+
+# Default non-arch specific configuration
+oe_phoneme_configbase() {
+  pmo CVM_DEBUG false
+  pmo CVM_JIT true
+}
+
+# Default arch specific configurations
+oe_phoneme_configarm() {
+	tf=true
+	if [ Xoabi = X${ARM_ABI} ]
+	then
+		tf=false
+	fi
+
+	pmo USE_AAPCS $tf
+}
+
+oe_phoneme_configx86() {
+	# Taken from linux-x86-generic/GNUmakefile
+	pmo CVM_JIT_REGISTER_LOCALS false
+}
+
+ALTERNATIVE_NAME = "java-cdc"
+ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"
+ALTERNATIVE_PATH = "${libdir}/jvm/${PN}/bin/cvm"
+ALTERNATIVE_PRIORITY = "10"
+
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dbg += "${COMMON_DIR}/bin/.debug/cvm"
+
diff --git a/packages/portaudio/portaudio-v19_20071207.bb b/packages/portaudio/portaudio-v19_20071207.bb
deleted file mode 100644
index f8de2d741d..0000000000
--- a/packages/portaudio/portaudio-v19_20071207.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: portaudio-v19_20071207.bb
-# Date: 20080104 (YMD)
-
-DESCRIPTION = "portaudio is a portable cross-platform Audio API"
-SECTION = "base"
-LICENSE = "GPL"
-
-PR = "r0"
-
-######################################################################################
-
-SRC_URI = "http://www.portaudio.com/archives/pa_stable_v19_${PV}.tar.gz"
-
-S = "${WORKDIR}/portaudio"
-
-inherit autotools
-
-do_stage() {
-        install -m 0644 ${S}/include/portaudio.h ${STAGING_INCDIR}/
-        oe_libinstall -C lib -so libportaudio ${STAGING_LIBDIR}/
-}
diff --git a/packages/portaudio/portaudio-v19_svn.bb b/packages/portaudio/portaudio-v19_svn.bb
new file mode 100644
index 0000000000..8fe48f8efe
--- /dev/null
+++ b/packages/portaudio/portaudio-v19_svn.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "A portable audio library"
+SECTION = "libs/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PV = "v19+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://www.portaudio.com/repos/portaudio;module=trunk;proto=https"
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+TESTS = "  pa_devs patest1      patest_hang patest_many                   patest_prime patest_sine patest_stop     patest_write_sine        \
+pa_fuzz    patest_buffer        patest_in_overflow  patest_maxsines       patest_read_record  patest_sine8         patest_sync              \
+pa_minlat  patest_callbackstop  patest_latency      patest_multi_sine     patest_record       patest_sine_formats  patest_toomanysines      \
+paqa_devs  patest_clip          patest_leftright    patest_out_underflow  patest_ringmix      patest_sine_time     patest_underflow         \
+paqa_errs  patest_dither        patest_longsine     patest_pink           patest_saw          patest_start_stop    patest_wire"
+
+# DEFINES = PA_USE_OSS=1 HAVE_LIBPTHREAD=1
+# DEFINES += PA_LITTLE_ENDIAN
+
+# INCLUDEPATH = ../pa_common
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES += "portaudio-examples"
+FILES_portaudio-examples = "${bindir}"
diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb
deleted file mode 100644
index 748519f5b1..0000000000
--- a/packages/portaudio/portaudio_0.0.19.bb
+++ /dev/null
@@ -1,87 +0,0 @@
-DESCRIPTION = "A portable audio library"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PV = "1:0.0.19+cvs${SRCDATE}"
-PR = "r1"
-
-SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz"
-S = "${WORKDIR}/portaudio"
-
-inherit qmake
-
-TESTS = "  pa_devs patest1      patest_hang patest_many                   patest_prime patest_sine patest_stop     patest_write_sine        \
-pa_fuzz    patest_buffer        patest_in_overflow  patest_maxsines       patest_read_record  patest_sine8         patest_sync              \
-pa_minlat  patest_callbackstop  patest_latency      patest_multi_sine     patest_record       patest_sine_formats  patest_toomanysines      \
-paqa_devs  patest_clip          patest_leftright    patest_out_underflow  patest_ringmix      patest_sine_time     patest_underflow         \
-paqa_errs  patest_dither        patest_longsine     patest_pink           patest_saw          patest_start_stop    patest_wire"
-
-do_configure_prepend() {
-    echo "TEMPLATE = subdirs" >portaudio.pro
-    echo "SUBDIRS = lib tests" >>portaudio.pro
-
-    mkdir -p lib
-    cat <<EOF >lib/lib.pro
-TEMPLATE = lib
-CONFIG = console debug warn_on
-TARGET = portaudio
-VERSION = 0.0.19
-DESTDIR = .
-DEFINES = PA_USE_OSS=1 HAVE_LIBPTHREAD=1
-DEFINES += PA_LITTLE_ENDIAN
-
-INCLUDEPATH = ../pa_common
-
-SOURCES = \
-        ../pa_common/pa_allocation.c \
-        ../pa_common/pa_converters.c \
-        ../pa_common/pa_cpuload.c \
-        ../pa_common/pa_dither.c \
-        ../pa_common/pa_front.c \
-        ../pa_common/pa_process.c \
-        ../pa_common/pa_skeleton.c \
-        ../pa_common/pa_stream.c \
-        ../pa_common/pa_trace.c \
-\
-        ../pa_unix_oss/pa_unix_oss.c \
-        ../pa_unix/pa_unix_hostapis.c \
-        ../pa_unix/pa_unix_util.c
-EOF
-
-    mkdir -p tests
-    echo "TEMPLATE = subdirs" >tests/tests.pro
-    echo "SUBDIRS = \\" >>tests/tests.pro
-
-    for test in ${TESTS}
-    do
-        mkdir -p tests/$test
-        cat <<EOF >tests/$test/$test.pro
-TEMPLATE = app
-CONFIG = console debug warn_on thread
-DESTDIR = ../../bin
-INCLUDEPATH = ../../pa_common/
-LIBS = -L../../lib -lportaudio -lm
-SOURCES = ../../pa_tests/$test.c
-EOF
-        echo "$test \\" >>tests/tests.pro
-    done
-    echo >>tests/tests.pro
-}
-
-do_stage() {
-	oe_libinstall -so -C lib libportaudio ${STAGING_LIBDIR}
-        install -m 0644 pa_common/portaudio.h ${STAGING_INCDIR}/portaudio.h
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -d ${D}${bindir}
-	install -d ${D}${includedir}
-	oe_libinstall -so -C lib libportaudio ${D}${libdir}
-	install -m 0644 pa_common/portaudio.h ${D}${includedir}
-	install -m 0755 bin/* ${D}${bindir}/
-}
-
-PACKAGES = "${PN}-dbg libportaudio0 portaudio-dev portaudio-examples"
-FILES_libportaudio0 = "${libdir}"
-FILES_portaudio-examples = "${bindir}"
diff --git a/packages/povray/povray-3.6.1+3.7.0-beta25b/.mtn2git_empty b/packages/povray/povray-3.6.1+3.7.0-beta25b/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/povray/povray-3.6.1+3.7.0-beta25b/.mtn2git_empty
diff --git a/packages/povray/povray-3.6.1+3.7.0-beta25b/configure-cross-hack.patch b/packages/povray/povray-3.6.1+3.7.0-beta25b/configure-cross-hack.patch
new file mode 100644
index 0000000000..e0803bafac
--- /dev/null
+++ b/packages/povray/povray-3.6.1+3.7.0-beta25b/configure-cross-hack.patch
@@ -0,0 +1,42 @@
+--- /tmp/configure.ac	2008-08-14 01:13:37.000000000 +0200
++++ povray-3.7.0.beta.25b/configure.ac	2008-08-14 01:17:56.253198000 +0200
+@@ -357,8 +357,6 @@
+   AC_MSG_RESULT([yes])
+   AX_CHECK_LIB([z], [$required_libz_version], [z], [zlibVersion], [zlib.h], [zlibVersion()], [$with_zlib])
+   if test x"$ax_check_lib" != x"ok"; then
+-    AC_MSG_ERROR([cannot find a suitable ZLIB library])
+-  else
+     pov_libz=ok
+   fi
+ fi
+@@ -373,8 +371,6 @@
+   AC_MSG_RESULT([yes])
+   AX_CHECK_LIB([png], [$required_libpng_version], [png12 png], [png_get_libpng_ver], [png.h], [png_get_libpng_ver(NULL)], [$with_libpng])
+   if test x"$ax_check_lib" != x"ok"; then
+-    AC_MSG_ERROR([cannot find a suitable PNG library])
+-  else
+     pov_libpng=ok
+   fi
+ fi
+@@ -390,11 +386,9 @@
+   AC_MSG_RESULT([yes])
+   AX_CHECK_LIBJPEG([$required_libjpeg_version], [$with_libjpeg])
+   if test x"$ax_check_libjpeg" != x"ok"; then
+-    AC_MSG_ERROR([cannot find a suitable JPEG library])
+-  else
+     # create jversion.h in builddir
+     test -d "./source" || mkdir ./source
+-    echo "#define JVERSION \"${ax_check_libjpeg_version}\"" > ./source/jversion.h
++    echo "#define JVERSION \"62\"" > ./source/jversion.h
+     pov_libjpeg=ok
+   fi
+ fi
+@@ -409,8 +403,6 @@
+   AC_MSG_RESULT([yes])
+   AX_CHECK_LIBTIFF([$required_libtiff_version], [$with_libtiff])
+   if test x"$ax_check_libtiff" != x"ok"; then
+-    AC_MSG_ERROR([cannot find a suitable TIFF library])
+-  else
+     pov_libtiff=ok
+   fi
+ fi
diff --git a/packages/povray/povray-3.6.1+3.7.0-beta25b/gcc43.diff b/packages/povray/povray-3.6.1+3.7.0-beta25b/gcc43.diff
new file mode 100644
index 0000000000..696dfb471f
--- /dev/null
+++ b/packages/povray/povray-3.6.1+3.7.0-beta25b/gcc43.diff
@@ -0,0 +1,70 @@
+--- /tmp/processoptions.cpp	2008-08-14 01:47:37.000000000 +0200
++++ povray-3.7.0.beta.25b/source/base/processoptions.cpp	2008-08-14 01:48:23.853198000 +0200
+@@ -90,6 +90,7 @@
+  *
+  *********************************************************************************/
+ 
++#include <cstring>
+ #include <cstdarg>
+ #include <cctype>
+ 
+--- /tmp/fileinputoutput.cpp	2008-08-14 01:49:16.000000000 +0200
++++ povray-3.7.0.beta.25b/source/base/fileinputoutput.cpp	2008-08-14 01:49:33.043198000 +0200
+@@ -90,6 +90,7 @@
+  *
+  *********************************************************************************/
+ 
++#include <cstring>
+ #include <cstdlib>
+ #include <cstdarg>
+ 
+--- /tmp/textstreambuffer.cpp	2008-08-14 01:52:07.000000000 +0200
++++ povray-3.7.0.beta.25b/source/base/textstreambuffer.cpp	2008-08-14 01:52:21.693198000 +0200
+@@ -90,6 +90,7 @@
+  *
+  *********************************************************************************/
+ 
++#include <cstring>
+ #include <algorithm>
+ 
+ #include "configbase.h"
+--- /tmp/fileinputoutput.h	2008-08-14 01:53:49.000000000 +0200
++++ povray-3.7.0.beta.25b/source/base/fileinputoutput.h	2008-08-14 01:54:07.213198000 +0200
+@@ -96,6 +96,7 @@
+ #include "base/types.h"
+ #include "base/path.h"
+ 
++#include <cstring>
+ #include <string>
+ 
+ namespace pov_base
+--- /tmp/configbase.h	2008-08-14 01:57:58.000000000 +0200
++++ povray-3.7.0.beta.25b/source/base/configbase.h	2008-08-14 01:58:12.373198000 +0200
+@@ -95,6 +95,7 @@
+ #ifndef CONFIGBASE_H
+ #define CONFIGBASE_H
+ 
++#include <climits>
+ #include "syspovconfigbase.h"
+ 
+ #ifndef DBL
+--- /tmp/unixoptions.cpp	2008-08-14 02:02:52.000000000 +0200
++++ povray-3.7.0.beta.25b/vfe/unix/unixoptions.cpp	2008-08-14 10:22:09.073198000 +0200
+@@ -454,13 +454,16 @@
+ 				char *errormsg =
+ 					"Cannot determine the current working directory.\n"
+ 					"Check that the PWD environment variable does exist and is valid.\n";
++				int no_error_call = 1;
+ 				if(no_error_call)
+ 				{
+ 					fprintf(stderr, "%s: %s\n", PACKAGE, errormsg);
+ 					exit(EXIT_FAILURE);
+ 				}
++#ifdef USE_ERROR				
+ 				else
+-					Error("%s", errormsg);
++					std::Error("%s", errormsg);
++#endif
+ 			}
+ #endif
+ 
diff --git a/packages/povray/povray_3.6.1+3.7.0-beta25b.bb b/packages/povray/povray_3.6.1+3.7.0-beta25b.bb
new file mode 100644
index 0000000000..eee01e13ed
--- /dev/null
+++ b/packages/povray/povray_3.6.1+3.7.0-beta25b.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "The Persistence of Vision Raytracer is a high-quality, totally free tool for creating stunning three-dimensional graphics. "
+HOMEPAGE = "http://www.povray.org"
+SECTION = "console/graphics"
+LICENSE = "povray"
+DEPENDS = "virtual/libx11 boost zlib jpeg libpng tiff"
+
+PR = "r1"
+
+#We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack.
+SRC_URI = "http://www.povray.org/redirect/www.povray.org/beta/source/povray-src-3.7.0.beta.25b.tar.bz2 \
+           file://configure-cross-hack.patch;patch=1 \
+	   file://gcc43.diff;patch=1 \
+	   "
+
+S = "${WORKDIR}/povray-3.7.0.beta.25b"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --with-boost-thread=boost_thread-mt \
+                COMPILED_BY=${MAINTAINER} "
+
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O3 -ftree-vectorize  -ffast-math -fno-math-errno "
+
+PACKAGES += "${PN}-scenes ${PN}-ini ${PN}-icons ${PN}-scripts ${PN}-includes"
+
+PACKAGE_ARCH_${PN}-doc = "all"
+
+PACKAGE_ARCH_${PN}-scenes = "all"
+FILES_${PN}-scenes = "${datadir}/povray-3.7/scenes"
+
+PACKAGE_ARCH_${PN}-ini = "all"
+FILES_${PN}-ini = "${datadir}/povray-3.7/ini"
+
+PACKAGE_ARCH_${PN}-icons = "all"
+FILES_${PN}-icons = "${datadir}/povray-3.7/icons"
+
+PACKAGE_ARCH_${PN}-scripts = "all"
+FILES_${PN}-scripts = "${datadir}/povray-3.7/scripts"
+
+PACKAGE_ARCH_${PN}-includes = "all"
+FILES_${PN}-includes = "${datadir}/povray-3.7/include"
+
diff --git a/packages/prboom/prboom_2.4.7.bb b/packages/prboom/prboom_2.4.7.bb
new file mode 100644
index 0000000000..f775855d93
--- /dev/null
+++ b/packages/prboom/prboom_2.4.7.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "A Doom Clone based on SDL"
+SECTION = "games"
+PRIORITY = "optional"
+DEPENDS = "virtual/libsdl libsdl-mixer libsdl-net"
+LICENSE = "GPL"
+
+PR = "r1"
+RRECOMMENDS = "freedoom"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
+	   "
+
+inherit autotools
+
+EXTRA_OECONF = " --disable-gl --disable-cpu-opt --without-x --disable-sdltest"
+
+do_install() {
+        install -d ${D}${bindir} \
+		   ${D}${datadir}/games/doom
+
+	install -m 0755 src/prboom ${D}${bindir}/prboom
+	install -m 0644 data/prboom.wad ${D}${datadir}/games/doom/
+}
+
+FILES_${PN} += "${datadir}/games/doom/prboom.wad"
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index a0ec692095..9ae307e7a4 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -1,6 +1,7 @@
 # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
 # Generator: './generate-manifest-2.5.py' Version 20080722 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
 # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
+
  
 
 PROVIDES+="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
@@ -268,9 +269,9 @@ RDEPENDS_python-shell="python-core python-re"
 FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* "
 
 DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
-PR_python-bsddb="ml0"
+PR_python-bsddb="ml1"
 RDEPENDS_python-bsddb="python-core"
-FILES_python-bsddb="${libdir}/python2.5/bsddb "
+FILES_python-bsddb="${libdir}/python2.5/bsddb ${libdir}/python2.5/lib-dynload/_bsddb.so "
 
 DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
 PR_python-mmap="ml0"
diff --git a/packages/python/python-edje/.mtn2git_empty b/packages/python/python-edje/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-edje/.mtn2git_empty
diff --git a/packages/python/python-edje/0001-fix-unicode-conversion.patch b/packages/python/python-edje/0001-fix-unicode-conversion.patch
new file mode 100644
index 0000000000..7964e097d1
--- /dev/null
+++ b/packages/python/python-edje/0001-fix-unicode-conversion.patch
@@ -0,0 +1,41 @@
+From fa12a33b5a3c0e86231ca84967d9eff456e5f314 Mon Sep 17 00:00:00 2001
+From: Jan Luebbe <jluebbe@debian.org>
+Date: Sat, 9 Aug 2008 18:30:04 +0200
+Subject: [PATCH] fix unicode conversion
+
+---
+ edje/edje.c_edje_object.pxi |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/edje/edje.c_edje_object.pxi b/edje/edje.c_edje_object.pxi
+index 0f4da68..21c237e 100644
+--- a/edje/edje.c_edje_object.pxi
++++ b/edje/edje.c_edje_object.pxi
+@@ -391,17 +391,20 @@ cdef public class Edje(evas.c_evas.Object) [object PyEdje, type PyEdje_Type]:
+         else:
+             raise TypeError("func must be callable or None")
+ 
+-    def part_text_set(self, char *part, char *text):
+-        edje_object_part_text_set(self.obj, part, text)
++    def part_text_set(self, char *part, text):
++        cdef char *s
++        u = text.encode("utf8")
++        s = u
++        edje_object_part_text_set(self.obj, part, s)
+ 
+     def part_text_get(self, char *part):
+-        "@rtype: str"
++        "@rtype: unicode"
+         cdef char *s
+         s = edje_object_part_text_get(self.obj, part)
+         if s == NULL:
+             return None
+         else:
+-            return s
++            return s.decode("utf8")
+ 
+     def part_swallow(self, char *part, c_evas.Object obj):
+         """Swallows an object into the edje
+-- 
+1.5.6.3
+
diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb
index 144fcfddde..a0665e8b09 100644
--- a/packages/python/python-edje_cvs.bb
+++ b/packages/python/python-edje_cvs.bb
@@ -1,5 +1,9 @@
 require python-efl.inc
+
 DEPENDS += "edje python-evas"
 RDEPENDS += "python-evas"
+
+SRC_URI += "file://0001-fix-unicode-conversion.patch;patch=1"
+
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
diff --git a/packages/python/python-ptrace_0.3.2.bb b/packages/python/python-ptrace_0.3.2.bb
new file mode 100644
index 0000000000..a039476c39
--- /dev/null
+++ b/packages/python/python-ptrace_0.3.2.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "python-ptrace is a debugger using ptrace."
+HOMEPAGE = "http://fusil.hachoir.org/trac/wiki/python-ptrace"
+SECTION = "devel/python"
+LICENSE = "GPLv2"
+PR = "ml0"
+
+SRC_URI = "http://pypi.python.org/packages/source/p/ptrace/ptrace-${PV}.tar.gz"
+S = "${WORKDIR}/ptrace-${PV}"
+
+inherit distutils
diff --git a/packages/python/python-pycurl/.mtn2git_empty b/packages/python/python-pycurl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pycurl/.mtn2git_empty
diff --git a/packages/python/python-pycurl/no-static-link.patch b/packages/python/python-pycurl/no-static-link.patch
new file mode 100644
index 0000000000..b7c5ab9c9c
--- /dev/null
+++ b/packages/python/python-pycurl/no-static-link.patch
@@ -0,0 +1,14 @@
+Index: pycurl-7.18.2/setup.py
+===================================================================
+--- pycurl-7.18.2.orig/setup.py
++++ pycurl-7.18.2/setup.py
+@@ -97,8 +97,7 @@ else:
+         else:
+             extra_compile_args.append(e)
+     libs = split_quoted(
+-        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
+-        os.popen("'%s' --static-libs" % CURL_CONFIG).read())
++        os.popen("'%s' --libs" % CURL_CONFIG).read())
+     for e in libs:
+         if e[:2] == "-l":
+             libraries.append(e[2:])
diff --git a/packages/python/python-pycurl_7.16.4.bb b/packages/python/python-pycurl_7.18.2.bb
index a9480ad949..406add10c8 100644
--- a/packages/python/python-pycurl_7.16.4.bb
+++ b/packages/python/python-pycurl_7.18.2.bb
@@ -2,11 +2,20 @@ DESCRIPTION = "libcurl Python Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-RDEPENDS = "python-core curl (>=${PV})"
 DEPENDS = "curl-${PV}"
 SRCNAME = "pycurl"
+PR = "ml0"
 
-SRC_URI = "http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "\
+  http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz \
+  file://no-static-link.patch;patch=1 \
+"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+do_install_append() {
+	mv -f ${D}${datadir}/share/* ${D}${datadir}/
+}
+
+RDEPENDS = "python-core curl (>=${PV})"
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index 707c0f562e..c68f7d5e3b 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "http://www.python.org"
 LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
-DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
-DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
+DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
+DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
 # bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml8"
+PR = "ml9"
 
 PYTHON_MAJMIN = "2.5"
 
diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
index de941df1df..75b5b5735d 100644
--- a/packages/qt4/qt_staging.inc
+++ b/packages/qt4/qt_staging.inc
@@ -17,9 +17,9 @@ do_stage_append() {
     sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la
 
     install -d ${STAGING_DIR_TARGET}/qt4/bin
-    cp ${STAGING_DIR_NATIVE}/qt4/bin/* ${STAGING_DIR_TARGET}/qt4/bin/ 
+    cp ${STAGING_DIR_NATIVE}/qt4/bin/* ${STAGING_DIR_TARGET}/qt4/bin/ || true 
     for qttool in ${STAGING_DIR_TARGET}/qt4/bin/*4 ; do
-         ln -sf $qttool  ${STAGING_DIR_TARGET}/qt4/bin/$(basename $qttool |sed s:4::g)
+         ln -sf $qttool  ${STAGING_DIR_TARGET}/qt4/bin/$(basename $qttool |sed s:4::g) 
     done
 }
 
diff --git a/packages/quake/sdlquake/.mtn2git_empty b/packages/quake/sdlquake/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/quake/sdlquake/.mtn2git_empty
diff --git a/packages/quake/sdlquake/sdlquake-no-x86-asm.diff b/packages/quake/sdlquake/sdlquake-no-x86-asm.diff
new file mode 100644
index 0000000000..e87094b1da
--- /dev/null
+++ b/packages/quake/sdlquake/sdlquake-no-x86-asm.diff
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am	2008-08-11 20:31:09.000000000 +0200
++++ sdlquake-1.0.9/Makefile.am	2008-08-11 20:55:00.263198000 +0200
+@@ -33,7 +33,6 @@
+ 	crc.h			\
+ 	cvar.c			\
+ 	cvar.h			\
+-	d_copy.S		\
+ 	d_edge.c		\
+ 	d_fill.c		\
+ 	d_iface.h		\
+@@ -48,7 +47,6 @@
+ 	d_sprite.c		\
+ 	d_surf.c		\
+ 	d_zpoint.c		\
+-	dosasm.S		\
+ 	dosisms.h		\
+ 	draw.c			\
+ 	draw.h			\
+@@ -103,7 +101,6 @@
+ 	r_sprite.c		\
+ 	r_surf.c		\
+ 	r_vars.c		\
+-	r_varsa.S		\
+ 	render.h		\
+ 	resource.h		\
+ 	sbar.c			\
+@@ -136,7 +133,7 @@
+ 	world.h			\
+ 	zone.c			\
+ 	zone.h			\
+-	$(X86_SRCS) $(NONX86_SRCS)
++	$(NONX86_SRCS)
+ 
+ X86_SRCS =			\
+ 	snd_mixa.S		\
diff --git a/packages/quake/sdlquake_1.0.9.bb b/packages/quake/sdlquake_1.0.9.bb
new file mode 100644
index 0000000000..2fe26993f0
--- /dev/null
+++ b/packages/quake/sdlquake_1.0.9.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Quake 1"
+SECTION = "x11/games"
+PRIORITY = "optional"
+DEPENDS = "libsdl-x11 libsdl-mixer libsdl-net zlib libxau"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.libsdl.org/projects/quake/src/sdlquake-${PV}.tar.gz \
+	   file://sdlquake-no-x86-asm.diff;patch=1 \
+	   " 	
+
+inherit autotools
+
+# Fix up broken autofoo
+do_configure_prepend() {
+	touch INSTALL NEWS README AUTHORS ChangeLog
+	echo "AM_PROG_AS" >> configure.in
+}
+
+
+
+
diff --git a/packages/rdesktop/rdesktop_1.6.0.bb b/packages/rdesktop/rdesktop_1.6.0.bb
new file mode 100644
index 0000000000..b5337f9e83
--- /dev/null
+++ b/packages/rdesktop/rdesktop_1.6.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Rdesktop rdp client for X"
+DEPENDS = "virtual/libx11 openssl"
+HOMEPAGE = "http://www.rdesktop.org"
+SECTION = "x11/network"
+LICENSE = "GPL"
+PV = "1.6.0"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
diff --git a/packages/resolvconf/resolvconf_1.41.bb b/packages/resolvconf/resolvconf_1.41.bb
new file mode 100644
index 0000000000..2c210ef1ec
--- /dev/null
+++ b/packages/resolvconf/resolvconf_1.41.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \
+information about currently available nameservers. It sets \
+itself up as the intermediary between programs that supply \
+nameserver information and programs that need nameserver \
+information."
+SECTION = "console/network"
+LICENSE = "GPL"
+AUTHOR = "Thomas Hood"
+HOMEPAGE = "http://packages.debian.org/resolvconf"
+DEPENDS = "bash"
+RDEPENDS = "bash"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
+
+do_compile () {
+	:
+}
+
+do_install () {
+	install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface
+	install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
+	cp -pPR etc/* ${D}${sysconfdir}/
+	install -m 0755 bin/resolvconf ${D}${base_sbindir}/
+	install -m 0644 README ${D}${docdir}/${P}/
+	install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
+}
+
+PACKAGE_ARCH = "all"
+
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index f6aec948bd..08915c033f 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml32"
+PR = "ml33"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -39,6 +39,7 @@ RDEPENDS = "\
 		python-ogg		\
 		python-opendir		\
 		python-pexpect		\
+		python-ptrace		\
 		python-pyalsa		\
 		python-pyalsaaudio	\
 		python-pybluez		\
diff --git a/packages/totem/totem-pl-parser_2.23.3.bb b/packages/totem/totem-pl-parser_2.23.3.bb
new file mode 100644
index 0000000000..7f3cd861e9
--- /dev/null
+++ b/packages/totem/totem-pl-parser_2.23.3.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Playlist parser for Totem, a GTK2 based media player"
+HOMEPAGE = "http://www.gnome.org/projects/totem/"
+LICENSE = "GPL"
+
+DEPENDS = "eds-dbus"
+
+inherit gnome
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/totem/totem/.mtn2git_empty b/packages/totem/totem/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/totem/totem/.mtn2git_empty
diff --git a/packages/totem/totem/gst-detect.diff b/packages/totem/totem/gst-detect.diff
new file mode 100644
index 0000000000..6d37515995
--- /dev/null
+++ b/packages/totem/totem/gst-detect.diff
@@ -0,0 +1,37 @@
+--- /tmp/configure.in	2008-08-10 15:27:06.000000000 +0200
++++ totem-2.23.4/configure.in	2008-08-10 20:37:08.743198000 +0200
+@@ -142,11 +142,7 @@
+ 		if $gst010_inspect $base_element >/dev/null 2>/dev/null; then
+ 			AC_MSG_RESULT([yes])
+ 		else
+-			AC_MSG_RESULT([no])
+-			AC_MSG_ERROR([
+-				Cannot find required GStreamer-0.10 plugin '$base_element'.
+-				It should be part of gst-plugins-base. Please install it.
+-			])
++			AC_MSG_RESULT([yes, we assume OE has already built them])
+ 		fi
+ 	done
+ 
+@@ -157,11 +153,7 @@
+ 		if $gst010_inspect $good_element >/dev/null 2>/dev/null; then
+ 			AC_MSG_RESULT([yes])
+ 		else
+-			AC_MSG_RESULT([no])
+-			AC_MSG_ERROR([
+-				Cannot find required GStreamer-0.10 plugin '$good_element'.
+-				It should be part of gst-plugins-good. Please install it.
+-			])
++			AC_MSG_RESULT([yes, we assume OE has already built them])
+ 		fi
+ 	done
+ 
+@@ -565,7 +557,7 @@
+ 			fi
+ 		;;
+ 		mythtv)
+-			PKG_CHECK_MODULES(GMYTH, gmyth >= 0.7 gmyth-upnp >= 0.7.1,
++			PKG_CHECK_MODULES(GMYTH, gmyth >= 0.7.0 gmyth-upnp,
+ 					  [HAVE_GMYTH=yes], [HAVE_GMYTH=no])
+ 			if test "${HAVE_GMYTH}" != "yes"; then
+ 				plugin_error_or_ignore "you need GMyth >= 0.7 installed for the MythTV plugin"
diff --git a/packages/totem/totem_2.23.4.bb b/packages/totem/totem_2.23.4.bb
new file mode 100644
index 0000000000..f2e945fd87
--- /dev/null
+++ b/packages/totem/totem_2.23.4.bb
@@ -0,0 +1,72 @@
+# totem OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "A GTK2 based media player"
+HOMEPAGE = "http://www.gnome.org/projects/totem/"
+LICENSE = "GPL"
+
+PR = "r3"
+
+DEPENDS = " totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad  gst-plugins-base" 
+RDEPENDS_${PN} += "iso-codes"
+RRECOMMENDS_${PN} += "gst-plugin-playbin \
+                      gst-plugin-gconfelements \
+		      gst-plugin-decodebin \
+		      gst-plugin-decodebin2 \
+		      gst-ffmpeg \
+		      gst-plugin-audioresample \
+		      gst-plugin-ximagesink \
+		      gst-plugin-xvimagesink \
+		      gst-plugin-alsa \
+		      gst-plugin-avi \
+		      gst-plugin-ffmpegcolorspace \
+		      gst-plugin-flvdemux \
+		      gst-plugin-nuvdemux \
+		      gst-plugin-videoscale \
+		      gst-plugin-a52dec \
+		      gst-plugin-mpegaudioparse \
+		      gst-plugin-ossaudio \
+		      gst-plugin-pulse \
+		      gst-plugin-autodetect \
+		      "
+
+inherit gnome
+
+SRC_URI += "file://gst-detect.diff;patch=1"
+
+EXTRA_OECONF=" --disable-schemas-install \
+               --enable-gtk \
+	       --disable-iso-codes \
+	       --disable-debug \
+               --enable-gstreamer \
+               --enable-browser-plugins \
+	       --disable-run-in-source-tree \
+	       --disable-python \
+	       --disable-vala \
+	       --with-dbus \
+	       "
+
+do_configure_prepend() {
+	sed -i -e s:help::g ${S}/Makefile.am
+}
+
+PACKAGES += "totem-plugin-bemused totem-plugin-gromit totem-plugin-lirc totem-plugin-media-player-keys totem-plugin-mythtv totem-plugin-ontop totem-plugin-properties totem-plugin-screensaver totem-plugin-skipto totem-plugin-thumbnail totem-plugin-youtube totem-browser-plugin-dbg totem-browser-plugin"
+
+FILES_totem-plugin-bemused += "${libdir}/totem/plugins/bemused/*"
+FILES_totem-plugin-gromit += "${libdir}/totem/plugins/gromit/*"
+FILES_totem-plugin-lirc += "${libdir}/totem/plugins/lirc/*"
+FILES_totem-plugin-media-player-keys += "${libdir}/totem/plugins/media-player-keys/*"
+FILES_totem-plugin-mythtv += "${libdir}/totem/plugins/mythtv/*"
+FILES_totem-plugin-ontop += "${libdir}/totem/plugins/ontop/*"
+FILES_totem-plugin-properties += "${libdir}/totem/plugins/properties/*"
+FILES_totem-plugin-screensaver += "${libdir}/totem/plugins/screensaver/*"
+FILES_totem-plugin-skipto += "${libdir}/totem/plugins/skipto/*"
+FILES_totem-plugin-thumbnail += "${libdir}/totem/plugins/thumbnail/*"
+FILES_totem-plugin-youtube += "${libdir}/totem/plugins/youtube/*"
+
+FILES_${PN} = "${bindir}/* ${sysconfdir} ${libdir}/lib*.so.* ${libexecdir} ${datadir}/icons ${datadir}/totem ${datadir}/applications"
+FILES_${PN}-dbg += "${libdir}/totem/plugins/*/.debug"
+FILES_${PN}-dev += "${libdir}/totem/plugins/*/*a"
+FILES_totem-browser-plugin-dbg += "${libdir}/mozilla/plugins/.debug"
+FILES_totem-browser-plugin += "${libdir}/mozilla/plugins/"
diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb
index 201b814c9d..04eb7eb2e8 100644
--- a/packages/u-boot/u-boot_git.bb
+++ b/packages/u-boot/u-boot_git.bb
@@ -1,10 +1,10 @@
 require u-boot.inc
-PR="r15"
+PR="r16"
 
 SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
 SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
 SRCREV_beagleboard = "9c1c36409b2cb4e81aab0bd9d0a69c68f4475aae"
-SRCREV_neuros-osd2 = "528a4ab736758ff0c889456d46673041eb52f756"
+SRCREV_neuros-osd2 = "bc66414cd99154a40949db1bd2f45a62b8febca9"
 
 SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git "
 SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 "
diff --git a/packages/uclibc/uclibc-0.9.29/uClibc.distro b/packages/uclibc/uclibc-0.9.29/uClibc.distro
index 1bd3bece28..022d2474d1 100644
--- a/packages/uclibc/uclibc-0.9.29/uClibc.distro
+++ b/packages/uclibc/uclibc-0.9.29/uClibc.distro
@@ -28,7 +28,7 @@ COMPAT_ATEXIT=y
 UCLIBC_SUSV3_LEGACY=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
 UCLIBC_HAS___PROGNAME=y
 UNIX98PTY_ONLY=y
 ASSUME_DEVPTS=y
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index ad62481800..fc06c28f67 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r21"
+PR = "r22"
 DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc
diff --git a/packages/udev/udev-124/.mtn2git_empty b/packages/udev/udev-124/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/udev-124/.mtn2git_empty
diff --git a/packages/udev/udev-124/flags.patch b/packages/udev/udev-124/flags.patch
new file mode 100644
index 0000000000..13f20eb6a8
--- /dev/null
+++ b/packages/udev/udev-124/flags.patch
@@ -0,0 +1,56 @@
+---
+ Makefile |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+Index: udev-115/Makefile
+===================================================================
+--- udev-115.orig/Makefile	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/Makefile	2007-09-20 17:21:45.000000000 +0200
+@@ -112,39 +112,39 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS		+= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS	= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
+ 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+ 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS		+= $(WARNINGS)
++override CFLAGS	+= $(WARNINGS)
+ 
+ LDFLAGS += -Wl,-warn-common,--as-needed
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-	CFLAGS += -DUSE_LOG
++	override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS  += -DDEBUG
++	override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-	CFLAGS += -fprofile-arcs -ftest-coverage
++	override CFLAGS += -fprofile-arcs -ftest-coverage
+ 	LDFLAGS += -fprofile-arcs
+ endif
+ 
+ ifeq ($(strip $(USE_SELINUX)),true)
+ 	UDEV_OBJS += udev_selinux.o
+ 	LIB_OBJS += -lselinux -lsepol
+-	CFLAGS += -DUSE_SELINUX
++	override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-	CFLAGS += -DUSE_STATIC
++	override CFLAGS += -DUSE_STATIC
+ 	LDFLAGS += -static
+ endif
+ 
diff --git a/packages/udev/udev-124/init b/packages/udev/udev-124/init
new file mode 100644
index 0000000000..b78a07b20f
--- /dev/null
+++ b/packages/udev/udev-124/init
@@ -0,0 +1,60 @@
+#!/bin/sh -e
+
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+export TZ=/etc/localtime
+
+[ -d /sys/class ] || exit 1
+[ -r /proc/mounts ] || exit 1
+[ -x /sbin/udevd ] || exit 1
+[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
+
+kill_udevd() {
+        if [ -x /sbin/pidof ]; then
+                pid=`/sbin/pidof -x udevd`
+                [ -n "$pid" ] && kill $pid
+        fi
+}
+
+export ACTION=add
+# propagate /dev from /sys
+echo -n "Starting udev"
+
+# mount the tmpfs on /dev, if not already done
+LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && {
+        mount -n -o mode=0755 -t tmpfs none "/dev"
+        mkdir -m 0755 /dev/pts
+        mkdir -m 0755 /dev/shm
+}
+
+if [ -e /etc/dev.tar ]; then
+	(cd /; tar xf /etc/dev.tar)
+	not_first_boot=1
+fi
+
+# make_extra_nodes
+kill_udevd > "/dev/null" 2>&1
+
+        # trigger the sorted events
+        echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+        /sbin/udevd -d
+
+        /sbin/udevadm control env STARTUP=1
+		if [ "$not_first_boot" != "" ];then
+			/sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus  --subsystem-nomatch=graphics  --subsystem-nomatch=backlight --subsystem-nomatch=video4linux  --subsystem-nomatch=platform
+			(/sbin/udevadm settle --timeout=3; /sbin/udevadm control env STARTUP=)&
+		else
+			/sbin/udevadm trigger
+			/sbin/udevadm settle
+			(cd /; tar cf /etc/dev.tar /dev)
+		fi
+
+echo
+exit 0
diff --git a/packages/udev/udev-124/local.rules b/packages/udev/udev-124/local.rules
new file mode 100644
index 0000000000..5b926018f5
--- /dev/null
+++ b/packages/udev/udev-124/local.rules
@@ -0,0 +1,31 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
+
+# Handle network interface setup
+SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
+SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
+
+# The first rtc device is symlinked to /dev/rtc
+KERNEL=="rtc0", SYMLINK+="rtc"
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-124/noasmlinkage.patch b/packages/udev/udev-124/noasmlinkage.patch
new file mode 100644
index 0000000000..d58a7ea4de
--- /dev/null
+++ b/packages/udev/udev-124/noasmlinkage.patch
@@ -0,0 +1,45 @@
+diff -pru udev-124.orig/test-udev.c udev-124/test-udev.c
+--- udev-124.orig/test-udev.c	2008-06-12 06:24:30.000000000 +0100
++++ udev-124/test-udev.c	2008-07-07 14:43:37.000000000 +0100
+@@ -46,7 +46,7 @@ void log_message(int priority, const cha
+ }
+ #endif
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGALRM:
+diff -pru udev-124.orig/udevd.c udev-124/udevd.c
+--- udev-124.orig/udevd.c	2008-06-12 06:24:30.000000000 +0100
++++ udev-124/udevd.c	2008-07-07 14:43:58.000000000 +0100
+@@ -87,7 +87,7 @@ void log_message(int priority, const cha
+ 
+ #endif
+ 
+-static void asmlinkage udev_event_sig_handler(int signum)
++static void udev_event_sig_handler(int signum)
+ {
+ 	if (signum == SIGALRM)
+ 		exit(1);
+@@ -798,7 +798,7 @@ static struct udevd_uevent_msg *get_netl
+ 	return msg;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGINT:
+diff -pru udev-124.orig/udevmonitor.c udev-124/udevmonitor.c
+--- udev-124.orig/udevmonitor.c	2008-06-12 06:24:30.000000000 +0100
++++ udev-124/udevmonitor.c	2008-07-07 14:44:24.000000000 +0100
+@@ -97,7 +97,7 @@ static int init_uevent_netlink_sock(void
+ 	return 0;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	if (signum == SIGINT || signum == SIGTERM)
+ 		udev_exit = 1;
diff --git a/packages/udev/udev-124/permissions.rules b/packages/udev/udev-124/permissions.rules
new file mode 100644
index 0000000000..205b733292
--- /dev/null
+++ b/packages/udev/udev-124/permissions.rules
@@ -0,0 +1,131 @@
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+# only needed for kernels < v2.6.18-rc1
+ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*",	WAIT_FOR_SYSFS="ioerr_cnt"
+# only needed for kernels < 2.6.16
+SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
+# only needed for kernels < 2.6.17
+SUBSYSTEM=="net", ENV{DRIVER}=="?*",		WAIT_FOR_SYSFS="device/driver"
+
+# devices needed to load the drivers providing them
+KERNEL=="tun",					OPTIONS+="ignore_remove"
+KERNEL=="ppp",					OPTIONS+="ignore_remove"
+KERNEL=="loop[0-9]*",				OPTIONS+="ignore_remove"
+
+# default permissions for block devices
+SUBSYSTEM=="block",				GROUP="disk"
+# the aacraid driver is broken and reports that disks removable (see #404927)
+SUBSYSTEM=="block", ATTRS{removable}=="1", \
+	DRIVERS!="aacraid",			GROUP="floppy"
+# all block devices on these buses are "removable"
+SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy"
+
+# IDE devices
+KERNEL=="hd[a-z]|pcd[0-9]*", 			DRIVERS=="ide-cdrom|pcd", \
+	IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*",				GROUP="cdrom"
+KERNEL=="ht[0-9]*", 				GROUP="tape"
+KERNEL=="nht[0-9]*", 				GROUP="tape"
+
+# SCSI devices
+KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
+SUBSYSTEMS=="scsi", ATTRS{type}=="1",				GROUP="tape"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="HP",	GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson",	GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON",	GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="4",				GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="5",				GROUP="cdrom"
+SUBSYSTEMS=="scsi", ATTRS{type}=="6",				GROUP="scanner"
+SUBSYSTEMS=="scsi", ATTRS{type}=="8",				GROUP="tape"
+
+# USB devices
+KERNEL=="legousbtower*",	MODE="0666"
+KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb",		GROUP="lp"
+
+# usbfs-like devices
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \
+				MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",	GROUP="plugdev", \
+	ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]"
+
+# serial devices
+SUBSYSTEM=="tty",				GROUP="dialout"
+SUBSYSTEM=="capi",				GROUP="dialout"
+SUBSYSTEM=="slamr",				GROUP="dialout"
+SUBSYSTEM=="zaptel",				GROUP="dialout"
+
+# vc devices (all members of the tty subsystem)
+KERNEL=="ptmx",			MODE="0666",	GROUP="root"
+KERNEL=="console",		MODE="0600",	GROUP="root"
+KERNEL=="tty",			MODE="0666",	GROUP="root"
+KERNEL=="tty[0-9]*",				GROUP="root"
+KERNEL=="pty*",			MODE="0666",	GROUP="tty"
+
+# video devices
+SUBSYSTEM=="video4linux",			GROUP="video"
+SUBSYSTEM=="drm",				GROUP="video"
+SUBSYSTEM=="dvb",				GROUP="video"
+SUBSYSTEM=="em8300",				GROUP="video"
+SUBSYSTEM=="graphics",				GROUP="video"
+SUBSYSTEM=="nvidia",				GROUP="video"
+
+# misc devices
+KERNEL=="random",		MODE="0666"
+KERNEL=="urandom",		MODE="0666"
+KERNEL=="mem",			MODE="0640",	GROUP="kmem"
+KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
+KERNEL=="port",			MODE="0640",	GROUP="kmem"
+KERNEL=="full",			MODE="0666"
+KERNEL=="null",			MODE="0666"
+KERNEL=="zero",			MODE="0666"
+KERNEL=="inotify",		MODE="0666"
+KERNEL=="sgi_fetchop",		MODE="0666"
+KERNEL=="sonypi",		MODE="0666"
+KERNEL=="agpgart",				GROUP="video"
+KERNEL=="nvram",				GROUP="nvram"
+KERNEL=="rtc|rtc[0-9]*",			GROUP="audio"
+KERNEL=="tpm*",			MODE="0600",	OWNER="tss", GROUP="tss"
+KERNEL=="fuse",					GROUP="fuse"
+KERNEL=="kqemu",		MODE="0666"
+KERNEL=="kvm",					GROUP="kvm"
+KERNEL=="tun",			MODE="0666",
+
+KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
+KERNEL=="pktcdvd",		MODE="0644"
+
+KERNEL=="uverbs*",				GROUP="rdma"
+KERNEL=="ucm*",					GROUP="rdma"
+KERNEL=="rdma_ucm",				GROUP="rdma"
+
+# printers and parallel devices
+SUBSYSTEM=="printer",				GROUP="lp"
+SUBSYSTEM=="ppdev",				GROUP="lp"
+KERNEL=="irlpt*",				GROUP="lp"
+KERNEL=="pt[0-9]*",				GROUP="tape"
+KERNEL=="pht[0-9]*",				GROUP="tape"
+
+# sound devices
+SUBSYSTEM=="sound",				GROUP="audio"
+
+# ieee1394 devices       
+KERNEL=="raw1394",				GROUP="disk"
+KERNEL=="dv1394*",				GROUP="video"
+KERNEL=="video1394*",				GROUP="video"
+
+# input devices
+KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \
+				MODE="0664",	GROUP="video"
+KERNEL=="js[0-9]*",		MODE="0664"
+KERNEL=="lirc[0-9]*",				GROUP="video"
+
+# AOE character devices
+SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"
+
diff --git a/packages/udev/udev-124/run.rules b/packages/udev/udev-124/run.rules
new file mode 100644
index 0000000000..75d71375bb
--- /dev/null
+++ b/packages/udev/udev-124/run.rules
@@ -0,0 +1,14 @@
+# debugging monitor
+RUN+="socket:/org/kernel/udev/monitor"
+
+# run a command on remove events
+ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
+
+# ignore the events generated by virtual consoles
+KERNEL=="ptmx",		OPTIONS+="last_rule"
+KERNEL=="console",	OPTIONS+="last_rule"
+KERNEL=="tty"	,	OPTIONS+="last_rule"
+KERNEL=="tty[0-9]*",	OPTIONS+="last_rule"
+KERNEL=="pty*",		OPTIONS+="last_rule"
+SUBSYSTEM=="vc",	OPTIONS+="last_rule"
+
diff --git a/packages/udev/udev-124/udev.rules b/packages/udev/udev-124/udev.rules
new file mode 100644
index 0000000000..443315ea53
--- /dev/null
+++ b/packages/udev/udev-124/udev.rules
@@ -0,0 +1,116 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# workaround for devices which do not report media changes
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \
+	ENV{ID_MODEL}=="IOMEGA_ZIP*",	NAME="%k", OPTIONS+="all_partitions"
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \
+	OPTIONS+="all_partitions"
+
+# SCSI devices
+SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \
+	ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \
+					SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \
+				NAME="%c"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}"
+
+# serial devices
+KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",		NAME="capi/%n"
+
+# video devices
+KERNEL=="dvb*",			PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \
+				NAME="%c"
+KERNEL=="card[0-9]*",		NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",		NAME="hwrng"
+KERNEL=="tun",			NAME="net/%k"
+KERNEL=="evtchn",		NAME="xen/%k"
+
+KERNEL=="cdemu[0-9]*",		NAME="cdemu/%n"
+KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%n"
+KERNEL=="pktcdvd",		NAME="pktcdvd/control"
+
+KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",		NAME="cpu/%n/msr"
+KERNEL=="microcode",		NAME="cpu/microcode"
+
+KERNEL=="umad*",		NAME="infiniband/%k"
+KERNEL=="issm*",		NAME="infiniband/%k"
+KERNEL=="uverbs*",		NAME="infiniband/%k"
+KERNEL=="ucm*",			NAME="infiniband/%k"
+KERNEL=="rdma_ucm",		NAME="infiniband/%k"
+
+# ALSA devices
+KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
+KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
+KERNEL=="timer",		NAME="snd/%k"
+KERNEL=="seq",			NAME="snd/%k"
+
+# ieee1394 devices       
+KERNEL=="dv1394*",		NAME="dv1394/%n"
+KERNEL=="video1394*",		NAME="video1394/%n"
+
+# input devices
+KERNEL=="mice",			NAME="input/%k"
+KERNEL=="mouse[0-9]*",		NAME="input/%k"
+KERNEL=="event[0-9]*",		NAME="input/%k"
+KERNEL=="js[0-9]*",		NAME="input/%k"
+KERNEL=="ts[0-9]*",		NAME="input/%k"
+KERNEL=="uinput",		NAME="input/%k"
+
+# Zaptel
+KERNEL=="zapctl",		NAME="zap/ctl"
+KERNEL=="zaptimer",		NAME="zap/timer"
+KERNEL=="zapchannel",		NAME="zap/channel"
+KERNEL=="zappseudo",		NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",		NAME="zap/%n"
+
+# AOE character devices
+SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="revalidate",	NAME="etherd/%k"
+
+# device mapper creates its own device nodes, so ignore these
+KERNEL=="dm-[0-9]*",		OPTIONS+="ignore_device"
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
+
+# Samsung UARTS
+KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
+
+# MXC UARTs
+KERNEL=="ttymxc[0-4]",   NAME="ttymxc%n"
+
diff --git a/packages/udev/udev-124/udevtrigger_add_devname_filtering.patch b/packages/udev/udev-124/udevtrigger_add_devname_filtering.patch
new file mode 100644
index 0000000000..5182542461
--- /dev/null
+++ b/packages/udev/udev-124/udevtrigger_add_devname_filtering.patch
@@ -0,0 +1,99 @@
+diff -pru udev-124.orig/udevtrigger.c udev-124/udevtrigger.c
+--- udev-124.orig/udevtrigger.c	2008-06-12 06:24:30.000000000 +0100
++++ udev-124/udevtrigger.c	2008-07-07 15:10:09.000000000 +0100
+@@ -42,6 +42,8 @@ static int dry_run;
+ LIST_HEAD(device_list);
+ LIST_HEAD(filter_subsystem_match_list);
+ LIST_HEAD(filter_subsystem_nomatch_list);
++LIST_HEAD(filter_kernel_match_list);
++LIST_HEAD(filter_kernel_nomatch_list);
+ LIST_HEAD(filter_attr_match_list);
+ LIST_HEAD(filter_attr_nomatch_list);
+ static int sock = -1;
+@@ -331,6 +333,26 @@ static int attr_match(const char *path, 
+ 	return 0;
+ }
+ 
++static int kernel_filtered(const char *kernel)
++{
++	struct name_entry *loop_name;
++
++	/* skip devices matching the prohibited kernel device names */
++	list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
++		if (fnmatch(loop_name->name, kernel, 0) == 0)
++			return 1;
++
++	/* skip devices not matching the listed kernel device names */
++	if (!list_empty(&filter_kernel_match_list)) {
++		list_for_each_entry(loop_name, &filter_kernel_match_list, node)
++			if (fnmatch(loop_name->name, kernel, 0) == 0)
++				return 0;
++		return 1;
++	}
++
++	return 0;
++}
++
+ static int attr_filtered(const char *path)
+ {
+ 	struct name_entry *loop_name;
+@@ -409,6 +431,9 @@ static void scan_subsystem(const char *s
+ 					if (dent2->d_name[0] == '.')
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -465,6 +490,9 @@ static void scan_block(void)
+ 					if (!strcmp(dent2->d_name,"device"))
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -576,6 +604,8 @@ int udevtrigger(int argc, char *argv[], 
+ 		{ "subsystem-nomatch", 1, NULL, 'S' },
+ 		{ "attr-match", 1, NULL, 'a' },
+ 		{ "attr-nomatch", 1, NULL, 'A' },
++		{ "kernel-match", 1, NULL, 'k' },
++		{ "kernel-nomatch", 1, NULL, 'K' },
+ 		{ "env", 1, NULL, 'e' },
+ 		{}
+ 	};
+@@ -622,6 +652,12 @@ int udevtrigger(int argc, char *argv[], 
+ 		case 'A':
+ 			name_list_add(&filter_attr_nomatch_list, optarg, 0);
+ 			break;
++		case 'k':
++			name_list_add(&filter_kernel_match_list, optarg, 0);
++			break;
++		case 'K':
++			name_list_add(&filter_kernel_nomatch_list, optarg, 0);
++			break;
+ 		case 'h':
+ 			printf("Usage: udevadm trigger OPTIONS\n"
+ 			       "  --verbose                       print the list of devices while running\n"
+@@ -632,6 +668,8 @@ int udevtrigger(int argc, char *argv[], 
+ 			       "  --env=<KEY>=<value>             pass an additional key (works only with --socket=)\n"
+ 			       "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
+ 			       "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
++			       "  --kernel-match=<subsystem>	  trigger devices from a matching kernel device name\n"
++			       "  --kernel-nomatch=<subsystem>	  exclude devices from a matching kernel device name\n"
+ 			       "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
+ 			       "                                  attribute\n"
+ 			       "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
+@@ -701,6 +739,8 @@ int udevtrigger(int argc, char *argv[], 
+ exit:
+ 	name_list_cleanup(&filter_subsystem_match_list);
+ 	name_list_cleanup(&filter_subsystem_nomatch_list);
++	name_list_cleanup(&filter_kernel_match_list);
++	name_list_cleanup(&filter_kernel_nomatch_list);
+ 	name_list_cleanup(&filter_attr_match_list);
+ 	name_list_cleanup(&filter_attr_nomatch_list);
+ 
diff --git a/packages/udev/udev-124/vol_id_ld.patch b/packages/udev/udev-124/vol_id_ld.patch
new file mode 100644
index 0000000000..11126eef8d
--- /dev/null
+++ b/packages/udev/udev-124/vol_id_ld.patch
@@ -0,0 +1,17 @@
+---
+ extras/volume_id/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: udev-115/extras/volume_id/Makefile
+===================================================================
+--- udev-115.orig/extras/volume_id/Makefile	2007-09-20 18:17:59.000000000 +0200
++++ udev-115/extras/volume_id/Makefile	2007-09-20 18:18:08.000000000 +0200
+@@ -44,7 +44,7 @@
+ ifeq ($(strip $(VOLUME_ID_STATIC)),true)
+ 	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
+ else
+-	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
++	$(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
+ endif
+ 
+ # man pages
diff --git a/packages/udev/udev_124.bb b/packages/udev/udev_124.bb
new file mode 100644
index 0000000000..338d7f1528
--- /dev/null
+++ b/packages/udev/udev_124.bb
@@ -0,0 +1,60 @@
+DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
+/dev/, handles hotplug events and loads drivers at boot time. It replaces \
+the hotplug package and requires a kernel not older than 2.6.12."
+RPROVIDES_${PN} = "hotplug"
+
+PR = "r6"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+	   file://noasmlinkage.patch;patch=1 \
+	   file://flags.patch;patch=1 \
+	   file://vol_id_ld.patch;patch=1 \
+	   file://udevtrigger_add_devname_filtering.patch;patch=1 \
+	   file://mount.blacklist \
+	   file://run.rules \
+	   "
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
+
+require udev.inc
+
+DEFAULT_PREFERENCE = "-999"
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+do_install () {
+	install -d ${D}${usrsbindir} \
+		   ${D}${sbindir}
+	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+
+	install -d ${D}${sysconfdir}/udev/rules.d/
+
+	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
+	install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
+	install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
+	install -m 0644 ${WORKDIR}/run.rules          ${D}${sysconfdir}/udev/rules.d/run.rules
+	install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
+	install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
+	if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
+		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
+	fi
+
+	install -d ${D}${sysconfdir}/udev/scripts/
+
+	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
+	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+
+	install -d ${D}${base_libdir}/udev/
+}
+
+do_install_append_h2200() {
+	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
diff --git a/packages/upnp/libupnp_1.6.5.bb b/packages/upnp/libupnp_1.6.5.bb
index a7a01597ac..245575ed28 100644
--- a/packages/upnp/libupnp_1.6.5.bb
+++ b/packages/upnp/libupnp_1.6.5.bb
@@ -2,10 +2,14 @@ DESCRIPTION = "The portable SDK for UPnP* Devices (libupnp) provides developers
 HOMEPAGE = "http://pupnp.sourceforge.net/"
 LICENSE = "BSD"
 
+PR = "r1"
+
 LEAD_SONAME = "libupnp"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${P}.tar.bz2"
 
-inherit autotools pkgconfig
+inherit autotools
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/vala/vala-native_0.3.4.bb b/packages/vala/vala-native_0.3.4.bb
new file mode 100644
index 0000000000..f097e7db74
--- /dev/null
+++ b/packages/vala/vala-native_0.3.4.bb
@@ -0,0 +1,5 @@
+require vala_${PV}.bb
+
+inherit native
+DEPENDS = "glib-2.0-native"
+
diff --git a/packages/vala/vala_0.3.4.bb b/packages/vala/vala_0.3.4.bb
new file mode 100644
index 0000000000..37ad4b4cfe
--- /dev/null
+++ b/packages/vala/vala_0.3.4.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. Vala compiles to C"
+SECTION = "devel"
+DEPENDS = "glib-2.0"
+HOMEPAGE = "http://live.gnome.org/Vala"
+LICENSE = "LGPL"
+
+SRC_URI = "http://download.gnome.org/sources/vala/0.3/vala-${PV}.tar.bz2"
+S = "${WORKDIR}/vala-${PV}"
+
+inherit autotools lib_package
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/x-load/x-load_git.bb b/packages/x-load/x-load_git.bb
index 82c39da5dd..b6ab851460 100644
--- a/packages/x-load/x-load_git.bb
+++ b/packages/x-load/x-load_git.bb
@@ -2,9 +2,9 @@ require x-load.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}"
 
-SRCREV = "0c9ba2fb18aaad9f92faad2351e59721ae71bec4"
+SRCREV = "73eb0caf065b3b3f407d8af5c4836624e5cc7b69"
 
-PV = "1.41+${PR}+git${SRCREV}"
+PV = "1.42+${PR}+git${SRCREV}"
 PR="r7"
 
 SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git"
diff --git a/packages/xorg-font/xorg-minimal-fonts.bb b/packages/xorg-font/xorg-minimal-fonts.bb
index cef0ed53b8..d91c6d772d 100644
--- a/packages/xorg-font/xorg-minimal-fonts.bb
+++ b/packages/xorg-font/xorg-minimal-fonts.bb
@@ -2,12 +2,17 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/fonts"
 LICENSE = "MIT-X"
 
+PR = "r1"
+
 SRC_URI = "file://misc"
 
 do_install() {
 	install -d ${D}/${datadir}/fonts/X11/misc
 	install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/
+	install -d ${D}/${libdir}/X11
+	ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
+
 }
 
 PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir}/fonts/X11/"
+FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
diff --git a/packages/xorg-lib/pixman/.mtn2git_empty b/packages/xorg-lib/pixman/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-lib/pixman/.mtn2git_empty
diff --git a/packages/xorg-lib/pixman/pixman-arm.patch b/packages/xorg-lib/pixman/pixman-arm.patch
new file mode 100644
index 0000000000..224b612548
--- /dev/null
+++ b/packages/xorg-lib/pixman/pixman-arm.patch
@@ -0,0 +1,310 @@
+commit 23a7d5dea599efec1f459bac64cf9edc4bd5ae11
+Author: Ilpo Ruotsalainen <ilpo.ruotsalainen@movial.fi>
+Date:   Thu Nov 29 12:29:59 2007 +0000
+
+    Implement ARM optimized version of fill routines.
+
+diff --git a/configure.ac b/configure.ac
+index 22a91ef..3ac2a40 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,6 +148,32 @@ fi
+ AM_CONDITIONAL(USE_SSE, test $have_sse_intrinsics = yes)
+ 
+ dnl ========================================================
++
++dnl Test for architechture specific optimizations for this platform
++
++AC_MSG_CHECKING(for architechture specific optimizations)
++
++use_arch_opts=no
++
++case "$host_cpu" in
++arm)
++	if test "$GCC" = "yes" ; then
++		use_arch_opts=yes
++		ARCH_OPT_SOURCES='pixman-arch-arm.lo'
++	fi
++	;;
++esac
++
++AC_MSG_RESULT($use_arch_opts)
++
++if test $use_arch_opts = yes ; then
++	AC_DEFINE(USE_ARCH_OPTS, 1, [use architechture specific optimizations])
++fi
++
++AC_SUBST([ARCH_OPT_SOURCES])
++AM_CONDITIONAL(USE_ARCH_OPTS, test $use_arch_opts = yes)
++
++dnl ========================================================
+ AC_SUBST(MMX_CFLAGS)
+ 
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
+diff --git a/pixman/Makefile.am b/pixman/Makefile.am
+index 66283a2..dab6363 100644
+--- a/pixman/Makefile.am
++++ b/pixman/Makefile.am
+@@ -20,6 +20,11 @@ libpixman_1_la_SOURCES =		\
+ libpixmanincludedir = $(includedir)/pixman-1/
+ libpixmaninclude_HEADERS = pixman.h
+ 
++if USE_ARCH_OPTS
++libpixman_1_la_LIBADD += $(ARCH_OPT_SOURCES)
++libpixman_1_la_DEPENDENCIES = $(ARCH_OPT_SOURCES)
++endif
++
+ # mmx code
+ if USE_MMX
+ noinst_LTLIBRARIES = libpixman-mmx.la
+diff --git a/pixman/pixman-arch-arm.c b/pixman/pixman-arch-arm.c
+new file mode 100644
+index 0000000..655092c
+--- /dev/null
++++ b/pixman/pixman-arch-arm.c
+@@ -0,0 +1,205 @@
++/*
++ * Copyright © 2007 Movial Creative Technologies Inc
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author: Ilpo Ruotsalainen <ilpo.ruotsalainen@movial.fi>
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "pixman.h"
++#include "pixman-private.h"
++
++static void
++pixman_fill8 (uint32_t  *bits,
++	      int	stride,
++	      int	x,
++	      int	y,
++	      int	width,
++	      int	height,
++	      uint32_t  xor)
++{
++    int byte_stride = stride * sizeof (uint32_t);
++    uint8_t *dst = (uint8_t *) bits;
++    uint8_t v = xor & 0xff;
++
++    xor = v | (v << 8);
++    xor |= xor << 16;
++
++    dst = dst + y * byte_stride + x;
++
++    while (height--)
++    {
++	uint32_t dummy1, dummy2;
++
++	asm volatile(
++	    /* Check if the fill width is very small */
++	    "	cmp	%0, #8\n"
++	    "	bcc	2f\n"
++	    /* Output single pixels until aligned to word boundary */
++	    "1:	tst	%1, #3\n"
++	    "	strneb	%4, [%1], #1\n"
++	    "	subne	%0, %0, #1\n"
++	    "	bne	1b\n"
++	    /* Output up to 16 pixels per iteration */
++	    "1:	subs	%0, %0, #8\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	subcss	%0, %0, #8\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	bcs	1b\n"
++	    /* Finish up any remaining pixels */
++	    "	and	%0, %0, #7\n"
++	    "2:	subs	%0, %0, #1\n"
++	    "	strcsb	%4, [%1], #1\n"
++	    "	subcss	%0, %0, #1\n"
++	    "	strcsb	%4, [%1], #1\n"
++	    "	bcs	2b\n"
++	    : "=r" (dummy1), "=r" (dummy2)
++	    : "0" (width), "1" (dst), "r" (xor)
++	    : "cc", "memory"
++	    );
++
++	dst += byte_stride;
++    }
++}
++
++static void
++pixman_fill16 (uint32_t *bits,
++	       int       stride,
++	       int       x,
++	       int       y,
++	       int       width,
++	       int       height,
++	       uint32_t  xor)
++{
++    int short_stride = (stride * sizeof (uint32_t)) / sizeof (uint16_t);
++    uint16_t *dst = (uint16_t *)bits;
++    uint16_t v = xor & 0xffff;
++
++    xor = v | v << 16;
++
++    dst = dst + y * short_stride + x;
++
++    while (height--)
++    {
++	uint32_t dummy1, dummy2;
++
++	asm volatile(
++	    /* Check if the fill width is very small */
++	    "	cmp	%0, #4\n"
++	    "	bcc	2f\n"
++	    /* Output single pixels until aligned to word boundary */
++	    "1:	tst	%1, #2\n"
++	    "	strneh	%4, [%1], #2\n"
++	    "	subne	%0, %0, #1\n"
++	    "	bne	1b\n"
++	    /* Output up to 8 pixels per iteration */
++	    "1:	subs	%0, %0, #4\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	subcss	%0, %0, #4\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	bcs	1b\n"
++	    /* Finish up any remaining pixels */
++	    "	and	%0, %0, #3\n"
++	    "2:	subs	%0, %0, #1\n"
++	    "	strcsh	%4, [%1], #2\n"
++	    "	bcs	2b\n"
++	    : "=r" (dummy1), "=r" (dummy2)
++	    : "0" (width), "1" (dst), "r" (xor)
++	    : "cc", "memory"
++	    );
++
++	dst += short_stride;
++    }
++}
++
++static void
++pixman_fill32 (uint32_t *bits,
++	       int       stride,
++	       int       x,
++	       int       y,
++	       int       width,
++	       int       height,
++	       uint32_t  xor)
++{
++    bits = bits + y * stride + x;
++    
++    while (height--)
++    {
++	uint32_t dummy1, dummy2;
++
++	asm volatile(
++	    /* Check if the fill width is very small */
++	    "	cmp	%0, #2\n"
++	    "	bcc	2f\n"
++	    /* Output up to 4 pixels per iteration */
++	    "1:	subs	%0, %0, #2\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	subcss	%0, %0, #2\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	strcs	%4, [%1], #4\n"
++	    "	bcs	1b\n"
++	    /* Output last pixel if necessary */
++	    "2:	tst	%0, #1\n"
++	    "	strne	%4, [%1], #4\n"
++	    : "=r" (dummy1), "=r" (dummy2)
++	    : "0" (width), "1" (bits), "r" (xor)
++	    : "cc", "memory"
++	    );
++
++	bits += stride;
++    }
++}
++
++pixman_bool_t
++pixman_fill (uint32_t *bits,
++	     int stride,
++	     int bpp,
++	     int x,
++	     int y,
++	     int width,
++	     int height,
++	     uint32_t xor)
++{
++    switch (bpp)
++    {
++    case 8:
++	pixman_fill8 (bits, stride, x, y, width, height, xor);
++	break;
++	
++    case 16:
++	pixman_fill16 (bits, stride, x, y, width, height, xor);
++	break;
++	
++    case 32:
++	pixman_fill32 (bits, stride, x, y, width, height, xor);
++	break;
++
++    default:
++	return FALSE;
++	break;
++    }
++	
++    return TRUE;
++}
+diff --git a/pixman/pixman-arch.h b/pixman/pixman-arch.h
+new file mode 100644
+index 0000000..1eee9d3
+--- /dev/null
++++ b/pixman/pixman-arch.h
+@@ -0,0 +1,7 @@
++#ifdef USE_ARCH_OPTS
++
++#ifdef __arm__
++#define USE_ARCH_FILL
++#endif
++
++#endif
+--- /tmp/pixman-utils.c	2008-08-14 12:38:44.000000000 +0200
++++ pixman-0.11.8/pixman/pixman-utils.c	2008-08-14 12:40:03.503198000 +0200
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ 
+ #include "pixman-private.h"
++#include "pixman-arch.h"
+ #include "pixman-mmx.h"
+ 
+ PIXMAN_EXPORT pixman_bool_t
+@@ -84,6 +85,7 @@
+ 	return FALSE;
+ }
+ 
++#ifndef USE_ARCH_FILL
+ static void
+ pixman_fill8 (uint32_t  *bits,
+ 	      int	stride,
+@@ -197,7 +199,7 @@
+ 
+     return TRUE;
+ }
+-
++#endif
+ 
+ /*
+  * Compute the smallest value no less than y which is on a
diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb
new file mode 100644
index 0000000000..8e4bd8cff3
--- /dev/null
+++ b/packages/xorg-lib/pixman_0.11.8.bb
@@ -0,0 +1,18 @@
+SECTION = "libs"
+PRIORITY = "optional"
+DESCRIPTION = "Low-level pixel manipulation library."
+LICENSE = "X11"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \
+           file://pixman-arm.patch;patch=1 \
+	  "
+
+inherit autotools
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage () {
+ 	autotools_stage_all
+}
+
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index bd191eadfe..8e7c5d7798 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -4,7 +4,7 @@ LICENSE = "MIT-X"
 
 PROVIDES = "virtual/xserver"
 
-DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ 
+DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ 
 xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
 xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
 scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
@@ -13,7 +13,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
 libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
 libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
 
-RDEPENDS_${PN} = "rgb xorg-minimal-fonts"
+RDEPENDS_${PN} = "hal rgb xorg-minimal-fonts"
 
 XORG_PN = "xorg-server"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
diff --git a/packages/xserver-common/files/fixes-fix-fix.patch b/packages/xserver-common/files/fixes-fix-fix.patch
new file mode 100644
index 0000000000..c44e0277b5
--- /dev/null
+++ b/packages/xserver-common/files/fixes-fix-fix.patch
@@ -0,0 +1,20 @@
+--- /tmp/default.xmodmap	2008-08-10 20:06:35.000000000 +0200
++++ xserver-common-1.22/X11/default.xmodmap	2008-08-10 20:07:04.000000000 +0200
+@@ -188,13 +188,13 @@
+ keycode 195 =
+ keycode 196 =
+ keycode 197 =
+-keycode 198 =
++keycode 198 = Up
+ keycode 199 =
+-keycode 200 =
+-keycode 201 =
++keycode 200 = Left
++keycode 201 = Right
+ keycode 202 =
+ keycode 203 =
+-keycode 204 =
++keycode 204 = Down
+ keycode 205 =
+ keycode 206 =
+ keycode 207 =
diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb
index 425e64c627..9ef4e457d2 100644
--- a/packages/xserver-common/xserver-common_1.22.bb
+++ b/packages/xserver-common/xserver-common_1.22.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r5"
+PR = "r6"
 
 PACKAGE_ARCH = "all"
 
@@ -12,6 +12,7 @@ inherit gpe
 SRC_URI_append = " file://setDPI.sh "
 SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch;patch=1 \
                             file://kdrive-1.4-fixes-fix.patch;patch=1 \
+                            file://fixes-fix-fix.patch;patch=1 \
 "
 
 do_install_append() {
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
index 417b29ca2a..b856a75cd0 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -106,14 +106,14 @@ case `module_id` in
                 else
                      DPI=140
                 fi 
-                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE}" ;;
+                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib" ;;
        "GTA02")
                 if [ `screen_width` -gt 330 ] ; then
                      DPI=285
                 else 
                      DPI=140
                 fi 
-                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE}" 
+                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib" 
 		XSERVER=/usr/bin/Xglamo 
 		;;
 	"Nokia N770")
@@ -143,4 +143,4 @@ fi
 
 DISPLAY=':0'
 
-exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* >/tmp/x.log 2>&1
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index e07a83ed3c..738bb3f6fc 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r29"
+PR = "r30"
 
 SRC_URI = "\
   file://Xdefaults \
author	Florian Boor <florian.boor@kernelconcepts.de>	2008-08-14 23:48:23 +0000
committer	Florian Boor <florian.boor@kernelconcepts.de>	2008-08-14 23:48:23 +0000
commit	e9570b88fa18c49a68b5f44bffd7e2abb101f499 (patch)
tree	083d8795a6ff13b6950f8da4ba4c507791b39fa2
parent	8e9a327b9c3924807b7c2093d6cc910213720440 (diff)
parent	2792ce30ea1b3eb6a32bad578a956557e3040e89 (diff)