diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-09 10:35:10 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-09 10:35:10 +0100 |
| commit | a8352578a40067db10fee76f0c910d007311376c (patch) | |
| tree | 25a566304010c9550c5d5613f7c326541c7d7301 | |
| parent | 44b9190fb62a6a09276c765685cc8ddde9cb201f (diff) | |
| parent | 1f951c59c5218d9a4a0cf43e082365110af1b94d (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
78 files changed, 4010 insertions, 649 deletions
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 2045697516..cb03650b48 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -24,6 +24,7 @@ gnome_stage_includes() { do_install_append() { rm -rf ${D}${localstatedir}/lib/scrollkeeper/* + rm -rf ${D}${localstatedir}/scrollkeeper/* rm -f ${D}${datadir}/applications/*.cache } diff --git a/conf/checksums.ini b/conf/checksums.ini index 808cc119cf..ec2651aca4 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1330,6 +1330,10 @@ sha256=9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f md5=593aa8001e5c301cdcdb4bb3b63abc33 sha256=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826 +[http://www.angstrom-distribution.org/unstable/sources/XML-Twig-3.33-upstream-keeps-changing-this-tarball-so-we-mirror-our-own.tar.gz] +md5=918f8fba33efe9cf5bc07907c6e46556 +sha256=630241ba64685a264d6037cbfed29476ab36fce652746ad5966fcfc9d810abdc + [http://xmltwig.com/xmltwig/XML-Twig-3.33.tar.gz] md5=495fd8c320f67a0c8e0b90ccb060f0ea sha256=d87ff8c2e1d594808a58373ea72aa6f6e42a9a19d550a569b3f5fd22b53efebd @@ -1974,6 +1978,10 @@ sha256=1828cbd348d1418287b29337e1047cfc3d6c092e18691cd9c6dfc2d6535bcebd md5=cebfeb99c4a7c2a6cee2564770415fe7 sha256=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 +[http://mesh.dl.sourceforge.net/project/asciidoc/asciidoc/8.5.1/asciidoc-8.5.1.tar.gz] +md5=412fb0c86c3dcb4cc159ef63bd274c90 +sha256=ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20 + [http://downloads.sourceforge.net/asio/asio-1.1.1.tar.bz2] md5=3e6bcedc549cb4c014227f882969db5c sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e @@ -6758,6 +6766,10 @@ sha256=d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae md5=0b6ccb1e50d96b7127a18a69399fcf05 sha256=b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4 +[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.5/source/firefox-3.5.5.source.tar.bz2] +md5=b3d92dfb40584141dc1068efc9bdfccc +sha256=2abe7b5561267c230df27951d1d8c6c5853d06ca2426997fdf0a63c5db689feb + [http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2] md5=ff6bf463300cb56bcf750973b2af3d80 sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d @@ -10602,6 +10614,10 @@ sha256=d864fbd0bf6dea24e4f71736da9902a1cae86d0a1a893b5fe17118927257ec3e md5=cd3f3eb54446be6003156158d51f4884 sha256=4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b +[http://grun.googlecode.com/files/grun-0.9.3.tar.gz] +md5=7788783e5a18221ae591606075d3a8ee +sha256=c484d80e4636a69c6ad6491a4769f555be20595e67cb4bfd34c3c91e501b95dd + [ftp://ftp.gnu.org/gnu/gsl/gsl-1.10.tar.gz] md5=d67be4f2e5560d6cf907e18a428becdc sha256=ea3968b58bfc7619f47bf5ff64a7198a38c72419d24b844e71e48823a4776ff0 @@ -11518,6 +11534,10 @@ sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06 md5=0524dd10ad986285ff4eeb3507f7471c sha256=689a413119c4d670ed95b9ac24511655c4805db678ad93866ab1036a0ba4d6bf +[ftp://ftp.gnu.org/gnu/help2man/help2man-1.36.4.tar.gz] +md5=d31a0a38c2ec71faa06723f6b8bd3076 +sha256=a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2 + [http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2] md5=1d9420e8b5a6d5fa491c458ffafd4adb sha256=b60a5358e56e676529e7d3d655d5107a76b9a2434e38952711fea794f65721ce @@ -16950,6 +16970,10 @@ sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f md5=7a80058a6382e5108cdb5554d1609615 sha256=d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f +[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.4.tar.bz2] +md5=ae7fde9fd0ae0d8ac12a1e1536d6d3ce +sha256=e63041db1ef666ca43293762c8aaec27bd4b54b6d86aee68ebb090c1b66584f4 + [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.tar.bz2] md5=84c077a37684e4cbfa67b18154390d8a sha256=0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512 @@ -19018,6 +19042,10 @@ sha256=86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff md5=14d9464043848eddd0bd0d35bbe63415 sha256=3761b27da474b71194ff900e7941c005be608a00fe0ba1f216390ce1ba9cba72 +[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.28/nautilus-2.28.1.tar.bz2] +md5=e759af11a0844828e2b484ff42ee0498 +sha256=197147d04529ee14e63609fa4755c9effff19842f77594ff8cce6e2433d0bec0 + [http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-2.6.1.tar.bz2] md5=50c5732c0c9736b7026bce1c6b0007dc sha256=83f1d6623e142af30a9b3fa9135ecf973fbb8c89f1dc36a218de0c0fef6ddf07 @@ -25230,6 +25258,10 @@ sha256=6c3b8fa619749cbb28ca0f8847e56773d13e0bb92f1ea34287420950373640c2 md5=59c92b223f69cc7e50ae6cd9d1539db1 sha256=38f24694983f20e5bffa2ebc1d35a7c3abea50479a6df6449cc900bf2732891d +[http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2] +md5=a8a9193c0ac1bec2f3ca7be40a5a82eb +sha256=d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1 + [ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.8a.tar.bz2] md5=0f429f87de9f20d6c0d952e63bf8e3fa sha256=efcda677be7ef093757d965736dff3b5af8c9fd36b3e7d3db09289a4a1d5d013 @@ -29630,6 +29662,10 @@ sha256=e17aa1a26119966258a3656a262bbba0f0b036eecb6d9bf192cf4b497686f4c3 md5=b006f72f45a3e7be3e64f88813275403 sha256=aa9acb0c56f0e40f574e16b762fb590fbd0004bccac9847e2e710c041b90d412 +[http://downloads.sourceforge.net/xmltv/xmltv-0.5.56.tar.bz2] +md5=308c01dc50f9f138bd9ada7483e2877b +sha256=9159dc21418f611b37520bf71f32a0ca3b44cc490bb9620e9a1a812315685d1c + [http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2] md5=03a85cfc5e1877a2e1f7be4fa1d3f63c sha256=ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index 0ec6782076..a9cf5773ee 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -2,16 +2,18 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -TARGET_ARCH = "i486" +TARGET_ARCH = "i586" require conf/machine/include/tune-geode.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" +PREFERRED_PROVIDER_virtual/kernel = "linux" +MACHINE_EXTRA_RDEPENDS = "kernel grub" +MACHINE_FEATURES = "kernel26 pci ext2 x86" +MACHINE_KERNEL_VERSION = "2.6" udevdir = "/dev" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586" diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf index f8874fd966..7316f2d747 100644 --- a/conf/machine/geodelx.conf +++ b/conf/machine/geodelx.conf @@ -2,7 +2,7 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -TARGET_ARCH = "i486" +TARGET_ARCH = "i586" require conf/machine/include/tune-geode.inc @@ -11,5 +11,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586" SELECTED_OPTIMIZATION_pn-glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}" diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 3978e8778f..5f33b46090 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # MIT Licensed # Initial version by Graeme 'XorA' Gregory, Further changes by Koen Kooi @@ -32,7 +32,7 @@ cat files-remote files-local | sort | uniq -u >files-uniq cat files-uniq files-local | sort | uniq -d > files-trans # Remove SGX files -rm -f upload-queue/bigbuck* upload-queue/*libgles* upload-queue/*3.00.* +rm -f upload-queue/bigbuck* upload-queue/*libgles* upload-queue/*kdrive*sgx* upload-queue/*3.00.* # Copy over non-duplicate files echo "Starting rsync..." diff --git a/recipes/asciidoc/asciidoc_8.5.1.bb b/recipes/asciidoc/asciidoc_8.5.1.bb new file mode 100644 index 0000000000..7e7fde7e91 --- /dev/null +++ b/recipes/asciidoc/asciidoc_8.5.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." +HOMEPAGE = "http://www.methods.co.nz/asciidoc/" +LICENSE = "GPLv2" + +SRC_URI = "http://mesh.dl.sourceforge.net/project/asciidoc/asciidoc/${PV}/asciidoc-${PV}.tar.gz" + +inherit distutils-base autotools_stage pkgconfig + +export vimdir = "${D}${sysconfdir}/vim" +export DESTDIR = "${D}" + +do_install() { + sed -i -e s:/etc/vim::g ${S}/Makefile + oe_runmake -e install +} + +FILES_${PN} += "${sysconfdir}" + +# TODO: only depend on codecs, csv, doctest, fnmatch, getopt, HTMLParser, locale, optparse, os, re, shutil, StringIO, subprocess, sys, tempfile, time, traceback, urlparse, zipfile +RDEPENDS_${PN} += "python-modules" diff --git a/recipes/gnome-mplayer/gecko-mediaplayer/extensions/flash@alwaysinnovating.com/chrome/content/ai-flash.js b/recipes/gnome-mplayer/gecko-mediaplayer/extensions/flash@alwaysinnovating.com/chrome/content/ai-flash.js index c21ad58847..e1486ab2dd 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer/extensions/flash@alwaysinnovating.com/chrome/content/ai-flash.js +++ b/recipes/gnome-mplayer/gecko-mediaplayer/extensions/flash@alwaysinnovating.com/chrome/content/ai-flash.js @@ -1,6 +1,18 @@ +// ==UserScript== +// @name Flash AI +// @description Flash AI add-on +// @include * +// ==/UserScript== -window.addEventListener("load", function() { myExtension.init(); }, false); +var firefox = true; +if (navigator.userAgent.match("midori")) firefox = false; + +if (!firefox){ + window.addEventListener("load", function() { myExtension.onPageLoad(); }, true); +}else{ + window.addEventListener("load", function() { myExtension.init(); }, false); +} var myExtension = { init: function() { var appcontent = document.getElementById("appcontent"); // browser @@ -17,7 +29,7 @@ var myExtension = { } - var idInterval=-1; +var idInterval=-1; var stUrl = ""; var timeout=2000; @@ -67,8 +79,12 @@ function getBrowserForDocument(aDocument) { } function checkPageOnLoad(aEvent) { - - var doc=aEvent.originalTarget; + var doc; + if(firefox){ + doc=aEvent.originalTarget; + }else{ + doc=document; + } var loc=doc.location.href; var host=doc.location.hostname; idInterval=-1; @@ -97,7 +113,7 @@ function checkPageOnLoad(aEvent) { } if (host.match(/youtube\./i)!=null) { - embmedia=doc.embeds; + embmedia=doc.embeds; if ((embmedia!=null)&&(idInterval==-1)) { embid=embmedia[0].getAttribute('id'); flashvars=unescape(embmedia[0].getAttribute('flashvars')); @@ -121,7 +137,7 @@ function checkPageOnLoad(aEvent) { embmedia=doc.embeds; if ((embmedia!=null)&&(idInterval==-1)) { - + // Myspace loves embedded flash ads, so we have to find the good one for the video... for(i=0;i<embmedia.length;i++){ source=unescape(embmedia[i].getAttribute('src')); @@ -132,11 +148,11 @@ function checkPageOnLoad(aEvent) { if(source.match(/videoid=/i)!=null){ // regular video id = (source.split("videoid=")[1]).split("&")[0]; + }else if (source.match(/m=/i)!=null){ // video channels myspace or hot stuff id = (source.split("m=")[1]).split("&")[0].split(",")[0]; } - if(id!=-1){ stUrl=getMySpaceURL(doc, id); idInterval = setInterval(replaceTag, timeout, doc, " ", new Array(embmedia[i])); @@ -150,24 +166,7 @@ function checkPageOnLoad(aEvent) { if (host.match(/video.yahoo\./i)!=null) { embmedia=doc.embeds; - if ((embmedia!=null)&&(idInterval==-1)) { - for(i=0;i<embmedia.length;i++){ - embid = embmedia[i].getAttribute('id'); - if(embid=="video1"){ - stUrl = getURLfromKeepVid(loc); - if (stUrl != null){ - this.replaceTag(doc, embid, new Array(embmedia[i])); - return; - } - } - } - } - setTimeout(checkPageOnLoad,timeout,aEvent); - return; - } - if (host.match(/video.yahoo\./i)!=null) { - embmedia=doc.embeds; if ((embmedia!=null)&&(idInterval==-1)) { for(i=0;i<embmedia.length;i++){ embid = embmedia[i].getAttribute('id'); @@ -183,8 +182,7 @@ function checkPageOnLoad(aEvent) { setTimeout(checkPageOnLoad,timeout,aEvent); return; } - - + //if (loc.match(/my\.yahoo\..*\/\?rd\=nux/i)!=null) { // atag=doc.getElementsByTagName('a'); @@ -197,7 +195,6 @@ function checkPageOnLoad(aEvent) { //} if (host.match(/dailymotion\./i)!=null) { - embmedia=doc.embeds; if ((embmedia!=null)&&(idInterval==-1)) { embid=embmedia[0].getAttribute('id'); diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb index 9dca7cb6b6..a9260836da 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb +++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "firefox gtk+ gconf dbus-glib" RDEPENDS = "firefox gnome-mplayer" -PR = "r4" +PR = "r7" inherit autotools @@ -13,21 +13,23 @@ SRC_URI = "http://gecko-mediaplayer.googlecode.com/files/${P}.tar.gz \ file://extensions \ " -# Yes, this needs to match the firefox version you are building *exactly* -MOZILLA_HOME = "firefox-3.5.4" - do_install_append() { - install -d ${D}${libdir}/${MOZILLA_HOME}/extensions/ cp -dpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/ - ln -sf ${libdir}/mozilla/extensions/flash@alwaysinnovating.com ${D}${libdir}/${MOZILLA_HOME}/extensions/ } PACKAGES =+ "${PN}-firefox-hack" RDEPENDS_${PN}-firefox-hack = "${PN}" -FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions ${libdir}/${MOZILLA_HOME}" +FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions" FILES_${PN} += "${sysconfdir}/* \ - ${libdir}/mozilla/* ${libdir}/${MOZILLA_HOME}" + ${libdir}/mozilla/*" FILES_${PN}-dbg += "${libdir}/mozilla*/plugins/.debug/*" +pkg_postinst_${PN}-firefox-hack() { +for firefoxdir in $D${libdir}/firefox-* ; do + if [ -e $firefoxdir/extensions/ ] ; then + ln -sf ${libdir}/mozilla/extensions/flash@alwaysinnovating.com $firefoxdir/extensions/ + fi +done +} diff --git a/recipes/gnome/gnome-icon-theme_1.3.3.bb b/recipes/gnome/gnome-icon-theme_1.3.3.bb deleted file mode 100644 index c601d2a5d0..0000000000 --- a/recipes/gnome/gnome-icon-theme_1.3.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2" -DEPENDS = "glib-2.0 intltool-native" -PR ="r1" - -FILES_${PN} += "${datadir}/*" - -EXTRA_OECONF = "--disable-hicolor-check" - -inherit autotools pkgconfig diff --git a/recipes/gnome/gnome-icon-theme_2.22.0.bb b/recipes/gnome/gnome-icon-theme_2.22.0.bb deleted file mode 100644 index d458d9ba74..0000000000 --- a/recipes/gnome/gnome-icon-theme_2.22.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" - -FILES_${PN} += "${datadir}/*" - -EXTRA_OECONF = "--disable-hicolor-check" - -inherit gnome - -PACKAGE_ARCH = "all" diff --git a/recipes/gnome/gnome-icon-theme_2.24.0.bb b/recipes/gnome/gnome-icon-theme_2.24.0.bb deleted file mode 100644 index 755e39151e..0000000000 --- a/recipes/gnome/gnome-icon-theme_2.24.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" - -PR = "r2" - -FILES_${PN} += "${datadir}/*" - -EXTRA_OECONF = "--disable-hicolor-check" - -inherit gnome - -pkg_postinst_${PN}() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -# Update the pixbuf loaders in case they haven't been registered yet -gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders - -gtk-update-icon-cache -q /usr/share/icons/gnome -} - -pkg_postrm_${PN}() { -gtk-update-icon-cache -q /usr/share/icons/gnome -} - diff --git a/recipes/gnome/gnome-icon-theme_2.26.0.bb b/recipes/gnome/gnome-icon-theme_2.26.0.bb deleted file mode 100644 index 7e5c7b3af8..0000000000 --- a/recipes/gnome/gnome-icon-theme_2.26.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" -DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" -RDEPENDS = "hicolor-icon-theme" -RRECOMMENDS = "librsvg-gtk" - -FILES_${PN} += "${datadir}/*" - -EXTRA_OECONF = "--disable-hicolor-check" - -inherit gnome - - diff --git a/recipes/gnome/gnome-icon-theme_2.28.0.bb b/recipes/gnome/gnome-icon-theme_2.28.0.bb index 38f212927f..e692287820 100644 --- a/recipes/gnome/gnome-icon-theme_2.28.0.bb +++ b/recipes/gnome/gnome-icon-theme_2.28.0.bb @@ -1,13 +1,16 @@ -LICENSE = "GPL" SECTION = "x11/gnome" +LICENSE = "GPL" DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" + RDEPENDS = "hicolor-icon-theme" RRECOMMENDS = "librsvg-gtk" -PACKAGE_ARCH = "all" -PR = "r1" -FILES_${PN} += "${datadir}/*" +PR = "r2" + +inherit gnome EXTRA_OECONF = "--disable-hicolor-check" -inherit gnome +PACKAGE_ARCH = "all" + +FILES_${PN} += "${datadir}/*" diff --git a/recipes/gnome/gnome-system-tools_2.27.1.bb b/recipes/gnome/gnome-system-tools_2.27.1.bb index a1e74bbf73..4839e5e9e6 100644 --- a/recipes/gnome/gnome-system-tools_2.27.1.bb +++ b/recipes/gnome/gnome-system-tools_2.27.1.bb @@ -4,6 +4,8 @@ LICENSE = "GPL" DEPENDS = "nautilus gnome-common glib-2.0 gtk+ gconf liboobs system-tools-backends gnome-control-center" inherit gnome pkgconfig +PR = "r1" + EXTRA_OECONF = "--disable-scrollkeeper \ " LDFLAGS += "-lgthread-2.0" diff --git a/recipes/gnome/gnome-terminal_2.28.0.bb b/recipes/gnome/gnome-terminal_2.28.0.bb index 3a31bf3fbe..1bc87e735a 100644 --- a/recipes/gnome/gnome-terminal_2.28.0.bb +++ b/recipes/gnome/gnome-terminal_2.28.0.bb @@ -4,6 +4,8 @@ LICENSE = "GPL" DEPENDS = "gnome-common glib-2.0 gtk+ gconf vte" inherit gnome pkgconfig +PR = "r1" + EXTRA_OECONF = "--disable-scrollkeeper" do_configure_prepend () { diff --git a/recipes/gnome/libgsf_1.14.16.bb b/recipes/gnome/libgsf_1.14.16.bb index 5697275f7a..9405b424bc 100644 --- a/recipes/gnome/libgsf_1.14.16.bb +++ b/recipes/gnome/libgsf_1.14.16.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" SECTION = "libs" -DEPENDS= "libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" +DEPENDS= "gtk+ libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" RDEPENDS = "gconf gnome-vfs" PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " diff --git a/recipes/grun/grun_0.9.3.bb b/recipes/grun/grun_0.9.3.bb new file mode 100644 index 0000000000..e407a923d4 --- /dev/null +++ b/recipes/grun/grun_0.9.3.bb @@ -0,0 +1,20 @@ +HOMEPAGE = "http://code.google.com/p/grun/" +DESCRIPTION = "gRun is a GTK based Run dialog that closely resembles the Windows Run dialog, just like xexec. It has a intelligent history mechanism and a dual level fork() mechanism for launching the application in its own process. gRun also has support for launching console mode application in an XTerm as well as associations for file types." +SECTION = "x11/applications" +LICENSE = "GPL" +PR = "r1" + +DEPENDS = "gtk+" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" +SRC_URI = "http://grun.googlecode.com/files/grun-${PV}.tar.gz" + +inherit autotools + + + + + + + + diff --git a/recipes/help2man/help2man_1.36.4.bb b/recipes/help2man/help2man_1.36.4.bb new file mode 100644 index 0000000000..a88fbb8be3 --- /dev/null +++ b/recipes/help2man/help2man_1.36.4.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "GNU utility to convert program --help output to a man page" +HOMEPAGE = "http://www.gnu.org/software/help2man" +SECTION = "console/utils" +LICENSE = "GPLv2" +DEPENDS = "gettext-native perl-native liblocale-gettext-perl-native" +RDEPENDS = "gettext perl liblocale-gettext-perl" + +TARGET_CC_ARCH += "${LDFLAGS}" + +SRC_URI = "${GNU_MIRROR}/help2man/${P}.tar.gz" + +inherit autotools + +PR = "r0" + +EXTRA_OECONF += "PERL=/usr/bin/perl" + +do_configure () { + oe_runconf +} + +FILES_${PN} += "/usr/lib/hacklocaledir.so" diff --git a/recipes/kexecboot/files/angstrom/icon.xpm b/recipes/kexecboot/files/angstrom/icon.xpm new file mode 100644 index 0000000000..77b6710bae --- /dev/null +++ b/recipes/kexecboot/files/angstrom/icon.xpm @@ -0,0 +1,39 @@ +/* XPM */ +static char * logo_xpm[] = { +"32 32 4 1", +" c None", +". c #729188", +"+ c #93ACA4", +"# c #CCCCCC", +" ", +" ++ ", +" ++ ", +" ++ ", +" .++. ", +" . . ", +" . . ", +" . ++ . ", +" ++++ ", +" ++++ ", +" +#++#+ ", +" +#++#+ ", +" +#+ +#+ ", +" +#+ +#+ ", +" ++ ++ ++ ", +" +#+ ++ +#+ ", +" ...+#+.++.+#+... ", +" ...#+..++..+#... ", +" +#+ ++ +#+ ", +" ++ ++ ++ ", +" +#+ +#+ ", +" ++ ++ ", +" +#+ +#+ ", +" ++ ++ ", +" +#+ +#+ ", +" +#+ +#+ ", +" ++ ++ ", +" +#+ +#+ ", +" +++ +++ ", +" .+ +. ", +" . . ", +" "}; diff --git a/recipes/kexecboot/files/icon.xpm b/recipes/kexecboot/files/icon.xpm new file mode 100644 index 0000000000..6e6fd776d8 --- /dev/null +++ b/recipes/kexecboot/files/icon.xpm @@ -0,0 +1,43 @@ +/* XPM */ +static char * icon_xpm[] = { +"32 32 8 1", +" c None", +". c #D6DBDE", +"+ c #9BA6AE", +"@ c #60727D", +"# c #B8BFC5", +"$ c #A9E8F6", +"% c #12BCE4", +"& c #57D2EC", +" ", +" ", +" ", +" .++@@@@++. ", +" +@@@@@@@@@@@@+ ", +" #@@@@@@@@@@@@@@@@# ", +" +@@@@@@@@@@@@@@@@@@+ ", +" .@@@@@@@@++##+@@@@@@@@@. ", +" @@@@@@@. .@@@@@@@ ", +" +@@@@@+ $$$$ #@@@@@+ ", +" #@@@@@. $%%%%%%%%$ .@@@@@# ", +" @@@@@. &%%%%%%%%%%& .@@@@@ ", +" #@@@@+ %%%%%%%%%%%%%% +@@@@# ", +" @@@@@ &%%%%%%%%%%%%%%& @@@@@ ", +".@@@@. $%%%%%& $%%%%%& .@@@@.", +"+@@@@ %%%%% $%%%%%& @@@@+", +"+@@@+ %%%%$ $%%%%%& $$ +@@@+", +"@@@@+ $%%%% $%%%%%& $%$ +@@@@", +"@@@@# &%%%& &%%%%& $%%& #@@@@", +"@@@@. &%%%& %%%%& $%%%& .@@@@", +"@@@@# $%%%& &%%& &%%%$ #@@@@", +"+@@@+ $%%%% %%%%$ +@@@+", +"+@@@@ %%%%& &%%%% @@@@+", +"#@@@@ &%%%%& &%%%%& @@@@#", +" @@@@+ %%%%%%&$$&%%%%%% +@@@@ ", +" +@@@@. $%%%%%%%%%%%%%%$ .@@@@+ ", +" .@@@@@ $%%%%%%%%%%%%$ @@@@@. ", +" #++++. &%%%%%%%%& .++++# ", +" $&&%%&&$ ", +" ", +" ", +" "}; diff --git a/recipes/kexecboot/kexecboot-0.4/add-reboot-option.patch b/recipes/kexecboot/kexecboot-0.4/add-reboot-option.patch deleted file mode 100644 index 52619229fd..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/add-reboot-option.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/kexecboot.c -+++ b/kexecboot.c -@@ -536,11 +536,23 @@ int main(int argc, char **argv) - fread(&evt, sizeof(struct input_event), 1, f); - while(evt.type != EV_KEY || evt.value != 0); - -- if(evt.code == KEY_UP && choice >0) -- choice--; -- if(evt.code == KEY_DOWN && choice < bl->size-1) -- choice++; -- // printf("%d %d\n",choice, evt.code); -+ switch (evt.code) { -+ case KEY_UP: -+ if (choice > 0) choice--; -+ break; -+ case KEY_DOWN: -+ if ( choice < (bl->size - 1) ) choice++; -+ break; -+ case KEY_R: -+ /* FIXME: Should work while no boot devices is found */ -+ sync(); -+ sleep(1); -+ /* if ( -1 == reboot(LINUX_REBOOT_CMD_RESTART) ) { */ -+ if ( -1 == reboot(RB_AUTOBOOT) ) { -+ perror("Can't initiate reboot"); -+ } -+ break; -+ } - - }while(evt.code != 87 && evt.code != 63); - fclose(f); ---- a/kexecboot.h -+++ b/kexecboot.h -@@ -29,6 +29,7 @@ - #include <sys/wait.h> - #include <ctype.h> - #include <errno.h> -+#include <sys/reboot.h> - #include "fb.h" - #include "devicescan.h" - #include "res/logo-img.h" diff --git a/recipes/kexecboot/kexecboot-0.4/add-sleep.patch b/recipes/kexecboot/kexecboot-0.4/add-sleep.patch deleted file mode 100644 index 8f41b0ef10..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/add-sleep.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/kexecboot.c 2009-01-24 14:11:17.000000000 +0100 -+++ b/kexecboot.c 2009-01-24 14:15:03.000000000 +0100 -@@ -427,6 +427,9 @@ - - DPRINTF("I'm the init-process!\n"); - -+ /* extra delay for initializing slow SD/CF */ -+ sleep(1); -+ - /* Mount procfs */ - if ( -1 == mount("proc", "/proc", "proc", - 0, NULL) ) { diff --git a/recipes/kexecboot/kexecboot-0.4/fb-render-16bit.patch b/recipes/kexecboot/kexecboot-0.4/fb-render-16bit.patch deleted file mode 100644 index f3405e49d8..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/fb-render-16bit.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: kexecboot-0.4/fb.c -=================================================================== ---- kexecboot-0.4.orig/fb.c 2009-01-29 22:03:34.000000000 +0000 -+++ kexecboot-0.4/fb.c 2009-01-29 22:08:22.000000000 +0000 -@@ -19,7 +19,15 @@ - - void fb_render(FB * fb) - { -- memcpy(fb->data, fb->backbuffer, fb->screensize); -+ uint16 *source, *dest; -+ int n = fb->screensize/2; -+ -+ source = (uint16 *)fb->backbuffer; -+ dest = (uint16 *)fb->data; -+ -+ while (n--) { -+ *dest++ = *source++; -+ } - } - - void fb_destroy(FB * fb) diff --git a/recipes/kexecboot/kexecboot-0.4/graphical-no-devices.patch b/recipes/kexecboot/kexecboot-0.4/graphical-no-devices.patch deleted file mode 100644 index b2cb214894..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/graphical-no-devices.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/kexecboot.c -+++ b/kexecboot.c -@@ -66,8 +66,15 @@ void display_menu(FB *fb, struct bootlist *bl, int current) - LOGO_IMG_WIDTH, - LOGO_IMG_HEIGHT, - LOGO_IMG_BYTES_PER_PIXEL, LOGO_IMG_RLE_PIXEL_DATA); -- fb_draw_text (fb, LOGO_IMG_WIDTH + margin, margin, 0, 0, 0, &radeon_font, -- "Make your choice by selecting\nan item with the cursor keys\nand press OK to continue"); -+ /* If no devices found print a message */ -+ if (0 == bl->size) { -+ fb_draw_text (fb, LOGO_IMG_WIDTH + margin, margin, 0, 0, 0, &radeon_font, -+ "No bootable devices found.\nInsert bootable device\nand press 'R' to reboot."); -+ } else { -+ fb_draw_text (fb, LOGO_IMG_WIDTH + margin, margin, 0, 0, 0, &radeon_font, -+ "Make your choice by selecting\nan item with the cursor keys\nand press OK to continue.\nPress 'R' to reboot."); -+ } -+ - if(current < firstslot) - firstslot=current; - if(current > firstslot + slots -1) diff --git a/recipes/kexecboot/kexecboot-0.4/kexecboot-tosa.patch b/recipes/kexecboot/kexecboot-0.4/kexecboot-tosa.patch deleted file mode 100644 index e1f4870853..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/kexecboot-tosa.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: kexecboot-0.4/kexecboot.c -=================================================================== ---- kexecboot-0.4.orig/kexecboot.c 2009-01-29 01:30:43.000000000 +0000 -+++ kexecboot-0.4/kexecboot.c 2009-01-29 01:39:17.000000000 +0000 -@@ -416,7 +416,7 @@ - {"Spitz", 270}, - - {"Collie", 270}, -- {"Tosa", 270}, -+ {"SHARP Tosa", 0}, - {"Poodle", 270}, - {NULL, 0} - }; -@@ -566,7 +566,9 @@ - break; - } - -- }while(evt.code != 87 && evt.code != 63); -+ }while(evt.code != 87 && evt.code != 63 && -+ evt.code != KEY_SPACE && evt.code != KEY_ENTER && -+ evt.code != KEY_HIRAGANA && evt.code != KEY_HENKAN); - fclose(f); - // reset terminal - tcsetattr(fileno(stdin), TCSANOW, &old); diff --git a/recipes/kexecboot/kexecboot-0.4/scan_devices-top.patch b/recipes/kexecboot/kexecboot-0.4/scan_devices-top.patch deleted file mode 100644 index 6b21d03a3d..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/scan_devices-top.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/kexecboot.c -+++ b/kexecboot.c -@@ -508,28 +508,27 @@ int main(int argc, char **argv) - if ((fb = fb_new(angle)) == NULL) - exit(-1); - -- bl = scan_devices(); -- -- if(!bl->size){ -- puts("No bootable device found"); -- exit(-1); -- } -- - f = fopen(eventif,"r"); - if(!f){ - perror(eventif); - exit(3); - } - -- - // deactivate terminal input -- - tcgetattr(fileno(stdin), &old); - new = old; - new.c_lflag &= ~ECHO; - // new.c_cflag &=~CREAD; - tcsetattr(fileno(stdin), TCSANOW, &new); - -+ bl = scan_devices(); -+/* -+ if(!bl->size){ -+ puts("No bootable device found"); -+ exit(-1); -+ } -+*/ -+ - do{ - display_menu(fb, bl, choice); - do diff --git a/recipes/kexecboot/kexecboot-0.4/silent-output-hack.patch b/recipes/kexecboot/kexecboot-0.4/silent-output-hack.patch deleted file mode 100644 index abe8e84dd1..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/silent-output-hack.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/devicescan.c 2009-01-17 00:51:35.000000000 +0100 -+++ b/devicescan.c 2009-01-24 22:13:45.000000000 +0100 -@@ -120,14 +120,14 @@ - malloc((strlen(split) + strlen("/dev/") + - 1) * sizeof(char)); - sprintf(device, "/dev/%s", split); -- printf("Probing %s\n",device); -+ /* printf("Probing %s\n",device); */ - int fd = open(device, O_RDONLY); - if (fd < 0) { - perror(device); - free(device); - continue; - } -- printf("Device %s is opened\n", device); -+ /* printf("Device %s is opened\n", device); */ - if (-1 == identify_fs(fd, &fstype, NULL, 0)) { - free(device); - continue; -@@ -137,33 +137,33 @@ - free(device); - continue; - } -- printf("FS on device %s is %s\n", device, fstype); -+ /* printf("FS on device %s is %s\n", device, fstype); */ - // no unknown filesystems - if (contains(fstype, fl) == -1) { - free(device); - continue; - } -- printf("found %s (%s)\n",device, fstype); -+ /* printf("found %s (%s)\n",device, fstype); */ - // mount fs - if (mount(device, "/mnt", fstype, MS_RDONLY, NULL)) { -- printf("mount failed\n"); -+ /* printf("mount failed\n"); */ - perror(device); - free(device); - continue; - } -- printf("mount successful\n"); -+ /* printf("mount successful\n"); */ - if ( (g = fopen("/mnt/zImage", "r")) ) - kernelpath = "/mnt/zImage"; - else if ( (g = fopen("/mnt/boot/zImage", "r")) ) - kernelpath = "/mnt/boot/zImage"; - else { -- printf("%s no kernel found, umounting\n", device); -+ /* printf("%s no kernel found, umounting\n", device); */ - free(device); - umount("/mnt"); - continue; - } - fclose(g); -- printf("found kernel\n"); -+ /* printf("found kernel\n"); */ - bl->list[count] = malloc(sizeof(struct boot)); - bl->list[count]->device = device; - bl->list[count]->fstype = fstype; -@@ -174,7 +174,7 @@ - fgets(bl->list[count]->cmdline, COMMAND_LINE_SIZE, - g); - fclose(g); -- printf("found command line\n"); -+ /* printf("found command line\n"); */ - bl->list[count]->cmdline[strlen(bl->list[count]->cmdline)-1] = '\0'; - } else - bl->list[count]->cmdline = NULL; ---- a/kexecboot.c 2009-01-25 10:41:04.000000000 +0100 -+++ b/kexecboot.c 2009-01-24 22:13:45.000000000 +0100 -@@ -558,7 +558,7 @@ - case KEY_R: - /* FIXME: Should work while no boot devices is found */ - sync(); -- sleep(1); -+ /* REMOVE: we sleep on boot sleep(1); */ - /* if ( -1 == reboot(LINUX_REBOOT_CMD_RESTART) ) { */ - if ( -1 == reboot(RB_AUTOBOOT) ) { - perror("Can't initiate reboot"); diff --git a/recipes/kexecboot/kexecboot-0.4/switch-cursor-off.patch b/recipes/kexecboot/kexecboot-0.4/switch-cursor-off.patch deleted file mode 100644 index 632cc6a01c..0000000000 --- a/recipes/kexecboot/kexecboot-0.4/switch-cursor-off.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kexecboot.c -+++ b/kexecboot.c -@@ -512,6 +512,9 @@ int main(int argc, char **argv) - DPRINTF("FB angle is %d, input device is %s\n", angle, eventif); - DPRINTF("Going to fb mode\n"); - -+ /* Switch cursor off. NOTE: works only when master-console is tty */ -+ printf("\033[?25l\n"); -+ - if ((fb = fb_new(angle)) == NULL) - exit(-1); diff --git a/recipes/kexecboot/kexecboot-cfg_0.1.bb b/recipes/kexecboot/kexecboot-cfg_0.1.bb index 97407a8a0a..b867457e22 100644 --- a/recipes/kexecboot/kexecboot-cfg_0.1.bb +++ b/recipes/kexecboot/kexecboot-cfg_0.1.bb @@ -2,9 +2,11 @@ LICENSE = "GPL" SECTION = "base" DESCRIPTION = "Configuration file for kexecboot" -PR = "r5" +PR = "r7" PACKAGE_ARCH = "${MACHINE_ARCH}" +SRC_URI = "file://icon.xpm" + CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd rw" CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd" @@ -29,18 +31,38 @@ CMDLINE += ${CMDLINE_DEBUG} FILES_${PN} += "/boot/*" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/icon.xpm ${S} +} + do_install_prepend () { - echo "DEFAULT=${DISTRO}" > ${S}/boot.cfg + + echo "# Show this label in kexecboot menu." >> ${S}/boot.cfg echo "LABEL=${DISTRO}" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg + + echo "# Specify full path to the kernel." >> ${S}/boot.cfg echo "KERNEL=/boot/${KERNEL_IMAGETYPE}" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg + + echo "# Append this tags to the kernel cmdline." >> ${S}/boot.cfg echo "APPEND=${CMDLINE}" >> ${S}/boot.cfg - echo "#ICON=/boot/my_icon.xpm" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg + + echo "# Specify full path for a custom distro-icon for the menu-item." >> ${S}/boot.cfg + echo "# If not set, use device-icons as default (NAND, SD, CF, ...)." >> ${S}/boot.cfg + echo "#ICON=/boot/icon.xpm" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg + + echo "# Priority of item in kexecboot menu." >> ${S}/boot.cfg + echo "# Items with highest priority will be shown at top of menu." >> ${S}/boot.cfg + echo "# Default: 0 (lowest, ordered by device ordering)" >> ${S}/boot.cfg + echo "#PRIORITY=10" >> ${S}/boot.cfg + echo "#" >> ${S}/boot.cfg } do_install () { - install -d ${D}/boot - install -m 0644 boot.cfg ${D}/boot/boot.cfg - - # old kexecboot versions < 0.52 were needing '/boot/kernel-cmdline' - # echo "${CMDLINE}"> ${D}/boot/kernel-cmdline + install -d ${D}/boot + install -m 0644 boot.cfg ${D}/boot/boot.cfg + install -m 0644 icon.xpm ${D}/boot/icon.xpm } diff --git a/recipes/kexecboot/kexecboot_0.4.bb b/recipes/kexecboot/kexecboot_0.4.bb deleted file mode 100644 index cf647a2c87..0000000000 --- a/recipes/kexecboot/kexecboot_0.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -PR = "r6" - -SRC_URI = "http://kexecboot.home.linuxtogo.org/kexecboot-${PV}.tar.gz \ - file://add-reboot-option.patch;patch=1 \ - file://scan_devices-top.patch;patch=1 \ - file://graphical-no-devices.patch;patch=1 \ - file://switch-cursor-off.patch;patch=1 \ - file://add-sleep.patch;patch=1 \ - file://silent-output-hack.patch;patch=1 \ - file://kexecboot-tosa.patch;patch=1 \ - file://fb-render-16bit.patch;patch=1" - -require kexecboot.inc diff --git a/recipes/kexecboot/kexecboot_0.5.bb b/recipes/kexecboot/kexecboot_0.5.bb deleted file mode 100644 index 04ab2772b4..0000000000 --- a/recipes/kexecboot/kexecboot_0.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -PR = "r1" - -SRC_URI = "http://kexecboot.home.linuxtogo.org/kexecboot-${PV}.tar.gz" - -require kexecboot.inc diff --git a/recipes/kexecboot/kexecboot_git.bb b/recipes/kexecboot/kexecboot_git.bb index 3f63276386..3bd280c206 100644 --- a/recipes/kexecboot/kexecboot_git.bb +++ b/recipes/kexecboot/kexecboot_git.bb @@ -1,20 +1,8 @@ PV = "0.5" -PR = "r5+gitr${SRCREV}" +PR = "r6+gitr${SRCREV}" SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git " - -# v0.52 (using boot.cfg and new screen layout) -# looking forward to the new 0.6 version -SRCREV = "8daf258fc5d1e5eb6127285c63d66f31f05cf80d" - -# v0.51 (pre cfg-files, using kernel-cmdline) -#SRCREV = "c5f17845f0f620adff854c2239a8aaa5d9942255" - -# v0.5 (add rescan / reboot) -#SRCREV = "8823a939a38a8a3287f90dee062e8ab8569f884f" - -# v0.4 (add bootlogo) -#SRCREV = "d7af5356df4f25203831403c69f1a263c163f31a" +SRCREV = "40e5be92f045f2a7cfc918f4b1acc42f6cc013e9" S = "${WORKDIR}/git" diff --git a/recipes/linux/linux-2.6.31.4/geode/defconfig b/recipes/linux/linux-2.6.31.4/geode/defconfig new file mode 100644 index 0000000000..62ca6cad99 --- /dev/null +++ b/recipes/linux/linux-2.6.31.4/geode/defconfig @@ -0,0 +1,1792 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.31.4 +# Thu Oct 15 09:26:12 2009 +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_FAST_CMPXCHG_LOCAL=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y +# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_X86_32_LAZY_GS=y +CONFIG_KTIME_SCALAR=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +# CONFIG_CLASSIC_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT 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=18 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +# CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +CONFIG_RELAY=y +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=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_HAVE_PERF_COUNTERS=y + +# +# Performance Counters +# +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_TRACEPOINTS=y +CONFIG_MARKERS=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_SLOW_WORK is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +# CONFIG_MODULES is not set +CONFIG_BLOCK=y +# CONFIG_LBDAF is not set +CONFIG_BLK_DEV_BSG=y +# 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 is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_FREEZER is not set + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_SMP is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_SCHED_OMIT_FRAME_POINTER is not set +# CONFIG_PARAVIRT_GUEST is not set +# CONFIG_MEMTEST is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +CONFIG_MGEODE_LX=y +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_GENERIC_CPU is not set +# CONFIG_X86_GENERIC is not set +CONFIG_X86_CPU=y +CONFIG_X86_L1_CACHE_BYTES=64 +CONFIG_X86_INTERNODE_CACHE_BYTES=64 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_X86_XADD=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_TSC=y +CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +# CONFIG_X86_DS is not set +# CONFIG_HPET_TIMER is not set +CONFIG_DMI=y +# CONFIG_IOMMU_HELPER is not set +# CONFIG_IOMMU_API is not set +CONFIG_NR_CPUS=1 +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set +# CONFIG_X86_UP_APIC is not set +# CONFIG_X86_MCE is not set +# CONFIG_X86_ANCIENT_MCE is not set +CONFIG_VM86=y +# CONFIG_TOSHIBA is not set +# CONFIG_I8K is not set +# CONFIG_X86_REBOOTFIXUPS is not set +# CONFIG_MICROCODE is not set +# CONFIG_X86_MSR is not set +# CONFIG_X86_CPUID is not set +# CONFIG_X86_CPU_DEBUG is not set +CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_X86_PAE is not set +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +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_SPARSEMEM_STATIC=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set +# CONFIG_X86_RESERVE_LOW_64K is not set +# CONFIG_MATH_EMULATION is not set +# CONFIG_MTRR is not set +# CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_SCHED_HRTICK=y +# CONFIG_KEXEC is not set +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set + +# +# Power management and ACPI options +# +# CONFIG_PM is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +# CONFIG_CPU_FREQ_STAT is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set + +# +# CPUFreq processor drivers +# +# CONFIG_X86_POWERNOW_K6 is not set +# CONFIG_X86_POWERNOW_K7 is not set +# CONFIG_X86_GX_SUSPMOD is not set +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +# CONFIG_X86_SPEEDSTEP_ICH is not set +# CONFIG_X86_SPEEDSTEP_SMI is not set +# CONFIG_X86_P4_CLOCKMOD is not set +# CONFIG_X86_CPUFREQ_NFORCE2 is not set +# CONFIG_X86_LONGRUN is not set +# CONFIG_X86_E_POWERSAVER is not set + +# +# shared options +# +# CONFIG_X86_SPEEDSTEP_LIB is not set +# CONFIG_CPU_IDLE is not set + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOOLPC is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCIEPORTBUS=y +# CONFIG_HOTPLUG_PCI_PCIE is not set +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIEASPM is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCI_LEGACY is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +CONFIG_ISA_DMA_API=y +# CONFIG_ISA is not set +# CONFIG_MCA is not set +# CONFIG_SCx200 is not set +# CONFIG_GEODE_MFGPT_TIMER is not set +# CONFIG_OLPC is not set +CONFIG_K8_NB=y +# CONFIG_PCCARD is not set +CONFIG_HOTPLUG_PCI=y +# CONFIG_HOTPLUG_PCI_FAKE is not set +# CONFIG_HOTPLUG_PCI_COMPAQ is not set +# CONFIG_HOTPLUG_PCI_CPCI is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set + +# +# Executable file formats / Emulations +# +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 is not set +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +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 is not set +# CONFIG_IP_PNP_RARP is not set +# 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 is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +CONFIG_INET_LRO=y +# CONFIG_INET_DIAG is not set +# 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_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +# CONFIG_NETFILTER_ADVANCED is not set + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=y +CONFIG_NETFILTER_NETLINK_LOG=y +# CONFIG_NF_CONNTRACK is not set +CONFIG_NETFILTER_XTABLES=y +CONFIG_NETFILTER_XT_TARGET_MARK=y +CONFIG_NETFILTER_XT_TARGET_NFLOG=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +CONFIG_NETFILTER_XT_MATCH_MARK=y +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_NF_DEFRAG_IPV4 is not set +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_LOG=y +CONFIG_IP_NF_TARGET_ULOG=y +CONFIG_IP_NF_MANGLE=y +# 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_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_NET_DROP_MONITOR is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_WIRELESS is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL 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=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# 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_SX8 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_BLK_DEV_HD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_IBM_ASM is not set +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_ISL29003 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_CB710_CORE is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=y + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +CONFIG_IDE_XFER_MODE=y +CONFIG_BLK_DEV_IDE_SATA=y +CONFIG_IDE_GD=y +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_IDE_TASK_IOCTL is not set +# CONFIG_IDE_PROC_FS is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_PLATFORM=y +# CONFIG_BLK_DEV_CMD640 is not set +CONFIG_BLK_DEV_IDEDMA_SFF=y + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +# CONFIG_IDEPCI_PCIBUS_ORDER is not set +# CONFIG_BLK_DEV_GENERIC is not set +# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_RZ1000 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_ATIIXP is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_CS5535 is not set +CONFIG_BLK_DEV_CS5536=y +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_JMICRON is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_IT8172 is not set +# CONFIG_BLK_DEV_IT8213 is not set +# CONFIG_BLK_DEV_IT821X is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_PDC202XX_OLD is not set +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SIS5513 is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_BLK_DEV_TC86C001 is not set +CONFIG_BLK_DEV_IDEDMA=y + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# You can enable one or both FireWire driver stacks. +# + +# +# See the help texts for more information. +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS 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_ARCNET is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +CONFIG_REALTEK_PHY=y +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_ETHOC is not set +# CONFIG_DNET is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 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_NET_PCI=y +# CONFIG_PCNET32 is not set +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +# CONFIG_B44 is not set +# CONFIG_FORCEDETH is not set +# CONFIG_E100 is not set +# CONFIG_FEALNX is not set +# CONFIG_NATSEMI is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_8139CP is not set +CONFIG_8139TOO=y +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +# CONFIG_R6040 is not set +# CONFIG_SIS900 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SMSC9420 is not set +# CONFIG_SUNDANCE is not set +# CONFIG_TLAN is not set +# CONFIG_KS8842 is not set +# CONFIG_VIA_RHINE is not set +# CONFIG_SC92031 is not set +# CONFIG_ATL2 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_TR is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 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_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=y +CONFIG_PPP_SYNC_TTY=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_BSDCOMP=y +CONFIG_PPP_MPPE=y +# CONFIG_PPPOE is not set +# CONFIG_PPPOL2TP is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=y +CONFIG_NETCONSOLE=y +# CONFIG_NETCONSOLE_DYNAMIC is not set +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD 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_AD7879_I2C=y +CONFIG_TOUCHSCREEN_AD7879=y +CONFIG_TOUCHSCREEN_EETI=y +CONFIG_TOUCHSCREEN_FUJITSU=y +CONFIG_TOUCHSCREEN_GUNZE=y +CONFIG_TOUCHSCREEN_ELO=y +CONFIG_TOUCHSCREEN_WACOM_W8001=y +CONFIG_TOUCHSCREEN_MTOUCH=y +CONFIG_TOUCHSCREEN_INEXIO=y +CONFIG_TOUCHSCREEN_MK712=y +CONFIG_TOUCHSCREEN_PENMOUNT=y +CONFIG_TOUCHSCREEN_TOUCHRIGHT=y +CONFIG_TOUCHSCREEN_TOUCHWIN=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=y +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_TOUCHIT213=y +CONFIG_TOUCHSCREEN_TSC2007=y +CONFIG_TOUCHSCREEN_W90X900=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=y +# CONFIG_INPUT_WISTRON_BTNS is not set +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +# CONFIG_INPUT_UINPUT is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW 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=y +CONFIG_DEVKMEM=y +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set +# CONFIG_ROCKETPORT is not set +# CONFIG_CYCLADES is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_ISI is not set +# CONFIG_SYNCLINK is not set +# CONFIG_SYNCLINKMP is not set +# CONFIG_SYNCLINK_GT is not set +# CONFIG_N_HDLC is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_RIO is not set +# CONFIG_STALDRV is not set +# CONFIG_NOZOMI is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=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_JSM 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_HW_RANDOM_TIMERIOMEM is not set +CONFIG_HW_RANDOM_INTEL=y +CONFIG_HW_RANDOM_AMD=y +CONFIG_HW_RANDOM_GEODE=y +CONFIG_HW_RANDOM_VIA=y +CONFIG_NVRAM=y +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_SONYPI is not set +# CONFIG_MWAVE is not set +# CONFIG_PC8736x_GPIO is not set +# CONFIG_NSC_GPIO is not set +# CONFIG_CS5535_GPIO is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_HANGCHECK_TIMER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +# CONFIG_I2C_CHARDEV is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=y + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +CONFIG_I2C_I801=y +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_OCORES is not set +# 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 + +# +# Graphics adapter I2C/DDC channel drivers +# +# CONFIG_I2C_VOODOO3 is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_SCx200_ACB 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_TSL2550 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 is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +# CONFIG_GPIOLIB is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ABITUGURU3 is not set +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7473 is not set +# CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_K8TEMP is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_I5K_AMB is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_FSCHMD is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_CORETEMP is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LM95241 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_HDAPS is not set +# CONFIG_SENSORS_APPLESMC is not set +# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM1535_WDT is not set +# CONFIG_ALIM7101_WDT is not set +CONFIG_GEODE_WDT=y +# CONFIG_SC520_WDT is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_IBMASR is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I6300ESB_WDT is not set +# CONFIG_ITCO_WDT is not set +# CONFIG_IT8712F_WDT is not set +# CONFIG_IT87_WDT is not set +# CONFIG_HP_WATCHDOG is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_PC87413_WDT is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SBC8360_WDT is not set +# CONFIG_SBC7240_WDT is not set +# CONFIG_CPU5_WDT is not set +# CONFIG_SMSC_SCH311X_WDT is not set +# CONFIG_SMSC37B787_WDT is not set +# CONFIG_W83627HF_WDT is not set +# CONFIG_W83697HF_WDT is not set +# CONFIG_W83697UG_WDT is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_W83977F_WDT is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_SBC_EPX_C3_WATCHDOG is not set + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# 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_HTC_PASIC3 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO 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 +# CONFIG_AB3100_CORE is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +CONFIG_AGP=y +# CONFIG_AGP_ALI is not set +# CONFIG_AGP_ATI is not set +# CONFIG_AGP_AMD is not set +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=y +# CONFIG_AGP_NVIDIA is not set +# CONFIG_AGP_SIS is not set +# CONFIG_AGP_SWORKS is not set +# CONFIG_AGP_VIA is not set +# CONFIG_AGP_EFFICEON is not set +CONFIG_DRM=y +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set +# CONFIG_DRM_RADEON is not set +# CONFIG_DRM_I810 is not set +# CONFIG_DRM_I830 is not set +CONFIG_DRM_I915=y +# CONFIG_DRM_I915_KMS is not set +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_SIS is not set +# CONFIG_DRM_VIA is not set +# CONFIG_DRM_SAVAGE is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# 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_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_VGA16 is not set +# CONFIG_FB_VESA is not set +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I810 is not set +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=y +# CONFIG_BACKLIGHT_PROGEAR is not set +# CONFIG_BACKLIGHT_MBP_NVIDIA is not set +# CONFIG_BACKLIGHT_SAHARA is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +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 is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +# CONFIG_SND 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=y +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=y +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_CYPRESS=y +CONFIG_HID_DRAGONRISE=y +# CONFIG_DRAGONRISE_FF is not set +CONFIG_HID_EZKEY=y +CONFIG_HID_KYE=y +CONFIG_HID_GYRATION=y +CONFIG_HID_KENSINGTON=y +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +CONFIG_HID_NTRIG=y +CONFIG_HID_PANTHERLORD=y +# CONFIG_PANTHERLORD_FF is not set +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y +CONFIG_HID_GREENASIA=y +# CONFIG_GREENASIA_FF is not set +CONFIG_HID_SMARTJOYPLUS=y +# CONFIG_SMARTJOYPLUS_FF is not set +CONFIG_HID_TOPSEED=y +CONFIG_HID_THRUSTMASTER=y +# CONFIG_THRUSTMASTER_FF is not set +CONFIG_HID_ZEROPLUS=y +# 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=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set +# CONFIG_USB_MON is not set +# 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_XHCI_HCD is not set +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=y +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_WHCI_HCD is not set +# CONFIG_USB_HWA_HCD 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 info +# +CONFIG_USB_LIBUSUAL=y + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 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_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA 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 is not set + +# +# OTG and related infrastructure +# +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +# CONFIG_RTC_HCTOSYS is not set +# 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_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_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +# 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_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING is not set +# CONFIG_X86_PLATFORM_DEVICES is not set + +# +# Firmware Drivers +# +# CONFIG_EDD is not set +CONFIG_FIRMWARE_MEMMAP=y +# CONFIG_DELL_RBU is not set +# CONFIG_DCDBAS is not set +# CONFIG_DMIID is not set +# CONFIG_ISCSI_IBFT_FIND is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set +CONFIG_GENERIC_ACL=y + +# +# Caches +# +# CONFIG_FSCACHE 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_KCORE is not set +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +# CONFIG_MISC_FILESYSTEMS is not set +# CONFIG_NETWORK_FILESYSTEMS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +# CONFIG_LDM_PARTITION is not set +CONFIG_SGI_PARTITION=y +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +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=y +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=y +# CONFIG_DLM is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=2048 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_ARCH_WANT_FRAME_POINTERS=y +# CONFIG_FRAME_POINTER is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FTRACE_SYSCALLS=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_STRICT_DEVMEM is not set +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_4KSTACKS is not set +CONFIG_DOUBLEFAULT=y +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +CONFIG_OPTIMIZE_INLINING=y + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +CONFIG_SECURITY_FILE_CAPABILITIES=y +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_PCOMP=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC 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 is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=y +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CRC32C_INTEL is not set +# 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=y +# 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=y +# CONFIG_CRYPTO_AES_586 is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_ARC4=y +# 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 is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SALSA20_586 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 +# CONFIG_CRYPTO_TWOFISH_586 is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +# CONFIG_VIRTUALIZATION is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC_T10DIF=y +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/recipes/linux/linux_2.6.31.4.bb b/recipes/linux/linux_2.6.31.4.bb new file mode 100644 index 0000000000..719c5eba68 --- /dev/null +++ b/recipes/linux/linux_2.6.31.4.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Linux 2.6 kernel for the AMD Geode GX processor" +LICENSE = "GPL" + +require linux.inc +COMPATIBLE_MACHINE = "geodegx" + +PR = "r0" +S = "${WORKDIR}/linux-${PV}" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_geodegx = "1" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://defconfig" diff --git a/recipes/mozilla/firefox-3.5.5/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.5.5/0001-Remove-Werror-from-build.patch new file mode 100644 index 0000000000..008dabbe8d --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/0001-Remove-Werror-from-build.patch @@ -0,0 +1,43 @@ +From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001 +From: Eduardo Valentin <eduardo.valentin@openpossa.org> +Date: Thu, 24 Jul 2008 16:05:09 -0400 +Subject: [PATCH 1/1] Remove -Werror from build + +Remove -Werror from build + +Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> +--- + configure | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +Index: mozilla-1.9.1/configure +=================================================================== +--- mozilla-1.9.1.orig/configure ++++ mozilla-1.9.1/configure +@@ -5525,7 +5525,7 @@ if test "$GNU_CC"; then + # Don't allow undefined symbols in libraries + DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" + fi +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + DSO_CFLAGS='' + DSO_PIC_CFLAGS='-fPIC' + ASFLAGS="$ASFLAGS -fPIC" +@@ -7104,7 +7104,7 @@ EOF + IMPLIB='emximp -o' + FILTER='emxexp -o' + LDFLAGS='-Zmap' +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + MOZ_DEBUG_FLAGS="-g -fno-inline" + MOZ_OPTIMIZE_FLAGS="-O2" + MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA" +@@ -7283,7 +7283,7 @@ else + fi + rm -f conftest* + fi +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + MOZ_OPTIMIZE_FLAGS="-xO4" + MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' + MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@' diff --git a/recipes/mozilla/firefox-3.5.5/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.5.5/0002-Fix-security-cross-compile-cpu-detection-error.patch new file mode 100644 index 0000000000..ce8d4d9948 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/0002-Fix-security-cross-compile-cpu-detection-error.patch @@ -0,0 +1,42 @@ +From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001 +From: Eduardo Valentin <eduardo.valentin@openpossa.org> +Date: Fri, 25 Jul 2008 11:20:02 -0400 +Subject: [PATCH 1/1] Fix security cross compile cpu detection error + +Fix security cross compile cpu detection error. +Reference to bug 376279. + +Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org> +--- + security/coreconf/arch.mk | 2 ++ + security/manager/Makefile.in | 1 + + 2 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk +index fba38ff..28da32e 100644 +--- a/security/coreconf/arch.mk ++++ b/security/coreconf/arch.mk +@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) + # Attempt to differentiate between sparc and x86 Solaris + # + ++ifndef OE_TEST + OS_TEST := $(shell uname -m) ++endif + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in +index 86119f7..86c09ca 100644 +--- a/security/manager/Makefile.in ++++ b/security/manager/Makefile.in +@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \ + RC="$(RC) $(RCFLAGS)" \ + OS_ARCH="$(OS_ARCH)" \ + CPU_ARCH="$(TARGET_CPU)" \ ++ OS_TEST="$(TARGET_CPU)" \ + $(NULL) + SKIP_CHK=1 + endif +-- +1.5.4.3 diff --git a/recipes/mozilla/firefox-3.5.5/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.5.5/010_FPU_IS_ARM_FPA_xslt.diff new file mode 100644 index 0000000000..854100c4c3 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/010_FPU_IS_ARM_FPA_xslt.diff @@ -0,0 +1,56 @@ +# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler +# +--- mozilla/content/xslt/public/txDouble.h.orig 2006-07-13 17:21:52.000000000 +0300 ++++ mozilla/content/xslt/public/txDouble.h 2007-10-25 15:01:25.000000000 +0300 +@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask + /** + * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports: + * ARM is a little endian architecture but 64 bit double words are stored + * differently: the 32 bit words are in little endian byte order, the two words + * are stored in big endian`s way. + */ + + #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) +-#define CPU_IS_ARM ++#if !defined(__VFP_FP__) ++#define FPU_IS_ARM_FPA ++#endif + #endif + + #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 + /** + * This version of the macros is safe for the alias optimizations + * that gcc does, but uses gcc-specific extensions. + */ + + typedef union txdpun { + PRFloat64 d; + struct { +-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) ++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) + PRUint32 lo, hi; + #else + PRUint32 hi, lo; + #endif + } s; + } txdpun; + + #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) + #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) + + #else // __GNUC__ + + /* We don't know of any non-gcc compilers that perform alias optimization, + * so this code should work. + */ + +-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) ++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) + #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[1]) + #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[0]) + #else + #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[0]) + #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[1]) + #endif + + #endif // __GNUC__ diff --git a/recipes/mozilla/firefox-3.5.5/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.5.5/Bug339782.additional.fix.diff new file mode 100644 index 0000000000..0848e730d3 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/Bug339782.additional.fix.diff @@ -0,0 +1,39 @@ +# XPTC_InvokeByIndex crashes +# Bug 339782 [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery) +Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +=================================================================== +--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -51,22 +51,32 @@ + #ifdef __ARM_EABI__ + #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) + #define VAR_STACK_SIZE_64 3 + #else + #define DOUBLEWORD_ALIGN(p) (p) + #define VAR_STACK_SIZE_64 2 + #endif + ++#ifdef __ARM_EABI__ ++#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) ++#else ++#define DOUBLEWORD_ALIGN(p) (p) ++#endif ++ + // Remember that these 'words' are 32bit DWORDS + + static PRUint32 + invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s) + { + PRUint32 result = 0; ++ ++ /* Note that we give a "worst case" estimate of how much stack _might_ be ++ * needed, rather than the real count - this should be safe */ ++ + for(PRUint32 i = 0; i < paramCount; i++, s++) + { + if(s->IsPtrData()) + { + result++; + continue; + } + switch(s->type) diff --git a/recipes/mozilla/firefox-3.5.5/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.5.5/Bug385583.nspr.jmp_buf.eabi.diff new file mode 100644 index 0000000000..486440c30e --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/Bug385583.nspr.jmp_buf.eabi.diff @@ -0,0 +1,33 @@ +diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h +--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-11-28 14:16:03.000000000 -0500 ++++ mozilla/nsprpub/pr/include/md/_linux.h 2007-11-28 14:12:09.000000000 -0500 +@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void); + #error "Linux/MIPS pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + +-#elif defined(__arm__) +-/* ARM/Linux */ ++#elif defined(__arm__) && !defined(__ARM_EABI__) ++/* ARM/Linux (old-ABI) */ + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] + #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val)) +@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void); + #error "ARM/Linux pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + ++#elif defined(__arm__) && defined(__ARM_EABI__) ++/* ARM/Linux (EABI) */ ++#if defined(__GLIBC__) && __GLIBC__ >= 2 ++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] ++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) ++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) ++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) ++#define _MD_SP_TYPE __ptr_t ++#else ++#error "ARM/Linux pre-glibc2 not supported yet" ++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ ++ + #else + + #error "Unknown CPU architecture" diff --git a/recipes/mozilla/firefox-3.5.5/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.5.5/Bug405992.atomic.nspr.diff new file mode 100644 index 0000000000..f54f916a6a --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/Bug405992.atomic.nspr.diff @@ -0,0 +1,48 @@ +# Add atomic operations for ARM. +diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h +index 5b794c5..cb8d58e 100644 +--- a/nsprpub/pr/include/md/_linux.h ++++ b/nsprpub/pr/include/md/_linux.h +@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); + }) + #endif + ++#if defined(__arm__) ++#define _PR_HAVE_ATOMIC_OPS ++#define _MD_INIT_ATOMIC() ++ ++typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); ++#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0) ++ ++#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1) ++#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1) ++#define _MD_ATOMIC_ADD(ptr, n) \ ++ ({ \ ++ PRInt32 ov, nv; \ ++ volatile PRInt32 *vp = (ptr); \ ++ \ ++ do { \ ++ ov = *vp; \ ++ nv = ov + (n); \ ++ } \ ++ while (__kernel_cmpxchg(ov, nv, vp)); \ ++ \ ++ nv; \ ++ }) ++#define _MD_ATOMIC_SET(ptr, nv) \ ++ ({ \ ++ PRInt32 ov; \ ++ volatile PRInt32 *vp = (ptr); \ ++ \ ++ do { \ ++ ov = *vp; \ ++ } \ ++ while (__kernel_cmpxchg(ov, (nv), vp)); \ ++ \ ++ ov; \ ++ }) ++#endif ++ + #define USE_SETJMP + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _PR_POLL_AVAILABLE diff --git a/recipes/mozilla/firefox-3.5.5/configure-wchart.patch b/recipes/mozilla/firefox-3.5.5/configure-wchart.patch new file mode 100644 index 0000000000..36ee2a0ba4 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/configure-wchart.patch @@ -0,0 +1,11 @@ +--- a/configure.in 2008-04-15 12:56:35.000000000 +0300 ++++ b/configure.in.old 2008-03-20 21:17:09.000000000 +0200 +@@ -2743,7 +2743,7 @@ + + AC_CACHE_CHECK(for compiler -fshort-wchar option, + ac_cv_have_usable_wchar_option_v2, +- [AC_TRY_LINK([#include <stddef.h> ++ [AC_TRY_COMPILE([#include <stddef.h> + $configure_static_assert_macros], + [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)], diff --git a/recipes/mozilla/firefox-3.5.5/jemalloc-tls.patch b/recipes/mozilla/firefox-3.5.5/jemalloc-tls.patch new file mode 100644 index 0000000000..d1d740989e --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/jemalloc-tls.patch @@ -0,0 +1,28 @@ +--- /tmp/jemalloc.c 2008-06-23 10:57:36.000000000 +0200 ++++ mozilla/memory/jemalloc/jemalloc.c 2008-06-23 11:20:13.000000000 +0200 +@@ -386,7 +386,7 @@ + #else + # define NO_TLS + #endif +-#if 0 ++ + #ifdef __i386__ + # define QUANTUM_2POW_MIN 4 + # define SIZEOF_PTR_2POW 2 +@@ -420,7 +420,6 @@ + # define QUANTUM_2POW_MIN 4 + # define SIZEOF_PTR_2POW 2 + #endif +-#endif + + #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) + +@@ -2582,7 +2581,7 @@ + * knowledge of how _pthread_self() calculates values, we can't + * easily do much better than this. + */ +- ind = (unsigned long) _pthread_self() % narenas; ++ ind = 255255 % narenas; + + /* + * Optimistially assume that arenas[ind] has been initialized. diff --git a/recipes/mozilla/firefox-3.5.5/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.5.5/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/jsautocfg-dontoverwrite.patch @@ -0,0 +1,23 @@ +--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 ++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 +@@ -319,20 +319,8 @@ + + jsopcode.h jsopcode.c: jsopcode.tbl + +-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) + jsautocfg.h: + touch $@ +-else +-ifeq ($(OS_ARCH),WINCE) +-jsautocfg.h: +- touch $@ +-else +-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) +- @rm -f $@ jsautocfg.tmp +- ./jscpucfg > jsautocfg.tmp +- mv jsautocfg.tmp $@ +-endif +-endif + + # jscpucfg is a strange target + # Needs to be built with the host compiler but needs to include diff --git a/recipes/mozilla/firefox-3.5.5/linkage-problem.patch b/recipes/mozilla/firefox-3.5.5/linkage-problem.patch new file mode 100644 index 0000000000..28bffd1e22 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/linkage-problem.patch @@ -0,0 +1,14 @@ +--- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200 ++++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200 +@@ -229,6 +229,11 @@ + $(NULL) + endif + ++ifdef MOZ_ENABLE_XFT ++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \ ++ $(NULL) ++endif ++ + ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) + EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ + $(NULL) diff --git a/recipes/mozilla/firefox-3.5.5/mozconfig b/recipes/mozilla/firefox-3.5.5/mozconfig new file mode 100644 index 0000000000..d8d3f3923d --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/mozconfig @@ -0,0 +1,72 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +#ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-bz2 +#ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --disable-necko-disk-cache +ac_add_options --disable-updater + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --disable-gtktest +ac_add_options --disable-tests +ac_add_options --disable-printing +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui +ac_add_options --enable-debugger-info-modules + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource + +# build minimal set of image decoders +#ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static +ac_add_options --enable-optimize=-O2 + +# Use cairo from system +ac_add_options --enable-system-cairo + +# Disable jemalloc +ac_add_options --disable-jemalloc + +# enable libxul +ac_add_options --enable-libxul + +# Disable striping +ac_add_options --disable-strip +ac_add_options --disable-install-strip diff --git a/recipes/mozilla/firefox-3.5.5/plugins-dir.patch b/recipes/mozilla/firefox-3.5.5/plugins-dir.patch new file mode 100644 index 0000000000..2c8b8e9bd1 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/plugins-dir.patch @@ -0,0 +1,16 @@ +Index: mozilla-1.9.1/build/unix/mozilla.in +=================================================================== +--- mozilla-1.9.1.orig/build/unix/mozilla.in ++++ mozilla-1.9.1/build/unix/mozilla.in +@@ -52,6 +52,11 @@ + + moz_libdir=%MOZAPPDIR% + ++if test -d /usr/lib/mozilla/plugins; then ++ MOZ_PLUGIN_PATH="${MOZ_PLUGIN_PATH:+"$MOZ_PLUGIN_PATH:"}/usr/lib/mozilla/plugins" ++ export MOZ_PLUGIN_PATH ++fi ++ + # Use run-mozilla.sh in the current dir if it exists + # If not, then start resolving symlinks until we find run-mozilla.sh + found=0 diff --git a/recipes/mozilla/firefox-3.5.5/security-cross.patch b/recipes/mozilla/firefox-3.5.5/security-cross.patch new file mode 100644 index 0000000000..b6c32fe52f --- /dev/null +++ b/recipes/mozilla/firefox-3.5.5/security-cross.patch @@ -0,0 +1,64 @@ +--- /tmp/Linux.mk 2009-11-02 10:26:16.000000000 +0100 ++++ mozilla-1.9.1/security/coreconf/Linux.mk 2009-11-02 10:27:04.000000000 +0100 +@@ -52,59 +52,8 @@ + + DEFAULT_COMPILER = gcc + +-ifeq ($(OS_TEST),ppc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-ifeq ($(USE_64),1) +- ARCHFLAG = -m64 +-endif +-else +-ifeq ($(OS_TEST),alpha) +- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = alpha +-else +-ifeq ($(OS_TEST),x86_64) +-ifeq ($(USE_64),1) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = x86_64 +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +- ARCHFLAG = -m32 +-endif +-else +-ifeq ($(OS_TEST),sparc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq (,$(filter-out arm% sa110,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = arm +-else +-ifeq (,$(filter-out parisc%,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq (,$(filter-out i%86,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +-else +-ifeq ($(OS_TEST),sh4a) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sh4 +-else +-# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4 +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = $(OS_TEST) +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- ++OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++CPU_ARCH = + + LIBC_TAG = _glibc + diff --git a/recipes/mozilla/firefox.inc b/recipes/mozilla/firefox.inc index 8526a8d151..0539a2d0c6 100644 --- a/recipes/mozilla/firefox.inc +++ b/recipes/mozilla/firefox.inc @@ -81,7 +81,6 @@ PRIVATE_LIBS = "libnssckbi.so \ libxul.so \ libplds4.so \ libnssutil3.so \ - libsqlite3.so \ libsoftokn3.so \ libnssdbm3.so \ libsmime3.so \ diff --git a/recipes/mysql/mysql5-native_5.1.40.bb b/recipes/mysql/mysql5-native_5.1.40.bb index bbe2382a95..47efbe67d0 100644 --- a/recipes/mysql/mysql5-native_5.1.40.bb +++ b/recipes/mysql/mysql5-native_5.1.40.bb @@ -1,4 +1,4 @@ -require mysql5_${PV}.bb +require mysql5_${PV}.inc inherit native PR ="r0" diff --git a/recipes/mysql/mysql5/misc.m4.patch b/recipes/mysql/mysql5/misc.m4.patch new file mode 100644 index 0000000000..7b0acff21c --- /dev/null +++ b/recipes/mysql/mysql5/misc.m4.patch @@ -0,0 +1,13 @@ +Index: mysql-5.1.40/config/ac-macros/misc.m4 +=================================================================== +--- mysql-5.1.40.orig/config/ac-macros/misc.m4 ++++ mysql-5.1.40/config/ac-macros/misc.m4 +@@ -476,7 +476,7 @@ AC_DEFUN([MYSQL_STACK_DIRECTION], + { + exit (find_stack_direction() < 0); + }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1, +- ac_cv_c_stack_direction=)]) ++ ac_cv_c_stack_direction=0)]) + AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) + ])dnl + diff --git a/recipes/mysql/mysql5_5.1.40.bb b/recipes/mysql/mysql5_5.1.40.bb index 64281ea109..ded2f0fd75 100644 --- a/recipes/mysql/mysql5_5.1.40.bb +++ b/recipes/mysql/mysql5_5.1.40.bb @@ -1,169 +1,3 @@ -DESCRIPTION = "The MySQL Open Source Database System" -HOMEPAGE = "http://www.mysql.com/" -SECTION = "libs" -LICENSE = "GPL" -DEPENDS = "ncurses" -PR = "r0" +require ${PN}_${PV}.inc -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ - file://configure.in.patch;patch=1 \ - file://plug.in.patch;patch=1 \ - file://misc.m4.patch;patch=1 \ - file://Makefile.am.patch;patch=1 \ - file://fix_host_path.patch;patch=1 \ - file://configure-ps-cache-check.patch;patch=1 \ - file://my.cnf \ - file://mysqld.sh" - -S = "${WORKDIR}/mysql-${PV}" - -BINCONFIG_GLOB = "mysql_config" - -inherit autotools binconfig update-rc.d - -INITSCRIPT_PACKAGES = "${PN}-server" -INITSCRIPT_NAME = "mysqld" -INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ." - -export ac_cv_path_PS=/bin/ps -export ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" -PARALLEL_MAKE = " " -EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" -EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " - -do_configure_append() { - sed -i /comp_err/d ${S}/sql/share/Makefile -} - -do_stage() { - autotools_stage_all - oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR} - oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} -} - -do_stage_append() { - sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config - sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql - - install -d ${D}/etc/init.d - install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ - install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld -} - -pkg_postinst_mysql5-server () { - if [ "x$D" != "x" ]; then - exit 1 - fi - - grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql - - #Install the database - test -d /usr/bin || mkdir -p /usr/bin - test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname - mkdir /var/lib/mysql - chown mysql.nogroup /var/lib/mysql - - mysql_install_db - -} - -pkg_postrm_mysql5-server () { - grep mysql /etc/passwd && deluser mysql -} - -PACKAGES = "${PN}-dbg ${PN} libmysqlclient libmysqlclient-dev libmysqlclient-dbg \ - ${PN}-client ${PN}-server ${PN}-leftovers" -CONFFILES_${PN}-server += "${sysconfdir}/my.cnf" - -FILES_${PN} = " " -RDEPENDS_${PN} = "${PN}-client ${PN}-server" -ALLOW_EMPTY_${PN} = "1" - -FILES_libmysqlclient = "${libdir}/libmysqlclient.so.*" -FILES_libmysqlclient-dev = " \ -${includedir}/mysql/ \ -${libdir}/lib* \ -${libdir}/plugin/* \ -${sysconfdir}/aclocal \ -${bindir}/mysql_config" - -FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ -/usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" - -FILES_${PN}-client = "\ -${bindir}/myisam_ftdump \ -${bindir}/mysql \ -${bindir}/mysql_client_test \ -${bindir}/mysql_client_test_embedded \ -${bindir}/mysql_find_rows \ -${bindir}/mysql_fix_extensions \ -${bindir}/mysql_waitpid \ -${bindir}/mysqlaccess \ -${bindir}/mysqladmin \ -${bindir}/mysqlbug \ -${bindir}/mysqlcheck \ -${bindir}/mysqldump \ -${bindir}/mysqldumpslow \ -${bindir}/mysqlimport \ -${bindir}/mysqlshow \ -${bindir}/mysqlslap \ -${bindir}/mysqltest_embedded \ -${libexecdir}/mysqlmanager" - -FILES_${PN}-server = "\ -${bindir}/comp_err \ -${bindir}/isamchk \ -${bindir}/isamlog \ -${bindir}/msql2mysql \ -${bindir}/my_print_defaults \ -${bindir}/myisamchk \ -${bindir}/myisamlog \ -${bindir}/myisampack \ -${bindir}/mysql_convert_table_format \ -${bindir}/mysql_fix_privilege_tables \ -${bindir}/mysql_install_db \ -${bindir}/mysql_secure_installation \ -${bindir}/mysql_setpermission \ -${bindir}/mysql_tzinfo_to_sql \ -${bindir}/mysql_upgrade \ -${bindir}/mysql_zap \ -${bindir}/mysqlbinlog \ -${bindir}/mysqld_multi \ -${bindir}/mysqld_safe \ -${bindir}/mysqlhotcopy \ -${bindir}/mysqltest \ -${bindir}/ndb_delete_all \ -${bindir}/ndb_desc \ -${bindir}/ndb_drop_index \ -${bindir}/ndb_drop_table \ -${bindir}/ndb_mgm \ -${bindir}/ndb_restore \ -${bindir}/ndb_select_all \ -${bindir}/ndb_select_count \ -${bindir}/ndb_show_tables \ -${bindir}/ndb_waiter \ -${bindir}/pack_isam \ -${bindir}/perror \ -${bindir}/replace \ -${bindir}/resolve_stack_dump \ -${bindir}/resolveip \ -${libexecdir}/mysqld \ -${sbindir}/mysqld \ -${sbindir}/ndb_cpcd \ -${sbindir}/ndbd \ -${sbindir}/ndb_mgmd \ -${datadir}/mysql/ \ -${localstatedir}/mysql/ \ -${sysconfdir}/init.d \ -${sysconfdir}/my.cnf" - -DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" -FILES_${PN}-leftovers = "/" +DEPENDS += mysql5-native diff --git a/recipes/mysql/mysql5_5.1.40.inc b/recipes/mysql/mysql5_5.1.40.inc new file mode 100644 index 0000000000..2edab16f55 --- /dev/null +++ b/recipes/mysql/mysql5_5.1.40.inc @@ -0,0 +1,174 @@ +DESCRIPTION = "The MySQL Open Source Database System" +HOMEPAGE = "http://www.mysql.com/" +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "ncurses" +PR = "r2" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ + file://configure.in.patch;patch=1 \ + file://plug.in.patch;patch=1 \ + file://misc.m4.patch;patch=1 \ + file://Makefile.am.patch;patch=1 \ + file://fix_host_path.patch;patch=1 \ + file://configure-ps-cache-check.patch;patch=1 \ + file://my.cnf \ + file://mysqld.sh" + +S = "${WORKDIR}/mysql-${PV}" + +BINCONFIG_GLOB = "mysql_config" + +inherit autotools binconfig update-rc.d + +INITSCRIPT_PACKAGES = "${PN}-server" +INITSCRIPT_NAME = "mysqld" +INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ." + +export ac_cv_path_PS=/bin/ps +export ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" +PARALLEL_MAKE = " " +EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" +EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " + +do_configure_append() { + sed -i /comp_err/d ${S}/sql/share/Makefile +} + +do_stage() { + autotools_stage_all + oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR} + oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} +} + +do_stage_append() { + sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config + sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + mv -f ${D}${libdir}/mysql/* ${D}${libdir} + rmdir ${D}${libdir}/mysql + + install -d ${D}/etc/init.d + install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ + install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld +} + +pkg_postinst_mysql5-server () { + if [ "x$D" != "x" ]; then + exit 1 + fi + + grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql + + #Install the database + test -d /usr/bin || mkdir -p /usr/bin + test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname + mkdir /var/lib/mysql + chown mysql.nogroup /var/lib/mysql + + mysql_install_db + +} + +pkg_postrm_mysql5-server () { + grep mysql /etc/passwd && deluser mysql +} + +PACKAGES = "${PN}-dbg ${PN} \ +libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-dbg \ +libmysqlclient libmysqlclient-dev libmysqlclient-dbg \ +${PN}-client ${PN}-server ${PN}-leftovers" +CONFFILES_${PN}-server += "${sysconfdir}/my.cnf" + +FILES_${PN} = " " +RDEPENDS_${PN} = "${PN}-client ${PN}-server" +ALLOW_EMPTY_${PN} = "1" + +FILES_libmysqlclient = "${libdir}/libmysqlclient.so.*" +FILES_libmysqlclient-dev = " \ +${includedir}/mysql/ \ +${libdir}/lib* \ +${libdir}/plugin/* \ +${sysconfdir}/aclocal \ +${bindir}/mysql_config" +FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ +/usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" + +FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" +FILES_libmysqlclient-r-dev = "${libdir}/libmysqlclient_r.*" +FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" + +FILES_${PN}-client = "\ +${bindir}/myisam_ftdump \ +${bindir}/mysql \ +${bindir}/mysql_client_test \ +${bindir}/mysql_client_test_embedded \ +${bindir}/mysql_find_rows \ +${bindir}/mysql_fix_extensions \ +${bindir}/mysql_waitpid \ +${bindir}/mysqlaccess \ +${bindir}/mysqladmin \ +${bindir}/mysqlbug \ +${bindir}/mysqlcheck \ +${bindir}/mysqldump \ +${bindir}/mysqldumpslow \ +${bindir}/mysqlimport \ +${bindir}/mysqlshow \ +${bindir}/mysqlslap \ +${bindir}/mysqltest_embedded \ +${libexecdir}/mysqlmanager" + +FILES_${PN}-server = "\ +${bindir}/comp_err \ +${bindir}/isamchk \ +${bindir}/isamlog \ +${bindir}/msql2mysql \ +${bindir}/my_print_defaults \ +${bindir}/myisamchk \ +${bindir}/myisamlog \ +${bindir}/myisampack \ +${bindir}/mysql_convert_table_format \ +${bindir}/mysql_fix_privilege_tables \ +${bindir}/mysql_install_db \ +${bindir}/mysql_secure_installation \ +${bindir}/mysql_setpermission \ +${bindir}/mysql_tzinfo_to_sql \ +${bindir}/mysql_upgrade \ +${bindir}/mysql_zap \ +${bindir}/mysqlbinlog \ +${bindir}/mysqld_multi \ +${bindir}/mysqld_safe \ +${bindir}/mysqlhotcopy \ +${bindir}/mysqltest \ +${bindir}/ndb_delete_all \ +${bindir}/ndb_desc \ +${bindir}/ndb_drop_index \ +${bindir}/ndb_drop_table \ +${bindir}/ndb_mgm \ +${bindir}/ndb_restore \ +${bindir}/ndb_select_all \ +${bindir}/ndb_select_count \ +${bindir}/ndb_show_tables \ +${bindir}/ndb_waiter \ +${bindir}/pack_isam \ +${bindir}/perror \ +${bindir}/replace \ +${bindir}/resolve_stack_dump \ +${bindir}/resolveip \ +${libexecdir}/mysqld \ +${sbindir}/mysqld \ +${sbindir}/ndb_cpcd \ +${sbindir}/ndbd \ +${sbindir}/ndb_mgmd \ +${datadir}/mysql/ \ +${localstatedir}/mysql/ \ +${sysconfdir}/init.d \ +${sysconfdir}/my.cnf" + +DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" +FILES_${PN}-leftovers = "/" diff --git a/recipes/mythtv/mythtv_0.21+0.22rc2.bb b/recipes/mythtv/mythtv_0.21+0.22rc2.bb index 3ba8ff725c..bc85a1ad86 100644 --- a/recipes/mythtv/mythtv_0.21+0.22rc2.bb +++ b/recipes/mythtv/mythtv_0.21+0.22rc2.bb @@ -1,10 +1,10 @@ require mythtv.inc -RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" +RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database" RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" PV = "0.21+0.22rc2" -PR = "r2" +PR = "r3" REALPV = "0.22" DEFAULT_PREFERENCE = "-1" @@ -51,6 +51,12 @@ do_configure_prepend() { --without-bindings=perl,python \ ${EXTRA_OECONF} } +do_install() { + oe_runmake INSTALL_ROOT=${D} install + install -d ${D}${datadir}/mythtv + install -d ${D}${datadir}/mythtv/sql + install -m 0644 ${S}/database/mc.sql ${D}${datadir}/mythtv/sql +} do_stage() { install -d ${STAGING_INCDIR} install -d ${STAGING_INCDIR}/${PN} @@ -84,7 +90,7 @@ do_stage() { chmod -R ugo+r ${STAGING_LIBDIR} } -PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" +PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database" PACKAGES_DYNAMIC = "mythtv-theme-*" FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug" @@ -92,7 +98,7 @@ FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/m FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf" FILES_mythtv-bin = "${bindir}/*" FILES_mythtv-filters = "${libdir}/mythtv/filters/*" -FILES_mythtv-data = "${datadir}" +FILES_mythtv-database = "${datadir}/mythtv/sql/" mythlibs = "mythdb mythavutil mythavcodec mythavformat mythswscale mythhdhomerun myth mythtv mythui mythfreemheg mythupnp mythlivemedia" diff --git a/recipes/nautilus/nautilus_2.28.1.bb b/recipes/nautilus/nautilus_2.28.1.bb new file mode 100644 index 0000000000..e3a551c76f --- /dev/null +++ b/recipes/nautilus/nautilus_2.28.1.bb @@ -0,0 +1,37 @@ +# nautilus OE build file +# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +inherit gnome + +SRC_URI += "file://idl-sysroot.patch;patch=1 \ + file://no-try-run-strftime.diff;patch=1 \ +" + +export SYSROOT = "${STAGING_DIR_HOST}" + +LICENSE="GPL" + +DEPENDS += "libunique gvfs tracker librsvg libexif eel esound gnome-desktop orbit2-native" +RDEPENDS = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash" + +EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb " + +PACKAGES += " libnautilus" + +FILES_${PN} += "${datadir}/icons /usr/libexec/ " +FILES_libnautilus = "/usr/lib/*.so*" +FILES_${PN}-dbg += "/usr/libexec/.debug" + +do_configure_prepend() { + sed -i -e /docs/d Makefile.am +} + +# We need native orbit-idl with target idl files. No way to say it in a clean way: +do_configure_append () { + find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; +} + +do_stage() { + autotools_stage_all +} diff --git a/recipes/openobex/obex-data-server_0.4.4.bb b/recipes/openobex/obex-data-server_0.4.4.bb index 34efcc738a..555f6df91f 100644 --- a/recipes/openobex/obex-data-server_0.4.4.bb +++ b/recipes/openobex/obex-data-server_0.4.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX client and server side functionality" LICENSE = "GPLv2" -DEPENDS = "bluez4 dbus-glib openobex" +DEPENDS = "gtk+ bluez4 dbus-glib openobex" SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz" diff --git a/recipes/perl/libxml-twig-perl_3.33.bb b/recipes/perl/libxml-twig-perl_3.33.bb index 76b3fa7758..d828a63166 100644 --- a/recipes/perl/libxml-twig-perl_3.33.bb +++ b/recipes/perl/libxml-twig-perl_3.33.bb @@ -2,9 +2,9 @@ SECTION = "libs" LICENSE = "Artistic|GPL" HOMEPAGE = "http://www.xmltwig.com/" DEPENDS += "libxml-parser-perl" -PR = "r0" +PR = "r1" -SRC_URI = "http://xmltwig.com/xmltwig/XML-Twig-${PV}.tar.gz" +SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/XML-Twig-${PV}-upstream-keeps-changing-this-tarball-so-we-mirror-our-own.tar.gz" S = "${WORKDIR}/XML-Twig-${PV}" diff --git a/recipes/qte/qte-2.3.10/fix-qte-asm-include.patch b/recipes/qte/qte-2.3.10/fix-qte-asm-include.patch new file mode 100644 index 0000000000..951bd82461 --- /dev/null +++ b/recipes/qte/qte-2.3.10/fix-qte-asm-include.patch @@ -0,0 +1,19 @@ +--- a/src/kernel/qpixmapcache.cpp 2005-01-23 14:00:46.000000000 +0000 ++++ b/src/kernel/qpixmapcache.cpp 2009-11-05 22:49:44.000000000 +0000 +@@ -119,13 +119,13 @@ + #include <time.h> + #include <stdio.h> + #include <signal.h> ++#include <unistd.h> + + #ifdef THROW_AWAY_UNUSED_PAGES + # include <sys/mman.h> // madvise +-# include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN +-# ifndef PAGE_ALIGN ++# define PAGE_SIZE getpagesize() ++# define PAGE_MASK (~(PAGE_SIZE-1)) + # define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) +-# endif // PAGE_ALIGN + #endif // THROW_AWAY_UNUSED_PAGES + + diff --git a/recipes/qte/qte-2.3.10/kernel-asm-page.patch b/recipes/qte/qte-2.3.10/kernel-asm-page.patch deleted file mode 100644 index bad2d95967..0000000000 --- a/recipes/qte/qte-2.3.10/kernel-asm-page.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp -index c2e7d9b..8d39585 100644 ---- a/src/kernel/qpixmapcache.cpp -+++ b/src/kernel/qpixmapcache.cpp -@@ -123,9 +123,13 @@ void cleanup_pixmap_cache(); - #ifdef THROW_AWAY_UNUSED_PAGES - # include <sys/mman.h> // madvise - # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN -+# include <unistd.h> // getpagesize() -+# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK) -+# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) -+# endif - # ifndef PAGE_ALIGN --# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) --# endif // PAGE_ALIGN -+# define PAGE_ALIGN(addr) (((addr)+getpagesize()-1)&~(getpagesize()-1)) -+# endif - #endif // THROW_AWAY_UNUSED_PAGES - - diff --git a/recipes/qte/qte-common_2.3.10.inc b/recipes/qte/qte-common_2.3.10.inc index f24a265bf0..cd2aa4f1a2 100644 --- a/recipes/qte/qte-common_2.3.10.inc +++ b/recipes/qte/qte-common_2.3.10.inc @@ -45,9 +45,9 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://keyboardless-buttonmap.patch;patch=1 \ file://kernel-keymap.patch;patch=1 \ file://kernel-keymap-corgi.patch;patch=1 \ - file://kernel-asm-page.patch;patch=1 \ file://remove-unused-kbdhandler.patch;patch=1 \ file://disable-dup-rotation.patch;patch=1 \ + file://fix-qte-asm-include.patch;patch=1 \ file://sharp_char.h \ file://switches.h " diff --git a/recipes/qte/qte-mt-static_2.3.10.bb b/recipes/qte/qte-mt-static_2.3.10.bb index 68ab2aceab..35640e5f3b 100644 --- a/recipes/qte/qte-mt-static_2.3.10.bb +++ b/recipes/qte/qte-mt-static_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r8" +PR = "r9" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/qte/qte-mt_2.3.10.bb b/recipes/qte/qte-mt_2.3.10.bb index 71873dc51a..00e5d72e64 100644 --- a/recipes/qte/qte-mt_2.3.10.bb +++ b/recipes/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r28" +PR = "r29" EXTRA_OECONF += "-thread" diff --git a/recipes/qte/qte_2.3.10.bb b/recipes/qte/qte_2.3.10.bb index 1183bc29bf..9a8be94a65 100644 --- a/recipes/qte/qte_2.3.10.bb +++ b/recipes/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r53" +PR = "r54" diff --git a/recipes/sqlite/sqlite3.inc b/recipes/sqlite/sqlite3.inc index ae20ff5ead..fae8966ba2 100644 --- a/recipes/sqlite/sqlite3.inc +++ b/recipes/sqlite/sqlite3.inc @@ -1,7 +1,7 @@ DESCRIPTION = "An Embeddable SQL Database Engine" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "readline ncurses" +DEPENDS = "tcl-native readline ncurses" LICENSE = "PD" SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ diff --git a/recipes/texi2html/texi2html_1.82.bb b/recipes/texi2html/texi2html_1.82.bb new file mode 100644 index 0000000000..35045d9c34 --- /dev/null +++ b/recipes/texi2html/texi2html_1.82.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Perl script that converts Texinfo to HTML" +HOMEPAGE = "http://www.nongnu.org/texi2html/" +SECTION = "console/utils" +LICENSE = "GPLv2" +SRC_URI = "http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2" + +PR = "r0" + +inherit autotools + +EXTRA_OECONF = "PERL=/usr/bin/perl" + diff --git a/recipes/tracker/tracker-0.6.95/05-tracker-ioprio-cross.patch b/recipes/tracker/tracker-0.6.95/05-tracker-ioprio-cross.patch new file mode 100644 index 0000000000..c04c12536c --- /dev/null +++ b/recipes/tracker/tracker-0.6.95/05-tracker-ioprio-cross.patch @@ -0,0 +1,64 @@ +From ae32c3902a1afe2f900ec5e42a1070c8c7fce83b Mon Sep 17 00:00:00 2001 +From: John Carr <john.carr@unrouted.co.uk> +Date: Tue, 3 Nov 2009 01:18:26 +0000 +Subject: [PATCH 1/2] Add AC_CACHE_CHECK magic around ioprio checking. + +Having the cache check allows the end user to set whether ioprio +is available or not. Without this cross-compilation is not +possible as there is no way to run the test program. +--- + configure.ac | 24 +++++++++++------------- + 1 files changed, 11 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 441b4b8..fca54b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1164,17 +1164,15 @@ AM_CONDITIONAL(HAVE_LIBVORBIS, test "x$have_libvorbis" = "xyes") + # Check ioprio support + #################################################################### + +-AC_MSG_CHECKING([[ioprio support]]) +-have_ioprio=no +- +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM([[ ++AC_CACHE_CHECK([if we have ioprio],[tracker_cv_have_ioprio], ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM([[ + #include <stdlib.h> + #include <errno.h> + #include <sys/syscall.h> + #include <unistd.h> +-]], +-[[ ++ ]], ++ [[ + inline int ioprio_get (int which, int who) + { + return syscall (__NR_ioprio_get, which, who); +@@ -1184,16 +1182,16 @@ AC_RUN_IFELSE( + { + return ioprio_get (1, 0); + } +-]] +-)], +-[have_ioprio=yes],[]) ++ ]])], ++ [tracker_cv_have_ioprio=yes], ++ [tracker_cv_have_ioprio=no], ++ [AC_MSG_ERROR([cross-compiling: please set 'tracker_cv_have_ioprio'])]) ++ ]) + +-if test "$have_ioprio" = "yes" ; then ++if test "x$tracker_cv_have_ioprio" = "xyes" ; then + AC_DEFINE(HAVE_IOPRIO, 1, [Define if we have ioprio]) + fi + +-AC_MSG_RESULT([$have_ioprio]) +- + ################################################################## + # Check for exempi + ################################################################## +-- +1.6.3.3 diff --git a/recipes/tracker/tracker-0.6.95/10-drop-bogus-version-info.patch b/recipes/tracker/tracker-0.6.95/10-drop-bogus-version-info.patch new file mode 100644 index 0000000000..c7ddd9f7fa --- /dev/null +++ b/recipes/tracker/tracker-0.6.95/10-drop-bogus-version-info.patch @@ -0,0 +1,73 @@ +Index: tracker-0.6.95/src/libstemmer/Makefile.am +=================================================================== +--- tracker-0.6.95.orig/src/libstemmer/Makefile.am 2009-09-30 20:33:48.964218706 +0200 ++++ tracker-0.6.95/src/libstemmer/Makefile.am 2009-09-30 20:34:29.120883357 +0200 +@@ -51,5 +51,5 @@ + + libstemmer_la_LIBADD = $(GCOV_LIBS) + libstemmer_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + +Index: tracker-0.6.95/src/libtracker-common/Makefile.am +=================================================================== +--- tracker-0.6.95.orig/src/libtracker-common/Makefile.am 2009-09-30 20:33:49.094218792 +0200 ++++ tracker-0.6.95/src/libtracker-common/Makefile.am 2009-09-30 20:34:29.120883357 +0200 +@@ -77,7 +77,7 @@ + tracker-utils.h + + libtracker_common_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + libtracker_common_la_LIBADD = \ + $(top_builddir)/src/libstemmer/libstemmer.la \ +Index: tracker-0.6.95/src/libtracker-data/Makefile.am +=================================================================== +--- tracker-0.6.95.orig/src/libtracker-data/Makefile.am 2009-09-30 20:33:49.020885421 +0200 ++++ tracker-0.6.95/src/libtracker-data/Makefile.am 2009-09-30 20:34:29.120883357 +0200 +@@ -41,7 +41,7 @@ + tracker-turtle.h + + libtracker_data_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + libtracker_data_la_LIBADD = \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +Index: tracker-0.6.95/src/libtracker-db/Makefile.am +=================================================================== +--- tracker-0.6.95.orig/src/libtracker-db/Makefile.am 2009-09-30 20:33:49.140887873 +0200 ++++ tracker-0.6.95/src/libtracker-db/Makefile.am 2009-09-30 20:34:29.120883357 +0200 +@@ -38,7 +38,7 @@ + tracker-db-manager.h + + libtracker_db_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + libtracker_db_la_LIBADD = \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +Index: tracker-0.6.95/src/libtracker-gtk/Makefile.am +=================================================================== +--- tracker-0.6.95.orig/src/libtracker-gtk/Makefile.am 2009-09-30 20:33:49.074220431 +0200 ++++ tracker-0.6.95/src/libtracker-gtk/Makefile.am 2009-09-30 20:34:29.120883357 +0200 +@@ -31,4 +31,4 @@ + $(GCOV_LIBS) + + libtracker_gtk_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 +Index: tracker-0.6.95/src/libtracker/Makefile.am +=================================================================== +--- tracker-0.6.95.orig/src/libtracker/Makefile.am 2009-09-30 20:33:49.164217943 +0200 ++++ tracker-0.6.95/src/libtracker/Makefile.am 2009-09-30 20:34:29.120883357 +0200 +@@ -14,7 +14,7 @@ + libtrackerclient_la_SOURCES = tracker.c + + libtrackerclient_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + libtrackerclient_la_LIBADD = \ + $(GLIB2_LIBS) \ diff --git a/recipes/tracker/tracker-0.6.95/20-tracker-defaults.patch b/recipes/tracker/tracker-0.6.95/20-tracker-defaults.patch new file mode 100644 index 0000000000..3ea607332c --- /dev/null +++ b/recipes/tracker/tracker-0.6.95/20-tracker-defaults.patch @@ -0,0 +1,30 @@ +Index: tracker-0.6.95/src/libtracker-common/tracker-config.c +=================================================================== +--- tracker-0.6.95.orig/src/libtracker-common/tracker-config.c 2009-09-30 20:33:41.664220179 +0200 ++++ tracker-0.6.95/src/libtracker-common/tracker-config.c 2009-09-30 20:34:33.990883559 +0200 +@@ -77,7 +77,7 @@ + #define DEFAULT_LOW_MEMORY_MODE FALSE + #define DEFAULT_NFS_LOCKING FALSE + #define DEFAULT_ENABLE_WATCHES TRUE +-#define DEFAULT_THROTTLE 0 /* 0->20 */ ++#define DEFAULT_THROTTLE 10 /* 0->20 */ + #define DEFAULT_ENABLE_INDEXING TRUE + #define DEFAULT_ENABLE_CONTENT_INDEXING TRUE + #define DEFAULT_ENABLE_THUMBNAILS TRUE +@@ -757,6 +757,7 @@ + gchar *language; + const gchar *watch_directory_roots[2] = { NULL, NULL }; + const gchar *empty_string_list[] = { NULL }; ++ const gchar * const disabled_modules[2] = { "evolution", NULL }; + + /* Get default values */ + language = tracker_language_get_default_code (); +@@ -867,7 +868,7 @@ + + if (overwrite || !g_key_file_has_key (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES, NULL)) { + g_key_file_set_string_list (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES, +- empty_string_list, 0); ++ disabled_modules, 2); + g_key_file_set_comment (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES, + " List of disabled modules (separator=;)\n" + " The modules that are indexed are kept in $prefix/lib/tracker/indexer-modules", diff --git a/recipes/tracker/tracker-0.6.95/30-gmime-2.4.patch b/recipes/tracker/tracker-0.6.95/30-gmime-2.4.patch new file mode 100644 index 0000000000..9068e9636a --- /dev/null +++ b/recipes/tracker/tracker-0.6.95/30-gmime-2.4.patch @@ -0,0 +1,435 @@ +# Patch pulled from http://cvs.fedoraproject.org/viewvc/rpms/tracker/devel/ +# based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=564640 +Index: tracker/configure.ac +=================================================================== +--- tracker.orig/configure.ac 2009-06-09 23:42:44.000000000 +0200 ++++ tracker/configure.ac 2009-09-30 22:53:51.000000000 +0200 +@@ -132,7 +132,7 @@ + GTK_REQUIRED=2.16.0 + GLADE_REQUIRED=2.5 + QDBM_REQUIRED=1.8 +-GMIME_REQUIRED=2.1.0 ++GMIME_REQUIRED=2.4.0 + LIBXML2_REQUIRED=0.6 + LIBNOTIFY_REQUIRED=0.4.3 + HAL_REQUIRED=0.5 +@@ -182,7 +182,7 @@ + AC_SUBST(PANGO_LIBS) + + # Check for GMime +-PKG_CHECK_MODULES(GMIME, [gmime-2.0 >= $GMIME_REQUIRED]) ++PKG_CHECK_MODULES(GMIME, [gmime-2.4 >= $GMIME_REQUIRED]) + AC_SUBST(GMIME_CFLAGS) + AC_SUBST(GMIME_LIBS) + +Index: tracker/src/tracker-indexer/modules/evolution-common.c +=================================================================== +--- tracker.orig/src/tracker-indexer/modules/evolution-common.c 2009-05-22 23:31:58.000000000 +0200 ++++ tracker/src/tracker-indexer/modules/evolution-common.c 2009-09-30 22:53:51.000000000 +0200 +@@ -89,41 +89,3 @@ + return metadata; + } + +-gchar * +-evolution_common_get_object_encoding (GMimeObject *object) +-{ +- const gchar *start_encoding, *end_encoding; +- const gchar *content_type = NULL; +- +- if (GMIME_IS_MESSAGE (object)) { +- content_type = g_mime_message_get_header (GMIME_MESSAGE (object), "Content-Type"); +- } else if (GMIME_IS_PART (object)) { +- content_type = g_mime_part_get_content_header (GMIME_PART (object), "Content-Type"); +- } +- +- if (!content_type) { +- return NULL; +- } +- +- start_encoding = strstr (content_type, "charset="); +- +- if (!start_encoding) { +- return NULL; +- } +- +- start_encoding += strlen ("charset="); +- +- if (start_encoding[0] == '"') { +- /* encoding is quoted */ +- start_encoding++; +- end_encoding = strstr (start_encoding, "\""); +- } else { +- end_encoding = strstr (start_encoding, ";"); +- } +- +- if (end_encoding) { +- return g_strndup (start_encoding, end_encoding - start_encoding); +- } else { +- return g_strdup (start_encoding); +- } +-} +Index: tracker/src/tracker-indexer/modules/evolution-common.h +=================================================================== +--- tracker.orig/src/tracker-indexer/modules/evolution-common.h 2009-05-22 23:31:58.000000000 +0200 ++++ tracker/src/tracker-indexer/modules/evolution-common.h 2009-09-30 22:53:51.000000000 +0200 +@@ -55,7 +55,6 @@ + gint flags, + off_t start); + TrackerModuleMetadata * evolution_common_get_wrapper_metadata (GMimeDataWrapper *wrapper); +-gchar * evolution_common_get_object_encoding (GMimeObject *object); + + G_END_DECLS + +Index: tracker/src/tracker-indexer/modules/evolution-imap.c +=================================================================== +--- tracker.orig/src/tracker-indexer/modules/evolution-imap.c 2009-06-09 23:42:49.000000000 +0200 ++++ tracker/src/tracker-indexer/modules/evolution-imap.c 2009-09-30 22:53:51.000000000 +0200 +@@ -557,7 +557,7 @@ + static gboolean + get_attachment_info (const gchar *mime_file, + gchar **name, +- GMimePartEncodingType *encoding) ++ GMimeContentEncoding *encoding) + { + GMimeContentType *mime; + gchar *tmp, *mime_content; +@@ -568,7 +568,7 @@ + } + + if (encoding) { +- *encoding = GMIME_PART_ENCODING_DEFAULT; ++ *encoding = GMIME_CONTENT_ENCODING_DEFAULT; + } + + if (!g_file_get_contents (mime_file, &tmp, NULL, NULL)) { +@@ -615,7 +615,7 @@ + *name = g_strdup (g_mime_content_type_get_parameter (mime, "name")); + } + +- g_mime_content_type_destroy (mime); ++ g_object_unref (mime); + } + + if (name && !*name) { +@@ -637,17 +637,17 @@ + gchar *encoding_str = g_strndup (pos_encoding, pos_end_encoding - pos_encoding); + + if (strcmp (encoding_str, "7bit") == 0) { +- *encoding = GMIME_PART_ENCODING_7BIT; ++ *encoding = GMIME_CONTENT_ENCODING_7BIT; + } else if (strcmp (encoding_str, "8bit") == 0) { +- *encoding = GMIME_PART_ENCODING_7BIT; ++ *encoding = GMIME_CONTENT_ENCODING_8BIT; + } else if (strcmp (encoding_str, "binary") == 0) { +- *encoding = GMIME_PART_ENCODING_BINARY; ++ *encoding = GMIME_CONTENT_ENCODING_BINARY; + } else if (strcmp (encoding_str, "base64") == 0) { +- *encoding = GMIME_PART_ENCODING_BASE64; ++ *encoding = GMIME_CONTENT_ENCODING_BASE64; + } else if (strcmp (encoding_str, "quoted-printable") == 0) { +- *encoding = GMIME_PART_ENCODING_QUOTEDPRINTABLE; ++ *encoding = GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE; + } else if (strcmp (encoding_str, "x-uuencode") == 0) { +- *encoding = GMIME_PART_ENCODING_UUENCODE; ++ *encoding = GMIME_CONTENT_ENCODING_UUENCODE; + } + + g_free (encoding_str); +@@ -734,14 +734,17 @@ + } + + static void +-extract_message_text (GMimeObject *object, ++extract_message_text (GMimeObject *parent, ++ GMimeObject *object, + gpointer user_data) + { + GString *body = (GString *) user_data; +- GMimePartEncodingType part_encoding; ++ GMimeContentEncoding part_encoding; + GMimePart *part; +- const gchar *content, *disposition, *filename; +- gchar *encoding, *part_body; ++ GMimeStream *stream; ++ GMimeDataWrapper *data; ++ const gchar *disposition, *filename, *encoding; ++ gchar *part_body, buffer[1024]; + gsize len; + + if (GMIME_IS_MESSAGE_PART (object)) { +@@ -750,7 +753,7 @@ + message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (object)); + + if (message) { +- g_mime_message_foreach_part (message, extract_message_text, user_data); ++ g_mime_message_foreach (message, extract_message_text, user_data); + g_object_unref (message); + } + +@@ -762,12 +765,12 @@ + + part = GMIME_PART (object); + filename = g_mime_part_get_filename (part); +- disposition = g_mime_part_get_content_disposition (part); +- part_encoding = g_mime_part_get_encoding (part); ++ disposition = g_mime_object_get_disposition (GMIME_OBJECT (part)); ++ part_encoding = g_mime_part_get_content_encoding (part); + +- if (part_encoding == GMIME_PART_ENCODING_BINARY || +- part_encoding == GMIME_PART_ENCODING_BASE64 || +- part_encoding == GMIME_PART_ENCODING_UUENCODE) { ++ if (part_encoding == GMIME_CONTENT_ENCODING_BINARY || ++ part_encoding == GMIME_CONTENT_ENCODING_BASE64 || ++ part_encoding == GMIME_CONTENT_ENCODING_UUENCODE) { + return; + } + +@@ -782,31 +785,34 @@ + return; + } + +- content = g_mime_part_get_content (GMIME_PART (object), &len); ++ data = g_mime_part_get_content_object (GMIME_PART (object)); + +- if (!content) { +- return; +- } ++ if (!data) ++ return; + +- if (g_utf8_validate (content, len, NULL)) { +- g_string_append_len (body, content, (gssize) len); +- return; +- } ++ stream = g_mime_data_wrapper_get_stream (data); + +- encoding = evolution_common_get_object_encoding (object); ++ if (!stream) { ++ g_object_unref (data); ++ return; ++ } + +- if (!encoding) { +- /* FIXME: This will break for non-utf8 text without +- * the proper content type set +- */ +- g_string_append_len (body, content, (gssize) len); +- } else { +- part_body = g_convert (content, (gssize) len, "utf8", encoding, NULL, NULL, NULL); +- g_string_append (body, part_body); ++ encoding = g_mime_object_get_content_disposition_parameter (GMIME_OBJECT (part), "charset"); + +- g_free (part_body); +- g_free (encoding); +- } ++ while (!g_mime_stream_eos (stream)) { ++ len = g_mime_stream_read (stream, buffer, 1024); ++ if (len > 0 && g_utf8_validate (buffer, len, NULL)) { ++ if (!encoding) ++ g_string_append_len (body, buffer, (gssize) len); ++ else { ++ part_body = g_convert (buffer, (gssize) len, "utf8", encoding, NULL, NULL, NULL); ++ g_string_append (body, part_body); ++ g_free (part_body); ++ } ++ } ++ } ++ ++ g_object_unref (stream); + } + + static gchar * +@@ -846,7 +852,7 @@ + + if (message) { + body = g_string_new (NULL); +- g_mime_message_foreach_part (message, extract_message_text, body); ++ g_mime_message_foreach (message, extract_message_text, body); + g_object_unref (message); + } + +@@ -1030,7 +1036,7 @@ + TrackerModuleMetadata *metadata; + GMimeStream *stream; + GMimeDataWrapper *wrapper; +- GMimePartEncodingType encoding; ++ GMimeContentEncoding encoding; + gchar *path, *name; + + if (!get_attachment_info (mime_file, &name, &encoding)) { +Index: tracker/src/tracker-indexer/modules/evolution-pop.c +=================================================================== +--- tracker.orig/src/tracker-indexer/modules/evolution-pop.c 2009-05-22 23:31:58.000000000 +0200 ++++ tracker/src/tracker-indexer/modules/evolution-pop.c 2009-09-30 22:53:51.000000000 +0200 +@@ -175,7 +175,7 @@ + gchar *number; + gint id; + +- header = g_mime_message_get_header (message, "X-Evolution"); ++ header = g_mime_object_get_header (GMIME_OBJECT (message), "X-Evolution"); + + if (!header) { + return -1; +@@ -253,8 +253,12 @@ + tracker_evolution_pop_file_get_text (TrackerModuleFile *file) + { + TrackerEvolutionPopFile *self; +- gchar *text, *encoding, *utf8_text; +- gboolean is_html; ++ const gchar *encoding; ++ gchar buffer[1024]; ++ guint len; ++ GString *body; ++ GMimeStream *stream; ++ GMimeDataWrapper *data; + + self = TRACKER_EVOLUTION_POP_FILE (file); + +@@ -263,27 +267,38 @@ + return NULL; + } + +- text = g_mime_message_get_body (self->message, TRUE, &is_html); ++ data = g_mime_part_get_content_object (GMIME_PART (self->message)); + +- if (!text) { +- return NULL; +- } ++ if (!data) ++ return NULL; + +- encoding = evolution_common_get_object_encoding (GMIME_OBJECT (self->message)); ++ stream = g_mime_data_wrapper_get_stream (data); + +- if (!encoding) { +- /* FIXME: could still puke on non-utf8 +- * messages without proper content type +- */ +- return text; +- } ++ if (!stream) { ++ g_object_unref (data); ++ return NULL; ++ } + +- utf8_text = g_convert (text, -1, "utf8", encoding, NULL, NULL, NULL); ++ body = g_string_new (""); + +- g_free (encoding); +- g_free (text); ++ encoding = g_mime_object_get_content_disposition_parameter (GMIME_OBJECT (self->message), "charset"); + +- return utf8_text; ++ while (!g_mime_stream_eos (stream)) { ++ len = g_mime_stream_read (stream, buffer, 1024); ++ if (len > 0 && g_utf8_validate (buffer, len, NULL)) { ++ if (!encoding) ++ g_string_append_len (body, buffer, (gssize) len); ++ else { ++ gchar *part_body = g_convert (buffer, (gssize) len, "utf8", encoding, NULL, NULL, NULL); ++ g_string_append (body, part_body); ++ g_free (part_body); ++ } ++ } ++ } ++ ++ g_object_unref (stream); ++ ++ return g_string_free (body, FALSE); + } + + static guint +@@ -291,7 +306,7 @@ + { + const gchar *header, *pos; + +- header = g_mime_message_get_header (message, "X-Evolution"); ++ header = g_mime_object_get_header (GMIME_OBJECT (message), "X-Evolution"); + + if (!header) { + return 0; +@@ -304,34 +319,24 @@ + + static GList * + get_message_recipients (GMimeMessage *message, +- const gchar *type) ++ GMimeRecipientType type) + { + GList *list = NULL; +- const InternetAddressList *addresses; ++ InternetAddressList *addresses; ++ guint len, i; + + addresses = g_mime_message_get_recipients (message, type); + +- while (addresses) { ++ len = internet_address_list_length (addresses); ++ ++ while (i < len) { + InternetAddress *address; +- gchar *str; + +- address = addresses->address; ++ address = internet_address_list_get_address (addresses, i); + +- if (address->name && address->value.addr) { +- str = g_strdup_printf ("%s %s", address->name, address->value.addr); +- } else if (address->value.addr) { +- str = g_strdup (address->value.addr); +- } else if (address->name) { +- str = g_strdup (address->name); +- } else { +- str = NULL; +- } +- +- if (str) { +- list = g_list_prepend (list, str); +- } ++ list = g_list_prepend (list, internet_address_to_string (address, TRUE)); + +- addresses = addresses->next; ++ i++; + } + + return g_list_reverse (list); +@@ -427,7 +432,8 @@ + } + + static void +-extract_mime_parts (GMimeObject *object, ++extract_mime_parts (GMimeObject *parent, ++ GMimeObject *object, + gpointer user_data) + { + GList **list = (GList **) user_data; +@@ -440,7 +446,7 @@ + message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (object)); + + if (message) { +- g_mime_message_foreach_part (message, extract_mime_parts, user_data); ++ g_mime_message_foreach (message, extract_mime_parts, user_data); + g_object_unref (message); + } + +@@ -451,7 +457,7 @@ + } + + part = GMIME_PART (object); +- disposition = g_mime_part_get_content_disposition (part); ++ disposition = g_mime_object_get_disposition (GMIME_OBJECT (part)); + + if (!disposition || + (strcmp (disposition, GMIME_DISPOSITION_ATTACHMENT) != 0 && +@@ -484,9 +490,9 @@ + if (self->message) { + /* Iterate through mime parts, if any */ + if (!self->mime_parts) { +- g_mime_message_foreach_part (self->message, +- extract_mime_parts, +- &self->mime_parts); ++ g_mime_message_foreach (self->message, ++ extract_mime_parts, ++ &self->mime_parts); + self->current_mime_part = self->mime_parts; + } else { + self->current_mime_part = self->current_mime_part->next; diff --git a/recipes/tracker/tracker-0.6.95/99-autoreconf.patch b/recipes/tracker/tracker-0.6.95/99-autoreconf.patch new file mode 100644 index 0000000000..2ba82c4bc1 --- /dev/null +++ b/recipes/tracker/tracker-0.6.95/99-autoreconf.patch @@ -0,0 +1,436 @@ +Index: tracker-0.6.95/aclocal.m4 +=================================================================== +--- tracker-0.6.95.orig/aclocal.m4 2009-09-30 22:47:58.914892386 +0200 ++++ tracker-0.6.95/aclocal.m4 2009-09-30 22:47:19.811568705 +0200 +@@ -493,7 +493,7 @@ + AC_REQUIRE([AM_MAINTAINER_MODE]) + + if test $USE_MAINTAINER_MODE = yes; then +- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED" ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED" + else + DISABLE_DEPRECATED="" + fi +@@ -4991,6 +4991,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -9177,61 +9180,59 @@ + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-#serial 5 ++#serial 4 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[{ +- # Autoconf 2.62 quotes --file arguments for eval, but not when files +- # are listed without --file. Let's play safe and only enable the eval +- # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac +- shift +- for mf +- do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done ++[# Autoconf 2.62 quotes --file arguments for eval, but not when files ++# are listed without --file. Let's play safe and only enable the eval ++# if we detect the quoting. ++case $CONFIG_FILES in ++*\'*) eval set x "$CONFIG_FILES" ;; ++*) set x $CONFIG_FILES ;; ++esac ++shift ++for mf ++do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" + done +-} ++done + ])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +Index: tracker-0.6.95/configure +=================================================================== +--- tracker-0.6.95.orig/configure 2009-09-30 22:47:59.028227224 +0200 ++++ tracker-0.6.95/configure 2009-09-30 22:47:28.338222381 +0200 +@@ -9623,6 +9623,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -12317,7 +12320,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12320 "configure" ++#line 12323 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12413,7 +12416,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12416 "configure" ++#line 12419 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -13461,7 +13464,7 @@ + GTK_REQUIRED=2.16.0 + GLADE_REQUIRED=2.5 + QDBM_REQUIRED=1.8 +-GMIME_REQUIRED=2.1.0 ++GMIME_REQUIRED=2.4.0 + LIBXML2_REQUIRED=0.6 + LIBNOTIFY_REQUIRED=0.4.3 + HAL_REQUIRED=0.5 +@@ -14309,12 +14312,12 @@ + pkg_cv_GMIME_CFLAGS="$GMIME_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.0 >= \$GMIME_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gmime-2.0 >= $GMIME_REQUIRED") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.4 >= \$GMIME_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gmime-2.4 >= $GMIME_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GMIME_CFLAGS=`$PKG_CONFIG --cflags "gmime-2.0 >= $GMIME_REQUIRED" 2>/dev/null` ++ pkg_cv_GMIME_CFLAGS=`$PKG_CONFIG --cflags "gmime-2.4 >= $GMIME_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14327,12 +14330,12 @@ + pkg_cv_GMIME_LIBS="$GMIME_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.0 >= \$GMIME_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gmime-2.0 >= $GMIME_REQUIRED") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-2.4 >= \$GMIME_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gmime-2.4 >= $GMIME_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GMIME_LIBS=`$PKG_CONFIG --libs "gmime-2.0 >= $GMIME_REQUIRED" 2>/dev/null` ++ pkg_cv_GMIME_LIBS=`$PKG_CONFIG --libs "gmime-2.4 >= $GMIME_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14351,14 +14354,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GMIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmime-2.0 >= $GMIME_REQUIRED"` ++ GMIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmime-2.4 >= $GMIME_REQUIRED"` + else +- GMIME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmime-2.0 >= $GMIME_REQUIRED"` ++ GMIME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmime-2.4 >= $GMIME_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GMIME_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (gmime-2.0 >= $GMIME_REQUIRED) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (gmime-2.4 >= $GMIME_REQUIRED) were not met: + + $GMIME_PKG_ERRORS + +@@ -14369,7 +14372,7 @@ + and GMIME_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-$as_echo "$as_me: error: Package requirements (gmime-2.0 >= $GMIME_REQUIRED) were not met: ++$as_echo "$as_me: error: Package requirements (gmime-2.4 >= $GMIME_REQUIRED) were not met: + + $GMIME_PKG_ERRORS + +@@ -23604,28 +23607,27 @@ + + + case $ac_file$ac_mode in +- "depfiles":C) test x"$AMDEP_TRUE" != x"" || { +- # Autoconf 2.62 quotes --file arguments for eval, but not when files +- # are listed without --file. Let's play safe and only enable the eval +- # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac +- shift +- for mf +- do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`$as_dirname -- "$mf" || ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files ++# are listed without --file. Let's play safe and only enable the eval ++# if we detect the quoting. ++case $CONFIG_FILES in ++*\'*) eval set x "$CONFIG_FILES" ;; ++*) set x $CONFIG_FILES ;; ++esac ++shift ++for mf ++do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ +@@ -23648,28 +23650,28 @@ + q + } + s/.*/./; q'` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`$as_dirname -- "$file" || ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ +@@ -23692,7 +23694,7 @@ + q + } + s/.*/./; q'` +- { as_dir=$dirpart/$fdir ++ { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac +@@ -23733,11 +23735,10 @@ + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 + $as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" + done +-} ++done + ;; + "libtool":C) + +Index: tracker-0.6.95/src/libstemmer/Makefile.in +=================================================================== +--- tracker-0.6.95.orig/src/libstemmer/Makefile.in 2009-09-30 22:47:59.631558022 +0200 ++++ tracker-0.6.95/src/libstemmer/Makefile.in 2009-09-30 22:47:32.971556115 +0200 +@@ -381,7 +381,7 @@ + + libstemmer_la_LIBADD = $(GCOV_LIBS) + libstemmer_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + all: all-am + +Index: tracker-0.6.95/src/libtracker-common/Makefile.in +=================================================================== +--- tracker-0.6.95.orig/src/libtracker-common/Makefile.in 2009-09-30 22:47:59.958224240 +0200 ++++ tracker-0.6.95/src/libtracker-common/Makefile.in 2009-09-30 22:47:33.128222987 +0200 +@@ -426,7 +426,7 @@ + tracker-utils.h + + libtracker_common_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + libtracker_common_la_LIBADD = \ + $(top_builddir)/src/libstemmer/libstemmer.la \ +Index: tracker-0.6.95/src/libtracker-data/Makefile.in +=================================================================== +--- tracker-0.6.95.orig/src/libtracker-data/Makefile.in 2009-09-30 22:47:59.781558711 +0200 ++++ tracker-0.6.95/src/libtracker-data/Makefile.in 2009-09-30 22:47:33.264889286 +0200 +@@ -374,7 +374,7 @@ + tracker-turtle.h + + libtracker_data_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + libtracker_data_la_LIBADD = \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +Index: tracker-0.6.95/src/libtracker-db/Makefile.in +=================================================================== +--- tracker-0.6.95.orig/src/libtracker-db/Makefile.in 2009-09-30 22:48:00.081555587 +0200 ++++ tracker-0.6.95/src/libtracker-db/Makefile.in 2009-09-30 22:47:33.401557540 +0200 +@@ -370,7 +370,7 @@ + tracker-db-manager.h + + libtracker_db_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + libtracker_db_la_LIBADD = \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +Index: tracker-0.6.95/src/libtracker-gtk/Makefile.in +=================================================================== +--- tracker-0.6.95.orig/src/libtracker-gtk/Makefile.in 2009-09-30 22:47:59.858224069 +0200 ++++ tracker-0.6.95/src/libtracker-gtk/Makefile.in 2009-09-30 22:47:33.538222150 +0200 +@@ -360,7 +360,7 @@ + $(GCOV_LIBS) + + libtracker_gtk_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + all: all-am + +Index: tracker-0.6.95/src/libtracker/Makefile.in +=================================================================== +--- tracker-0.6.95.orig/src/libtracker/Makefile.in 2009-09-30 22:48:00.238226105 +0200 ++++ tracker-0.6.95/src/libtracker/Makefile.in 2009-09-30 22:47:33.698222969 +0200 +@@ -340,7 +340,7 @@ + lib_LTLIBRARIES = libtrackerclient.la + libtrackerclient_la_SOURCES = tracker.c + libtrackerclient_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info 0:0:0 + + libtrackerclient_la_LIBADD = \ + $(GLIB2_LIBS) \ diff --git a/recipes/tracker/tracker-0.6.95/munge-configure.ac-cross-compile.patch b/recipes/tracker/tracker-0.6.95/munge-configure.ac-cross-compile.patch new file mode 100644 index 0000000000..c520550cc8 --- /dev/null +++ b/recipes/tracker/tracker-0.6.95/munge-configure.ac-cross-compile.patch @@ -0,0 +1,39 @@ +Index: tracker-0.6.95/configure.ac +=================================================================== +--- tracker-0.6.95.orig/configure.ac 2009-11-03 19:36:02.854851277 +0000 ++++ tracker-0.6.95/configure.ac 2009-11-03 19:38:23.757362563 +0000 +@@ -1332,34 +1332,6 @@ + old_exec_message="" + old_data_message="" + +-AC_CHECK_FILE("${prefix}/bin/trackerd", old_exec_trackerd=yes,,) +-AC_CHECK_FILE("${prefix}/bin/tracker-indexer", old_exec_tracker_indexer=yes,,) +-AC_CHECK_FILE("${prefix}/bin/tracker-extract", old_exec_tracker_extract=yes,,) +-AC_CHECK_FILE("${prefix}/bin/tracker-thumbnailer", old_exec_tracker_thumbnailer=yes,,) +-AC_CHECK_FILE("${DBUS_SERVICES_DIR}/tracker.service", old_data_dbus_service=yes,) +-AC_CHECK_FILE("${prefix}/share/tracker/tracker-introspect.xml", old_data_dbus_xml=yes,,) +-AC_CHECK_FILE("${prefix}/share/tracker/sqlite-service-stored-procs.sql", old_data_stored_procs=yes,,) +- +-if test "x$old_exec_trackerd" == "xyes" -o \ +- "x$old_exec_tracker_indexer" == "xyes" -o \ +- "x$old_exec_tracker_extract" == "xyes" -o \ +- "x$old_exec_tracker_thumbnailer" == "xyes"; then +- old_exec_message=" +- Old Tracker executable files were found in your path. +- (trackerd, tracker-indexer, tracker-thumbnailer, tracker-extract)" +- old_file_action=" +- ** These files will be removed as part of the installation **" +-fi +- +-if test "x$old_data_dbus_service" == "xyes" -o \ +- "x$old_data_dbus_xml" == "xyes" -o \ +- "x$old_data_stored_procs" == "xyes"; then +- old_data_message=" +- Old Tracker data files were found in the prefix you are installing to." +- old_file_action=" +- ** These files will be removed as part of the installation **" +-fi +- + AM_CONDITIONAL(OLD_EXEC_REMOVE_ALL, test -n "$old_exec_message") + AM_CONDITIONAL(OLD_DATA_REMOVE_ALL, test -n "$old_data_message") + diff --git a/recipes/tracker/tracker_0.6.95.bb b/recipes/tracker/tracker_0.6.95.bb new file mode 100644 index 0000000000..f97b5ea881 --- /dev/null +++ b/recipes/tracker/tracker_0.6.95.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." +LICENSE = "GPLv2" +DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf libgnomecanvas gettext" +HOMEPAGE="http://www.tracker-project.org/" + +PR = "r1" + +inherit autotools pkgconfig gnome + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/0.6/tracker-${PV}.tar.bz2 \ + file://munge-configure.ac-cross-compile.patch;patch=1 \ + file://05-tracker-ioprio-cross.patch;patch=1 \ + file://10-drop-bogus-version-info.patch;patch=1 \ + file://20-tracker-defaults.patch;patch=1 \ + file://30-gmime-2.4.patch;patch=1 \ + file://99-autoreconf.patch;patch=1 \ + file://90tracker \ +" + +EXTRA_OECONF += " tracker_cv_have_ioprio=yes" + +LEAD_SONAME = "libtrackerclient.so.0" + +do_install_append() { + cp -dPr ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true + install -d ${D}/${sysconfdir}/X11/Xsession.d/ + install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ +} + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${datadir}/dbus-1/" +FILES_${PN}-dbg += "${libdir}/*/*/.debug" + +CONFFILES_${PN} += "${sysconfdir}/X11/Xsession.d/90tracker" diff --git a/recipes/u-boot/files/omap3-touchbook/fw_env.config b/recipes/u-boot/files/omap3-touchbook/fw_env.config index a7bfec1ebb..4063144d36 100644 --- a/recipes/u-boot/files/omap3-touchbook/fw_env.config +++ b/recipes/u-boot/files/omap3-touchbook/fw_env.config @@ -3,4 +3,4 @@ # environment sector is assumed present. # MTD device name Device offset Env. size Flash sector size -/dev/mtd2 0x0000 0x20000 0x20000 +/dev/mtd2 0x0000 0x20000 0x40000 diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 39d6864a4d..e674e4d25b 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r34" +PR ="r35" FILESPATHPKG =. "u-boot-git:" diff --git a/recipes/webkit/arora-e_0.10.1.bb b/recipes/webkit/arora-e_0.10.1.bb new file mode 100644 index 0000000000..a526fda715 --- /dev/null +++ b/recipes/webkit/arora-e_0.10.1.bb @@ -0,0 +1,3 @@ +inherit qt4e + +require arora.inc diff --git a/recipes/webkit/arora.inc b/recipes/webkit/arora.inc new file mode 100644 index 0000000000..bbd8bfb33e --- /dev/null +++ b/recipes/webkit/arora.inc @@ -0,0 +1,45 @@ +DESCRIPTION = "Arora is a lightweight cross-platform web browser" +LICENE = "GPLv2" +HOMEPAGE = "http://code.google.com/p/arora/" + +PR = "r1" + +SRC_URI = "http://arora.googlecode.com/files/arora-${PV}.tar.gz" + +S = "${WORKDIR}/arora-${PV}" + +do_configure_prepend() { + sed -i -e s:lrelease-qt4:${OE_QMAKE_LRELEASE}:g ${S}/src/locale/locale.pri +} + +# Huge hack ahead: +# Something is putting '.libs' in the Makefiles, which we do now want. The problem is that qmake generates makefiles during 'make all' *sigh* +do_compile_prepend() { + ( oe_runmake src/Makefile tools/Makefile + cd ${S}/tools ; oe_runmake cacheinfo/Makefile htmlToXBel/Makefile placesimport/Makefile + ) + + for i in $(find ${S} -name 'Makefile') ; do + sed -i -e 's:/.libs::g' $i + make || true + done + +} + +do_install() { + sed -i -e s:/usr/local:${D}${prefix}:g install.pri + sed -i -e s:$(INSTALL_ROOT)/OE/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/arora-0.10.1-r0/image/:$(INSTALL_ROOT)/:g src/Makefile + + for i in $(find ${S} -name 'Makefile') ; do + sed -i -e s:/usr/local:${prefix}:g $i + done + + oe_runmake -e INSTALL_ROOT=${D} install + cp -r ${D}/${D}/* ${D}/ || true + cp -r ${D}/usr/local/* ${D}${prefix} || true + rm -rf ${D}/usr/local ${D}/${D} +} + +FILES_${PN} += "${datadir}/arora ${datadir}/gnome-control-center ${datadir}/icons" + + diff --git a/recipes/webkit/arora_0.10.1.bb b/recipes/webkit/arora_0.10.1.bb index 11da72e5ff..ea90c4538a 100644 --- a/recipes/webkit/arora_0.10.1.bb +++ b/recipes/webkit/arora_0.10.1.bb @@ -1,45 +1,3 @@ -DESCRIPTION = "Arora is a lightweight cross-platform web browser" -LICENE = "GPLv2" -HOMEPAGE = "http://code.google.com/p/arora/" - inherit qt4x11 -PR = "r1" - -SRC_URI = "http://arora.googlecode.com/files/arora-${PV}.tar.gz" - -do_configure_prepend() { - sed -i -e s:lrelease-qt4:${OE_QMAKE_LRELEASE}:g ${S}/src/locale/locale.pri -} - -# Huge hack ahead: -# Something is putting '.libs' in the Makefiles, which we do now want. The problem is that qmake generates makefiles during 'make all' *sigh* -do_compile_prepend() { - ( oe_runmake src/Makefile tools/Makefile - cd ${S}/tools ; oe_runmake cacheinfo/Makefile htmlToXBel/Makefile placesimport/Makefile - ) - - for i in $(find ${S} -name 'Makefile') ; do - sed -i -e 's:/.libs::g' $i - make || true - done - -} - -do_install() { - sed -i -e s:/usr/local:${D}${prefix}:g install.pri - sed -i -e s:$(INSTALL_ROOT)/OE/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/arora-0.10.1-r0/image/:$(INSTALL_ROOT)/:g src/Makefile - - for i in $(find ${S} -name 'Makefile') ; do - sed -i -e s:/usr/local:${prefix}:g $i - done - - oe_runmake -e INSTALL_ROOT=${D} install - cp -r ${D}/${D}/* ${D}/ || true - cp -r ${D}/usr/local/* ${D}${prefix} || true - rm -rf ${D}/usr/local ${D}/${D} -} - -FILES_${PN} += "${datadir}/gnome-control-center ${datadir}/icons" - - +require arora.inc diff --git a/recipes/wv/wv_1.2.0.bb b/recipes/wv/wv_1.2.0.bb index 7f06f587c4..b3114a5325 100644 --- a/recipes/wv/wv_1.2.0.bb +++ b/recipes/wv/wv_1.2.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Programs for accessing Microsoft Word documents" HOMEPAGE = "http://wvware.sourceforge.net/" LICENSE = "GPLv2" DEPENDS = "libgsf glib-2.0" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \ file://pkgconfig.patch;patch=1" @@ -16,3 +16,7 @@ EXTRA_OECONF = "" do_stage () { autotools_stage_all } + +do_compile () { + oe_runmake -f GNUmakefile +} diff --git a/recipes/xmltv/xmltv_0.5.54.bb b/recipes/xmltv/xmltv_0.5.56.bb index 70005d70f4..70005d70f4 100644 --- a/recipes/xmltv/xmltv_0.5.54.bb +++ b/recipes/xmltv/xmltv_0.5.56.bb |