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

Conflicts:

	packages/dsplink/codec-engine_2.21.bb
	packages/dsplink/dsplink.inc

diff --combined conf/checksums.ini
index aa05d27,cb60687..67e788e
--- 1/conf/checksums.ini
--- 2/conf/checksums.ini
+++ b/conf/checksums.ini
@@@ -34,10 -34,6 +34,10 @@@ sha256=f09d4ae3365b876da9f40f49178ab724
  md5=333b0e9328194f28af83c26d3717e4ac
  sha256=8930ebfdc8a606d8cb26f073d4700460c3289fb79e943e12948329e17336ca47
  
 +[http://www.ralinktech.com.tw/data/drivers/2008_0506_RT73_Linux_STA_Drv1.1.0.1.tar.bz2]
 +md5=3e08bf734b740e83391fda571c8e9ecd
 +sha256=932b9c127992fd7985e4054d91120164e54f7132fa457b06fdcd30307e5b70f9
 +
  [http://www.amd.com/files/connectivitysolutions/geode/geode_lx/AES_Linux_LX_02.01.0100.tar.gz]
  md5=12cb241a9037fffe31ba7c68a48ed614
  sha256=a6068b4aa0e2330eed6e4741bad3191dc9ca7d7326f7bfab578ac55e2b8b91a2
@@@ -642,10 -638,6 +642,10 @@@ sha256=f274a4bc969ae192994a856b7f786c6f
  md5=4be042a043ec520074b0ab6f7ca0bded
  sha256=fa668e8f01fe43fdddb33f0c5e294698818f37519000b9f782f504ece071c740
  
 +[http://www.reactivated.net/software/zd1211-vendor/releases/ZD1211LnxDrv_2_22_0_0.tar.gz]
 +md5=0ac1145f1f30d883694b4a1317f142c4
 +sha256=262f44f0d1274d2baf6548e53df96c6664b076f39e3aaeeb022bbd5caccbe3e3
 +
  [http://zope.org/Products/Zope/2.7.1/Zope-2.7.1.tgz]
  md5=ae9d4bb3f7220dfffb6e91b42503b16c
  sha256=341f56aa4ece9001a118be8ff9675bfad6410dc1df86dd86aeb726adc732341b
@@@ -950,14 -942,30 +950,30 @@@ sha256=8cd84eb2031a91572e1be2975f417173
  md5=26b37525371cdaaec552237e0667305d
  sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10
  
+ [ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.5.28.6.tar.gz]
+ md5=26b37525371cdaaec552237e0667305d
+ sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10
+ 
+ [ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.6.25.tar.gz]
+ md5=6569fd95e829036c141a5ccaf8e5948c
+ sha256=fa00ce910ab6f0987c4a210962be357d4f013fc89ef72b015f39ae8649522b59
+ 
  [ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.6.46.2.tar.gz]
  md5=67d439a252996357b0313b3ad999739a
  sha256=6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686
  
+ [ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.6.46.2.tar.gz]
+ 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.2.tar.gz]
+ md5=c66f943203fa24e85ed8c48f6ac5ad1e
+ sha256=e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9
+ 
  [ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.3.tar.gz]
  md5=e2e6e23f43bfdf135b923205659dfaf1
  sha256=d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710
@@@ -1122,10 -1130,6 +1138,10 @@@ sha256=2bbf2b8fdf6e12dabb0cc751a973d904
  md5=3b27365772d918050b2251d98a9c7c82
  sha256=9c548c44d3cfdf259118d9fd4e468e1fe4567456dbff8ff59838c5f70ef62ea3
  
 +[http://sources.dreamboxupdate.com/download/snapshots/ath_hal-20080815.tgz]
 +md5=f88c708bbc6ce971f170499110098604
 +sha256=eb1dd7529fccb17c59f4ae027d5c4d60dfe89e399a97be72b378e2ba646cd54d
 +
  [ftp://ftp.gtk.org/pub/gtk/v2.8/atk-1.10.3.tar.bz2]
  md5=c84a01fea567b365c0d44b227fead948
  sha256=c596baf95f6a6cd7748b1018336b2ac45ca2ef668816e6c703b01691e09b8a89
@@@ -1286,10 -1290,6 +1302,10 @@@ sha256=dedf5325105f071e5d9f898fdb7337a7
  md5=3cb3be404950ef08e51adbe59c7b811e
  sha256=c3648f02dd7d4dc8c0ef9a48089fda4ca47b81a977c838b17f55e6abf7f51447
  
 +[http://sources.dreamboxupdate.com/download/7020/backdrop_dm8000.mvi]
 +md5=404ecdfe1f291ef64079c463fe699ac2
 +sha256=bd486f5434eaa7fd5f39fb67c8dc0394e2d08c2505419c72c5a5a563463658fd
 +
  [http://heanet.dl.sourceforge.net/sourceforge/bacula/bacula-1.38.11.tar.gz]
  md5=0d6d6614afdc468d214de4e66f9f5a26
  sha256=d095165d256771c918b80f836feaf837aedc1362b2d67171013d3ab7ac5ee47f
@@@ -1306,6 -1306,10 +1322,6 @@@ sha256=c450b49ce9903d97ed5e4aa788b388e0
  md5=5afcef5d6047f14cd5f65d2fdbd86fb2
  sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
  
 -[ftp://ftp.pl.debian.org/pub/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
 -md5=5afcef5d6047f14cd5f65d2fdbd86fb2
 -sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
 -
  [ftp://ftp.us.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
  md5=5afcef5d6047f14cd5f65d2fdbd86fb2
  sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
@@@ -1850,22 -1854,6 +1866,22 @@@ sha256=e721987d891ce97ba7a4fc17115a1b48
  md5=4be91177d19069e21beeb106f2f77dff
  sha256=7738399ecfcfb2242e9f99a316b13a5f59e89052de05074dbf705ccf4edc327d
  
 +[http://sources.dreamboxupdate.com/download/7020/bootlogo_dm8000.elf]
 +md5=8ab6ead17f2d51e9b93f968b027cb3a9
 +sha256=d5b517b85c2d346cacaef3fd1833f4aaccf9ba37785fcca94a3bd33563c040c8
 +
 +[http://sources.dreamboxupdate.com/download/7020/bootlogo_dm8000.jpg]
 +md5=017abc2244931c14464ae6d4ad8c2296
 +sha256=5f8ea9e76a10c28282425cb1fccbcfd5897da1e83adeaa9d89744c3597f49f02
 +
 +[http://sources.dreamboxupdate.com/download/7020/bootlogo_dm8000.mvi]
 +md5=c1a99cb9ab8248faaf273cd5d9f16cfd
 +sha256=0c02c791020c5d230fafc226f2282f42434a0b4db66e6aa7eda56f23cec01578
 +
 +[http://sources.dreamboxupdate.com/download/7020/bootlogo_wait_dm8000.mvi]
 +md5=4c3eba94a7092c8ad9adeaa90ed40673
 +sha256=b8057f51a1317294e4feab663ded9652491bcfbaaaf7e141f06129452ad36e6d
 +
  [http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-0.6.tar.gz]
  md5=d7d8343f90a149c1604e5a14ea2f967d
  sha256=3ff618bcbf9926f356aec2a604b1f1d617e3f87ad545b1d96c066ed712675845
@@@ -2758,10 -2746,6 +2774,10 @@@ sha256=e34e30a4c0ea405f9e830aa0026e9c06
  md5=562c78876219bf458d79a041af18293d
  sha256=89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191
  
 +[http://sources.dreamboxupdate.com/download/7020/dccamd-dm8000-1.1]
 +md5=d0439fec02ef37e4896d65c1605f3982
 +sha256=b2457ff8d8355baa8dfb2a1ed30847668af6fdf16bcfc1bf89a3b0e672e4ef02
 +
  [http://packetstormsecurity.org/UNIX/scanners/dcetest-2.0.tar.gz]
  md5=74ee7617c8b01cc641992c1d13dc394b
  sha256=4a319a08ae0838234f5b6fbd0b4d2e0fac7560a7553a4e1b043527cc17032aa3
@@@ -3038,6 -3022,10 +3054,10 @@@ sha256=8955fad7d9e7aef36f7a82f9577c3ae4
  md5=0fc9fffc2c2cfa7107d8f422815078c1
  sha256=c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f
  
+ [ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.13.22.tar.gz]
+ md5=0fc9fffc2c2cfa7107d8f422815078c1
+ sha256=c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f
+ 
  [ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.13.24.tar.gz]
  md5=d8ec0b2bf86d5277fb50f8d391c0dd4a
  sha256=8b1ed52659c5f6723f37bf1122508d7f1b82e064aa9db04d18d726bde34c2713
@@@ -3050,18 -3038,6 +3070,18 @@@ sha256=a525f321e875a8c16f5b6942bc02ac66
  md5=dad1a4a08c475b31a6b62e7dc92fe9d2
  sha256=5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587
  
 +[http://sources.dreamboxupdate.com/download/opendreambox/dreambox-blindscan-utils-dm8000-1.0.tar.bz2]
 +md5=4e540e321fb76df423fc166ddfd83773
 +sha256=167494f7617d2f8d8c25d9dab7a4ab5ec26b91bbe06413365f31ddedabc3bed6
 +
 +[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm8000-2.6.12-5.1-brcmstb-dm8000-20080920.tar.bz2]
 +md5=a508ee35044989c41e7f49664496cedf
 +sha256=47e7132ed5ec55bbaec2348cd5b61cc610a762a247cb4d3aebc9e47ff19fc9be
 +
 +[http://sources.dreamboxupdate.com/download/opendreambox/dreambox-dvb-tools-v3-1.5.tar.gz]
 +md5=da705f04302e87c7b4e83903ce4b5707
 +sha256=d2005e7b8ea9d8d8b4503117daf18a642bbabd0e013d41302c5f80e3333c67ef
 +
  [http://xorg.freedesktop.org/releases/individual/proto/dri2proto-1.1.tar.bz2]
  md5=1d70f0653b0b3a837853262dc5d34da4
  sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
@@@ -3526,10 -3502,6 +3546,10 @@@ sha256=990cd830ea362ba2cb88ca7b59cd3f4d
  md5=55220ebadef5f541d705b72fe222b5b1
  sha256=4b891e1d58c8cdf397737ac81a9328d8c663743b41f835bb2267831866d75a3e
  
 +[http://sources.dreamboxupdate.com/download/opendreambox/fakelocale.tar.gz]
 +md5=d11a901c9e4dc2947cbc560044de2b67
 +sha256=b424804aff7a23efaa1fa25d27a55ac25173d0e7e95d07fe31096250bb498cc6
 +
  [http://openzaurus.org/mirror/fakeroot_1.2.13.tar.gz]
  md5=cf25d5d4c943ebf2293fe6f23ecba0fd
  sha256=6f51ebdf0e18bea58d18f79e8ffebb797fe57bdf44b96dff9d84b70467af7841
@@@ -3574,6 -3546,10 +3594,6 @@@ sha256=2cbf95aef9e3f9a32b6859ae35723eaa
  md5=9441c981bfd4e521abcd5d93385f71d8
  sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
  
 -[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz]
 -md5=9441c981bfd4e521abcd5d93385f71d8
 -sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
 -
  [ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz]
  md5=9441c981bfd4e521abcd5d93385f71d8
  sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
@@@ -4550,6 -4526,10 +4570,10 @@@ sha256=aeef281072cf3e045b73e7047bd9830a
  md5=f754d2ddea7107c5dff5f846f9426d30
  sha256=69b3269a6b1ca26357e1e72c6be7f0ed742cd88d2042243c0bb9ba76e4acac99
  
+ [http://www.kernel.org/pub/software/scm/git/git-1.5.6.5.tar.bz2]
+ md5=5175d142ad0745b9e22a64904aa86c45
+ sha256=692901194603cc4fb4072d8f907487d867caef6b62161f50f0f44dbeb001066e
+ 
  [http://downloads.sourceforge.net/gizmod/gizmod-2.3.tar.bz2]
  md5=b7200b08149599c4c0f56d88f0c7f208
  sha256=53af32530e58ba23cbb752f063364612bbea57b31de2ee35814973452c2f63f2
@@@ -6482,14 -6462,6 +6506,14 @@@ sha256=ba261a21539e1f204ba74590d313c501
  md5=9e6a16b7d074782d1c62f1f7316e56ab
  sha256=e2db8d3383cd8eca6a18ebee85875de895f3ac7414eab091a87f052d79a87b09
  
 +[http://www.guzu.net/files/hddtemp-0.3-beta15.tar.bz2]
 +md5=8b829339e1ae9df701684ec239021bb8
 +sha256=618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b
 +
 +[http://www.guzu.net/linux/hddtemp.db]
 +md5=7b2651d53d10808e270bc386b6db89dd
 +sha256=ca43f8ab1e4fb3919af940a2fe6a95feb03939f685450a48666763a3edc326bb
 +
  [http://downloads.sourceforge.net/hdparm/hdparm-6.3.tar.gz]
  md5=0c12672f3a09c14ad0b0882f15fc9389
  sha256=08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d
@@@ -6938,10 -6910,6 +6962,10 @@@ sha256=beb929f4ceff865375a9e56c0156ffbf
  md5=5bcaa0fe3fec26840c8f1ecefc891887
  sha256=53b67c08477623bb03436f79bf2ca859d7cd9684c57775ea539e1db449658236
  
 +[http://sources.dreamboxupdate.com/snapshots/include2.tar.gz]
 +md5=9d236095a88d7ce9f3bf0503ee5237d6
 +sha256=739bc35bccdb1e4c6e14b77ab86808354eb6fd75434d3bd6236f3b3346805e02
 +
  [ftp://ftp.gnu.org/gnu/inetutils/inetutils-1.4.2.tar.gz]
  md5=df0909a586ddac2b7a0d62795eea4206
  sha256=9f001daa0f3d571ae35aac88f04d5dd982a14e90257e4dfb535c143fa18d5830
@@@ -9382,10 -9350,6 +9406,10 @@@ sha256=83e82b9afe296584a6c9f1f8b3e3a70d
  md5=4f75fc9901c724b712c371c9a1e782d3
  sha256=912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160
  
 +[http://critical.ch/distfiles/libsidplay-1.36.59.tgz]
 +md5=37c51ba4bd57164b1b0bb7b43b9adece
 +sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
 +
  [http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-1.36.59.tgz]
  md5=37c51ba4bd57164b1b0bb7b43b9adece
  sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
@@@ -9794,10 -9758,6 +9818,10 @@@ sha256=06e4be5214166e1de11715c8b58c61d1
  md5=dc43ff7ae6aded45f578c87b7b0c8766
  sha256=c01bd621f771cdee349877f55cc841a1bdfb206b2cf5c9aa62aa6a9680e61980
  
 +[http://www.ant.uni-bremen.de/whomes/rinas/libxmlccwrap/download/libxmlccwrap-0.0.12.tar.gz]
 +md5=9f8bbad3452d704603246273b2dda758
 +sha256=38fb5f75f8b7dad1c8d535cc7b18ea9f1603e14a8b9256a2f60cf721513dc299
 +
  [http://gpe.linuxtogo.org/download/source/libxsettings-0.11.tar.gz]
  md5=ea623deae839c41ef68c9a31233157ef
  sha256=4cae17ea07445660cedb34a8a0222055954ed67de3d5a527850d8b9e923e3543
@@@ -9902,26 -9862,6 +9926,26 @@@ sha256=877af8ed89e56af004bb0662c1a9cfc7
  md5=f00fd1b5a80f52baf9d1d83acddfa325
  sha256=1fa39c202efe168bfeb0ddd74c8e4814f77da7dc78993e47826bad9173b95808
  
 +[http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-add-ioprio.patch.bz2]
 +md5=9af26454c10261c099865fa8008e898f
 +sha256=af680b4c40128e1e63bb7bff7a67ff813bc4741a0c8a95ddfb13ed9b9ed4782b
 +
 +[http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-brcm-5.1.patch.bz2]
 +md5=dd3c40f0f02153efa817808a0a2f687e
 +sha256=c609eb3c63de0cd63f54607e744f04f267f069ba5eeabff294c769e857bcf3bb
 +
 +[http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-core-fix-several-locking-problems.patch.bz2]
 +md5=c395c813ec87b603169f56d9b9dc84d8
 +sha256=8b8172b65e9032935f49f38984a76aea4eb4dba4a3c5c7bb441172cc9d4a1331
 +
 +[http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-multipid-r4.patch.bz2]
 +md5=7b3a8555190f7e6370459b058f4a3bb6
 +sha256=17d706ec6f16ecaa135bb6bb81ad14f9757f2835099a19f74ab676f23026b217
 +
 +[http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvbapi-pilot-rolloff-extension-r0.patch.bz2]
 +md5=d93c88a6ef7ca15eb46d9767563eaae4
 +sha256=b79086627a13f84c2a38eeb8039045d4577fb2c851faff7f8509acbf6b835773
 +
  [http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc2.tar.bz2]
  md5=b8b75ddeca0f48221f085703f2f72692
  sha256=2e36150665e7268d5dd03b70621a0e80c4f7abb04584694dba540774030f6a54
@@@ -9930,14 -9870,6 +9954,14 @@@
  md5=0f9afd619a10872b3383362d55c892c3
  sha256=4cc5ca6e2ea8583f026620169e5d6eceb6c620181ba0633efbeb74cdb8c2fc59
  
 +[http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-update-wireless.patch.bz2]
 +md5=8f39722809d9e10698d691372ac69dab
 +sha256=326aba0a5d7c41496a88cc9855e842e49b0d8153c66eeb39d6b15b3afd165a86
 +
 +[http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-update_dvbapi-r1.patch.bz2]
 +md5=0d3899252651474f91aebba1b760acb5
 +sha256=8a3047b7c9dfcb84735e9eaed0ea3fc6e028bb3d8ed82756a8ce2b0d3bd18e46
 +
  [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.6.tar.bz2]
  md5=1592bb2a8ec0deb1ff32e8238f25ecc5
  sha256=d8bbdd8064c3564e6ec74fec3332776733e7982e67af66c5311fd1955bf309dd
@@@ -10070,10 -10002,6 +10094,10 @@@ sha256=01f083599014e22ee2ca4894dbe96dd1
  md5=1df3e4fbf2670712cecb4953e2d24834
  sha256=8dffedf772a9f75a8cee2a603e1b14e4b7848010dcfa0e6b087afcf4f66da6de
  
 +[http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.12.0.tar.bz2]
 +md5=eae2f562afe224ad50f65a6acfb4252c
 +sha256=e1c4e5c36787c5c25b9efb60ac0419d4e5b465bc4c7d4de09c9b49b0ed99fd11
 +
  [http://ewi546.ewi.utwente.nl/OE/eabi/linux-libc-headers-2.6.15.99.tar.bz2]
  md5=0ab7fdfc84522e16bfe78b8e0cc66bfa
  sha256=c8630034519e525347e0cb8435bdf0edf9fbad2d16392768ba142c06681b2305
@@@ -10450,10 -10378,6 +10474,10 @@@ sha256=46a30f2cd62c66099d4b87a32fb82751
  md5=fe1758398de89fce57f05f9c1d1bb923
  sha256=70cfa5eacd27d46a5e6f562b01769c64794d20ce4636cf133def7db7f0715efb
  
 +[http://www.angstrom-distribution.org/unstable/sources/madwifi-ng-r3314-20080131.tar.gz]
 +md5=2c7352cbbdac995de8c3bce5b80db5f2
 +sha256=0599c75b95ba63bdc554cb8124192e62c75fbeb71b9e8a5a7bc351c8e0666758
 +
  [http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz]
  md5=d6e04fa7fb0bea5079f24a753633fb29
  sha256=d504e1e7b8f0d01b5441a86d1086aa4088c8896d87d8aabd6dabace76997467a
@@@ -11122,10 -11046,6 +11146,10 @@@ sha256=db0c299592b8f1f704f41bd3fc3a2bf1
  md5=d605b6068b6c9aa2bc7550f49c60958c
  sha256=7e5e1768db0201981f90256fa94db3f09f23285ffd60dc60a51a753825084848
  
 +[ftp://archive.debian.org/debian-archive/pool/non-free/m/mrouted/mrouted_3.9-beta3.orig.tar.gz]
 +md5=96067b571622ac232dab42a5c56dcedc
 +sha256=8d38a1feadf9298dd554b352fd6cc247207c930ef0c7df736deb5b44e5c58fb6
 +
  [http://downloads.sourceforge.net/materm/mrxvt-0.5.2.tar.gz]
  md5=ed87b7dd9f4fb482de0f14f085085027
  sha256=558491d1f112362780abaf7429d14216e658b7768dd30f82f102ce646d3065cf
@@@ -11318,10 -11238,6 +11342,10 @@@ sha256=76472e51576b42bfc129e487ae7dd3a5
  md5=516c576c0ca5c0a01ad24d018093cfee
  sha256=8a29457052b73ac0139e3b2824a74323256dd7631b1691239ddb18124e231a71
  
 +[http://www.webdav.org/neon/neon-0.28.2.tar.gz]
 +md5=b99b3f44e8507ae2d17362f1b34aaf02
 +sha256=d9cd601613db6affb25655e0908b0bf8c266669cef31999b6b4121d585ff9094
 +
  [http://downloads.sourceforge.net/net-snmp/net-snmp-5.1.2.tar.gz]
  md5=8080555ab3f90011f25d5122042d9a8d
  sha256=1fca69e934c3d526e308450cc5af2478d440e012922dd0bb10388fcf093ef32e
@@@ -11678,10 -11594,6 +11702,10 @@@ sha256=347c551e7c88affc1f4b7a4b71508025
  md5=7401faebc6baee9add32608709c54eec
  sha256=063f00d5b889beee910eb113c8cfbb4fc85cd404693494bcaaf79dd09a98335c
  
 +[http://sources.dreamboxupdate.com/download/snapshots/openwrt_madwifi_patches_20080829.tar.bz2]
 +md5=f5cef7c338bd09d2e6774033e8509c34
 +sha256=e48847244e137cdba469f1937fc3dc0c4a399a1b8dc8a1563dac654135d650c8
 +
  [http://downloads.sourceforge.net/oprofile/oprofile-0.9.2.tar.gz]
  md5=9af4e1e1aab89131516736bb60e9efba
  sha256=4b3780ee09efe665a69151c994e0e5f01a56c57338660c18df30916904df83a6
@@@ -12122,6 -12034,10 +12146,6 @@@ sha256=5bad39b0d28f294f10690d15bc1e54ba
  md5=b5f96d823b1183ba0c4e61516e1a23c0
  sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc
  
 -[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.26/patch-2.6.26-rc4.bz2]
 -md5=b5f96d823b1183ba0c4e61516e1a23c0
 -sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc
 -
  [http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.27-rc1.bz2]
  md5=948b25bab0082d1db5bd8c9fac824891
  sha256=2b35a35a0ab3b82b77bb2996782ef70ec15a13b9331b15bac814b891ae8f4867
@@@ -12858,10 -12774,6 +12882,10 @@@ sha256=fad4e6ca8e9e2a9e4bcddc96194db698
  md5=d2aa74615aa9cf23413975a68613ffc1
  sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1
  
 +[http://downloads.sourceforge.net/pyopenssl/pyOpenSSL-0.6.tar.gz]
 +md5=af67fda6d2125cae9c56ee50430a40c7
 +sha256=58ee9dd10fbd97d65347626f60a38aafdcb05d19ad90c883c4284266ba7ec959
 +
  [http://www.andrewchatham.com/pyogg/download/pyao-0.82.tar.gz]
  md5=8e00f5154401a6f6d99efd20606e2819
  sha256=9a444518252f6d747e76a219e5efbc05b4e1742260a7419da9ddf93a519b30c5
@@@ -12894,10 -12806,6 +12918,10 @@@ sha256=2a9fbef7d953e1fc1eec837a4087cd51
  md5=cdcebdfd63e74754f57b9e9b0db4ea20
  sha256=a6d7db68c87699e283a1f58b637a7e730c350899fd7b35b88e63caa0e85a9ab9
  
 +[http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz]
 +md5=4d5674f3898a573691ffb335e8d749cd
 +sha256=b08d4ed54c9403c77778a3803e53a4f33f359b42d94f6f3e14abb1bf4941e6ea
 +
  [http://pycurl.sourceforge.net/download/pycurl-7.14.0.tar.gz]
  md5=6f73d518fb520af14634a06ee1b7ddce
  sha256=a60e08b01fc3355ec18ec0e447349b6f8bff3f9628eb42891cff1eb51b9618b1
@@@ -13858,10 -13766,6 +13882,10 @@@ sha256=114f8be9b73d75811cac866650a64cdb
  md5=6465dc6545970352dfa6305c36c2403d
  sha256=097882b4613c87303dd068c41c95e77675da790cab63c7b440e70643d1741035
  
 +[http://sources.dreamboxupdate.com/download/7020/secondstage-dm8000-65.bin]
 +md5=18f6363a45a2fd708e1e91cc1bcad25b
 +sha256=c47212f4a24a16e2fbb90bc6c8e16c0cb9489b68be83542f2df8f26dcb62528c
 +
  [ftp://ftp.gnu.org/gnu/sed/sed-4.0.8.tar.gz]
  md5=fb7fa2a7336afc358012763b292e2124
  sha256=a02d8c006bc0531bd646cae3082b7db8c7a1969084411cb129ec105fd12c0a13
@@@ -15010,10 -14914,6 +15034,10 @@@ sha256=d91b4addcbb241b04b6cf795447163ed
  md5=ee74158c6c55ae16327595c70369ef83
  sha256=ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec
  
 +[http://dreamboxupdate.com/download/opendreambox/tuxbox-common-r8.tar.gz]
 +md5=032d3f766e803555d9e3ca5aaba34858
 +sha256=e1d06c75136152c78f07cb37b81e624270c95a457fbc86b2608bcc1b3cbd108b
 +
  [http://heanet.dl.sourceforge.net/sourceforge/tuxnes/tuxnes-0.75.tar.gz]
  md5=5db0cd42dfdff3e681805e93b4867c43
  sha256=217fc57fdd2a5ec360c197ea36110ec929d3f27c88cf875f0f4723b3496ed7c2
@@@ -15634,10 -15534,6 +15658,10 @@@ sha256=acd218148d7f92ee7bd0539d6aabd0b4
  md5=67a48fd9b69db8818a4dca5375c7993a
  sha256=cb4909d8753dff7f6ac90a62a61ed1ae68e49ead2dbc60c22673c55bb0e14a36
  
 +[http://sources.dreamboxupdate.com/download/7020/wdog-dm8000]
 +md5=dc7c1a43733033e0bebfe57cf06a4562
 +sha256=82d626e85a0b63d715b79a79e6ebacc25dd3b739320dbcdafd79cbb7ed0cc351
 +
  [http://downloads.sourceforge.net/webcamserver/webcam_server-0.50.tar.gz]
  md5=96830836f64edbb12c248eb84e6b0d18
  sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
@@@ -17802,14 -17698,6 +17826,14 @@@ sha256=81a5c8b74f100d7444356895f745321d
  md5=ae1f9198544d1585f44dab7bab110ae3
  sha256=28e73da5403faad322022e8fb327f99677841d26396a1a1f1e854c768b47cf7c
  
 +[http://sources.dreamboxupdate.com/zoneinfo.tar.bz2]
 +md5=ac244d186fd829699c781b9ee8f40f22
 +sha256=51d8b034902ea2a54c7b0bc4482af8c9460bb76f6b9fd41baa7254b388690f8e
 +
 +[http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz]
 +md5=93668855e37b4691c5c956665c33392c
 +sha256=c049ef6f0748a2db26c7d01de1566e52f048e5fa6fbbb8da90c43e55597a5075
 +
  [http://downloads.sourceforge.net/zrally/zrally_0.90_src.tar.gz]
  md5=7084c0d2b28108563ca45e5ec1533ba1
  sha256=c4fb0477fdc110b63d867ae2a46cca7913fa6a0ca8bf574c7189329bea91dcdf

diff --combined packages/dsplink/dsplink.inc
index 5253f00,9955d4d..10e7c23
--- 1/packages/dsplink/dsplink.inc
--- 2/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@@ -9,38 -9,13 +9,36 @@@ inherit modul
  S = "${WORKDIR}/dsplink_1_60/dsplink"
  
  # Needed for buildscripts
- export DSPLINK = "${S}"
+ export DSPLINK="${S}"
  
  require ti-paths.inc
  
 +DSPLINKPLATFORM ?= "DAVINCI"
 +DSPLINKPLATFORM_omap5912osk = "OMAP"
 +DSPLINKPLATFORM_beagleboard = "OMAP3530"
 +DSPLINKPLATFORM_davinci-sffsdr = "DAVINCI"
 +DSPLINKPLATFORM_davinci-dvevm = "DAVINCI"
 +
 +DSPLINKDSP ?= "C64XX"
 +
 +DSPLINKSOC ?= "DM6446"
 +DSPLINKSOC_beagleboard = "3530"
 +
 +DSPCFG ?= "DM6446GEMSHMEM"
 +DSPCFG_beagleboard ?= "OMAP3530SHMEM"
 +
 +GPPOS ?= "DAVINCILSP"
 +GPPOS_beagleboard = "OMAPLSP"
 +
 +export DSPLINKPLATFORM 
 +export DSPLINKDSP
 +export DSPLINKSOC
 +export DSPCFG
 +export GPPOS
 +
  do_configure () {
- 
- # Run perl script to create appropriate makefiles (v1.60 and up)
- DSPLINK=${S} perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 --dspcfg_0=${DSPCFG} --dspos_0=DSPBIOS5XX  --gppos=${GPPOS} --comps=ponslrm
- 
+       # Run perl script to create appropriate makefiles (v1.60 and up)
+       perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 --dspcfg_0=${DSPCFG} --dspos_0=DSPBIOS5XX  --gppos=${GPPOS} --comps=ponslrm
  }
  
  PARALLEL_MAKE = ""
@@@ -55,13 -30,16 +53,16 @@@ do_compile () 
        export DSP_BASE_RTDX=${TITOOLSDIR}/${TIBIOSDIR}/packages/ti/rtdx
        export GPPTOOL_DIR=${CROSS_DIR}
        export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}
-       export LINK_INSTALL_DIR=${S}
+       export LINK_INSTALL_DIR=${DSPLINK}
        export VARIANT=${DSPLINKSOC}
        export PLATFORM=${DSPLINKPLATFORM}
        export BASE_TOOLCHAIN=${CROSS_DIR}
        export BASE_CGTOOLS=${BASE_TOOLCHAIN}/bin
+       # 'OSINC_PLATFORM' is used in both the dsp and gpp sides...     
        export OSINC_PLATFORM1=${CROSS_DIR}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include
        export OSINC_TARGET=${BASE_TOOLCHAIN}/target/usr/include
+ 
+       # 'ARCHIVER' is being used in the dsp side of the build as well as gpp
        export ARCHIVER_AR=${TARGET_PREFIX}ar
        export BASE_SABIOS=${DSP_BASE_BIOS}
        
@@@ -80,7 -58,7 +81,7 @@@ do_install () 
        install ${S}/gpp/BUILD/EXPORT/RELEASE/mplistgpp         ${D}/${bindir}
        install ${S}/gpp/BUILD/EXPORT/RELEASE/readwritegpp      ${D}/${bindir}
        install ${S}/gpp/BUILD/EXPORT/RELEASE/ringiogpp         ${D}/${bindir}
 -      install ${S}/gpp/BUILD/EXPORT/RELEASE/scalegpp          ${D}/${bindir} || true
 +      install ${S}/gpp/BUILD/EXPORT/RELEASE/scalegpp          ${D}/${bindir}
  
        install -d ${D}/${datadir}/dsplink
        for i in $(find ${S}/dsp/BUILD/ -name "*.out") ; do