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

13 files changed, 180 insertions, 14 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 1164411963..7c9dceee5f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -89,6 +89,14 @@ TARGET_PREFIX = "${TARGET_SYS}-"
 TARGET_CC_ARCH = ""
 TARGET_EXEEXT = ""
 
+SDK_ARCH ?= "${BUILD_ARCH}"
+SDK_OS ?= "${BUILD_OS}"
+SDK_VENDOR ?= "${BUILD_VENDOR}"
+SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}"
+SDK_PREFIX = "${SDK_SYS}-"
+SDK_CC_ARCH ?= "${BUILD_CC_ARCH}"
+SDK_EXEEXT = ""
+
 # A shortcut for the commonly used value
 EXEEXT = "${HOST_EXEEXT}"
 
@@ -274,6 +282,8 @@ STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
 # specific packages - hack around it for now.
 STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
 
+STAGING_DIR_SDK = "${STAGING_DIR}/${SDK_SYS}"
+
 DEPLOY_DIR = "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
 DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
@@ -285,7 +295,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
 
 SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
-SDK_PREFIX = "/usr/local/${SDK_NAME}"
+SDK_PATH = "/usr/local/${SDK_NAME}"
 
 ##################################################################
 # Kernel info.
@@ -400,14 +410,17 @@ PATCHRESOLVE = 'noop'
 export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
 export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
+export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${layout_includedir} -isystem${STAGING_DIR_HOST}${layout_includedir}"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
 export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
+export SDK_CFLAGS = "${SDK_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
 
 export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -fpermissive"
 export CXXFLAGS = "${TARGET_CXXFLAGS}"
 export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive"
+export SDK_CXXFLAGS = "${SDK_CFLAGS} -fpermissive"
 
 export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
                         -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
@@ -418,6 +431,9 @@ export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
                          -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \
                          -Wl,-O1 \
                          ${TARGET_LINK_HASH_STYLE}"
+export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${layout_libdir} \
+                         -Wl,-rpath-link,${STAGING_DIR_SDK}${layout_libdir} \
+                         -Wl,-O1"
 
 # Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
 ALLOWED_FLAGS = "-O -mcpu -march -pipe"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index e3a8253f76..20c3199163 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1650,6 +1650,14 @@ sha256=0d77c73a3c151a7da647dd924f32151e5ee4574530568fd65067882f79cd5a44
 md5=b64a8ae8592b4d32ac9baebf0b915c1e
 sha256=456d2bf4550a37c70e829b3029acf3cb81f931908d35f1dbade7ec54f4cdb146
 
+[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7-7.diff.gz]
+md5=03ccc8d178ee956feb46ab970e982e94
+sha256=71e8890e709ee77756368b8508f65c6c9bf8c6ed5e1501726ef30e1dc105d4f5
+
+[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.dfsg-3.diff.gz]
+md5=fa5ea0d162c41c197af48d717df1389f
+sha256=2bbf2b8fdf6e12dabb0cc751a973d9040f7ed9123cf87a7f794044f3429b0de0
+
 [ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.dfsg-6.diff.gz]
 md5=b5d570affb1412e8e90b9dd24554ad96
 sha256=9aa41c8c88ecb1163b7ac69824ac390d6eaaa30ed31a0624486e43f414ec6b7a
@@ -2122,6 +2130,14 @@ sha256=1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b
 md5=b12426fd72bedf00c389a7fb458275a8
 sha256=5a4a5b82dd8f485b4fef941cc216eb052184cf138f72b512eb62d836b460acdb
 
+[http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_480p_surround-fix.avi]
+md5=ed7ed01e9aefba8ddd77c13332cec120
+sha256=40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db044634f
+
+[http://mirror.bigbuckbunny.de/peach/bigbuckbunny_movies/big_buck_bunny_720p_surround.avi]
+md5=0da8fe124595f5b206d64cb1400bbefc
+sha256=b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06edcd528c
+
 [http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.0.2.tar.bz2]
 md5=95c29d9d10bf2868996c0c47a3b9a8dc
 sha256=30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee
@@ -2194,6 +2210,10 @@ sha256=5645c3371aac47cbbcc1354eab10ec32777837d7cb4ba47b94c9043612b12f36
 md5=bcb9fabaf0eaf91bd38c4ee148658df8
 sha256=5645c3371aac47cbbcc1354eab10ec32777837d7cb4ba47b94c9043612b12f36
 
+[http://downloads.sourceforge.net/mingw/binutils-2.17.50-20060824-1-src.tar.gz]
+md5=64905b00a89f4e7ba3b3991c89ba59a4
+sha256=1e041ad002aa2f7a06624afcb4a9832085c63abe0a9551cdbc40522aac18871a
+
 [http://kernel.org/pub/linux/devel/binutils/binutils-2.17.50.0.1.tar.bz2]
 md5=cfecfb29e260225fa192654f3763c2f8
 sha256=9a56b06e4f533745e9b7cde5b170f905f74d130b899f48498cbd6d376c664b7a
@@ -3230,6 +3250,10 @@ sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797
 md5=d8f3bbfbcc337d9776991d9561f451f3
 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec-r1.patch]
+md5=ed96c1bddce4b7e40a40bad1d3cd63b5
+sha256=c178b3a7460cfaeb58c11ef9641d72ee912818b2ecbf1c09edf628d9168c0971
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec.patch]
 md5=97cdbeb23bc8c8f4fe563d10a0c8c110
 sha256=2e5488039040e76bdedb08323f729a0ef0549d23b35bb740f541c960393ec378
@@ -3246,6 +3270,10 @@ sha256=5dad5d521e2bebb3847e84a84d04cc546f4cdda55e467a1cfec149378b7923ef
 md5=4fbebfebf03cb47cf6444bdb6f6b79b4
 sha256=19681eedbb924eb253308befe12938ab53c7cb3e74fc3eded000d087d322b403
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie_pm-3.patch]
+md5=812ee8bf3ea5739acb0ab2f732ecdc20
+sha256=8bb75a2577c72b4ad95851e545aafc7b0b89c3c41f087aea76b28635786f11c7
+
 [ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz]
 md5=4cd3ce38efbd27c6cf4223f0ced2a5b5
 sha256=21341f1900b0fe919a2ad057c334f5d7172588e4262b3d1b0904da03a9db0cff
@@ -3346,6 +3374,10 @@ sha256=b3b8da5e458f56246f735b499b32bc2a3a039d2d4092b1b249c60a188c2314d5
 md5=705eebe74d98397e26193e0db9612b03
 sha256=905ee280a38f479ab7da75e6dfba21f221b23bb068111ebddc4c2e853f3fff09
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/config.patch]
+md5=c8be31ffebdae0e007ea587a11994e75
+sha256=64dfe89e56167bde80c6a18831b5a4259215c78c34ca16f4cb9fde10ffe54437
+
 [http://download.savannah.gnu.org/releases/confuse/confuse-2.5.tar.gz]
 md5=4bc9b73d77ebd571ac834619ce0b3582
 sha256=65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859
@@ -3366,6 +3398,10 @@ sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de
 md5=3f1995bf91846b601a25a37832c88cb6
 sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d
 
+[ftp://ftp.moblin.org/connman/releases/connman-gnome-0.4.tar.gz]
+md5=c9a3b384f080ed4cdf139ce9377ef2c8
+sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
+
 [http://www.conserver.com/conserver-8.1.14.tar.gz]
 md5=f7825728e5af8992ed4a99fb560a3df8
 sha256=48a9e2f8a02054bc6740ae354433bfa1636a6e726f2d62af22752d7a6103410b
@@ -6238,6 +6274,30 @@ sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
 md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
 sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
 
+[http://downloads.sourceforge.net/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz]
+md5=30154205636c12c6abcc462ce07550cf
+sha256=404358fe19326679f602de6f7d6a2db180e27af83813150f58ab28eec197b646
+
+[http://downloads.sourceforge.net/mingw/gcc-core-3.4.5-20060117-2-src.tar.gz]
+md5=d0dc9d57d493889bc1ca88b127290b9d
+sha256=a21c2f48bb48d62935ee955ac8fa318658861f6316f30feb3cdec5337abf7f05
+
+[http://downloads.sourceforge.net/mingw/gcc-g++-3.4.5-20060117-2-src.tar.gz]
+md5=ca81c8420ab9d1d05ff9c73a9d4f7d63
+sha256=d54078fdccaa3776927b3931c15b880c43e76cb6a0fb59594d1b85cfc89356e9
+
+[http://downloads.sourceforge.net/mingw/gcc-g77-3.4.5-20060117-2-src.tar.gz]
+md5=57d489658743f0d9048e440b312740c8
+sha256=3ea32832e07571be317cdb1f9b9dc678a51ad2c2f066f91e155c449d0cf7d796
+
+[http://downloads.sourceforge.net/mingw/gcc-java-3.4.5-20060117-2-src.tar.gz]
+md5=96b039f4e11bff4d3d8a4e7da6e3998d
+sha256=ec7a963c0dfd986697350be26e53577b0a39c86970b4e9485d85ca99b0cb2197
+
+[http://downloads.sourceforge.net/mingw/gcc-objc-3.4.5-20060117-2-src.tar.gz]
+md5=2bffc1e314f2efb1034b3d3ea1ce2f7d
+sha256=a8a3c0f0a38f819b87ff9282f1e40536f5050153f0f60db5c869509a70497c2c
+
 [http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.gz]
 md5=fc49f45251c1336fe1dad5dba1c83fcd
 sha256=fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92
@@ -12586,6 +12646,10 @@ sha256=cac67ef8837a2bdd20d7fb5e990e233d80a9ff398cf08a62bb7fac068a419b3e
 md5=5208f24d0328ee7c20b52c43eaa9aa0e
 sha256=c4158398de4411627b14f52626e4cef39443f4d5c1b9bce8c07f8526d18362f9
 
+[http://www.tcpdump.org/release/libpcap-1.0.0.tar.gz]
+md5=9ad1358c5dec48456405eac197a46d3d
+sha256=a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
+
 [http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.10.3.tar.bz2]
 md5=6d5468debf76fac84576ca26c9535821
 sha256=2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc
@@ -13022,6 +13086,10 @@ sha256=3287c9be61f9ec8ddab99f9b679bbf58610d024bce980307f88151a552ecd1e3
 md5=db7c7a2236c2f6af5e02cf3e9384eb67
 sha256=6044618e37c2925615a08517e8b69ef84147ef5287a222fc451968b36a0a9be7
 
+[http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.4.tar.gz]
+md5=7e4b4c29a69c86c38e3e60ec11fc2255
+sha256=a48c307fdcc77a28ee3a2ba0b68501a42e3709bf693c52df4831b87c71c8c359
+
 [http://downloads.sourceforge.net/giflib/libungif-4.1.3.tar.bz2]
 md5=8c198831cc0495596c78134b8849e9ad
 sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
@@ -13538,6 +13606,10 @@ sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
 md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472
 sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/linux-2.6.24-SIMpad-rtc-sa1100.patch]
+md5=f0e143ed696bb064804cf0970718b414
+sha256=7aad0d9df138fa99332a82ca69eb07504b04e9b0a3cdb405ce872ca3bd4f44ac
+
 [http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.3.atmel.3.tar.bz2]
 md5=952715cc523f4a77e7c5f94f608594c0
 sha256=d26a1de101692958fbca1d1be40fe52bd605636baea616a3e8ed96e422a3648d
@@ -13746,6 +13818,10 @@ sha256=6f11fc04a1f3f04ebb996723fc86ca363c3959ca1ef76d1057db9db3ea5a98d0
 md5=db9ec09fb75c7326527f1f8b2cbf2ec2
 sha256=2f6d619ebbab25f5b5091555f96dc29159fa3c214d1c5fdc5673af97515d18e6
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo-r1.patch]
+md5=31c32cadae5a7469cf94bf8bae658515
+sha256=788f1cc9c699c60408591eba0a057bfdf51cedef539b52fe8ddba39dd948aee6
+
 [http://www.rpsys.net/openzaurus/patches/archive/locomo_kbd_tweak-r1.patch]
 md5=6c0d60bcc357365af056baa812c45960
 sha256=830ef8c4b65ed34954afc2581447fd0a9afcf5f9de354772352c8da54dceb676
@@ -13766,6 +13842,10 @@ sha256=0c629eac7ba7fcfc86228d3070579eff774bf0d61ea9b1c4ed93d5c13af97b53
 md5=f80615d9020c2d56a4a41dfa93ba8429
 sha256=34202206b33ebab7c34be20bd41fc8249745011a355be690ba997aa8e7d77943
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo_spi-6.patch]
+md5=44bb0f9f1fb07efbbb41619a44ed04ce
+sha256=50502256533d1fc62ac3f4a29a7e212835592bfbfd47f36b607c20e72297a63d
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo_spi-r3.patch]
 md5=e7773693243f7a7b4b0a76ae61e4881f
 sha256=2e5bd2c74f01832945a27400bfbc779633b0e679d0bfe967744795e39b5d3165
@@ -14626,6 +14706,14 @@ sha256=8ee3e48da07e20899a11adb9f2dd4dfc4922b43bcb1dc7bd78c55aceeb5eccc1
 md5=048aa29c31f067382cd669ee20934b9e
 sha256=4f65183200955540c097b82bfb18f5d21b636ca79f47cd018a4ea8b89cd2998c
 
+[http://downloads.sourceforge.net/mingw/mingw-runtime-3.14-src.tar.gz]
+md5=7d049a8331efcfe34600c0cda6934ac6
+sha256=a145a90d0824c65cfc11c3fc843ba484585983e1e8ee14b79f4d09cf1d38b98b
+
+[http://downloads.sourceforge.net/mingw/mingwrt-3.15.1-mingw32-src.tar.gz]
+md5=0411b98fd5eeac0706e2abb7122526bb
+sha256=4f4d19f3e15fdf00957932211be609b6bf4e689ad5938ce7bff666a638bde0e7
+
 [http://www.denx.de/twiki/pub/Know/MiniFOHome/mini_fo-0-6-1-pre1.tar.bz2]
 md5=7e192e01b08023c7f3e63bf1c796bc14
 sha256=68c64a38f0b29347f86871248f0399e7e1b12645dc6263af7b2e4940f1392eaa
@@ -14746,6 +14834,10 @@ sha256=f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850
 md5=75bbd1dc425849e415a60afd9e74d2ff
 sha256=e83b80b4ccd7863223fac4a2d54974a64a79c635d6bdda0c6e7039f966eae9e2
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mmc-spi.patch]
+md5=329fd64f8ccdb2731c54f6a1b8c6de14
+sha256=27934de6da3f5ac94ed60ba4bfdd3acc2d93b01a2f932b576f87fb4508dcde6e
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mmc_spi-r4.patch]
 md5=85922650d2e640e2cb723e71fd00a471
 sha256=34cf9ceb9e811ee85c74ae2c217548e1d193741fbf9a43d37116f1d4e404f496
@@ -15070,6 +15162,10 @@ sha256=7206aaf289cd349ed0c52bf081b9a29a25d03e83eaf3e6de4a6070c4de1abe9d
 md5=dd6ca5b6006aa03febb611f481cdd7ba
 sha256=c7b9cd542fd9076d9a7cd5c033665fb05c6f412b3b235cb4379b0f8fe84fb351
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mtd-sharp-flash-hack-r4.patch]
+md5=a8ad16ca9b91a72c0e1c01952af5693d
+sha256=2037e99cb87c350b6a2b155c5c780e724d50b1233d6e30689fc2e1ea3468f55a
+
 [ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz]
 md5=442bdbdb024db27dc9c89207fac16f95
 sha256=c3ed189e314d0f1d106df3ecb80b1f1147e86fe6cd05ceb53652c1396b67ab2e
@@ -18678,6 +18774,10 @@ sha256=597cefac4535d7f3b752253e5997b3c851c261b26b966a39beb032dcf1d5baa7
 md5=d1b43acf08e371a56915293bbcf584c6
 sha256=554456550ca6e792297d6d39367120af5b2bd6181d514a43faf4e2f565721908
 
+[http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.4.tar.gz]
+md5=dc0f37d933b0b6c713ad617e09441f3b
+sha256=257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee
+
 [ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz]
 md5=3fbb02294a8ca33d4684055adba5ed6f
 sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
@@ -18722,10 +18822,18 @@ sha256=04ecd2577ee0c210df610b4a5d870f2bda57c80962fb5b51ae9c4a94098c726c
 md5=7a0c73ccf0e31808ad37b61e730cd10e
 sha256=33d2363d40b1db7568864dc063ce4af70e50a9f9292a16445f0b167618d8fbba
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-dma.patch]
+md5=4336cca098b577608813a7c1454f2edd
+sha256=c532c14ffb9358d1e0dbb67fce113c6aec0dd9c77ad41875222d69979baac9e7
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-udc-r2.patch]
 md5=1b8cfd298b9fa10c4779c98fbe8e0bd3
 sha256=564d375388284d7f13003202cba9fc1976b045bd14b3f12adec1449cded33f26
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100_spinlock.patch]
+md5=946368c1a4961ac0362436e967055f76
+sha256=16554de4368956c1d3e1be4245d388bff4767390f2183bfe35b04327def508a5
+
 [http://heanet.dl.sourceforge.net/sablevm/sablevm-1.12.tar.gz]
 md5=6648af9bb5dd3dbbc8cb6835371f5ecd
 sha256=576c1af8affdebb0d5e10f8a8edad10e994965cef6db7980a3c52e25e15d6b94
@@ -18794,6 +18902,10 @@ sha256=22647c6bdd0f1b311bd0e3a893fb184f07d0f5e1c4b3bccd20a024fe18fd7567
 md5=528677f261f3ed4a58f9483ca25ba6b2
 sha256=4f2bb8c5785c50ad05d3adc0027c0881211b8a5c51e840651b53b7e455c004a3
 
+[http://samba.org/samba/ftp/stable/samba-3.3.0.tar.gz]
+md5=adb048dc3988055533e1ea5d91d81f99
+sha256=b00ca360e9b414744eff33ca4567f3eb1a28d32914e20f00b6672fbc141c9beb
+
 [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
@@ -19182,6 +19294,10 @@ sha256=947e7bfe44dad0caf8dc857b40fa840a316cc0d9b97aafefd134ef1fdb87753b
 md5=143bf72b794dbc24d36600f8e8aedbb7
 sha256=0e87278dcee1d69d3bc44a3f028b4a73b78ceed3c0ba5ab174e6d2f4066bc4db
 
+[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sharpsl_pm-4.patch]
+md5=39b7dd5a77cf267d104e57dbfbfb1789
+sha256=a9880d7408e73c6c74ae975ed7fd20b2563459b68d6c4afdfc20f033c95b4d8b
+
 [http://www.rpsys.net/openzaurus/patches/archive/sharpsl_pm-do-r2.patch]
 md5=416c6db0f2358ff9b88853dde2d6823f
 sha256=6c862826f6e0f72bb96ac7fca76c8118af65e65702dd55060d1ec06765f5add8
@@ -20158,6 +20274,10 @@ sha256=65083a94bce9e539c4d9141b4e765415872e01bf17ec4be906d2e304aa8c3e7f
 md5=629dfea34e4087eb4683f834060abb63
 sha256=8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33
 
+[http://heanet.dl.sourceforge.net/tcl/tcl8.4.11-src.tar.gz]
+md5=629dfea34e4087eb4683f834060abb63
+sha256=8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33
+
 [http://downloads.sourceforge.net/tcl/tcl8.4.19-src.tar.gz]
 md5=ade2c033a7b545ee108f3fdfeb629fcf
 sha256=1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9
@@ -20174,6 +20294,10 @@ sha256=d701a3e4d7ab296fecdd6f8f84610a3c6d275839f9db4269b1ff7db3e0a9c0e5
 md5=2aacf4dc9a3bc500a8b4f3887a32cdd5
 sha256=09f1daece22a3555f1ca1f9779caf36357cc8d5b9ad1964606093c7e884e0da4
 
+[http://www.tcpdump.org/release/tcpdump-4.0.0.tar.gz]
+md5=b22ca72890df2301d922c9f2d17867f9
+sha256=5fe99efe0274b5764c9974417c96a38b5f94e21096d8a94cc1fa172a42035284
+
 [http://downloads.sourceforge.net/tcpick/tcpick-0.1.22.tar.gz]
 md5=77b991a686e83cb716fd241aaa6ea432
 sha256=db19142fd2ca6218ead04fb3144b1640e2ad5a1c784a4e790c8816a37a79ac2e
@@ -21414,6 +21538,14 @@ sha256=d6863b3ad5ecb465d217714ad474f2a9fb6e7890b4565184e8d5962d46850a31
 md5=a17be90788c4ccd6ee8253659b9321f8
 sha256=56dfd5365848095793faa31ee1cf753c10891dd076944d3533b05c6547965134
 
+[http://downloads.sourceforge.net/mingw/w32api-3.11-src.tar.gz]
+md5=bc37e4e6973f603c317a40602f7f35d9
+sha256=852fee2c0aa5cd9ff529c1ba1d28668796c7c3dc959376f6a207a0b178ac5225
+
+[http://downloads.sourceforge.net/mingw/w32api-3.13-mingw32-src.tar.gz]
+md5=8eae788a09a589414b83adc91bb0c069
+sha256=02cec615f8cfc94786ea9c1f41645cf43cc2414ca36b92fdd041304723bf2fc4
+
 [http://mpx.freeshell.net/w3cam-0.7.2.tar.gz]
 md5=eec0b301b32bc8e9f65a4e54248c9868
 sha256=96d659d916fafe555311068c9bf8662b93f10d099b12b17ed04d8a8fffbc72e0
@@ -21742,6 +21874,10 @@ sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
 md5=0683a56108ca6d0c4329c7b9a5b7fbde
 sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
 
+[http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090127-2245.tar.bz2]
+md5=25fcaa86a53333d416d5e837fb47ba7d
+sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
+
 [http://archive.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz]
 md5=fc805051f0fe505c7a4b1b5c8db9b9e3
 sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 59968f508f..08279e8f98 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -12,7 +12,6 @@ SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
 SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
 SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
 SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
-SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-multitap-pad ?= "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 4bba014b7e..8bcb65542d 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -175,7 +175,7 @@ PREFERRED_VERSION_comprec ?= "0.02"
 PREFERRED_VERSION_confuse ?= "2.5"
 PREFERRED_VERSION_confuse-native ?= "2.5"
 PREFERRED_VERSION_connect ?= "0.1"
-PREFERRED_VERSION_connman ?= "0.4"
+PREFERRED_VERSION_connman ?= "0.8"
 PREFERRED_VERSION_conserver ?= "8.1.14"
 PREFERRED_VERSION_console-tools ?= "0.3.2"
 PREFERRED_VERSION_contacts ?= "0.7"
@@ -1501,7 +1501,7 @@ PREFERRED_VERSION_python24-native ?= "2.4.0"
 PREFERRED_VERSION_python24-pyqt2 ?= "3.13"
 PREFERRED_VERSION_python24-pyqwt2 ?= "3.10"
 PREFERRED_VERSION_python24-sip ?= "4.1.1"
-PREFERRED_VERSION_python ?= "2.5.2"
+PREFERRED_VERSION_python ?= "2.6.1"
 PREFERRED_VERSION_python-ao ?= "0.82"
 PREFERRED_VERSION_python-constraint ?= "1.1"
 PREFERRED_VERSION_python-dbus ?= "0.83.0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3aaa13276d..077cb85775 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -202,13 +202,14 @@ SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu ?= "${QEMUSRCREV}"
 SRCREV_pn-qi ?= "ed52486b43dca91891305b9e832c8366a2742798"
-SRCREV_pn-remoko ?= "115"
-SRCREV_pn-remoko-server ?= "115"
+SRCREV_pn-remoko ?= "121"
+SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-socketcan-modules ?= "917"
+SRCREV_pn-socketcan-utils-test ?= "917"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-starling ?= "9574"
 SRCREV_pn-table ?= "2191"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index f5bcb79550..c95c373d2c 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -13,9 +13,6 @@ XSERVER = "xserver-xorg \
 # Only has DVI connector for external screen
 GUI_MACHINE_CLASS = "bigscreen"
 
-#Ship all kernel modules till the board support has matured enough
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-
 #include conf/machine/include/tune-arm1136jf-s.inc
 # requires gcc 4.3.0:
 include conf/machine/include/tune-cortexa8.inc
diff --git a/conf/machine/boc01.conf b/conf/machine/boc01.conf
index a7db1b19e9..7c8182a22b 100644
--- a/conf/machine/boc01.conf
+++ b/conf/machine/boc01.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Bolloré telecom CPE v01
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppce300c3"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux"
 
diff --git a/conf/machine/include/lsppc.inc b/conf/machine/include/lsppc.inc
index 807c292605..50a3ab3c57 100644
--- a/conf/machine/include/lsppc.inc
+++ b/conf/machine/include/lsppc.inc
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Generic Machine configuration for ppc based linkstations
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
+PACKAGE_EXTRA_ARCHS = "ppc"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 MACHINE_EXTRA_RDEPENDS = "kernel-devicetree avr-evtd"
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 296ce6a2ed..fe28a3cb4d 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ezx"
+PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel"
 
 #cat /proc/mtd
 #dev:    size   erasesize  name
diff --git a/conf/machine/include/tune-cortexa9.inc b/conf/machine/include/tune-cortexa9.inc
new file mode 100644
index 0000000000..a12494fbb6
--- /dev/null
+++ b/conf/machine/include/tune-cortexa9.inc
@@ -0,0 +1,9 @@
+# Instead of using -mfpu=vfp[2] we can use -mfpu=neon to make use of gcc intrinsics[1] and vectorize loops with -ftree-vectorize[3]
+# [1] http://gcc.gnu.org/onlinedocs/gcc/ARM-NEON-Intrinsics.html
+# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html 
+# [3] https://support.codesourcery.com/GNUToolchain/kbentry29
+
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp"
+FEED_ARCH = "armv7a"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7 armv7a"
+BASE_PACKAGE_ARCH = "armv7a"
diff --git a/conf/machine/n1200.conf b/conf/machine/n1200.conf
index b13576e2ed..3563c54bd7 100644
--- a/conf/machine/n1200.conf
+++ b/conf/machine/n1200.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Thecus n1200, an MPC8347 based NAS
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
+PACKAGE_EXTRA_ARCHS = "ppc"
 
 MACHINE_FEATURES                = "kernel26 usbhost ext2"
 MACHINE_TASK_PROVIDER           = "task-base"
diff --git a/conf/machine/stb225.conf b/conf/machine/stb225.conf
new file mode 100644
index 0000000000..97370e1fe8
--- /dev/null
+++ b/conf/machine/stb225.conf
@@ -0,0 +1,8 @@
+# PNX8335 STB225 board
+TARGET_ARCH = "mipsel"
+TARGET_CC_ARCH="-march=mips32"
+MACHINE_FEATURES = "kernel26"
+IMAGE_FSTYPES="tar.gz"
+PREFERRED_PROVIDER_virtual/kernel="linux"
+KERNEL_IMAGETYPE="vmlinux"
+KERNEL_OUTPUT="${KERNEL_IMAGETYPE}"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index ed0e05dfd7..edea47a2d4 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -4,8 +4,9 @@
 
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
+require conf/machine/include/kexecboot.inc
 
-IMAGE_FSTYPES ?= "jffs2"
+IMAGE_FSTYPES += "jffs2 tar.gz"
 
 # wlan-ng Modules
 # OHCI suspend/resume fixup