diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-01-22 10:04:48 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-01-22 10:04:48 +0100 |
| commit | 9b2387f596f4b5c0b47eb970522534750816c9a4 (patch) | |
| tree | a998d24c8c550a3bd6b97ee9269f4ea603471f1f | |
| parent | a72f0d33dd88bcc183ec8d7efd8ff814d6528cc3 (diff) | |
| parent | 658cf78bc2615df4d3a8ef5b2f5c9974d4aab292 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
111 files changed, 1487 insertions, 393 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ae0519b2ca..83b2835c23 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -180,10 +180,13 @@ Interests: Small read-only Linux based firmware, deterministic builds. Recipes: lighttpd, fastcgi, squashfs-tools, rt-tests, linux-rt, linux Machines: mpc8313e-rdb, mpc8315e-rdb, canyonlands, calamari, openrd-base -Person: Liam Girdwoord -Mail: liam.girdwood@wolfsonmicro.com +Person: Liam Girdwood +Mail: lrg@slimlogic.co.uk +Website: http://www.slimlogic.co.uk +Interests: Mobile and embedded Linux within commercial environments. +Interests: Kernel development, userspace development, audio, power management. Machines: mx31ads -Recipes: mx31ads-kernel* +Recipes: mx31ads-kernel*, glibc-2.10.1, some pulseaudio versions Person: Lynn Lin Mail: Lin_Lynn@emc.com diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 83530b5a5e..53ea252b0e 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -112,7 +112,9 @@ kernel_do_stage() { # Check for arch/x86 on i386 elif [ -d arch/x86/include/asm/ ]; then - cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ + if [ -e include/asm ] ; then + cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ + fi install -d ${STAGING_KERNEL_DIR}/arch/x86/include cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ fi diff --git a/conf/checksums.ini b/conf/checksums.ini index 75daba9f0d..de94be8477 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1362,6 +1362,10 @@ sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7 md5=0fc5008858661c0abd0399acbe30ef28 sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037 +[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2] +md5=218373aa45d74b6ba8c69c4d5af3bb19 +sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d + [http://www.us.xfce.org/archive/xfce/4.6.1/src/Thunar-1.0.1.tar.bz2] md5=218373aa45d74b6ba8c69c4d5af3bb19 sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d @@ -2642,6 +2646,10 @@ sha256=f34f8eabb463815adbf18d78883e2e61c5ad0020e087152a4c7a604fcd5754ea md5=2ad6ebb3f058e5fbe9ec5e0f0017db28 sha256=06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5 +[http://pawsa.fedorapeople.org/balsa/balsa-2.4.2.tar.bz2] +md5=1eb90a92c089e194a595072a57c57394 +sha256=48bde6ff926fcc5d47853b87242cc890bdb21b5c74a2454a2b5c0269e9340090 + [ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz] md5=5afcef5d6047f14cd5f65d2fdbd86fb2 sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e @@ -5814,6 +5822,10 @@ sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4 md5=5cb7987d29db068153bdc8f23c767c43 sha256=2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d +[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.2.tar.bz2] +md5=3ca8ddb42cd4ee31b8690031303221af +sha256=f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1 + [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz] md5=8e11d77770452f97bb3c23f510489815 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d @@ -9314,6 +9326,10 @@ sha256=9d9ef356cc4478499442573556787125dc76c8acd1e55e5001fb11f1e224d27f md5=c9f8cebfba72bfab674bc0170551fb8d sha256=7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf +[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.11.tar.bz2] +md5=78e7c4dc7dcb74b1869fee7897e00f59 +sha256=fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451 + [http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.8.tar.bz2] md5=3dfbd17203c0c88b94b6f579f24c11cc sha256=2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c @@ -13930,6 +13946,10 @@ sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051 md5=001d780829f936e34851ef7cd37b4dfd sha256=4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2 +[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.3.tar.bz2] +md5=5d74971360f194ce33d2bd2e4d9b066c +sha256=8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac + [http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2] md5=0545089013213e90aac19b8f8045d32e |