diff options
| author |   Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-13 01:32:19 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-13 01:32:19 +0400 |
| commit | 26bcb9945b54e6d849fe4905688758b5a8006389 (patch) | |
| tree | 25e66e55311d2e7212f87be1193c7d585e4a3e5a | |
| parent | 0bab68016165040c906baabe5ec7f1a5426ead82 (diff) | |
| parent | b296387c6227c3ab870277f77b2d30110475e00c (diff) | |
| download | openembedded-26bcb9945b54e6d849fe4905688758b5a8006389.tar.gz | |
Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev
57 files changed, 3454 insertions, 108 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index 3360dcb2de..f6bd7c5b4a 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -539,7 +539,7 @@ python emit_pkgdata() { allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1) root = "%s/install/%s" % (workdir, pkg) os.chdir(root) - g = glob('*') + g = glob('*') + glob('.[!.]*') if g or allow_empty == "1": packagedfile = pkgdatadir + '/runtime/%s.packaged' % pkg file(packagedfile, 'w').close() diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 5127d32f33..e5339a9064 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -130,7 +130,7 @@ python do_package_deb () { os.chdir(root) from glob import glob - g = glob('*') + g = glob('*') + glob('.[!.]*') try: del g[g.index('DEBIAN')] del g[g.index('./DEBIAN')] diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 1f1b5c9a79..e3a7522619 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -186,7 +186,7 @@ python do_package_ipk () { bb.mkdirhier(pkgoutdir) os.chdir(root) from glob import glob - g = glob('*') + g = glob('*') + glob('.[!.]*') try: del g[g.index('CONTROL')] del g[g.index('./CONTROL')] diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass index 76f48ca429..cb70a5fae8 100644 --- a/classes/package_tar.bbclass +++ b/classes/package_tar.bbclass @@ -84,7 +84,7 @@ python do_package_tar () { tarfn = bb.data.getVar('PKGFN', localdata, 1) os.chdir(root) from glob import glob - if not glob('*'): + if not glob('*') + glob('.[!.]*'): bb.note("Not creating empty archive for %s-%s" % (pkg, bb.data.expand('${PV}-${PR}${DISTRO_PR}', d, True))) continue ret = os.system("tar -czf %s %s" % (tarfn, '.')) diff --git a/conf/checksums.ini b/conf/checksums.ini index 26c217ab95..ff8845fc98 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -522,6 +522,10 @@ sha256=3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4 md5=22e03dc4038cd63f32c21eb60994892b sha256=3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4 +[http://downloads.sourceforge.net/mesa3d/MesaDemos-7.4.tar.bz2] +md5=02816f10f30b1dc5e069e0f68c177c98 +sha256=c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897 + [http://downloads.sourceforge.net/mesa3d/MesaGLUT-7.0.2.tar.bz2] md5=3a33f8efc8c58a592a854cfc7a643286 sha256=fa31ca39f00ff92c7da59d9993d0eefb8d901eb8a519743942e523fde120eb6c @@ -582,6 +586,10 @@ sha256=a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 md5=04d379292e023df0b0266825cb0dbde5 sha256=a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +[http://downloads.sourceforge.net/mesa3d/MesaLib-7.4.tar.bz2] +md5=7ecddb341a2691e0dfdb02f697109834 +sha256=6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4 + [http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz] md5=598bb59b86c2c4842eeffb03392fab5b sha256=8fd609d1e6b460b5c95ad5612cb823aa863d51360ed55caea987909a9bab50f5 @@ -8550,6 +8558,10 @@ sha256=19a1f79c42b37ee3c90ba6298442b52438f1c67d311ebd33db72210cee2d99d2 md5=c42dfaebc37fe81eab0b5676b124ab63 sha256=417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 +[ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-8.64.0.tar.bz2] +md5=e62a3a6db85be6473c99f0e7fecd3ee1 +sha256=618b4eccb9f7d5e4991c8f099e1778471408759ce1e796ea464ae9011cdd242d + [ftp://ftp.gnu.org/gnu/chess/gnuchess-5.05.tar.gz] md5=008820142c414517512ab0ad3e036c8b sha256=d97ee0f1c45e1bfa880305a33e7e0ef695927094adce100cc76a76a0f57ef789 @@ -13038,6 +13050,10 @@ sha256=f8c711427fea50845811360c92f6350ff3dacb9533741470d54ae5d0a2f6848e md5=620fe7dd02c3236c3e9881a3a238173d sha256=ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c +[http://dri.freedesktop.org/libdrm/libdrm-2.4.11.tar.bz2] +md5=e0e66fae165d0b665b61e9516bf33ade +sha256=5e07ec4b644f50160900d4281a74dd1cbf1535cfe4ab24e0c28ae5b038836a8c + [http://www.metzlerbros.org/dvb/libdvb-0.5.5.1.tar.gz] md5=47612d2f8a4d4dee746a166d8b7f6f77 sha256=941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a @@ -19386,6 +19402,10 @@ sha256=2632d931b5732eb1d0de7a2e2d92c75d64412438958ee96dceb4443e4fc2a62f md5=d04973bde34edac7dd2e50bfe8f10700 sha256=b216936e6e011b58fefee8e3f80d01008cb078b7fe2a5632b2ce98bc7bcb05c2 +[https://alioth.debian.org/frs/download.php/2867/pmount-0.9.19.tar.gz] +md5=2fd9fe103375dbd0c91af2f302250a8c +sha256=e2174f1249ea79121648bb0e9353729767654e6d430fb2d28da342ec25a179be + [http://downloads.sourceforge.net/pmt/pngcrush-1.6.4.tar.gz] md5=a329caad3f49ed3ca105e6fd441f5b93 sha256=22ffea3aed00da9a9518a9c25b619d212bbe27b9ec72165cf74640f930108b2f @@ -22082,6 +22102,14 @@ sha256=5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9 md5=0e847845c4cb8c16f79bc4538ae288ad sha256=52ff7476b3580a92c385167f1855583c2cf74ae1898a6a5e8446ce67c80bc139 +[http://download.skype.com/linux/skype-2.0.0.72.tar.bz2] +md5=71fa47d788e73bcaf5b788be9236e97d +sha256=d3087571ab206729e6628986eb485e48204f5f1f0ed3f28326c376d86d583fe8 + +[http://download.skype.com/linux/skype_static-2.0.0.72.tar.bz2] +md5=cfaa796ef55e3f858a09bbe096eded5a +sha256=2f37963e8f19c0ec5efd8631abe9633b6551f09dee024460c40fad10728bc580 + [http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03-14.diff.gz] md5=bbc8f69a7add52ed30dbac276d43ef92 sha256=948499164f7be0c0b12e545bf49f1ab81e4546704cb3bedc1141d31a2d6dcbe6 @@ -23266,6 +23294,10 @@ sha256=266d6ec9795c2b480101c8754988df68da2c5b3579687bf51ae31000b08ba8bd md5=340bc7fa4a9cad1fe9ecc9b1df49d164 sha256=1c76d6ac7e80de0ae88cc5cbdad7a2a564eac96788549359b001366dc52fe817 +[ftp://ftp.gnu.org/gnu/termcap/termcap-1.3.1.tar.gz] +md5=ffe6f86e63a3a29fa53ac645faaabdfa +sha256=91a0e22e5387ca4467b5bcb18edf1c51b930262fd466d5fda396dd9d26719100 + [http://openzaurus.linuxtogo.org/download/3.5.4/sources/terminus-fonts.tar.bz2] md5=e7b056a7619cdd460b5db5a7e263cafc sha256=cf7becd610e298d23780216f474907745bd29484f7f81308a9d13cf07f2a4e2d @@ -25458,6 +25490,10 @@ sha256=1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8 md5=50a9c32af12ca4733afe23042f012f9c sha256=76ded0e6977f7d562a8236bc810423cd050320531be9621d868a48309ebc4d63 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.2.3.tar.bz2] +md5=cc2923460c8eff9652b01889a063058d +sha256=67550c8f4a85a8029f08880adf487e2efd4585e7adbe8da357fbd49750b08d8f + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-elographics-X11R7.0-1.0.0.5.tar.bz2] md5=24c33f833bb2db72a07c3d28bfc0aae9 sha256=f1b7f84175d33f4d18c83cd0d37bd3962acd668922fa074a8ae29e18517cdda7 @@ -26106,6 +26142,10 @@ sha256=d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a md5=5cd6b3ed57c7e78ab51e9d9266e73fb6 sha256=5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.6.3.tar.bz2] +md5=440c014bbd3072b5d379fe1bdb861918 +sha256=b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.0.tar.bz2] md5=6081b8fa50c689d51f85c2fbaf93867e sha256=fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1 @@ -26534,6 +26574,10 @@ sha256=b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203 md5=433cf6f961eb4a2ab6fcb086def0b2b4 sha256=f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.2.0.tar.bz2] +md5=9a86b683f73f3806f55d05cd804a6f4a +sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2] md5=049ada4df1abb5aa2b6633ba90353e78 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452 diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc new file mode 100644 index 0000000000..4d62c487c7 --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc @@ -0,0 +1,246 @@ +# see http://www.x.org/wiki/Releases/7.5 +# WORK IN PROGRESS, 7.5 will be released on 2009-XX-XX + +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" + +PREFERRED_PROVIDER_libxext ?= "libxext" +PREFERRED_PROVIDER_xext ?= "libxext" +PREFERRED_PROVIDER_libxi ?= "libxi" +PREFERRED_PROVIDER_libxft ?= "libxft" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_libxpm ?= "libxpm" +PREFERRED_PROVIDER_xpm ?= "libxpm" +PREFERRED_PROVIDER_libxt ?= "libxt" +PREFERRED_PROVIDER_libxaw ?= "libxaw" +PREFERRED_PROVIDER_libice ?= "libice" +PREFERRED_PROVIDER_libxrender ?= "libxrender" +PREFERRED_PROVIDER_libxcursor ?= "libxcursor" +PREFERRED_PROVIDER_xextensions ?= "xextensions" +PREFERRED_PROVIDER_xproto ?= "xproto" +PREFERRED_PROVIDER_x11 ?= "libx11" +PREFERRED_PROVIDER_libxv ?= "libxv" +PREFERRED_PROVIDER_xft ?= "libxft" +PREFERRED_PROVIDER_libxrandr ?= "libxrandr" +PREFERRED_PROVIDER_libxdamage ?= "libxdamage" +PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite" +PREFERRED_PROVIDER_libxfixes ?= "libxfixes" +PREFERRED_PROVIDER_libxinerama ?= "libxinerama" +PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm" +PREFERRED_PROVIDER_libxmu ?= "libxmu" +PREFERRED_PROVIDER_libsm ?= "libsm" +PREFERRED_PROVIDER_xrandr ?= "xrandr" +PREFERRED_PROVIDER_xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg" + +PREFERRED_VERSION_task-xorg ?= "X11R7.4" + +# app +PREFERRED_VERSION_appres ?= "1.0.1" +PREFERRED_VERSION_bitmap ?= "1.0.3" +PREFERRED_VERSION_iceauth ?= "1.0.2" +PREFERRED_VERSION_luit ?= "1.0.3" +PREFERRED_VERSION_mkfontdir-native ?= "1.0.4" +PREFERRED_VERSION_mkfontdir ?= "1.0.4" +PREFERRED_VERSION_mkfontscale ?= "1.0.5" +PREFERRED_VERSION_sessreg ?= "1.0.4" +PREFERRED_VERSION_setxkbmap ?= "1.0.4" +PREFERRED_VERSION_smproxy ?= "1.0.2" +PREFERRED_VERSION_x11perf ?= "1.5" +PREFERRED_VERSION_xauth ?= "1.0.3" +PREFERRED_VERSION_xbacklight ?= "1.1" +PREFERRED_VERSION_xcmsdb ?= "1.0.1" +PREFERRED_VERSION_xcursorgen ?= "1.0.2" +PREFERRED_VERSION_xdpyinfo ?= "1.0.3" +PREFERRED_VERSION_xdriinfo ?= "1.0.2" +PREFERRED_VERSION_xev ?= "1.0.3" +PREFERRED_VERSION_xgamma ?= "1.0.2" +PREFERRED_VERSION_xhost ?= "1.0.2" +PREFERRED_VERSION_xinput ?= "1.3.0" +PREFERRED_VERSION_xkbcomp ?= "1.0.5" +PREFERRED_VERSION_xkbevd ?= "1.0.2" +PREFERRED_VERSION_xkbutils ?= "1.0.1" +PREFERRED_VERSION_xkill ?= "1.0.1" +PREFERRED_VERSION_xlsatoms ?= "1.0.1" +PREFERRED_VERSION_xlsclients ?= "1.0.1" +PREFERRED_VERSION_xmodmap ?= "1.0.3" +PREFERRED_VERSION_xpr ?= "1.0.2" +PREFERRED_VERSION_xprop ?= "1.0.4" +PREFERRED_VERSION_xrandr ?= "1.2.3" +PREFERRED_VERSION_xrdb ?= "1.0.5" +PREFERRED_VERSION_xrefresh ?= "1.0.2" +PREFERRED_VERSION_xset ?= "1.0.4" +PREFERRED_VERSION_xsetmode ?= "1.0.0" +PREFERRED_VERSION_xsetroot ?= "1.0.2" +PREFERRED_VERSION_xvinfo ?= "1.0.2" +PREFERRED_VERSION_xwd ?= "1.0.2" +PREFERRED_VERSION_xwininfo ?= "1.0.4" +PREFERRED_VERSION_xwud ?= "1.0.1" + +# data +PREFERRED_VERSION_xbitmaps ?= "1.0.1" +PREFERRED_VERSION_xcursor-themes ?= "1.0.1" + +# doc +PREFERRED_VERSION_xorg-docs ?= "1.4" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2" + +# driver +PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1" +PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0" +PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1" +PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0" +PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1" +PREFERRED_VERSION_xf86-input-void ?= "1.1.1" +PREFERRED_VERSION_xf86-video-apm ?= "1.2.0" +PREFERRED_VERSION_xf86-video-ark ?= "0.7.0" +PREFERRED_VERSION_xf86-video-ast ?= "0.85.0" +PREFERRED_VERSION_xf86-video-ati ?= "6.9.0" +PREFERRED_VERSION_xf86-video-chips ?= "1.2.0" +PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1" +PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0" +PREFERRED_VERSION_xf86-video-geode ?= "2.11.2" +PREFERRED_VERSION_xf86-video-glide ?= "1.0.1" +PREFERRED_VERSION_xf86-video-glint ?= "1.2.1" +PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1" +PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0" +PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" +PREFERRED_VERSION_xf86-video-intel ?= "2.4.2" +PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.9" +PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.12" +PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.903" +PREFERRED_VERSION_xf86-video-r128 ?= "6.8.0" +PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0" +PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0" +PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1" +PREFERRED_VERSION_xf86-video-savage ?= "2.2.1" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0" +PREFERRED_VERSION_xf86-video-sis ?= "0.10.0" +PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0" +PREFERRED_VERSION_xf86-video-tga ?= "1.2.0" +PREFERRED_VERSION_xf86-video-trident ?= "1.3.0" +PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0" +PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0" +PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" +PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0" +PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0" +PREFERRED_VERSION_xf86-video-wsfb ?= "0.2.1" +PREFERRED_VERSION_xf86-video-xgi ?= "1.5.0" +PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3" + +# font +PREFERRED_VERSION_encodings ?= "1.0.2" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-util-native ?= "1.0.1" +PREFERRED_VERSION_font-util ?= "1.0.1" +PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1" + +# lib +PREFERRED_VERSION_diet-x11 ?= "1.1.5" +PREFERRED_VERSION_libapplewm ?= "1.0.0" +PREFERRED_VERSION_libdmx ?= "1.0.2" +PREFERRED_VERSION_libfs ?= "1.0.1" +PREFERRED_VERSION_libice ?= "1.0.4" +PREFERRED_VERSION_libfontenc ?= "1.0.4" +PREFERRED_VERSION_libsm ?= "1.1.0" +PREFERRED_VERSION_libwindowswm ?= "1.0.0" +PREFERRED_VERSION_libx11 ?= "1.1.5" +PREFERRED_VERSION_libx11-native ?= "1.1.1" +PREFERRED_VERSION_libxau ?= "1.0.4" +PREFERRED_VERSION_libxaw ?= "1.0.4" +PREFERRED_VERSION_libxcomposite ?= "0.4.0" +PREFERRED_VERSION_libxcursor ?= "1.1.9" +PREFERRED_VERSION_libxdamage ?= "1.1.1" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.2" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxext ?= "1.0.4" +PREFERRED_VERSION_libxfixes ?= "4.0.3" +PREFERRED_VERSION_libxfont ?= "1.3.3" +PREFERRED_VERSION_libxfontcache ?= "1.0.4" +PREFERRED_VERSION_libxft ?= "2.1.13" +PREFERRED_VERSION_libxi ?= "1.2.0" +PREFERRED_VERSION_libxinerama ?= "1.0.3" +PREFERRED_VERSION_libxkbfile ?= "1.0.5" +PREFERRED_VERSION_libxmu ?= "1.0.4" +PREFERRED_VERSION_libxpm ?= "3.5.7" +PREFERRED_VERSION_libxrandr ?= "1.2.3" +PREFERRED_VERSION_libxrender ?= "0.9.4" +PREFERRED_VERSION_libxres ?= "1.0.3" +PREFERRED_VERSION_libxscrnsaver ?= "1.1.3" +PREFERRED_VERSION_libxt ?= "1.0.5" +PREFERRED_VERSION_libxtst ?= "1.0.3" +PREFERRED_VERSION_libxv ?= "1.0.4" +PREFERRED_VERSION_libxvmc ?= "1.0.4" +PREFERRED_VERSION_libxxf86dga ?= "1.0.2" +PREFERRED_VERSION_libxxf86misc ?= "1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "1.0.2" +PREFERRED_VERSION_xtrans ?= "1.2.1" + +# This should be here but is needed until bitbake can do +# versioned depends +PREFERRED_VERSION_mesa ?= "7.4" + +# proto +PREFERRED_VERSION_applewmproto ?= "1.0.3" +PREFERRED_VERSION_bigreqsproto ?= "1.0.2" +PREFERRED_VERSION_compositeproto ?= "0.4" +PREFERRED_VERSION_damageproto ?= "1.1.0" +PREFERRED_VERSION_dmxproto ?= "2.2.2" +PREFERRED_VERSION_fixesproto ?= "4.0" +PREFERRED_VERSION_fontcacheproto ?= "0.1.2" +PREFERRED_VERSION_fontsproto ?= "2.0.2" +PREFERRED_VERSION_glproto ?= "1.4.9" +PREFERRED_VERSION_inputproto ?= "1.5.0" +PREFERRED_VERSION_kbproto ?= "1.0.3" +PREFERRED_VERSION_randrproto ?= "1.2.1" +PREFERRED_VERSION_recordproto ?= "1.13.2" +PREFERRED_VERSION_renderproto ?= "0.9.3" +PREFERRED_VERSION_resourceproto ?= "1.0.2" +PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" +PREFERRED_VERSION_dri2proto ?= "2.0" +PREFERRED_VERSION_trapproto ?= "3.4.3" +PREFERRED_VERSION_videoproto ?= "2.2.2" +PREFERRED_VERSION_windowswmproto ?= "1.0.3" +PREFERRED_VERSION_xmiscproto ?= "1.1.2" +PREFERRED_VERSION_xextproto ?= "7.0.3" +PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" +PREFERRED_VERSION_xf86driproto ?= "2.0.4" +PREFERRED_VERSION_xf86miscproto ?= "0.9.2" +PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" +PREFERRED_VERSION_xinemaroproto ?= "1.1.2" +PREFERRED_VERSION_xproto-native ?= "7.0.13" +PREFERRED_VERSION_xproto ?= "7.0.13" + +# util +PREFERRED_VERSION_gccmakedep ?= "1.0.2" +PREFERRED_VERSION_imake ?= "1.0.2" +PREFERRED_VERSION_makedepend ?= "1.0.1" +PREFERRED_VERSION_util-macros-native ?= "1.2.1" +PREFERRED_VERSION_util-macros ?= "1.2.1" +PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" + +# xserver +PREFERRED_VERSION_xserver-kdrive ?= "1.4" +PREFERRED_VERSION_xserver-xorg ?= "1.5.3" + +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 0e1a25a4b7..faa8c4d2a8 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -76,7 +76,7 @@ SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV} SRCREV_pn-gcc-cross-sdk ?= ${GCCREV} SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnet ?= "495" -SRCREV_pn-gnuradio ?= "10302" +SRCREV_pn-gnuradio ?= "11418" SRCREV_pn-gpe-conf ?= "9900" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gpe-gallery ?= "9376" diff --git a/conf/machine/omapzoom2.conf b/conf/machine/omapzoom2.conf index dd76a9fd38..abfec5e674 100644 --- a/conf/machine/omapzoom2.conf +++ b/conf/machine/omapzoom2.conf @@ -9,6 +9,7 @@ XSERVER = "xserver-xorg \ xf86-input-tslib \ xf86-input-mouse \ xf86-video-omapfb \ + xf86-video-fbdev \ xf86-input-keyboard" # Only has DVI connector for external screen @@ -20,9 +21,9 @@ IMAGE_FSTYPES += "tar.bz2 jffs2" EXTRA_IMAGECMD_jffs2 = "-lnp " # Guesswork -SERIAL_CONSOLE = "115200 ttyS2" +SERIAL_CONSOLE = "115200 ttyS3" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap" +PREFERRED_PROVIDER_virtual/kernel = "linux-omapandroid" KERNEL_IMAGETYPE = "uImage" @@ -50,5 +51,6 @@ PREFERRED_VERSION_u-boot = "git" #EXTRA_IMAGEDEPENDS += "u-boot x-load" #MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " +MACHINE_EXTRA_RRECOMMENDS = "" # and sdio MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa" diff --git a/recipes/dri/libdrm_2.4.11.bb b/recipes/dri/libdrm_2.4.11.bb new file mode 100644 index 0000000000..0ea2396372 --- /dev/null +++ b/recipes/dri/libdrm_2.4.11.bb @@ -0,0 +1,11 @@ +SECTION = "x11/base" +DEPENDS = "libpthread-stubs" +LICENSE = "MIT" +SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" +PROVIDES = "drm" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/recipes/glibc/files/tls_i486.patch b/recipes/glibc/files/tls_i486.patch new file mode 100644 index 0000000000..69a1fdf91d --- /dev/null +++ b/recipes/glibc/files/tls_i486.patch @@ -0,0 +1,14 @@ +Index: glibc-2.9/sysdeps/i386/dl-tlsdesc.S +=================================================================== +--- glibc-2.9.orig/sysdeps/i386/dl-tlsdesc.S 2009-07-07 23:21:11.647664128 +0200 ++++ glibc-2.9/sysdeps/i386/dl-tlsdesc.S 2009-07-07 23:21:32.802555992 +0200 +@@ -128,8 +128,7 @@ + .Lslow: + cfi_adjust_cfa_offset (28) + movl %ebx, 16(%esp) +- call __i686.get_pc_thunk.bx +- addl $_GLOBAL_OFFSET_TABLE_, %ebx ++ LOAD_PIC_REG (bx) + call ___tls_get_addr@PLT + movl 16(%esp), %ebx + jmp .Lret diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb index be66e2b727..b0ba738477 100644 --- a/recipes/glibc/glibc_2.9.bb +++ b/recipes/glibc/glibc_2.9.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r1" +PR = "r2" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" @@ -64,6 +64,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ file://etc/ld.so.conf \ file://generate-supported.mk \ file://march-i686.patch;patch=1;pnum=0 \ + file://tls_i486.patch;patch=1 \ " diff --git a/recipes/gnuradio/gnuradio/no-usrp2-svn.patch b/recipes/gnuradio/gnuradio/no-usrp2-svn.patch new file mode 100644 index 0000000000..d79b419c1a --- /dev/null +++ b/recipes/gnuradio/gnuradio/no-usrp2-svn.patch @@ -0,0 +1,12 @@ +--- gnuradio-trunk-work/configure.ac.orig 2008-10-06 13:38:45.000000000 -0400 ++++ gnuradio-trunk-work/configure.ac 2008-10-06 13:39:02.000000000 -0400 +@@ -317,9 +317,7 @@ + GRC_PMT + GRC_MBLOCK dnl this must come after GRC_PMT + GRC_USRP +-GRC_USRP2 + GRC_GR_USRP dnl this must come after GRC_USRP +-GRC_GR_USRP2 + GRC_GR_GCELL dnl this must come after GRC_GCELL and GRC_GNURADIO_CORE + GRC_GR_MSDD6000 + GRC_GR_AUDIO_ALSA diff --git a/recipes/gnuradio/gnuradio_svn.bb b/recipes/gnuradio/gnuradio_svn.bb index dc693b78de..d063e90088 100644 --- a/recipes/gnuradio/gnuradio_svn.bb +++ b/recipes/gnuradio/gnuradio_svn.bb @@ -4,24 +4,18 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += " gsl " -PV = "3.2.0+svnr${SRCREV}" +PV = "3.2.1+svnr${SRCREV}" PR = "${INC_PR}.1" EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable--usrp2" SRC_URI = "svn://gnuradio.org/svn/gnuradio/;module=trunk;proto=http \ - file://no-usrp2.patch;patch=1 \ - file://gnuradio-neon.patch;patch=1;pnum=0 \ + file://no-usrp2-svn.patch;patch=1 \ ${SOURCEFORGE_MIRROR}/libusb/libusb-0.1.12.tar.gz \ " S="${WORKDIR}/trunk" -#do_configure() { -# ./bootstrap -# oe_runconf -#} - do_compile_append() { sed -i -e s:${STAGING_DIR_TARGET}::g \ -e s:/${TARGET_SYS}::g \ diff --git a/recipes/i2c-tools/read-edid_1.4.1.bb b/recipes/i2c-tools/read-edid_1.4.1.bb index e1f10ca48d..3fa98b3223 100644 --- a/recipes/i2c-tools/read-edid_1.4.1.bb +++ b/recipes/i2c-tools/read-edid_1.4.1.bb @@ -1,5 +1,6 @@ DESCRIPTION = "read-edid elucidates various very useful informations from a conforming PnP monitor" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://john.fremlin.de/programs/linux/read-edid/read-edid-${PV}.tar.gz \ http://ftp.de.debian.org/debian/pool/main/r/read-edid/read-edid_1.4.1-2.1.diff.gz;patch=1 " @@ -7,13 +8,15 @@ SRC_URI = "http://john.fremlin.de/programs/linux/read-edid/read-edid-${PV}.tar.g inherit autotools do_compile() { - oe_runmake parse-edid + oe_runmake parse-edid get-edid } do_install() { install -d ${D}/${sbindir} install -m 0755 parse-edid ${D}/${sbindir}/ + install -m 0755 get-edid ${D}/${sbindir}/ } -PACKAGES =+ "parse-edid" +PACKAGES =+ "parse-edid get-edid" FILES_parse-edid = "${sbindir}/parse-edid" +FILES_get-edid = "${sbindir}/parse-edid" diff --git a/recipes/libgpg-error/libgpg-error.inc b/recipes/libgpg-error/libgpg-error.inc index 6fcc9202b2..400c1668a6 100644 --- a/recipes/libgpg-error/libgpg-error.inc +++ b/recipes/libgpg-error/libgpg-error.inc @@ -8,6 +8,8 @@ DEPENDS += "virtual/libiconv" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ file://pkgconfig.patch;patch=1" +INC_PR = "r6" + # move libgpg-error-config into -dev package FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}/*" diff --git a/recipes/libgpg-error/libgpg-error_0.6.bb b/recipes/libgpg-error/libgpg-error_0.6.bb index 4929121167..69577e003a 100644 --- a/recipes/libgpg-error/libgpg-error_0.6.bb +++ b/recipes/libgpg-error/libgpg-error_0.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GPG-Error library" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL LGPL FDL" -PR = "r1" +PR = "${INC_PR}.1" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz" diff --git a/recipes/libgpg-error/libgpg-error_0.7.bb b/recipes/libgpg-error/libgpg-error_0.7.bb index 0f28ed00d4..526a2a401b 100644 --- a/recipes/libgpg-error/libgpg-error_0.7.bb +++ b/recipes/libgpg-error/libgpg-error_0.7.bb @@ -1,6 +1,6 @@ require libgpg-error.inc -PR = "r5" +PR = "${INC_PR}.1" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz \ file://pkgconfig.patch;patch=1" diff --git a/recipes/libgpg-error/libgpg-error_1.0.bb b/recipes/libgpg-error/libgpg-error_1.0.bb index b81d4b9da7..6e7c0e6adb 100644 --- a/recipes/libgpg-error/libgpg-error_1.0.bb +++ b/recipes/libgpg-error/libgpg-error_1.0.bb @@ -1,3 +1,3 @@ require libgpg-error.inc -PR = "r2" +PR = "${INC_PR}.1" diff --git a/recipes/libgpg-error/libgpg-error_1.3.bb b/recipes/libgpg-error/libgpg-error_1.3.bb index b81d4b9da7..6e7c0e6adb 100644 --- a/recipes/libgpg-error/libgpg-error_1.3.bb +++ b/recipes/libgpg-error/libgpg-error_1.3.bb @@ -1,3 +1,3 @@ require libgpg-error.inc -PR = "r2" +PR = "${INC_PR}.1" diff --git a/recipes/libgpg-error/libgpg-error_1.4.bb b/recipes/libgpg-error/libgpg-error_1.4.bb index b81d4b9da7..6e7c0e6adb 100644 --- a/recipes/libgpg-error/libgpg-error_1.4.bb +++ b/recipes/libgpg-error/libgpg-error_1.4.bb @@ -1,3 +1,3 @@ require libgpg-error.inc -PR = "r2" +PR = "${INC_PR}.1" diff --git a/recipes/linux/linux-omapandroid/omapzoom2/defconfig b/recipes/linux/linux-omapandroid/omapzoom2/defconfig new file mode 100644 index 0000000000..6e5fed0e1e --- /dev/null +++ b/recipes/linux/linux-omapandroid/omapzoom2/defconfig @@ -0,0 +1,1864 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.29-omap1 +# Fri Jul 3 10:05:29 2009 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_PANIC_TIMEOUT=0 +CONFIG_EMBEDDED=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ASHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_COMPAT_BRK=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_FREEZER is not set + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_W90X900 is not set + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +# CONFIG_ARCH_OMAP1 is not set +# CONFIG_ARCH_OMAP2 is not set +CONFIG_ARCH_OMAP3=y + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set +# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set +# CONFIG_OMAP_SMARTREFLEX is not set +# CONFIG_OMAP_RESET_CLOCKS is not set +CONFIG_OMAP_BOOT_TAG=y +CONFIG_OMAP_BOOT_REASON=y +# CONFIG_OMAP_COMPONENT_VERSION is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +CONFIG_OMAP_MUX=y +CONFIG_OMAP_MUX_DEBUG=y +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MBOX_FWK is not set +CONFIG_OMAP_IOMMU=y +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_TICK_GPTIMER=1 +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 is not set +CONFIG_OMAP_LL_DEBUG_UART_EXT=y +CONFIG_OMAP_SERIAL_WAKE=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y +# CONFIG_OMAP_PM_SRF is not set +CONFIG_ARCH_OMAP34XX=y +CONFIG_ARCH_OMAP3430=y + +# +# OMAP Board Type +# +# CONFIG_MACH_NOKIA_RX51 is not set +# CONFIG_MACH_OMAP_LDP is not set +CONFIG_MACH_OMAP_ZOOM2=y +CONFIG_WIFI_CONTROL_FUNC=y +# CONFIG_TIWLAN_SDIO is not set +# CONFIG_MACH_OMAP_3430SDP is not set +# CONFIG_MACH_OMAP3EVM is not set +# CONFIG_MACH_OMAP3_BEAGLE is not set +# CONFIG_MACH_OVERO is not set +# CONFIG_MACH_OMAP3_PANDORA is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_V7=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_IFAR=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMBEE is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +# CONFIG_HAS_TLS_REG is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT=y +CONFIG_HZ=128 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_ARCH_FLATMEM_HAS_HOLES=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +# CONFIG_CPU_FREQ is not set +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +CONFIG_VFP=y +CONFIG_VFPv3=y +# CONFIG_NEON is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +# CONFIG_SUSPEND is not set +CONFIG_HAS_WAKELOCK=y +CONFIG_HAS_EARLYSUSPEND=y +CONFIG_WAKELOCK=y +CONFIG_WAKELOCK_STAT=y +CONFIG_USER_WAKELOCK=y +CONFIG_EARLYSUSPEND=y +# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set +# CONFIG_CONSOLE_EARLYSUSPEND is not set +CONFIG_FB_EARLYSUSPEND=y +# CONFIG_APM_EMULATION is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_COMPAT_NET_DEV_OPS=y +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +CONFIG_XFRM_MIGRATE=y +# CONFIG_XFRM_STATISTICS is not set +CONFIG_NET_KEY=y +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +CONFIG_ANDROID_PARANOID_NETWORK=y +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +CONFIG_BT=y +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +CONFIG_BT_HIDP=y + +# +# Bluetooth device drivers +# +# CONFIG_BT_HCIBTUSB is not set +# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +# CONFIG_BT_HCIUART_BCSP is not set +CONFIG_BT_HCIUART_LL=y +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIBRF6150 is not set +# CONFIG_BT_HCIH4P is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_PHONET is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +CONFIG_WIRELESS_OLD_REGULATORY=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +# CONFIG_LIB80211 is not set +# CONFIG_MAC80211 is not set +# CONFIG_WIMAX is not set +CONFIG_RFKILL=y +CONFIG_RFKILL_PM=y +# CONFIG_RFKILL_INPUT is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +CONFIG_MTD_OMAP_NOR=y +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_OMAP2=y +CONFIG_MTD_NAND_OMAP_HWECC=y +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +CONFIG_ANDROID_PMEM=y +# CONFIG_ICS932S401 is not set +# CONFIG_OMAP_STI is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_KERNEL_DEBUGGER_CORE is not set +# CONFIG_UID_STAT is not set +CONFIG_WL127X_RFKILL=y +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_93CX6 is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_LIBFC is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +CONFIG_SMC911X=y +# CONFIG_SMSC911X is not set +# CONFIG_DNET is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +CONFIG_NETDEV_1000=y +CONFIG_NETDEV_10000=y + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_IWLWIFI_LEDS is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_HSO is not set +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +# CONFIG_INPUT_KEYRESET is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_OMAP is not set +CONFIG_KEYBOARD_TWL4030=y +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set +# CONFIG_TOUCHSCREEN_TSC210X is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVMEM=y +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_OMAP is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_DCC_TTY is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +CONFIG_TWL4030_MADC=y +# CONFIG_TWL4030_POWEROFF is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_PCA963X is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_OMAP24XX=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_TSC210X is not set +# CONFIG_SPI_TSC2301 is not set +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +CONFIG_GPIO_TWL4030=y + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +CONFIG_W1=y +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_DS2490 is not set +# CONFIG_W1_MASTER_DS2482 is not set +# CONFIG_W1_MASTER_DS1WM is not set +# CONFIG_W1_MASTER_GPIO is not set +CONFIG_HDQ_MASTER_OMAP=y + +# +# 1-wire Slaves +# +# CONFIG_W1_SLAVE_THERM is not set +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_DS2431 is not set +# CONFIG_W1_SLAVE_DS2433 is not set +# CONFIG_W1_SLAVE_DS2760 is not set +CONFIG_W1_SLAVE_BQ27000=y +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_BATTERY_DS2760 is not set +CONFIG_TWL4030_BCI_BATTERY=y +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=y + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +CONFIG_TWL4030_CORE=y +# CONFIG_TWL4030_POWER is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set + +# +# Multimedia devices +# + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=y + +# +# Multimedia drivers +# +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=y +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEOBUF_GEN=y +CONFIG_VIDEOBUF_DMA_SG=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS5345 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# Video decoders +# +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_TCM825X is not set +CONFIG_VIDEO_IMX046=y +CONFIG_VIDEO_LV8093=y +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA7111 is not set +# CONFIG_VIDEO_SAA7114 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_VPX3220 is not set + +# +# Video and audio decoders +# +# CONFIG_VIDEO_CX25840 is not set + +# +# MPEG video encoders +# +# CONFIG_VIDEO_CX2341X is not set + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +CONFIG_VIDEO_OMAP3=y +CONFIG_VIDEO_OMAP3_V4L2=y +CONFIG_VIDEO_OMAP_VIDEOLIB=y +CONFIG_VIDEO_OMAP_VIDEOOUT=y +CONFIG_NTSC_M=y +# CONFIG_PAL_BDGHI is not set +# CONFIG_SOC_CAMERA is not set +# CONFIG_V4L_USB_DRIVERS is not set +# CONFIG_RADIO_ADAPTERS is not set +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_UVESA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +CONFIG_FB_OMAP_LCD_WVGA=y +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_DSS_VRAM_SIZE=4 +CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y +# CONFIG_OMAP2_DSS_RFBI is not set +CONFIG_OMAP2_DSS_VENC=y +# CONFIG_OMAP2_DSS_SDI is not set +# CONFIG_OMAP2_DSS_DSI is not set +# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 + +# +# OMAP2/3 Display Device Drivers +# +# CONFIG_PANEL_GENERIC is not set +# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set +# CONFIG_PANEL_SHARP_LS037V7DW01 is not set +# CONFIG_PANEL_N800 is not set +CONFIG_PANEL_ZOOM2=y +# CONFIG_CTRL_BLIZZARD is not set +CONFIG_FB_OMAP2=y +CONFIG_FB_OMAP2_DEBUG_SUPPORT=y +# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set +CONFIG_FB_OMAP2_NUM_FBS=1 +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +CONFIG_LCD_PLATFORM=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=y + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=y +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_ARM=y +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +CONFIG_HID_COMPAT=y +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_GREENASIA_FF is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_THRUSTMASTER_FF is not set +# CONFIG_ZEROPLUS_FF is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_SOC=y + +# +# OMAP 343x high speed USB support +# +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_PERIPHERAL is not set +CONFIG_USB_MUSB_OTG=y +CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC_HCD=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +# CONFIG_USB_TI_CPPI_DMA is not set +# CONFIG_USB_MUSB_DEBUG is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# + +# +# see USB_STORAGE Help for more information +# +# CONFIG_USB_STORAGE is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_IMX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_CI13XXX is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +CONFIG_USB_ANDROID=y +# CONFIG_USB_CDC_COMPOSITE is not set + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_ISP1301_OMAP is not set +CONFIG_TWL4030_USB=y +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_EMBEDDED_SDIO is not set +# CONFIG_MMC_PARANOID_SD_INIT is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_MMC_BLOCK_PARANOID_RESUME=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_OMAP_HS=y +# CONFIG_OMAP_HS_MMC2 is not set +# CONFIG_OMAP_HS_MMC3 is not set +# CONFIG_MMC_SPI is not set +# CONFIG_MEMSTICK is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_NEW_LEDS is not set +CONFIG_SWITCH=y +# CONFIG_SWITCH_GPIO is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +CONFIG_RTC_INTF_ALARM=y +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +CONFIG_RTC_DRV_TWL4030=y +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_DMADEVICES is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +CONFIG_REGULATOR_TWL4030=y +# CONFIG_UIO is not set +CONFIG_STAGING=y +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_MEILHAUS is not set +# CONFIG_USB_IP_COMMON is not set +# CONFIG_ECHO is not set +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_INPUT_MIMIO is not set +# CONFIG_TRANZPORT is not set + +# +# Android +# +CONFIG_ANDROID=y +CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ANDROID_LOGGER=y +CONFIG_ANDROID_RAM_CONSOLE=y +CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y +# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set +# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set +CONFIG_ANDROID_TIMED_OUTPUT=y +CONFIG_ANDROID_TIMED_GPIO=y +CONFIG_ANDROID_LOW_MEMORY_KILLER=y + +# +# CBUS support +# +# CONFIG_CBUS is not set +# CONFIG_MPU_BRIDGE is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_FILE_LOCKING=y +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_PRINT_QUOTA_WARNING=y +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_YAFFS_FS=y +CONFIG_YAFFS_YAFFS1=y +# CONFIG_YAFFS_9BYTE_TAGS is not set +# CONFIG_YAFFS_DOES_ECC is not set +CONFIG_YAFFS_YAFFS2=y +CONFIG_YAFFS_AUTO_YAFFS2=y +# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set +# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set +# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set +CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y +# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +# CONFIG_SUNRPC_REGISTER_V4 is not set +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_HAVE_FUNCTION_TRACER=y + +# +# Tracers +# +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_TRACE_BRANCH_PROFILING is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_FIPS is not set +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=m +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/recipes/linux/linux-omapandroid_2.6.29.bb b/recipes/linux/linux-omapandroid_2.6.29.bb new file mode 100644 index 0000000000..40444250dc --- /dev/null +++ b/recipes/linux/linux-omapandroid_2.6.29.bb @@ -0,0 +1,24 @@ +require linux.inc + +DESCRIPTION = "Linux kernel for OMAP processors" +KERNEL_IMAGETYPE = "uImage" + +COMPATIBLE_MACHINE = "omapzoom2" + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_omapzoom2 = "1" + +SRCREV = "1e5ddc5d409f25652fe99064f22c0aa75bc9b7b3" + +# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc +PV = "2.6.29" +PR_append = "+gitr${SRCREV}" + +SRC_URI = "git://android.git.kernel.org/kernel/omap;branch=android-omap-2.6.29;protocol=git \ + file://defconfig" + +SRC_URI_append = " \ +" + +S = "${WORKDIR}/git" + diff --git a/recipes/mesa/mesa-dri_7.4.bb b/recipes/mesa/mesa-dri_7.4.bb new file mode 100644 index 0000000000..296a254841 --- /dev/null +++ b/recipes/mesa/mesa-dri_7.4.bb @@ -0,0 +1,28 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto dri2proto expat" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PE = "1" +PR = "r6" + +# most of our targets do not have DRI so will use mesa-xlib +DEFAULT_PREFERENCE = "-1" + +# ASUS EeePC 901 has DRI support so use mesa-dri by default +DEFAULT_PREFERENCE_eee901 = "1" + +PACKAGES =+ "${PN}-xprogs" + +FILES_${PN} += "${libdir}/dri/*.so" +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" + +EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" + +do_install_append () { + install -d ${D}/usr/bin + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ +} diff --git a/recipes/mesa/mesa_7.4.bb b/recipes/mesa/mesa_7.4.bb new file mode 100644 index 0000000000..43cde679a1 --- /dev/null +++ b/recipes/mesa/mesa_7.4.bb @@ -0,0 +1,2 @@ +# This is a dummy package so OE can use the poky mesa files +require mesa-dri_${PV}.bb diff --git a/recipes/opkg/files/opkg-libdir.patch b/recipes/opkg/files/opkg-libdir.patch new file mode 100644 index 0000000000..1d48b9a6bf --- /dev/null +++ b/recipes/opkg/files/opkg-libdir.patch @@ -0,0 +1,11 @@ +--- trunk/utils/update-alternatives.orig 2009-06-23 15:33:56.000000000 -0300 ++++ trunk/utils/update-alternatives 2009-06-23 15:34:10.000000000 -0300 +@@ -21,7 +21,7 @@ + set -e + + # admin dir +-ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives" ++ad="$OPKG_OFFLINE_ROOT/${libdir}/opkg/alternatives" + + usage() { + echo "update-alternatives: $* diff --git a/recipes/opkg/opkg-native_svn.bb b/recipes/opkg/opkg-native_svn.bb index 82c74e0b86..acd681cb35 100644 --- a/recipes/opkg/opkg-native_svn.bb +++ b/recipes/opkg/opkg-native_svn.bb @@ -3,6 +3,8 @@ require opkg.inc DEPENDS = "curl-native" PR = "r3" +SRC_URI += "file://opkg-libdir.patch;patch=1" + target_libdir := "${libdir}" inherit native diff --git a/recipes/pmount/pmount-0.9.18/gettext.patch b/recipes/pmount/pmount-0.9.18/gettext.patch index dbac93f6ba..a784e32440 100644 --- a/recipes/pmount/pmount-0.9.18/gettext.patch +++ b/recipes/pmount/pmount-0.9.18/gettext.patch @@ -1,7 +1,7 @@ -Index: pmount-0.9.17/src/pmount-hal.c +Index: pmount-0.9.18/src/pmount-hal.c =================================================================== ---- pmount-0.9.17.orig/src/pmount-hal.c 2007-07-01 13:58:49.000000000 +0200 -+++ pmount-0.9.17/src/pmount-hal.c 2008-10-08 23:39:20.970178412 +0200 +--- pmount-0.9.18.orig/src/pmount-hal.c 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/pmount-hal.c 2009-07-12 17:16:00.719122863 +0200 @@ -16,7 +16,6 @@ #include <dirent.h> #include <sys/stat.h> @@ -10,54 +10,77 @@ Index: pmount-0.9.17/src/pmount-hal.c #include <libhal-storage.h> #include "policy.h" -@@ -26,7 +25,12 @@ - #include "realpath.h" +@@ -25,9 +24,6 @@ - /* gettext abbreviation */ -+#ifdef ENABLE_NLS -+#include <libintl.h> - #define _(String) gettext(String) -+#else -+#define _(String) (String) -+#endif + #include "realpath.h" +-/* gettext abbreviation */ +-#define _(String) gettext(String) +- void help() { puts( _( -@@ -196,10 +200,12 @@ - char *dmask = NULL; - char *iocharset = NULL; + "pmount-hal - execute pmount with additional information from hal\n\n" +@@ -198,8 +194,8 @@ -+#ifdef ENABLE_NLS /* initialize locale */ setlocale( LC_ALL, "" ); - bindtextdomain( "pmount", NULL ); - textdomain( "pmount" ); -+#endif +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); if( argc < 2 ) { help(); -Index: pmount-0.9.17/src/utils.h +Index: pmount-0.9.18/src/utils.h =================================================================== ---- pmount-0.9.17.orig/src/utils.h 2007-07-07 09:05:06.000000000 +0200 -+++ pmount-0.9.17/src/utils.h 2008-10-08 23:19:09.515475595 +0200 -@@ -12,7 +12,12 @@ +--- pmount-0.9.18.orig/src/utils.h 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/utils.h 2009-07-12 17:23:01.384780369 +0200 +@@ -12,8 +12,31 @@ #define __utils_h /* gettext abbreviation */ +#ifdef ENABLE_NLS ++ +#include <libintl.h> ++ #define _(String) gettext(String) + ++#ifdef gettext_noop ++#define N_(String) gettext_noop(String) +#else -+#define _(String) (String) ++#define N_(String) (String) +#endif - ++ ++#else /* NLS is disabled */ ++ ++#define _(String) (String) ++#define N_(String) (String) ++#define textdomain(String) (String) ++#define gettext(String) (String) ++#define dgettext(Domain,String) (String) ++#define dcgettext(Domain,String,Type) (String) ++#define bindtextdomain(Domain,Directory) (Domain) ++#define bind_textdomain_codeset(Domain,Codeset) (Codeset) ++ ++#endif /* ENABLE_NLS */ ++ /* global flag whether to print debug messages (false by default) */ extern int enable_debug; -Index: pmount-0.9.17/configure.ac + +Index: pmount-0.9.18/configure.ac =================================================================== ---- pmount-0.9.17.orig/configure.ac 2007-12-14 20:27:23.000000000 +0100 -+++ pmount-0.9.17/configure.ac 2008-10-08 23:19:09.598820915 +0200 -@@ -77,10 +77,7 @@ +--- pmount-0.9.18.orig/configure.ac 2008-10-18 21:02:18.000000000 +0200 ++++ pmount-0.9.18/configure.ac 2009-07-12 17:16:00.719122863 +0200 +@@ -5,8 +5,6 @@ + AC_CONFIG_SRCDIR(src) + AM_INIT_AUTOMAKE(pmount, 0.9.18) + +-AC_PROG_INTLTOOL([0.21]) +- + AM_MAINTAINER_MODE + AC_ISC_POSIX + AC_HEADER_STDC +@@ -77,10 +75,13 @@ fi AM_CONDITIONAL(PMOUNT_HAL, test -n "$BUILD_HAL") @@ -65,69 +88,110 @@ Index: pmount-0.9.17/configure.ac -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) -AM_GLIB_GNU_GETTEXT ++ ++IT_PROG_INTLTOOL([0.21]) ++GETTEXT_PACKAGE=$PACKAGE ++AC_SUBST([GETTEXT_PACKAGE]) ++AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) +AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.17]) AC_OUTPUT([ Makefile -Index: pmount-0.9.17/src/pmount.c +Index: pmount-0.9.18/src/pmount.c =================================================================== ---- pmount-0.9.17.orig/src/pmount.c 2008-10-08 23:36:44.452037557 +0200 -+++ pmount-0.9.17/src/pmount.c 2008-10-08 23:37:38.778816969 +0200 -@@ -21,9 +21,12 @@ +--- pmount-0.9.18.orig/src/pmount.c 2008-10-18 20:49:54.000000000 +0200 ++++ pmount-0.9.18/src/pmount.c 2009-07-12 17:16:00.722456315 +0200 +@@ -21,7 +21,6 @@ #include <errno.h> #include <locale.h> #include <langinfo.h> -#include <libintl.h> #include <sys/stat.h> -+#ifdef ENABLE_NLS -+#include <libintl.h> -+#endif -+ #include "fs.h" - #include "policy.h" - #include "utils.h" -@@ -619,10 +622,12 @@ - { NULL, 0, NULL, 0} - }; +@@ -652,8 +651,8 @@ -+#ifdef ENABLE_NLS /* initialize locale */ setlocale( LC_ALL, "" ); - bindtextdomain( "pmount", NULL ); - textdomain( "pmount" ); -+#endif +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); /* If pmount is run without a single argument, print out the list of removable devices. Does not require root privileges, just read access -Index: pmount-0.9.17/src/pumount.c +Index: pmount-0.9.18/src/pumount.c =================================================================== ---- pmount-0.9.17.orig/src/pumount.c 2008-10-08 23:38:21.122028300 +0200 -+++ pmount-0.9.17/src/pumount.c 2008-10-08 23:38:47.972023678 +0200 -@@ -16,9 +16,12 @@ +--- pmount-0.9.18.orig/src/pumount.c 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/pumount.c 2009-07-12 17:16:00.722456315 +0200 +@@ -16,9 +16,9 @@ #include <sys/wait.h> #include <limits.h> #include <getopt.h> -#include <libintl.h> #include <locale.h> -+#ifdef ENABLE_NLS -+#include <libintl.h> -+#endif + #include "policy.h" #include "utils.h" #include "luks.h" -@@ -172,10 +175,12 @@ - { NULL, 0, NULL, 0} - }; +@@ -174,8 +174,8 @@ -+#ifdef ENABLE_NLS /* initialize locale */ setlocale( LC_ALL, "" ); - bindtextdomain( "pmount", NULL ); - textdomain( "pmount" ); -+#endif +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); /* are we root? */ if( geteuid() ) { +Index: pmount-0.9.18/src/luks.c +=================================================================== +--- pmount-0.9.18.orig/src/luks.c 2009-07-12 17:17:45.278704656 +0200 ++++ pmount-0.9.18/src/luks.c 2009-07-12 17:17:49.627119155 +0200 +@@ -14,7 +14,6 @@ + #include <stdio.h> + #include <limits.h> + #include <sys/stat.h> +-#include <libintl.h> + + enum decrypt_status + luks_decrypt( const char* device, char* decrypted, int decrypted_size, +Index: pmount-0.9.18/src/policy.c +=================================================================== +--- pmount-0.9.18.orig/src/policy.c 2009-07-12 17:17:55.502449663 +0200 ++++ pmount-0.9.18/src/policy.c 2009-07-12 17:18:03.200672861 +0200 +@@ -18,7 +18,6 @@ + #include <stdlib.h> + #include <errno.h> + #include <dirent.h> +-#include <libintl.h> + #include <sys/stat.h> + #include <sysfs/libsysfs.h> + #include <regex.h> +Index: pmount-0.9.18/src/realpath.c +=================================================================== +--- pmount-0.9.18.orig/src/realpath.c 2009-07-12 17:18:27.354526224 +0200 ++++ pmount-0.9.18/src/realpath.c 2009-07-12 17:18:32.256256916 +0200 +@@ -31,7 +31,6 @@ + #include <errno.h> + #include <stdio.h> + #include "realpath.h" +-#include <libintl.h> + #include "utils.h" + + #define MAX_READLINKS 32 +Index: pmount-0.9.18/src/utils.c +=================================================================== +--- pmount-0.9.18.orig/src/utils.c 2009-07-12 17:18:09.718277410 +0200 ++++ pmount-0.9.18/src/utils.c 2009-07-12 17:18:13.935179014 +0200 +@@ -21,7 +21,6 @@ + #include <unistd.h> + #include <fcntl.h> + #include <signal.h> +-#include <libintl.h> + + /* File name used to tag directories created by pmount */ + #define CREATED_DIR_STAMP ".created_by_pmount" diff --git a/recipes/pmount/pmount-0.9.19/gettext.patch b/recipes/pmount/pmount-0.9.19/gettext.patch new file mode 100644 index 0000000000..a784e32440 --- /dev/null +++ b/recipes/pmount/pmount-0.9.19/gettext.patch @@ -0,0 +1,197 @@ +Index: pmount-0.9.18/src/pmount-hal.c +=================================================================== +--- pmount-0.9.18.orig/src/pmount-hal.c 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/pmount-hal.c 2009-07-12 17:16:00.719122863 +0200 +@@ -16,7 +16,6 @@ + #include <dirent.h> + #include <sys/stat.h> + #include <locale.h> +-#include <libintl.h> + #include <libhal-storage.h> + + #include "policy.h" +@@ -25,9 +24,6 @@ + + #include "realpath.h" + +-/* gettext abbreviation */ +-#define _(String) gettext(String) +- + void help() { + puts( _( + "pmount-hal - execute pmount with additional information from hal\n\n" +@@ -198,8 +194,8 @@ + + /* initialize locale */ + setlocale( LC_ALL, "" ); +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); + + if( argc < 2 ) { + help(); +Index: pmount-0.9.18/src/utils.h +=================================================================== +--- pmount-0.9.18.orig/src/utils.h 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/utils.h 2009-07-12 17:23:01.384780369 +0200 +@@ -12,8 +12,31 @@ + #define __utils_h + + /* gettext abbreviation */ ++#ifdef ENABLE_NLS ++ ++#include <libintl.h> ++ + #define _(String) gettext(String) + ++#ifdef gettext_noop ++#define N_(String) gettext_noop(String) ++#else ++#define N_(String) (String) ++#endif ++ ++#else /* NLS is disabled */ ++ ++#define _(String) (String) ++#define N_(String) (String) ++#define textdomain(String) (String) ++#define gettext(String) (String) ++#define dgettext(Domain,String) (String) ++#define dcgettext(Domain,String,Type) (String) ++#define bindtextdomain(Domain,Directory) (Domain) ++#define bind_textdomain_codeset(Domain,Codeset) (Codeset) ++ ++#endif /* ENABLE_NLS */ ++ + /* global flag whether to print debug messages (false by default) */ + extern int enable_debug; + +Index: pmount-0.9.18/configure.ac +=================================================================== +--- pmount-0.9.18.orig/configure.ac 2008-10-18 21:02:18.000000000 +0200 ++++ pmount-0.9.18/configure.ac 2009-07-12 17:16:00.719122863 +0200 +@@ -5,8 +5,6 @@ + AC_CONFIG_SRCDIR(src) + AM_INIT_AUTOMAKE(pmount, 0.9.18) + +-AC_PROG_INTLTOOL([0.21]) +- + AM_MAINTAINER_MODE + AC_ISC_POSIX + AC_HEADER_STDC +@@ -77,10 +75,13 @@ + fi + AM_CONDITIONAL(PMOUNT_HAL, test -n "$BUILD_HAL") + +-GETTEXT_PACKAGE="pmount" +-AC_SUBST(GETTEXT_PACKAGE) +-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) +-AM_GLIB_GNU_GETTEXT ++ ++IT_PROG_INTLTOOL([0.21]) ++GETTEXT_PACKAGE=$PACKAGE ++AC_SUBST([GETTEXT_PACKAGE]) ++AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.17]) + + AC_OUTPUT([ + Makefile +Index: pmount-0.9.18/src/pmount.c +=================================================================== +--- pmount-0.9.18.orig/src/pmount.c 2008-10-18 20:49:54.000000000 +0200 ++++ pmount-0.9.18/src/pmount.c 2009-07-12 17:16:00.722456315 +0200 +@@ -21,7 +21,6 @@ + #include <errno.h> + #include <locale.h> + #include <langinfo.h> +-#include <libintl.h> + #include <sys/stat.h> + + #include "fs.h" +@@ -652,8 +651,8 @@ + + /* initialize locale */ + setlocale( LC_ALL, "" ); +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); + + /* If pmount is run without a single argument, print out the list + of removable devices. Does not require root privileges, just read access +Index: pmount-0.9.18/src/pumount.c +=================================================================== +--- pmount-0.9.18.orig/src/pumount.c 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/pumount.c 2009-07-12 17:16:00.722456315 +0200 +@@ -16,9 +16,9 @@ + #include <sys/wait.h> + #include <limits.h> + #include <getopt.h> +-#include <libintl.h> + #include <locale.h> + ++ + #include "policy.h" + #include "utils.h" + #include "luks.h" +@@ -174,8 +174,8 @@ + + /* initialize locale */ + setlocale( LC_ALL, "" ); +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); + + /* are we root? */ + if( geteuid() ) { +Index: pmount-0.9.18/src/luks.c +=================================================================== +--- pmount-0.9.18.orig/src/luks.c 2009-07-12 17:17:45.278704656 +0200 ++++ pmount-0.9.18/src/luks.c 2009-07-12 17:17:49.627119155 +0200 +@@ -14,7 +14,6 @@ + #include <stdio.h> + #include <limits.h> + #include <sys/stat.h> +-#include <libintl.h> + + enum decrypt_status + luks_decrypt( const char* device, char* decrypted, int decrypted_size, +Index: pmount-0.9.18/src/policy.c +=================================================================== +--- pmount-0.9.18.orig/src/policy.c 2009-07-12 17:17:55.502449663 +0200 ++++ pmount-0.9.18/src/policy.c 2009-07-12 17:18:03.200672861 +0200 +@@ -18,7 +18,6 @@ + #include <stdlib.h> + #include <errno.h> + #include <dirent.h> +-#include <libintl.h> + #include <sys/stat.h> + #include <sysfs/libsysfs.h> + #include <regex.h> +Index: pmount-0.9.18/src/realpath.c +=================================================================== +--- pmount-0.9.18.orig/src/realpath.c 2009-07-12 17:18:27.354526224 +0200 ++++ pmount-0.9.18/src/realpath.c 2009-07-12 17:18:32.256256916 +0200 +@@ -31,7 +31,6 @@ + #include <errno.h> + #include <stdio.h> + #include "realpath.h" +-#include <libintl.h> + #include "utils.h" + + #define MAX_READLINKS 32 +Index: pmount-0.9.18/src/utils.c +=================================================================== +--- pmount-0.9.18.orig/src/utils.c 2009-07-12 17:18:09.718277410 +0200 ++++ pmount-0.9.18/src/utils.c 2009-07-12 17:18:13.935179014 +0200 +@@ -21,7 +21,6 @@ + #include <unistd.h> + #include <fcntl.h> + #include <signal.h> +-#include <libintl.h> + + /* File name used to tag directories created by pmount */ + #define CREATED_DIR_STAMP ".created_by_pmount" diff --git a/recipes/pmount/pmount-0.9.19/install.patch b/recipes/pmount/pmount-0.9.19/install.patch new file mode 100644 index 0000000000..b02942a591 --- /dev/null +++ b/recipes/pmount/pmount-0.9.19/install.patch @@ -0,0 +1,15 @@ +Index: pmount-0.9.17/src/Makefile.am +=================================================================== +--- pmount-0.9.17.orig/src/Makefile.am 2008-10-09 01:22:41.668067209 +0200 ++++ pmount-0.9.17/src/Makefile.am 2008-10-09 01:23:22.144725902 +0200 +@@ -36,8 +36,8 @@ + + install-data-hook: + test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR) +- $(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount +- $(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount ++ $(INSTALL_DATA) -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount ++ $(INSTALL_DATA) -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount + + uninstall-hook: + rm -f $(INSTALL_DIR)/pmount diff --git a/recipes/pmount/pmount_0.9.18.bb b/recipes/pmount/pmount_0.9.18.bb index 26770b33a9..71a823e698 100644 --- a/recipes/pmount/pmount_0.9.18.bb +++ b/recipes/pmount/pmount_0.9.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Policy based mounter that gives the ability to mount removable devices as a user" HOMEPAGE = "http://pmount.alioth.debian.org/" LICENSE = "GPLv2" -PR = "r0" +PR = "r1" DEPENDS = "hal e2fsprogs-libs sysfsutils" RDEPENDS_${PN}-hal = "${PN}" diff --git a/recipes/pmount/pmount_0.9.19.bb b/recipes/pmount/pmount_0.9.19.bb new file mode 100644 index 0000000000..2bab217a29 --- /dev/null +++ b/recipes/pmount/pmount_0.9.19.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Policy based mounter that gives the ability to mount removable devices as a user" +HOMEPAGE = "http://pmount.alioth.debian.org/" +LICENSE = "GPLv2" +PR = "r0" + +DEPENDS = "hal e2fsprogs-libs" +RDEPENDS_${PN}-hal = "${PN}" +RRECOMMENDS_${PN}-hal = "hal" + +SRC_URI = "https://alioth.debian.org/frs/download.php/2867/pmount-0.9.19.tar.gz \ + file://gettext.patch;patch=1 \ + file://install.patch;patch=1 \ + " + +inherit autotools gettext + +EXTRA_OECONF = "--enable-hal" + +PACKAGES =+ "${PN}-hal" + +FILES_${PN}-hal = "${bindir}/pmount-hal" + diff --git a/recipes/pulseaudio/pulseaudio-0.9.15/fixbluezbuild.patch b/recipes/pulseaudio/pulseaudio-0.9.15/fixbluezbuild.patch new file mode 100644 index 0000000000..d817a62b4d --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.15/fixbluezbuild.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.15/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.15.orig/src/Makefile.am 2009-07-07 22:04:21.313945421 +0200 ++++ pulseaudio-0.9.15/src/Makefile.am 2009-07-07 22:04:32.503184920 +0200 +@@ -1534,7 +1534,7 @@ + + libbluetooth_ipc_la_SOURCES = modules/bluetooth/ipc.c modules/bluetooth/ipc.h + libbluetooth_ipc_la_LDFLAGS = -avoid-version +-libbluetooth_ipc_la_LIBADD = $(AM_LIBADD)libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la ++libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la + libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS) + BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h + diff --git a/recipes/pulseaudio/pulseaudio-0.9.15/gettext.patch b/recipes/pulseaudio/pulseaudio-0.9.15/gettext.patch new file mode 100644 index 0000000000..8727b9819b --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.15/gettext.patch @@ -0,0 +1,140 @@ +Index: pulseaudio-0.9.15/configure.ac +=================================================================== +--- pulseaudio-0.9.15.orig/configure.ac 2009-07-11 20:20:45.430959569 +0200 ++++ pulseaudio-0.9.15/configure.ac 2009-07-11 20:22:47.488992720 +0200 +@@ -460,15 +460,15 @@ + # Check for open64 to know if the current system does have open64() and similar functions + AC_CHECK_FUNCS([open64]) + +-#### [lib]iconv #### ++#### localization support #### + + AM_ICONV +- +-IT_PROG_INTLTOOL([0.35.0]) +-GETTEXT_PACKAGE=pulseaudio ++IT_PROG_INTLTOOL([0.37.0]) ++GETTEXT_PACKAGE=$PACKAGE + AC_SUBST([GETTEXT_PACKAGE]) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) +-AM_GLIB_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.17]) + + pulselocaledir='${prefix}/${DATADIRNAME}/locale' + AC_SUBST(pulselocaledir) +Index: pulseaudio-0.9.15/src/pulse/i18n.h +=================================================================== +--- pulseaudio-0.9.15.orig/src/pulse/i18n.h 2009-07-11 20:20:45.437631408 +0200 ++++ pulseaudio-0.9.15/src/pulse/i18n.h 2009-07-11 20:20:50.116383023 +0200 +@@ -28,15 +28,13 @@ + + PA_C_DECL_BEGIN + +-#if !defined(GETTEXT_PACKAGE) +-#error "Something is very wrong here, config.h needs to be included first" +-#endif ++ + + #ifdef ENABLE_NLS + + #include <libintl.h> + +-#define _(String) dgettext(GETTEXT_PACKAGE, String) ++#define _(String) dgettext(PACKAGE, String) + #ifdef gettext_noop + #define N_(String) gettext_noop(String) + #else +Index: pulseaudio-0.9.15/src/pulse/i18n.c +=================================================================== +--- pulseaudio-0.9.15.orig/src/pulse/i18n.c 2009-07-11 20:20:45.444294874 +0200 ++++ pulseaudio-0.9.15/src/pulse/i18n.c 2009-07-11 20:20:50.116383023 +0200 +@@ -31,8 +31,8 @@ + + PA_ONCE_BEGIN { + +- bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); +- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); ++ bindtextdomain(PACKAGE, PULSE_LOCALEDIR); ++ bind_textdomain_codeset(PACKAGE, "UTF-8"); + + } PA_ONCE_END; + } +Index: pulseaudio-0.9.15/src/utils/pacat.c +=================================================================== +--- pulseaudio-0.9.15.orig/src/utils/pacat.c 2009-07-11 20:20:45.450959436 +0200 ++++ pulseaudio-0.9.15/src/utils/pacat.c 2009-07-11 20:20:50.116383023 +0200 +@@ -588,7 +588,7 @@ + }; + + setlocale(LC_ALL, ""); +- bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); ++ bindtextdomain(PACKAGE, PULSE_LOCALEDIR); + + if (!(bn = strrchr(argv[0], '/'))) + bn = argv[0]; +Index: pulseaudio-0.9.15/src/utils/pacmd.c +=================================================================== +--- pulseaudio-0.9.15.orig/src/utils/pacmd.c 2009-07-11 20:20:45.457628031 +0200 ++++ pulseaudio-0.9.15/src/utils/pacmd.c 2009-07-11 20:20:50.116383023 +0200 +@@ -53,7 +53,7 @@ + pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed; + + setlocale(LC_ALL, ""); +- bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); ++ bindtextdomain(PACKAGE, PULSE_LOCALEDIR); + + if (pa_pid_file_check_running(&pid, "pulseaudio") < 0) { + pa_log("No PulseAudio daemon running, or not running as session daemon."); +Index: pulseaudio-0.9.15/src/utils/pactl.c +=================================================================== +--- pulseaudio-0.9.15.orig/src/utils/pactl.c 2009-07-11 20:20:45.464297385 +0200 ++++ pulseaudio-0.9.15/src/utils/pactl.c 2009-07-11 20:20:50.116383023 +0200 +@@ -808,7 +808,7 @@ + }; + + setlocale(LC_ALL, ""); +- bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); ++ bindtextdomain(PACKAGE, PULSE_LOCALEDIR); + + if (!(bn = strrchr(argv[0], '/'))) + bn = argv[0]; +Index: pulseaudio-0.9.15/src/utils/paplay.c +=================================================================== +--- pulseaudio-0.9.15.orig/src/utils/paplay.c 2009-07-11 20:20:45.470968508 +0200 ++++ pulseaudio-0.9.15/src/utils/paplay.c 2009-07-11 20:20:50.116383023 +0200 +@@ -236,7 +236,7 @@ + }; + + setlocale(LC_ALL, ""); +- bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); ++ bindtextdomain(PACKAGE, PULSE_LOCALEDIR); + + if (!(bn = strrchr(argv[0], '/'))) + bn = argv[0]; +Index: pulseaudio-0.9.15/src/utils/pasuspender.c +=================================================================== +--- pulseaudio-0.9.15.orig/src/utils/pasuspender.c 2009-07-11 20:20:45.477632683 +0200 ++++ pulseaudio-0.9.15/src/utils/pasuspender.c 2009-07-11 20:20:50.116383023 +0200 +@@ -233,7 +233,7 @@ + }; + + setlocale(LC_ALL, ""); +- bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); ++ bindtextdomain(PACKAGE, PULSE_LOCALEDIR); + + if (!(bn = strrchr(argv[0], '/'))) + bn = argv[0]; +Index: pulseaudio-0.9.15/src/utils/pax11publish.c +=================================================================== +--- pulseaudio-0.9.15.orig/src/utils/pax11publish.c 2009-07-11 20:20:45.487631479 +0200 ++++ pulseaudio-0.9.15/src/utils/pax11publish.c 2009-07-11 20:20:50.116383023 +0200 +@@ -50,7 +50,7 @@ + enum { DUMP, EXPORT, IMPORT, REMOVE } mode = DUMP; + + setlocale(LC_ALL, ""); +- bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); ++ bindtextdomain(PACKAGE, PULSE_LOCALEDIR); + + while ((c = getopt(argc, argv, "deiD:S:O:I:c:hr")) != -1) { + switch (c) { diff --git a/recipes/pulseaudio/pulseaudio-0.9.15/tls_m4.patch b/recipes/pulseaudio/pulseaudio-0.9.15/tls_m4.patch new file mode 100644 index 0000000000..7b333e3df9 --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.15/tls_m4.patch @@ -0,0 +1,30 @@ +Index: pulseaudio-0.9.15/m4/tls.m4 +=================================================================== +--- pulseaudio-0.9.15.orig/m4/tls.m4 2008-08-19 23:25:02.000000000 +0200 ++++ pulseaudio-0.9.15/m4/tls.m4 2009-07-10 09:55:25.266365511 +0200 +@@ -1,12 +1,19 @@ + AC_DEFUN([CC_CHECK_TLS], [ + AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage], + cc_cv_tls___thread, +- [AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( +- [[static __thread int a = 6;]], +- [[a = 5;]]), +- [cc_cv_tls___thread=yes], +- [cc_cv_tls___thread=no]) ++ [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }], ++ [chktls_save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS" ++ chktls_save_CFLAGS="$CFLAGS" ++ CFLAGS="-fPIC $CFLAGS" ++ dnl If -shared works, test if TLS works in a shared library. ++ AC_LINK_IFELSE([int f() { return 0; }], ++ AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }], ++ [cc_cv_tls___thread=yes], ++ [cc_cv_tls___thread=no]), ++ [cc_cv_tls___thread=yes]) ++ CFLAGS="$chktls_save_CFLAGS" ++ LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no]) + ]) + + AS_IF([test "x$cc_cv_tls___thread" = "xyes"], diff --git a/recipes/pulseaudio/pulseaudio_0.9.15.bb b/recipes/pulseaudio/pulseaudio_0.9.15.bb index 4b16b474d2..639e449ccb 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.15.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.15.bb @@ -1,7 +1,9 @@ require pulseaudio.inc DEPENDS += "gdbm speex" -PR = "${INC_PR}.1" +PR = "${INC_PR}.4" + +inherit gettext SRC_URI += "\ file://buildfix.patch;patch=1 \ @@ -9,6 +11,9 @@ SRC_URI += "\ file://periodfix.patch;patch=1 \ file://fallback.patch;patch=1 \ file://autoconf_version.patch;patch=1 \ + file://gettext.patch;patch=1 \ + file://fixbluezbuild.patch;patch=1 \ + file://tls_m4.patch;patch=1 \ " do_compile_prepend() { diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 427bbaecb4..42e2726e5a 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -110,7 +110,7 @@ do_configure() { cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/ echo "[Paths]" > $QT_CONF_PATH - echo "Prefix=${prefix}" >> $QT_CONF_PATH + echo "Prefix=${prefix}/" >> $QT_CONF_PATH echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH echo "Libraries=${libdir}" >> $QT_CONF_PATH @@ -125,7 +125,7 @@ do_configure() { ${EXTRA_QMAKE_MUNGE}|| true (echo o; echo yes) | ./configure -v \ - -prefix ${prefix} \ + -prefix ${prefix}/ \ -bindir ${bindir} \ -libdir ${libdir} \ -datadir ${datadir}/${QT_DIR_NAME} \ diff --git a/recipes/rdesktop/rdesktop-1.6.0/audio-2008.patch b/recipes/rdesktop/rdesktop-1.6.0/audio-2008.patch new file mode 100644 index 0000000000..57052a78a4 --- /dev/null +++ b/recipes/rdesktop/rdesktop-1.6.0/audio-2008.patch @@ -0,0 +1,22 @@ +--- a/rdpdr.c (revisão 1505) ++++ b/rdpdr.c (cópia de trabalho) +@@ -841,14 +841,11 @@ + RD_BOOL + rdpdr_init() + { +- if (g_num_devices > 0) +- { +- rdpdr_channel = +- channel_register("rdpdr", +- CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_COMPRESS_RDP, +- rdpdr_process); +- } +- ++ rdpdr_channel = ++ channel_register("rdpdr", ++ CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_COMPRESS_RDP, ++ rdpdr_process); ++ + return (rdpdr_channel != NULL); + } + diff --git a/recipes/rdesktop/rdesktop-1.6.0/rdesktop-addin.patch b/recipes/rdesktop/rdesktop-1.6.0/rdesktop-addin.patch new file mode 100644 index 0000000000..ffd942a6bd --- /dev/null +++ b/recipes/rdesktop/rdesktop-1.6.0/rdesktop-addin.patch @@ -0,0 +1,534 @@ +diff -ur rdesktop-1.6.0-orig/channels.c rdesktop-1.6.0/channels.c +--- rdesktop-1.6.0-orig/channels.c 2007-01-08 07:47:05.000000000 +0300 ++++ rdesktop-1.6.0/channels.c 2008-12-05 18:58:00.000000000 +0300 +@@ -19,6 +19,9 @@ + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include <sys/types.h> ++#include <sys/wait.h> ++#include <unistd.h> + #include "rdesktop.h" + + #define MAX_CHANNELS 6 +@@ -44,7 +47,7 @@ + */ + + VCHANNEL * +-channel_register(char *name, uint32 flags, void (*callback) (STREAM)) ++channel_register(char *name, uint32 flags, void (*callback) (STREAM,char*)) + { + VCHANNEL *channel; + +@@ -159,7 +162,7 @@ + if ((flags & CHANNEL_FLAG_FIRST) && (flags & CHANNEL_FLAG_LAST)) + { + /* single fragment - pass straight up */ +- channel->process(s); ++ channel->process(s, channel->name); + } + else + { +@@ -183,7 +186,109 @@ + { + in->end = in->p; + in->p = in->data; +- channel->process(in); ++ channel->process(in, channel->name); + } + } + } ++ ++/* Generic callback for delivering data to third party add-ins */ ++void addin_callback(STREAM s, char *name) ++{ ++ pid_t pid; ++ int pipe_read; ++ int pipe_write; ++ uint32 blocksize; ++ ++ blocksize = s->end - s->p; ++ ++ lookup_addin(name, &pid, &pipe_read, &pipe_write); ++ if (pid > 0) { ++ /* Prepend the block with the block size so the ++ add-in can identify blocks */ ++ write(pipe_write, &blocksize, sizeof(uint32)); ++ write(pipe_write, s->p, blocksize); ++ } ++} ++ ++void addin_add_fds(int *n, fd_set *rfds, fd_set *wfds, struct timeval *tv) ++{ ++ extern ADDIN_DATA addin_data[]; ++ extern int addin_count; ++ int i; ++ ++ for (i = 0; i < addin_count; i++) { ++ /* Take in account only live addins. */ ++ if (addin_data[i].pid > 0) { ++ int addin_fd = addin_data[i].pipe_read; ++ ++ FD_SET(addin_fd, rfds); ++ if (*n < addin_fd) ++ *n = addin_fd; ++ } ++ } ++} ++ ++/* Process outgoing addin data */ ++void addin_check_fds(fd_set *rfds, fd_set *wfds) ++{ ++ extern ADDIN_DATA addin_data[]; ++ extern int addin_count; ++ int i; ++ unsigned int block_len; ++ ssize_t bytes_read; ++ STREAM s; ++ ++ for (i = 0; i < addin_count; i++) { ++ int addin_fd = addin_data[i].pipe_read; ++ ++ if (!FD_ISSET(addin_fd, rfds)) { ++ continue; ++ } ++ ++ bytes_read = read(addin_fd, &block_len, sizeof(block_len)); ++ if (bytes_read <= 0) { ++ addin_check_terminated(&addin_data[i]); ++ continue; ++ } ++ ++ if (block_len > 0xffff) { ++ warning("received too much data (%d) from addin %s\n", ++ block_len, addin_data[i].name); ++ addin_check_terminated(&addin_data[i]); ++ continue; ++ } ++ ++ if (block_len > addin_data[i].buf_len) { ++ addin_data[i].buf = (unsigned char *)xrealloc( ++ addin_data[i].buf, ++ block_len); ++ addin_data[i].buf_len = block_len; ++ } ++ ++ bytes_read = read(addin_fd, addin_data[i].buf, block_len); ++ if (bytes_read > 0) { ++ s = channel_init(addin_data[i].vchannel, bytes_read); ++ memcpy(s->p, addin_data[i].buf, bytes_read); ++ s->p += bytes_read; ++ s->end = s->p; ++ ++ channel_send(s, addin_data[i].vchannel); ++ } ++ } ++} ++ ++void addin_check_terminated(ADDIN_DATA *addin) ++{ ++ int status = 0; ++ ++ pid_t result = waitpid(addin->pid, &status, WNOHANG); ++ if (result <= 0) ++ return; ++ ++ if (WIFEXITED(status) || WIFSIGNALED(status)) { ++ warning("Addin %s is suddenly terminated\n", addin->name); ++ /* Mark this addin as terminated to exclude ++ it from processing. */ ++ addin->pid = 0; ++ } ++} +diff -ur rdesktop-1.6.0-orig/cliprdr.c rdesktop-1.6.0/cliprdr.c +--- rdesktop-1.6.0-orig/cliprdr.c 2007-01-08 07:47:05.000000000 +0300 ++++ rdesktop-1.6.0/cliprdr.c 2008-12-05 18:42:40.000000000 +0300 +@@ -111,7 +111,7 @@ + } + + static void +-cliprdr_process(STREAM s) ++cliprdr_process(STREAM s, char *name) + { + uint16 type, status; + uint32 length, format; +Only in rdesktop-1.6.0/doc: .svn +Only in rdesktop-1.6.0/keymaps: .svn +diff -ur rdesktop-1.6.0-orig/lspci.c rdesktop-1.6.0/lspci.c +--- rdesktop-1.6.0-orig/lspci.c 2007-01-08 07:47:05.000000000 +0300 ++++ rdesktop-1.6.0/lspci.c 2008-12-05 18:42:40.000000000 +0300 +@@ -128,7 +128,7 @@ + + /* Process new data from the virtual channel */ + static void +-lspci_process(STREAM s) ++lspci_process(STREAM s, char *name) + { + unsigned int pkglen; + static char *rest = NULL; +diff -ur rdesktop-1.6.0-orig/proto.h rdesktop-1.6.0/proto.h +--- rdesktop-1.6.0-orig/proto.h 2008-04-02 15:13:22.000000000 +0400 ++++ rdesktop-1.6.0/proto.h 2008-12-05 18:58:00.000000000 +0300 +@@ -45,7 +45,7 @@ + RD_HCURSOR cache_get_cursor(uint16 cache_idx); + void cache_put_cursor(uint16 cache_idx, RD_HCURSOR cursor); + /* channels.c */ +-VCHANNEL *channel_register(char *name, uint32 flags, void (*callback) (STREAM)); ++VCHANNEL *channel_register(char *name, uint32 flags, void (*callback) (STREAM,char *)); + STREAM channel_init(VCHANNEL * channel, uint32 length); + void channel_send(STREAM s, VCHANNEL * channel); + void channel_process(STREAM s, uint16 mcs_channel); +@@ -314,6 +314,21 @@ + void scard_lock(int lock); + void scard_unlock(int lock); + ++/* External addins */ ++void init_external_addin(char * addin_name, char * addin_path, char * args, ADDIN_DATA * addin_data); ++ ++/* Generic callback for delivering data to third party add-ins */ ++void addin_callback(STREAM s, char *name); ++ ++/* Find an external add-in registration by virtual channel name */ ++void lookup_addin(char *name, pid_t * pid, int * pipe_read, int * pipe_write); ++ ++void addin_add_fds(int *n, fd_set *rfds, fd_set *wfds, struct timeval *tv); ++ ++void addin_check_fds(fd_set *rfds, fd_set *wfds); ++ ++void addin_check_terminated(ADDIN_DATA *addin); ++ + /* *INDENT-OFF* */ + #ifdef __cplusplus + } +diff -ur rdesktop-1.6.0-orig/rdesktop.c rdesktop-1.6.0/rdesktop.c +--- rdesktop-1.6.0-orig/rdesktop.c 2008-04-05 09:22:26.000000000 +0400 ++++ rdesktop-1.6.0/rdesktop.c 2008-12-05 18:58:00.000000000 +0300 +@@ -28,6 +28,7 @@ + #include <sys/times.h> /* times */ + #include <ctype.h> /* toupper */ + #include <errno.h> ++#include <signal.h> /* kill */ + #include "rdesktop.h" + + #ifdef HAVE_LOCALE_H +@@ -115,6 +116,9 @@ + extern uint32 g_num_devices; + extern char *g_rdpdr_clientname; + ++ADDIN_DATA addin_data[MAX_ADDINS]; ++int addin_count = 0; ++ + #ifdef RDP2VNC + extern int rfb_port; + extern int defer_time; +@@ -208,6 +212,9 @@ + fprintf(stderr, + " \"AKS\" -> Device vendor name \n"); + #endif ++ fprintf(stderr, ++ " '-r addin:<channelname>:</path/to/executable>[:arg1[:arg2:]...]': enable third\n"); ++ fprintf(stderr, " party virtual channel add-in.\n"); + fprintf(stderr, " -0: attach to console\n"); + fprintf(stderr, " -4: use RDP version 4\n"); + fprintf(stderr, " -5: use RDP version 5 (default)\n"); +@@ -417,6 +424,8 @@ + struct passwd *pw; + uint32 flags, ext_disc_reason = 0; + char *p; ++ char *addin_name; ++ char *addin_path; + int c; + char *locale = NULL; + int username_option = 0; +@@ -672,8 +681,58 @@ + break; + + case 'r': ++ if (str_startswith(optarg, "addin")) ++ { ++ if (addin_count >= MAX_ADDINS) ++ { ++ error("Add-ins data table full, increase MAX_ADDINS\n"); ++ return 1; ++ } ++ ++ optarg += 5; + +- if (str_startswith(optarg, "sound")) ++ if (*optarg == ':') ++ { ++ addin_name = optarg + 1; ++ if (*addin_name != '\0') ++ { ++ addin_path = next_arg(addin_name, ':'); ++ } ++ else ++ { ++ addin_path = 0; ++ } ++ if (addin_path != 0) ++ { ++ p = next_arg(addin_path, ':'); ++ } ++ if (*addin_name != '\0' && addin_path != 0 && *addin_path != '\0') ++ { ++ init_external_addin(addin_name, addin_path, ++ p, &addin_data[addin_count]); ++ if (addin_data[addin_count].pid != 0) ++ { ++ addin_count++; ++ } ++ else ++ { ++ error("Failed to initialise add-in [%s]\n", addin_name); ++ return 1; ++ } ++ } ++ else ++ { ++ usage(argv[0]); ++ return(1); ++ } ++ } ++ else ++ { ++ usage(argv[0]); ++ return(1); ++ } ++ } ++ else if (str_startswith(optarg, "sound")) + { + optarg += 5; + +@@ -982,6 +1041,17 @@ + cache_save_state(); + ui_deinit(); + ++ /* Send a SIGUSR1 to all addins to close and sleep for a couple of secs ++ to give them a chance to stop */ ++ for (c = 0; c < addin_count; c++) ++ { ++ if (addin_data[c].pid != 0) ++ { ++ kill(addin_data[c].pid,SIGUSR1); ++ sleep(2); ++ } ++ } ++ + if (ext_disc_reason >= 2) + print_disconnect_reason(ext_disc_reason); + +@@ -1625,3 +1695,105 @@ + return False; + return True; + } ++ ++/* Initialise external addin */ ++void init_external_addin(char * addin_name, char * addin_path, char * args, ADDIN_DATA * addin_data) ++{ ++ char *p; ++ char *current_arg; ++ char * argv[256]; ++ char argv_buffer[256][256]; ++ int i; ++ int readpipe[2],writepipe[2]; ++ pid_t child; ++ ++ /* Initialise addin structure */ ++ memset(addin_data, 0, sizeof(ADDIN_DATA)); ++ /* Go through the list of args, adding each to argv */ ++ argv[0] = addin_path; ++ i = 1; ++ p=current_arg=args; ++ while (current_arg != 0 && current_arg[0] != '\0') ++ { ++ p=next_arg(p, ':');; ++ if (p != 0 && *p != '\0') ++ *(p - 1) = '\0'; ++ strcpy(argv_buffer[i], current_arg); ++ argv[i]=argv_buffer[i]; ++ i++; ++ current_arg=p; ++ } ++ argv[i] = NULL; ++ ++ ++ /* Create pipes */ ++ if (pipe(readpipe) < 0 || pipe(writepipe) < 0) ++ { ++ perror("pipes for addin"); ++ return; ++ } ++ ++ /* Fork process */ ++ if ((child = fork()) < 0) ++ { ++ perror("fork for addin"); ++ return; ++ } ++ ++ /* Child */ ++ if (child == 0) ++ { ++ /* Set stdin and stdout of child to relevant pipe ends */ ++ dup2(writepipe[0],0); ++ dup2(readpipe[1],1); ++ ++ /* Close all fds as they are not needed now */ ++ close(readpipe[0]); ++ close(readpipe[1]); ++ close(writepipe[0]); ++ close(writepipe[1]); ++ execvp((char *)argv[0], (char **)argv); ++ perror("Error executing child"); ++ _exit(128); ++ } ++ else ++ { ++ strcpy(addin_data->name, addin_name); ++ /* Close child end fd's */ ++ close(readpipe[1]); ++ close(writepipe[0]); ++ addin_data->pipe_read=readpipe[0]; ++ addin_data->pipe_write=writepipe[1]; ++ addin_data->vchannel=channel_register(addin_name, ++ CHANNEL_OPTION_INITIALIZED | ++ CHANNEL_OPTION_ENCRYPT_RDP | ++ CHANNEL_OPTION_COMPRESS_RDP, ++ addin_callback); ++ if (!addin_data->vchannel) ++ { ++ perror("Channel register failed"); ++ return; ++ } ++ else ++ addin_data->pid=child; ++ ++ } ++ ++} ++ ++/* Find an external add-in registration by virtual channel name */ ++void lookup_addin(char *name, pid_t * pid, int * pipe_read, int * pipe_write) ++{ ++ int i; ++ ++ *pid = 0; ++ ++ for (i = 0; i < addin_count; i++) { ++ if (!strcmp(name,addin_data[i].name)) { ++ *pid=addin_data[i].pid; ++ *pipe_read=addin_data[i].pipe_read; ++ *pipe_write=addin_data[i].pipe_write; ++ break; ++ } ++ } ++} +diff -ur rdesktop-1.6.0-orig/rdesktop.h rdesktop-1.6.0/rdesktop.h +--- rdesktop-1.6.0-orig/rdesktop.h 2008-04-05 08:54:10.000000000 +0400 ++++ rdesktop-1.6.0/rdesktop.h 2008-12-05 18:42:40.000000000 +0300 +@@ -41,6 +41,8 @@ + + #define VERSION "1.6.0" + ++#define MAX_ADDINS 20 ++ + #ifdef WITH_DEBUG + #define DEBUG(args) printf args; + #else +diff -ur rdesktop-1.6.0-orig/rdpdr.c rdesktop-1.6.0/rdpdr.c +--- rdesktop-1.6.0-orig/rdpdr.c 2008-02-14 14:37:17.000000000 +0300 ++++ rdesktop-1.6.0/rdpdr.c 2008-12-05 18:42:40.000000000 +0300 +@@ -781,7 +781,7 @@ + } + + static void +-rdpdr_process(STREAM s) ++rdpdr_process(STREAM s, char *name) + { + uint32 handle; + uint8 *magic; +diff -ur rdesktop-1.6.0-orig/rdpsnd.c rdesktop-1.6.0/rdpsnd.c +--- rdesktop-1.6.0-orig/rdpsnd.c 2008-02-14 14:37:17.000000000 +0300 ++++ rdesktop-1.6.0/rdpsnd.c 2008-12-05 18:42:40.000000000 +0300 +@@ -544,7 +544,7 @@ + } + + static void +-rdpsnd_process(STREAM s) ++rdpsnd_process(STREAM s, char *name) + { + uint16 len; + +@@ -611,7 +611,7 @@ + } + + static void +-rdpsnddbg_process(STREAM s) ++rdpsnddbg_process(STREAM s, char *name) + { + unsigned int pkglen; + static char *rest = NULL; +diff -ur rdesktop-1.6.0-orig/seamless.c rdesktop-1.6.0/seamless.c +--- rdesktop-1.6.0-orig/seamless.c 2008-04-02 15:13:22.000000000 +0400 ++++ rdesktop-1.6.0/seamless.c 2008-12-05 18:42:40.000000000 +0300 +@@ -370,7 +370,7 @@ + + + static void +-seamless_process(STREAM s) ++seamless_process(STREAM s, char *name) + { + unsigned int pkglen; + static char *rest = NULL; +Only in rdesktop-1.6.0: .svn +diff -ur rdesktop-1.6.0-orig/types.h rdesktop-1.6.0/types.h +--- rdesktop-1.6.0-orig/types.h 2007-01-08 07:47:06.000000000 +0300 ++++ rdesktop-1.6.0/types.h 2008-12-05 18:42:40.000000000 +0300 +@@ -125,7 +125,7 @@ + char name[8]; + uint32 flags; + struct stream in; +- void (*process) (STREAM); ++ void (*process) (STREAM,char *); + } + VCHANNEL; + +@@ -265,4 +265,15 @@ + } + FILEINFO; + ++typedef struct _ADDIN_DATA ++{ ++ char name[255]; ++ unsigned char *buf; ++ unsigned int buf_len; ++ pid_t pid; ++ int pipe_read; ++ int pipe_write; ++ VCHANNEL *vchannel; ++} ADDIN_DATA; ++ + typedef RD_BOOL(*str_handle_lines_t) (const char *line, void *data); +diff -ur rdesktop-1.6.0-orig/xwin.c rdesktop-1.6.0/xwin.c +--- rdesktop-1.6.0-orig/xwin.c 2008-05-11 10:14:38.000000000 +0400 ++++ rdesktop-1.6.0/xwin.c 2008-12-05 18:42:40.000000000 +0300 +@@ -2620,6 +2620,9 @@ + rdpdr_add_fds(&n, &rfds, &wfds, &tv, &s_timeout); + seamless_select_timeout(&tv); + ++ /* add addins handles */ ++ addin_add_fds(&n, &rfds, &wfds, &tv); ++ + n++; + + switch (select(n, &rfds, &wfds, NULL, &tv)) +@@ -2642,6 +2645,8 @@ + rdpsnd_check_fds(&rfds, &wfds); + #endif + ++ addin_check_fds(&rfds, &wfds); ++ + rdpdr_check_fds(&rfds, &wfds, (RD_BOOL) False); + + if (FD_ISSET(rdp_socket, &rfds)) diff --git a/recipes/rdesktop/rdesktop.inc b/recipes/rdesktop/rdesktop.inc index 4c832cae3f..8f2d587b53 100644 --- a/recipes/rdesktop/rdesktop.inc +++ b/recipes/rdesktop/rdesktop.inc @@ -4,4 +4,6 @@ DEPENDS = "virtual/libx11 openssl" SECTION = "x11/network" LICENSE = "GPL" +INC_PR = "r2" + SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz" diff --git a/recipes/rdesktop/rdesktop_1.3.1.bb b/recipes/rdesktop/rdesktop_1.3.1.bb index d50a0c1e8c..ffb36d22a5 100644 --- a/recipes/rdesktop/rdesktop_1.3.1.bb +++ b/recipes/rdesktop/rdesktop_1.3.1.bb @@ -1,5 +1,7 @@ require rdesktop.inc +PR = "${INC_PR}.1" + SRC_URI +="file://configure.patch;patch=1" # Note - rdesktop 1.3.1 doesn't use autotools - don't make the same diff --git a/recipes/rdesktop/rdesktop_1.4.1.bb b/recipes/rdesktop/rdesktop_1.4.1.bb index 8682c8ee98..99200c6f10 100644 --- a/recipes/rdesktop/rdesktop_1.4.1.bb +++ b/recipes/rdesktop/rdesktop_1.4.1.bb @@ -1,6 +1,6 @@ require rdesktop.inc -PR = "r1" +PR = "${INC_PR}.1" SRC_URI += "file://strip.patch;patch=1" diff --git a/recipes/rdesktop/rdesktop_1.5.0.bb b/recipes/rdesktop/rdesktop_1.5.0.bb index d652dfe633..c492afa0b2 100644 --- a/recipes/rdesktop/rdesktop_1.5.0.bb +++ b/recipes/rdesktop/rdesktop_1.5.0.bb @@ -1,6 +1,6 @@ require rdesktop.inc -PR = "r0" +PR = "${INC_PR}.1" inherit autotools diff --git a/recipes/rdesktop/rdesktop_1.6.0.bb b/recipes/rdesktop/rdesktop_1.6.0.bb index d652dfe633..0f39e784cf 100644 --- a/recipes/rdesktop/rdesktop_1.6.0.bb +++ b/recipes/rdesktop/rdesktop_1.6.0.bb @@ -1,6 +1,11 @@ require rdesktop.inc -PR = "r0" +PR = "${INC_PR}.2" + +SRC_URI += " file://audio-2008.patch;patch=1" +SRC_URI_append_ossystems = " file://rdesktop-addin.patch;patch=1" + +SRC_URI += " file://audio-2008.patch;patch=1" inherit autotools diff --git a/recipes/rdesktop/rdesktop_cvs.bb b/recipes/rdesktop/rdesktop_cvs.bb index 0b76ee7535..496b6defa8 100644 --- a/recipes/rdesktop/rdesktop_cvs.bb +++ b/recipes/rdesktop/rdesktop_cvs.bb @@ -1,7 +1,7 @@ require rdesktop.inc PV = "1.6.0+cvs${SRCDATE}" -PR = "r0" +PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anonymous@rdesktop.cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop" S = "${WORKDIR}/rdesktop" @@ -9,4 +9,3 @@ S = "${WORKDIR}/rdesktop" inherit autotools EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. " - diff --git a/recipes/skype/skype-static_2.0.0.72.bb b/recipes/skype/skype-static_2.0.0.72.bb new file mode 100644 index 0000000000..4bf4de3da7 --- /dev/null +++ b/recipes/skype/skype-static_2.0.0.72.bb @@ -0,0 +1,4 @@ +include skype_${PV}.bb + +SRC_URI = "http://download.skype.com/linux/skype_static-2.0.0.72.tar.bz2" +S="${WORKDIR}/skype_static-${PV}" diff --git a/recipes/skype/skype_2.0.0.72.bb b/recipes/skype/skype_2.0.0.72.bb new file mode 100644 index 0000000000..f545571877 --- /dev/null +++ b/recipes/skype/skype_2.0.0.72.bb @@ -0,0 +1,20 @@ +DEPENDS = "virtual/libx11 qt4-x11-free glibc-gconv-utf-16" +HOMEPAGE="www.skype.com" +SRC_URI = "http://download.skype.com/linux/skype-2.0.0.72.tar.bz2" + +S="${WORKDIR}/${PN}-${PV}" + +do_install() { + install -d ${D}/usr/bin + cp skype ${D}/usr/bin/ + + install -d ${D}/usr/share/skype + cp -r sounds lang avatars ${D}/usr/share/skype + + install -d ${D}/usr/share/pixmaps + cp -r icons/SkypeBlue_48x48.png ${D}/usr/share/pixmaps/skype.png +} + +FILES_${PN} += "${datadir}/skype" + +COMPATIBLE_HOST = "i.86.*-linux" diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc index 55cff83b7e..3c723664d3 100644 --- a/recipes/uclibc/uclibc.inc +++ b/recipes/uclibc/uclibc.inc @@ -69,8 +69,9 @@ UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}" UCLIBC_LOCALE_URI_arm = "http://wiki.openembedded.net/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}" SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ - file://uClibc.config" - + file://uClibc.config \ + http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ + " UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}" # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in diff --git a/recipes/uclibc/uclibc_0.9.26.bb b/recipes/uclibc/uclibc_0.9.26.bb index add217efb0..71fb7eb753 100644 --- a/recipes/uclibc/uclibc_0.9.26.bb +++ b/recipes/uclibc/uclibc_0.9.26.bb @@ -2,8 +2,9 @@ PR = "r12" require uclibc.inc -SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ - file://26headers.patch;patch=1 \ - file://nokernelheadercheck.patch;patch=1 \ - file://dyn-ldconfig.patch;patch=1" +SRC_URI += "file://26headers.patch;patch=1 \ + file://nokernelheadercheck.patch;patch=1 \ + file://dyn-ldconfig.patch;patch=1 \ + " + S = "${WORKDIR}/uClibc-${PV}" diff --git a/recipes/uclibc/uclibc_0.9.27.bb b/recipes/uclibc/uclibc_0.9.27.bb index 56575da4ac..7a9976d1d8 100644 --- a/recipes/uclibc/uclibc_0.9.27.bb +++ b/recipes/uclibc/uclibc_0.9.27.bb @@ -11,8 +11,7 @@ require uclibc.inc PATCH_ipc_h ?= "" PATCH_ipc_h_ixp4xx = "file://kernel-key-t-ipc.h.patch;patch=1" -SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ - file://dyn-ldconfig.patch;patch=1 \ +SRC_URI += "file://dyn-ldconfig.patch;patch=1 \ file://nokernelheadercheck.patch;patch=1" SRC_URI += " file://armeb-kernel-stat.h.patch;patch=1" SRC_URI += "${PATCH_ipc_h}" diff --git a/recipes/uclibc/uclibc_0.9.28.bb b/recipes/uclibc/uclibc_0.9.28.bb index adf7a7400a..8ad4343313 100644 --- a/recipes/uclibc/uclibc_0.9.28.bb +++ b/recipes/uclibc/uclibc_0.9.28.bb @@ -9,8 +9,6 @@ require uclibc.inc KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" -SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2" - S = "${WORKDIR}/uClibc-${PV}" #*** PATCHES *** diff --git a/recipes/uclibc/uclibc_0.9.29.bb b/recipes/uclibc/uclibc_0.9.29.bb index f6bc68902d..de98a637c9 100644 --- a/recipes/uclibc/uclibc_0.9.29.bb +++ b/recipes/uclibc/uclibc_0.9.29.bb @@ -39,6 +39,4 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}" -SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2" - S = "${WORKDIR}/uClibc-${UCLIBC_BASE}" diff --git a/recipes/uclibc/uclibc_0.9.30.1.bb b/recipes/uclibc/uclibc_0.9.30.1.bb index dbdcbb6740..3ddaad4ab6 100644 --- a/recipes/uclibc/uclibc_0.9.30.1.bb +++ b/recipes/uclibc/uclibc_0.9.30.1.bb @@ -28,6 +28,4 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}" -SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2" - S = "${WORKDIR}/uClibc-${UCLIBC_BASE}" diff --git a/recipes/uclibc/uclibc_0.9.30.bb b/recipes/uclibc/uclibc_0.9.30.bb index 317edf03a9..1337da9b94 100644 --- a/recipes/uclibc/uclibc_0.9.30.bb +++ b/recipes/uclibc/uclibc_0.9.30.bb @@ -29,6 +29,4 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}" -SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2" - S = "${WORKDIR}/uClibc-${UCLIBC_BASE}" diff --git a/recipes/udev/udev_118.bb b/recipes/udev/udev_118.bb index 7fcd4c546c..b7043496af 100644 --- a/recipes/udev/udev_118.bb +++ b/recipes/udev/udev_118.bb @@ -14,6 +14,7 @@ SRC_URI = "\ file://udevtrigger_add_devname_filtering.patch;patch=1 \ file://mount.blacklist \ " +TARGET_CC_ARCH += "${LDFLAGS}" require udev.inc diff --git a/recipes/xorg-driver/xf86-input-elographics_1.2.3.bb b/recipes/xorg-driver/xf86-input-elographics_1.2.3.bb new file mode 100644 index 0000000000..cb49a58d4c --- /dev/null +++ b/recipes/xorg-driver/xf86-input-elographics_1.2.3.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- ELOGraphics input driver" +PE = "2" diff --git a/recipes/xorg-driver/xf86-video-intel_2.6.3.bb b/recipes/xorg-driver/xf86-video-intel_2.6.3.bb new file mode 100644 index 0000000000..eed1fcb600 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-intel_2.6.3.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb new file mode 100644 index 0000000000..bd2f7cf7c1 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb @@ -0,0 +1,9 @@ +require xorg-driver-video.inc +PE = "1" + +SRC_URI += "file://fix-includepath.patch;patch=1 \ + file://fix-configure-includes.patch;patch=1" + +#DESCRIPTION = "" + +#DEPENDS += " " |