diff options
153 files changed, 6100 insertions, 1207 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index d29ba4bfcf..89ee917d20 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -661,7 +661,7 @@ python base_do_fetch() { bb.note("No conf/checksums.ini found, not checking checksums") return except: - bb.note("Creating the CheckSum parser failed") + bb.note("Creating the CheckSum parser failed: %s:%s" % (sys.exc_info()[0], sys.exc_info()[1])) return pv = bb.data.getVar('PV', d, True) diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass index b5b7b8655b..4978421b63 100644 --- a/classes/cmake.bbclass +++ b/classes/cmake.bbclass @@ -1,7 +1,7 @@ DEPENDS += " cmake-native " # We want the staging and installing functions from autotools -inherit autotools +inherit autotools_stage # Use in-tree builds by default but allow this to be changed # since some packages do not support them (e.g. llvm 2.5). diff --git a/classes/e.bbclass b/classes/e.bbclass index a6fa1d0d78..fca9aa0010 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -23,7 +23,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" # This construction is stupid, someone with more E knowledge should change it to =+ or something # And it's in efl.bbclass as well.... -PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib" +PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib ${PN}-static" FILES_${PN}-lib = "${libdir}/lib*.so.*" FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so" diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 22e664ce01..d4c3baa9cf 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -24,7 +24,7 @@ do_stage() { } # This construction is stupid, someone with more E knowledge should change it to =+ or something -PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests" +PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests ${PN}-static" FILES_${PN} = "${libdir}/*.so.*" @@ -40,13 +40,14 @@ FILES_${PN}-themes = "${datadir}/${PN}/themes \ FILES_${PN}-dev += "${bindir}/${PN}-config \ ${libdir}/pkgconfig/* \ ${libdir}/lib*.la \ - ${libdir}/lib*.a \ ${libdir}/*.so \ - ${libdir}/${PN}/*.a \ ${libdir}/${PN}/*.la \ - ${libdir}/${PN}/*/*.a \ ${libdir}/${PN}/*/*.la" +FILES_${PN}-static += "${libdir}/${PN}/*.a \ + ${libdir}/${PN}/*/*.a \ +" + FILES_${PN}-dbg += "${libdir}/${PN}/.debug \ ${libdir}/${PN}/*/.debug" diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 26e813a036..37721898d6 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -19,3 +19,5 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" +export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4" +export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4" diff --git a/conf/checksums.ini b/conf/checksums.ini index 9fd26b32ee..b12faee8e7 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -538,6 +538,10 @@ sha256=5ed480cb76c91c2739ddba87f15437510e58c60dfdd7ead6f469149b2da94bb7 md5=fc5e35645b75befae28c88b711b28ffb sha256=42d06febf4717dd43eb557027d1b00a484c22589793438778ed69449a073a3b8 +[http://kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.1.0.tar.bz2] +md5=9cda791c827dfcd9f2888caf0a64cc4a +sha256=139b1abb0f1c402e443ad9083b5ff0512f4a5ae7bc806528e9d7eced13384ed7 + [http://ltt.polymtl.ca/packages/LinuxTraceToolkitViewer-0.8.41-12052006.tar.gz] md5=de139052f234cf54d714c960524bd5ef sha256=a21431358d7f2a5deb76b1a95ee80dc870b0dc2426d4860c61144343d48eff3e @@ -1318,6 +1322,10 @@ sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c md5=84d9e0001fe01c14867256c3fe115899 sha256=55386de7bf78f67ad2b9ef664a578db66ee53f512a28eb067cd2303f5e23d740 +[http://www.cpan.org/modules/by-module/XML/XML-Parser-2.36.tar.gz] +md5=1b868962b658bd87e1563ecd56498ded +sha256=9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f + [http://www.cpan.org/modules/by-module/XML/XML-Simple-2.18.tar.gz] md5=593aa8001e5c301cdcdb4bb3b63abc33 sha256=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826 @@ -1418,6 +1426,10 @@ sha256=b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93 md5=f61c623cdb3c3b2aed05bbc868050ddd sha256=b0d0f723a08372ac0889e44a590ee1f13f8c5487b394181396f978191a627bdd +[http://www.abisource.com/downloads/abiword/2.8.1/source/abiword-2.8.1.tar.gz] +md5=284fe25289c160c3797b527a8aacad12 +sha256=f51b614b1202cf63a5f7ede093d31d638ece3c8e76da4036cc4aed589a9cd2ec + [http://www.abiword.org/downloads/abiword/2.5.1/source/abiword-plugins-2.5.1.tar.gz] md5=b1ce7ca49a0ee4e04f828e10eaebe6a9 sha256=37faf6ea346c9b6473c5b2dfd1bb599457faa06b6a7cdef58e3e9f3e2773976b @@ -2378,6 +2390,10 @@ sha256=dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d md5=068c1d220b07037e64caf87d4a7a0504 sha256=260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950 +[http://avahi.org/download/avahi-0.6.25.tar.gz] +md5=a83155a6e29e3988f07e5eea3287b21e +sha256=9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59 + [http://www.apache.org/dist/excalibur/avalon-framework/source/avalon-framework-api-4.3-src.tar.gz] md5=d4cffb4ba1d07bdc517ac6e322636495 sha256=a4d56a053609ddfc77f6a42c3f15a11708d5e0eb29ffc60a40b87e4cc7331d47 @@ -2646,6 +2662,10 @@ sha256=6714d9c1285fc04d39f03b85ebad3723be6f8709ca8935e984b280ac42e97492 md5=d44b5dddebd8a7a7309aea6c36fda117 sha256=4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33 +[http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/OMAP35x_AM35x_Video_Texture_Streaming/1_0/exports/bc-cat-0.1.0.tar.gz] +md5=c7fdd6041ca823ebe95d1a6b1da12ba7 +sha256=daa948e966ba3aec698e45987e85fa6e1c3b3f54b55f117573c9e0f206d02c92 + [http://archive.apache.org/dist/jakarta/bcel/source/bcel-5.2-src.tar.gz] md5=905b7e718e30e7ca726530ecf106e532 sha256=68039d59a38379d7b65ea3fc72276c43ba234776460e14361af35771bcaab295 @@ -3302,6 +3322,10 @@ sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef md5=328bfec66c312150e4c2a78dcecb504b sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef +[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz] +md5=1a0926fe4c8228f14a2622b4182b801e +sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0 + [http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2] md5=e006cde4b4a28cfce95e43710cd126a9 sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575 @@ -4358,6 +4382,10 @@ sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97 md5=f5b84040e99eeff3a18e11e83b1eb12a sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de +[http://www.kernel.org/pub/linux/network/connman/connman-0.46.tar.gz] +md5=9bcdc528f38bc17ecb92519a28b741f1 +sha256=1853ed3d6400e25ef61ba1c98a7ef0f3984a2bf59aaf3485721cbc1de036b75c + [ftp://ftp.moblin.org/connman/releases/connman-0.8.tar.gz] md5=3f1995bf91846b601a25a37832c88cb6 sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d @@ -5826,6 +5854,10 @@ sha256=a0d03208e335610defc3049d8dd03f4ec7fcf477f44c4897b3f68adc478237ee md5=b96a6d4263122f1711db12701d79f738 sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55 +[http://sources.openembedded.org/eject-2.1.5.tar.gz] +md5=b96a6d4263122f1711db12701d79f738 +sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55 + [http://ekg.chmurka.net/ekg-1.6.tar.gz] md5=1094eee5062d9b9900c4b28bd68fb564 sha256=c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28 @@ -6718,6 +6750,10 @@ sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e md5=136867f95c86f3988b7f825e874b85de sha256=d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae +[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.4/source/firefox-3.5.4.source.tar.bz2] +md5=0b6ccb1e50d96b7127a18a69399fcf05 +sha256=b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4 + [http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2] md5=ff6bf463300cb56bcf750973b2af3d80 sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d @@ -7454,6 +7490,10 @@ sha256=0934bd29fb2ad0367ea3bdfdce47537179f9af6aa960cbcc897c40da2e1a0ee3 md5=585a65f61c2cd308ab45d5c514f695dc sha256=0934bd29fb2ad0367ea3bdfdce47537179f9af6aa960cbcc897c40da2e1a0ee3 +[http://ftp.gnu.org/gnu/freefont/freefont-ttf-20090104.tar.gz] +md5=1128bb17763cde6990eacd5996f7def7 +sha256=2b8e7164b0c362d5c5e90275b25772514d76d5fda3d54c026445611e467d638e + [http://dfn.dl.sourceforge.net/sourceforge/freeglut/freeglut-2.4.0.tar.gz] md5=6d16873bd876fbf4980a927cfbc496a1 sha256=269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052 @@ -18862,6 +18902,18 @@ sha256=7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd md5=37b4479951fa0cf052269d27c41ca200 sha256=6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 +[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc1.tar.bz2] +md5=1c03d3f4ccedcd9de1c0ac2226e0031c +sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da + +[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2] +md5=de15246c1f59665f3960015c49138da3 +sha256=73dff22a4622f2140b49ee824f1f69d6120135d828bc38f6877a619986c99245 + +[ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2] +md5=7d629aa8c0f1c8cdc11310b09a929626 +sha256=39494a9c05c47b9a28c6168211a5987a8386929a3210e637ed6191e3554ee9f6 + [http://www.mythtv.org/mc/mythtv-0.18.1.tar.bz2] md5=e6cabf88feeaf6ae8f830d3fdf7b113d sha256=86c9cf038d5d8a3fdf137ff735b55820281543a4a08e86cfad81a113a7b9a1d2 @@ -18878,6 +18930,10 @@ sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4 md5=049e93d78d5370351539c9a23b47e1af sha256=8e6823f4b92d88c837735322ca71199919406a2826bddae257c6e0f52d089cd7 +[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2] +md5=1e4be634b137e5b944c94b418d8c3791 +sha256=5cba470ccd60fec00be2bf7ef231f104dcea8275698fe70f5df398dbe2fe19fd + [http://kldp.net/frs/download.php/3742/nabi-0.17.tar.gz] md5=8746890ea666ac1b7ae6db77993c6592 sha256=1a239a7bb0644441ca781459fbf5a1c5fb95e823351bf308aa680eb60cc45b94 @@ -19446,6 +19502,10 @@ sha256=c986121e520897af6c326ece8a26eca87bdb4641a93913b63a5c29521cefaf66 md5=f9adc013e0e4b26c992cc0ca05328f3d sha256=44ba0d99e1bf8fa2caf9f7a85d569e513208c0710c1ad00032e271289e87b63f +[http://www.kernel.org/pub/linux/bluetooth/obexd-0.18.tar.gz] +md5=5674f746b55439d32bc765d2c5baad16 +sha256=6dbabd9345967120ad21cc25489a6d244aed7975cee9297cc5716af4debc7228 + [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz] md5=085b9edc0504c0d79e7479a54e2018c5 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e @@ -19870,6 +19930,10 @@ sha256=063f00d5b889beee910eb113c8cfbb4fc85cd404693494bcaaf79dd09a98335c md5=ba2ee667a8b7606b125b7d32f47ca578 sha256=d7f52e2217ed1cf367ca93257b27c8acb29fcae4fcaa31b4a94146a3c7a7de33 +[http://openvpn.net/release/openvpn-2.1_rc20.tar.gz] +md5=8187f8f21507faac5e320e32747203b8 +sha256=4d423b48cb3ccc66b5669b9404dcb028cb62af410361c09e6056db0c5d2a1267 + [http://downloads.sourceforge.net/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2] md5=7f35543286911b827dcbf8d07a7d72be sha256=bad49b59646dbea380cc88be13a77d17c70488b8e11e85f7dd474930fa9cf36a @@ -23874,6 +23938,10 @@ sha256=c7d7f2fb4a3903dd26a90df358f5757f2637c333cd6f6bf511f506a958349fa1 md5=9b48fc595d7291fa8edddfafba2cb7a9 sha256=28a6af2d1490374de26084e346bbd227586c0f6232dcf4cfebf80413adc7d932 +[http://download.berlios.de/slim/slim-1.3.1.tar.gz] +md5=727d0acb24c0fbf0751134c37a9c895f +sha256=acd7a4024bfd7c2a4f3cd5d77ffed4956d13727a8f554042126d0568defe0f77 + [http://downloads.sourceforge.net/slotsig/slotsig-0.6.tar.bz2] md5=dfe9f5d3f17075ec23eb923899ac5f24 sha256=124499d3c5d2d44ab07b60c235547079044f3728fd3c907987900e270bd947f8 @@ -25406,6 +25474,10 @@ sha256=ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2 md5=768059a486ff73ae18595afab3b78a70 sha256=f4d3b413a61bfe6895f7f87bbfbcc7159f66b1d73fc29a7380839802fbb01198 +[http://ftp.gnome.org/pub/GNOME/sources/tracker/0.6/tracker-0.6.95.tar.bz2] +md5=a4edc8aa830070bd3f1d80a7df07c80c +sha256=0fe42353117c62ccc9de3b3c9c11acf707a0702d30cd24b8d1cd1e2581dec339 + [http://downloads.sourceforge.net/transconnect/transconnect-1.2.tar.gz] md5=c255ff48387ea6a7092707ba992237e7 sha256=47d6cc44f78fc6d4cdb1dfee02fe6e0f4d8aae0ce2e3e92567667f0475736617 @@ -26038,6 +26110,10 @@ sha256=2edc7cc98fd217f6980d8ba0b3792beed4695d4e8429a11c7237faab04ab47f4 md5=6e393cc7423b5d228fa3d34c21481ae4 sha256=9876b0e45a1bd3899222b916ab1d423e9efa3ad9374d55a6a301d5716f2d8a2f +[http://downloads.sourceforge.net/linux-usb/usbutils-0.86.tar.gz] +md5=34979f675d2bcb3e1b45012fa830a53f +sha256=b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4 + [http://www.kroah.com/linux-usb/usbview-1.0.tar.gz] md5=2ac1bdae03a858b965e895b211a75ad7 sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd @@ -26650,6 +26726,14 @@ sha256=4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7 md5=b69ee5a5ffc825ff6d7970a62dcae46a sha256=6641a438972acdc8113957c25a17db55d6d9c3ce037ed3ac5337ac6ee153d73f +[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08-rev2.zip] +md5=2283368c079076b3e2d53cff854ca047 +sha256=505a77bda0011a1968a5a5c764cdbe81c536b1c8863f4dd31545735f5056497e + +[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08.zip] +md5=850aabefe44682167cad5e57b6145ac3 +sha256=0e8cb79d14e2e3c82f311c052ea2e22cc380f9a97af1d259d25e2605e3237885 + [ftp://ftp.elmeg.de/artem/ClientCards/11b/linux/wl_lkm_718_release.tar.gz] md5=049c6c3d410e9f46884627b57485d3e7 sha256=a28c7ea94d57a5354b7de06cf5f6416d80a40596911c129d4b6a4087dc916831 @@ -27054,6 +27138,10 @@ sha256=7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f md5=66d60febc62a01bafac9bb3a35fb37ae sha256=f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63 +[http://www.xchat.org/files/source/2.8/xchat-2.8.6.tar.bz2] +md5=1f2670865d43a23a9abc596dde999aca +sha256=8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d + [http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.0.1.tar.bz2] md5=2c6ecedb10dc51adbb64c95f22fd99c2 sha256=3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc @@ -27534,6 +27622,10 @@ sha256=63606119e86c27b47bd7ec4b2b6048b76515df6755fc5dd8bcfc98f5fe53d994 md5=e926692d74ee81ed459d0fe89439ff8b sha256=433fd29043cd427ba486bcce471aae3ad1abca94c8682feff92da0c380b8dff3 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.6.tar.bz2] +md5=bc4b2356e1dbf2d21e1e95249b18f5f8 +sha256=dbf3799e207175e91f50492d51343e5cfdc706f637f6e9f14257b764e86bb3f9 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.0.tar.bz2] md5=21dac6461379d67ee3b333c77f63e7bf sha256=6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8 @@ -28938,6 +29030,10 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83 md5=73a366b9892152266b465d7d9c35bef4 sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83 +[http://mocha.xfce.org/archive/src/xfce/xfce4-panel/4.6/xfce4-panel-4.6.2.tar.bz2] +md5=88352816c84cbea57121b0c478976976 +sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b + [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2] md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6 @@ -30146,6 +30242,10 @@ sha256=a3cfc867672924f27d5ed39a99bc089cc9417d193513984f0a081a92230e947b md5=9bcab80b474d5454477d1ca166a68c34 sha256=27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1 +[https://launchpad.net/ubuntu/karmic/+source/xubuntu-artwork/0.38/+files/xubuntu-artwork_0.38.tar.gz] +md5=38626b5ae9abfe00428a5f0a265d5177 +sha256=8a73aea3fcb2b33968bc12f28befbf7a83c5d45fe1898e54855f095538238b8d + [http://downloads.sourceforge.net/xvidcap/xvidcap-1.1.6.tar.gz] md5=c6add7ae452e5cecbdda6e55e7c67cdb sha256=17ca7b7f8ce12f7e312b2abc2da7f381dc0e964cdac6312631cd7987f02b9fba diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 2f22a7d91d..b57ea4d673 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -22,6 +22,7 @@ SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-bootchart-lite ?= "4" SRCREV_pn-bubble-keyboard ?= "194" SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +SRCREV_pn-cdparanoia ?= "16684" SRCREV_pn-clutter-box2d ?= "3197" SRCREV_pn-clutter-cairo ?= "3210" SRCREV_pn-clutter-gst ?= "3188" @@ -41,9 +42,6 @@ SRCREV_pn-diversity-radar ?= "453" SRCREV_pn-eds-dbus ?= "736" SRCREV_pn-enlazar ?= "37" SRCREV_pn-essential-dialer ?= "194" -SRCREV_pn-exalt ?= "79" -SRCREV_pn-exalt-daemon ?= "78" -SRCREV_pn-exalt-module ?= "78" SRCREV_pn-ezx-boot-usb-native ?= "2371" SRCREV_pn-ezx-gen-blob ?= "2426" SRCREV_pn-ezxd ?= "2074" @@ -80,8 +78,6 @@ SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libefso ?= "194" -SRCREV_pn-libexalt ?= "78" -SRCREV_pn-libexalt-dbus ?= "76" SRCREV_pn-libfakekey ?= "1455" SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" SRCREV_pn-libgee ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6" @@ -113,6 +109,7 @@ SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3" SRCREV_pn-maemo-mapper ?= "118" SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04" SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9" +SRCREV_pn-matchbox-config-gtk ?= "1614" SRCREV_pn-matchbox-desktop-2 ?= "2096" SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" @@ -187,9 +184,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opkg ?= "219" -SRCREV_pn-opkg-native ?= "219" -SRCREV_pn-opkg-sdk ?= "219" +SRCREV_pn-opkg ?= "240" +SRCREV_pn-opkg-native ?= "240" +SRCREV_pn-opkg-sdk ?= "240" SRCREV_pn-opkg-utils ?= "4578" SRCREV_pn-opkg-utils-native ?= "4595" SRCREV_pn-oprofileui ?= "173" @@ -232,6 +229,7 @@ SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" +SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "5394" @@ -242,7 +240,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "43038" +EFL_SRCREV ?= "43437" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" @@ -313,4 +311,8 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}" SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}" SRCREV_pn-waker ?= "${EFL_SRCREV}" +#exalt +SRCREV_pn-exalt ?= "${EFL_SRCREV}" +SRCREV_pn-exalt-client ?= "${EFL_SRCREV}" + require conf/distro/include/sane-srcrevs-fso.inc diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf index f7a60b4be4..0ee57c407f 100644 --- a/conf/machine/am3517-evm.conf +++ b/conf/machine/am3517-evm.conf @@ -18,7 +18,6 @@ require conf/machine/include/omap3.inc PACKAGE_EXTRA_ARCHS += "omap3517-evm" # Ship all kernel modules -MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules" IMAGE_FSTYPES ?= "jffs2 tar.bz2" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 69cdec6f1f..a5de68e0af 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -41,6 +41,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" -MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " # and sdio MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/igep0020.conf b/conf/machine/igep0020.conf index deb17233cc..55c18507c3 100644 --- a/conf/machine/igep0020.conf +++ b/conf/machine/igep0020.conf @@ -41,5 +41,4 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" # UBI: sub-page size: 512 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" -# MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index 20f53bf643..f91607cf76 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r11" +MACHINE_KERNEL_PR = "r12" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index bb750aad98..e87b56c282 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -11,8 +11,6 @@ UBOOT_LOADADDRESS = "0x80008000" # Only build u-boot, xload is optional EXTRA_IMAGEDEPENDS += "u-boot" -MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " - # TI DVSDK stuff: CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo" CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc index 2a583fe6e4..fe57c9ccc0 100644 --- a/conf/machine/include/tune-strongarm.inc +++ b/conf/machine/include/tune-strongarm.inc @@ -2,8 +2,7 @@ # gcc does not differentiate between the different Strongarm versions, so neither do we # http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html -ARM_ABI = "oabi" TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" -FEED_ARCH = "arm-oabi" -PACKAGE_BASE_ARCH = "armv4" -PACKAGE_EXTRA_ARCHS += "armv4 " +FEED_ARCH = "armv4" +BASE_PACKAGE_ARCH = "armv4" +PACKAGE_EXTRA_ARCHS += "armv4" diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf index b06cb319ca..c896fa0b02 100644 --- a/conf/machine/omap3-pandora.conf +++ b/conf/machine/omap3-pandora.conf @@ -1,33 +1,74 @@ #@TYPE: Machine #@NAME: OMAP3 based Pandora Handheld Console #@DESCRIPTION: Machine configuration for the Pandora http://www.openpandora.org/ Handheld Console +#@MAINTAINER: John Willis TARGET_ARCH = "arm" -require conf/machine/include/omap3.inc + PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -XSERVER = "xserver-xorg \ - xf86-input-evdev \ - xf86-input-tslib \ - xf86-video-omapfb \ - " -#What is the correct one, both seem in use? -MACHINE_GUI_CLASS = "bigscreen" -GUI_MACHINE_CLASS = "bigscreen" +XSERVER = " \ + xserver-xorg \ + xserver-xorg-extension-glx \ + xserver-xorg-extension-dri \ + xf86-input-evtouch \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-video-omapfb \ +" #800 * 480 Widescreen +GUI_MACHINE_CLASS = "bigscreen" +MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "800" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" -# Ship all kernel modules -MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules" - -IMAGE_FSTYPES += "jffs2 tar.bz2" -EXTRA_IMAGECMD_jffs2 = "-lnp " +#IMAGE_FSTYPES += "tar.bz2 ubi" +IMAGE_FSTYPES = "tar.bz2" +#EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyS0" -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen bluetooth wifi" +require conf/machine/include/omap3.inc + +# Put it below omap3.inc as we override the kernel here +PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" + +# Use our 'Powered by Angstrom' splash for the images. +PREFERRED_PROVIDER_virtual/psplash = "psplash-omap3pandora" + +KERNEL_IMAGETYPE = "uImage" + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" +UBOOT_ARCH = "arm" +UBOOT_MACHINE = "omap3_pandora_config" + +PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora" +PREFERRED_PROVIDER_x-load = "x-load-omap3pandora" + +EXTRA_IMAGEDEPENDS += "u-boot" +EXTRA_IMAGEDEPENDS += "x-load" + +PREFERRED_VERSION_libgles-omap3 = "3.00.00.09" + +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf index 3595383f03..2839b7ddf6 100644 --- a/conf/machine/omap3-touchbook.conf +++ b/conf/machine/omap3-touchbook.conf @@ -45,6 +45,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" -MACHINE_EXTRA_RRECOMMENDS = " rt3070 omap3-sgx-modules " # and sdio MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen" diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf index ad410fae4c..097904d886 100644 --- a/conf/machine/omap3evm.conf +++ b/conf/machine/omap3evm.conf @@ -16,7 +16,6 @@ GUI_MACHINE_CLASS = "smallscreen" require conf/machine/include/omap3.inc # Ship all kernel modules -MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules" IMAGE_FSTYPES ?= "jffs2 tar.bz2" EXTRA_IMAGECMD_jffs2 = "-lnp " diff --git a/conf/machine/omapzoom.conf b/conf/machine/omapzoom.conf index 4ca164e633..4732f68c98 100644 --- a/conf/machine/omapzoom.conf +++ b/conf/machine/omapzoom.conf @@ -52,6 +52,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" #EXTRA_IMAGEDEPENDS += "u-boot x-load" -#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " # and sdio MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/omapzoom2.conf b/conf/machine/omapzoom2.conf index 7d0a72b5d7..749339faea 100644 --- a/conf/machine/omapzoom2.conf +++ b/conf/machine/omapzoom2.conf @@ -50,7 +50,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" #EXTRA_IMAGEDEPENDS += "u-boot x-load" -#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " MACHINE_EXTRA_RRECOMMENDS = "" # and sdio MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/palmpre.conf b/conf/machine/palmpre.conf index c7baaedd2d..dccc892472 100644 --- a/conf/machine/palmpre.conf +++ b/conf/machine/palmpre.conf @@ -26,6 +26,5 @@ IMAGE_FSTYPES += "tar.bz2" # Let's keep the following three from the beagleboard machine config UBOOT_MACHINE = "omap3_beagle_config" PREFERRED_VERSION_u-boot = "git" -#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone bluetooth touchscreen keyboard wifi" diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 38f2c365cf..7f3dff0dd3 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -70,7 +70,7 @@ fi for machine in ${ARCH_MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free iso-codes perl perl-native python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS=" \ abiword \ aircrack-ng \ diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index 1e787a4ffa..758fee9acd 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -33,7 +33,7 @@ echo "Removing duplicate packages in unsorted" cat files-duplicate | xargs rm -f # Log remaining packages to a file -find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v angstrom-version | grep -v locale > new-files.txt +find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v -- -static | grep -v angstrom-version | grep -v locale > new-files.txt for newfile in $(cat new-files.txt | sed s:./::g) ; do echo "$(date -u +%s) $newfile $(basename ${PWD})" >> ../upload-full.txt done diff --git a/recipes/abiword/abiword_2.8.0.bb b/recipes/abiword/abiword_2.8.1.bb index 546e29cd64..8f9bbee2ee 100644 --- a/recipes/abiword/abiword_2.8.0.bb +++ b/recipes/abiword/abiword_2.8.1.bb @@ -1,6 +1,6 @@ require abiword-2.5.inc -PR = "r1" +PR = "r2" SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" @@ -17,7 +17,7 @@ EXTRA_OECONF = " --disable-static \ RCONFLICTS = "abiword-embedded" -FILES_${PN} += "${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml" +FILES_${PN} += "${libdir}/libabiword-*.so ${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/certs ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml" FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" diff --git a/recipes/angstrom/angstrom-uboot-scripts.bb b/recipes/angstrom/angstrom-uboot-scripts.bb index bcdba45d9f..d4c6347aeb 100644 --- a/recipes/angstrom/angstrom-uboot-scripts.bb +++ b/recipes/angstrom/angstrom-uboot-scripts.bb @@ -1,5 +1,7 @@ DESCRIPTION = "Various uboot scripts" +PR = "r1" + DEPENDS = "u-boot-mkimage-native" SRC_URI = "file://*.cmd" diff --git a/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd index 3ba551e015..79287445e1 100644 --- a/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd +++ b/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd @@ -1,4 +1,4 @@ setenv vram '16M' -setenv dvimode 'hd720 mem=88M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:8M,1:4M,2:4M' +setenv dvimode 'hd720 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:8M,1:4M,2:4M' run loaduimage run mmcboot diff --git a/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd b/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd index 8991e704a4..cd43f1f03b 100644 --- a/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd +++ b/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd @@ -1,4 +1,4 @@ mmcinit fatload mmc 0 0x82000000 uImage -setenv bootargs 'console=tty1 omapfb.vrfb=1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=88M@0x80000000 mem=128M@0x88000000 vram=18M omapfb.vram=0:10M,1:4M,2:4M' +setenv bootargs 'console=tty1 omapfb.vrfb=1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=99M@0x80000000 mem=128M@0x88000000 vram=18M omapfb.vram=0:10M,1:4M,2:4M' bootm diff --git a/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd b/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd index 4702d3f393..0a9c743bc9 100644 --- a/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd +++ b/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd @@ -1,4 +1,4 @@ mmcinit fatload mmc 0 0x82000000 uImage -setenv bootargs 'console=tty1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=88M@0x80000000 mem=128M@0x88000000 vram=16M omapfb.vram=0:8M,1:4M,2:4M' +setenv bootargs 'console=tty1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=99M@0x80000000 mem=128M@0x88000000 vram=18M omapfb.vram=0:10M,1:4M,2:4M' bootm diff --git a/recipes/autofs/autofs.inc b/recipes/autofs/autofs.inc new file mode 100644 index 0000000000..badadb524a --- /dev/null +++ b/recipes/autofs/autofs.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Kernel based automounter for linux." +SECTION = "base" +LICENSE = "GPL" +INC_PR = "r4" +EXTRA_OEMAKE += "'RANLIB=${RANLIB}'" + +inherit autotools + +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + cp aclocal.m4 acinclude.m4 + fi +} + +do_install () { + install -d ${D}${mandir}/man5 ${D}${mandir}/man8 \ + ${D}${sbindir} + oe_runmake 'INSTALLROOT=${D}' install +} diff --git a/recipes/autofs/autofs_3.1.7.bb b/recipes/autofs/autofs_3.1.7.bb index 05481ed46c..10840d8d33 100644 --- a/recipes/autofs/autofs_3.1.7.bb +++ b/recipes/autofs/autofs_3.1.7.bb @@ -1,18 +1,4 @@ -DESCRIPTION = "Kernel based automounter for linux." -SECTION = "base" -LICENSE = "GPL" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2" - -inherit autotools +require autofs.inc -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cp aclocal.m4 acinclude.m4 - fi -} - -do_install () { - install -d ${D}${mandir}/man5 ${D}${mandir}/man8 \ - ${D}${sbindir} - oe_runmake 'INSTALLROOT=${D}' install -} +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2" +PR = "${INC_PR}" diff --git a/recipes/autofs/autofs_4.0.0.bb b/recipes/autofs/autofs_4.0.0.bb index 6033b8a09a..b08d6aa3bf 100644 --- a/recipes/autofs/autofs_4.0.0.bb +++ b/recipes/autofs/autofs_4.0.0.bb @@ -1,17 +1,4 @@ -DESCRIPTION = "Kernel based automounter for linux." -SECTION = "base" -LICENSE = "GPL" +require autofs.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/old/autofs-${PV}-1.tar.bz2" - -inherit autotools - -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cp aclocal.m4 acinclude.m4 - fi -} - -do_install () { - oe_runmake 'INSTALLROOT=${D}' install -} +PR = "${INC_PR}" diff --git a/recipes/autofs/autofs_4.1.4.bb b/recipes/autofs/autofs_4.1.4.bb index 2f998ab220..0ec818a046 100644 --- a/recipes/autofs/autofs_4.1.4.bb +++ b/recipes/autofs/autofs_4.1.4.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "Kernel based automounter for linux." -SECTION = "base" -LICENSE = "GPL" - -PR = "r3" +require autofs.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \ @@ -14,8 +10,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 file://auto.net-sort-option-fix.patch;patch=1 \ file://autofs-additional-distros.patch;patch=1 \ file://no-bash.patch;patch=1" +PR = "${INC_PR}" -inherit autotools update-rc.d +inherit update-rc.d INITSCRIPT_NAME = "autofs" INITSCRIPT_PARAMS = "defaults" @@ -24,13 +21,3 @@ INITSCRIPT_PARAMS = "defaults" CFLAGS += "${LDFLAGS}" EXTRA_OEMAKE = "STRIP=/bin/true" PARALLEL_MAKE = "" - -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cp aclocal.m4 acinclude.m4 - fi -} - -do_install () { - oe_runmake 'INSTALLROOT=${D}' install -} diff --git a/recipes/avahi/avahi-python_0.6.25.bb b/recipes/avahi/avahi-python_0.6.25.bb new file mode 100644 index 0000000000..9c9e77d54e --- /dev/null +++ b/recipes/avahi/avahi-python_0.6.25.bb @@ -0,0 +1,19 @@ +require avahi.inc + +PR = "r1" + +# FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built +FILES_avahi-discover = "" + +PROVIDES = "avahi" +DEPENDS += "python-native" + +SRC_URI += "file://configure-check-pymod.patch;patch=1" + +S = "${WORKDIR}/avahi-${PV}" + +RDEPENDS_avahi-discover = "python-avahi python-pygtk" +RDEPENDS_python-avahi = "python-dbus" +PACKAGES =+ "python-avahi" + +AVAHI_PYTHON = "--enable-python" diff --git a/recipes/avahi/avahi-ui_0.6.25.bb b/recipes/avahi/avahi-ui_0.6.25.bb new file mode 100644 index 0000000000..966958d597 --- /dev/null +++ b/recipes/avahi/avahi-ui_0.6.25.bb @@ -0,0 +1,20 @@ +require avahi.inc + +PR = "r1" + +DEPENDS += "avahi gtk+" + +AVAHI_GTK = "--enable-gtk" + +S = "${WORKDIR}/avahi-${PV}" + +do_stage() { + install -d ${STAGING_INCDIR}/avahi-ui + cp ${S}/avahi-ui/*.h ${STAGING_INCDIR}/avahi-ui/ + oe_libinstall -C avahi-ui -a -so libavahi-ui ${STAGING_LIBDIR} +} + +PACKAGES = "${PN} ${PN}-dbg" + +FILES_${PN} = "${libdir}/libavahi-ui*.so.*" +FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*" diff --git a/recipes/avahi/avahi_0.6.25.bb b/recipes/avahi/avahi_0.6.25.bb new file mode 100644 index 0000000000..61a62a54a4 --- /dev/null +++ b/recipes/avahi/avahi_0.6.25.bb @@ -0,0 +1,7 @@ +require avahi.inc + +PR = "r1" + +DEPENDS += "intltool-native" + +PACKAGES =+ "libavahi-gobject" diff --git a/recipes/binutils/binutils-cross-sdk.inc b/recipes/binutils/binutils-cross-sdk.inc index da00965241..4d5a6df493 100644 --- a/recipes/binutils/binutils-cross-sdk.inc +++ b/recipes/binutils/binutils-cross-sdk.inc @@ -6,9 +6,6 @@ EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \ --enable-install-libbfd \ --disable-werror" -# In case we end up with a .debug dir -FILES_${PN}-dbg += "${prefix}/${HOST_PREFIX}${BUILD_SYS}/${TARGET_SYS}/lib/.debug/*" - do_stage() { : } diff --git a/recipes/boost/boost-14x.inc b/recipes/boost/boost-14x.inc new file mode 100644 index 0000000000..b1a5f6bb65 --- /dev/null +++ b/recipes/boost/boost-14x.inc @@ -0,0 +1,83 @@ +# The Boost web site provides free peer-reviewed portable +# C++ source libraries. The emphasis is on libraries which +# work well with the C++ Standard Library. The libraries are +# intended to be widely useful, and are in regular use by +# thousands of programmers across a broad spectrum of applications. +DESCRIPTION = "Free peer-reviewed portable C++ source libraries" +HOMEPAGE = "http://www.boost.org/" +SECTION = "libs" +DEPENDS = "zlib bzip2 python expat" +PRIORITY = "optional" +LICENSE = "Boost Software License" +PR = "r0" + +ARM_INSTRUCTION_SET = "arm" +BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" +BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" + +inherit cmake + +EXTRA_OECMAKE = "-DBUILD_SHARED=ON \ + -DBUILD_MULTI_THREADED=ON \ + -DBUILD_RELEASE=ON \ + -DBUILD_DEBUG=OFF \ + " + +BOOST_LIBS = "\ + date_time \ + filesystem \ + graph \ + iostreams \ + program_options \ + python \ + regex \ + serialization \ + signals \ + system \ + test \ + thread \ + " + +# FIXME: for some reason this fails on powerpc +#BOOST_LIBS += "serialization" + +# To enable python, uncomment the following: +#BOOST_LIBS += "python" +#DEPENDS += "python" +#PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" +#PYTHON_VERSION = "2.5" + +S = "${WORKDIR}/${BOOST_P}" + +# Make a package for each library, plus -dev +PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" +python __anonymous () { + import bb + + packages = [] + extras = [] + for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ): + pkg = "boost-%s" % lib.replace("_", "-") + extras.append("--with-%s" % lib) + packages.append(pkg) + if not bb.data.getVar("FILES_%s" % pkg, d, 1): + bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so*" % lib, d) + bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) + bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) +} + +# Override the contents of specific packages +FILES_boost-serialization = "${libdir}/libboost_serialization*.so* \ + ${libdir}/libboost_wserialization*.so*" +FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so \ + ${libdir}/libboost_unit_test_framework*.so*" + +# -dev last to pick up the remaining stuff +PACKAGES += "${PN}-dev" +FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" + +# "boost" is a metapackage which pulls in all boost librabries +PACKAGES += "${PN}" +RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" + diff --git a/recipes/boost/boost_1.40.0.bb b/recipes/boost/boost_1.40.0.bb new file mode 100644 index 0000000000..5db3b4a301 --- /dev/null +++ b/recipes/boost/boost_1.40.0.bb @@ -0,0 +1,10 @@ +require boost-14x.inc + +PR = "r0" + +SRC_URI = "http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz \ + file://uclibc.patch;patch=1 \ + " +S = "${WORKDIR}/boost-1.40.0.cmake2" + +DEFAULT_PREFERENCE = "-1" diff --git a/recipes/boost/files/uclibc.patch b/recipes/boost/files/uclibc.patch new file mode 100644 index 0000000000..738b8b947d --- /dev/null +++ b/recipes/boost/files/uclibc.patch @@ -0,0 +1,13 @@ +Index: boost-1.40.0.cmake2/libs/thread/src/pthread/thread.cpp +=================================================================== +--- boost-1.40.0.cmake2.orig/libs/thread/src/pthread/thread.cpp 2009-11-03 21:33:21.392444361 +0100 ++++ boost-1.40.0.cmake2/libs/thread/src/pthread/thread.cpp 2009-11-03 21:36:04.748684550 +0100 +@@ -390,7 +390,7 @@ + { + #if defined(PTW32_VERSION) || defined(__hpux) + return pthread_num_processors_np(); +-#elif defined(__linux__) ++#elif defined(__linux__) && !defined(__UCLIBC__) + return get_nprocs(); + #elif defined(__APPLE__) || defined(__FreeBSD__) + int count; diff --git a/recipes/busybox/busybox-1.11.3/iptunnel.patch b/recipes/busybox/busybox-1.11.3/iptunnel.patch new file mode 100644 index 0000000000..18734fc527 --- /dev/null +++ b/recipes/busybox/busybox-1.11.3/iptunnel.patch @@ -0,0 +1,11 @@ +diff -Nurd busybox-1.11.3.orig//networking/libiproute/iptunnel.c busybox-1.11.3/networking/libiproute/iptunnel.c +--- busybox-1.11.3.orig//networking/libiproute/iptunnel.c 2009-10-29 12:49:58.000000000 +0100 ++++ busybox-1.11.3/networking/libiproute/iptunnel.c 2009-10-29 12:50:33.000000000 +0100 +@@ -21,6 +21,7 @@ + #ifndef __constant_htons + #define __constant_htons htons + #endif ++#include <asm/byteorder.h> + #include <linux/if_tunnel.h> + + #include "ip_common.h" /* #include "libbb.h" is inside */ diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index 0ff65a41bc..753b402bee 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -11,7 +11,7 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -INC_PR = "r22" +INC_PR = "r23" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --git a/recipes/busybox/busybox_1.11.3.bb b/recipes/busybox/busybox_1.11.3.bb index 293608bcb3..0ec753f951 100644 --- a/recipes/busybox/busybox_1.11.3.bb +++ b/recipes/busybox/busybox_1.11.3.bb @@ -7,6 +7,7 @@ SRC_URI = "\ file://udhcpscript.patch;patch=1 \ file://B921600.patch;patch=1 \ file://fdisk_lineedit_segfault.patch;patch=1 \ + file://iptunnel.patch;patch=1 \ file://busybox-appletlib-dependency.patch;patch=1 \ file://busybox-cron \ file://busybox-httpd \ diff --git a/recipes/cdparanoia/cdparanoia_svn.bb b/recipes/cdparanoia/cdparanoia_svn.bb new file mode 100644 index 0000000000..d3358a64e3 --- /dev/null +++ b/recipes/cdparanoia/cdparanoia_svn.bb @@ -0,0 +1,35 @@ +# cdparanoia OE build file +# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +PR ="r0" +LICENSE="GPL" + +PV = "10.2+svn${SRCREV}" + +SRC_URI="svn://svn.xiph.org/trunk;module=cdparanoia;proto=http \ + file://fixes10.patch;patch=1 \ + file://Makefile.in.patch;patch=1 \ + file://interface_Makefile.in.patch;patch=1 \ + file://paranoia_Makefile.in.patch;patch=1 " + +S="${WORKDIR}/cdparanoia" + +PARALLEL_MAKE = "" + +inherit autotools + +do_install() { + oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ + INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install +} + +do_stage() { + install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} + + install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} + install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} + + oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} + oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} +} diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb new file mode 100644 index 0000000000..26b7b82798 --- /dev/null +++ b/recipes/connman/connman_0.46.bb @@ -0,0 +1,37 @@ +require connman.inc + +PR = "r1" + +EXTRA_OECONF += "\ + --disable-gtk-doc \ + --enable-debug \ + --enable-threads \ + --enable-loopback \ + --enable-ethernet \ + --enable-wifi \ + --disable-wimax \ + --enable-bluetooth \ + --enable-udhcp \ + --enable-dhclient \ + --enable-resolvconf \ + --enable-dnsproxy \ + --disable-novatel \ + --disable-huawei \ + --disable-hso \ + --enable-ppp \ +# needs udev >= 129 + --disable-udev \ + --disable-polkit \ + --enable-client \ + --enable-fake \ +# --with-udhcpc=PROGRAM \ +# --with-dhclient=PROGRAM \ +# --with-resolvconf=PROGRAM \ +# --with-pppd=PROGRAM \ +" + +SRC_URI = "\ + http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ + file://connman \ +" + diff --git a/recipes/e17/exalt-client_svn.bb b/recipes/e17/exalt-client_svn.bb new file mode 100644 index 0000000000..469a95554a --- /dev/null +++ b/recipes/e17/exalt-client_svn.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPLv2" +PV = "0.0.1+svnr${SRCREV}" + +require e-module.inc + +DEPENDS += "elementary exalt edje-native" + +CFLAGS += " -I${STAGING_INCDIR}/exalt -I${STAGING_INCDIR}/exalt_dbus" + +do_configure_prepend() { + sed -i -e /po/d configure.ac + sed -i -e s:\ po::g Makefile.am +} + +FILES_${PN} += "${libdir}/enlightenment/modules/*/*.desktop \ + ${libdir}/enlightenment/modules/*/*.edj \ + ${libdir}/enlightenment/modules/*/*/*.so" + +FILES_${PN}-static += "${libdir}/enlightenment/modules/*/*/*.a" +FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.la" +FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug" + + diff --git a/recipes/e17/exalt_svn.bb b/recipes/e17/exalt_svn.bb new file mode 100644 index 0000000000..8868296736 --- /dev/null +++ b/recipes/e17/exalt_svn.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Exalt is a network manager for the windows manager Enlightenment DR17." +HOMEPAGE = "http://watchwolf.fr/wiki/doku.php?id=exalt" + +LICENSE = "LGPLv2" +DEPENDS = "elementary vpnc wpa-supplicant ecore eet edbus" +RDEPENDS = "vpnc wpa-supplicant" + +PV = "0.9+svnr${SRCREV}" + +inherit e + +EXTRA_OECONF = " \ +--with-wpa_supplicant=${sbindir}/wpa_supplicant \ +--with-vpnc=${sbindir}/vpnc \ +--with-vpnc-disconnect=${sbindir}/vpnc-disconnect \ +" + +do_install_append() { + # install dbus config file + install -d ${D}${sysconfdir}/dbus-1/system.d/ + install -m 0644 data/daemon/dbus/exalt.conf ${D}${sysconfdir}/dbus-1/system.d/exalt.conf + + # install dbus service file + install -d ${D}${datadir}/dbus-1/system-services/ + install -m 0644 org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/ +} + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${datadir}/dbus-1" + diff --git a/recipes/e17/expedite_svn.bb b/recipes/e17/expedite_svn.bb index c4dfa5afed..2bcc6d9877 100644 --- a/recipes/e17/expedite_svn.bb +++ b/recipes/e17/expedite_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" DEPENDS = "eet evas" -RDEPENDS = "evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png" +RDEPENDS = "expedite-themes evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png" LICENSE = "MIT BSD" PV = "0.6.0+svnr${SRCREV}" -PR = "r1" +PR = "r3" inherit e @@ -13,7 +13,6 @@ EXTRA_OECONF = "\ --enable-simple-x11 \ \ --disable-opengl-glew \ - --disable-opengl-x11 \ --enable-software-x11 \ --enable-xrender-x11 \ --enable-software-16-x11 \ diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc index 55774ee7ad..833d38f240 100644 --- a/recipes/efl1/evas.inc +++ b/recipes/efl1/evas.inc @@ -29,12 +29,12 @@ do_install_append() { find "${D}" -name .debug -type d -exec rm -rf {} \; } -FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la" -FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" +FILES_${SRCNAME}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la" +FILES_${SRCNAME}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*" -RRECOMMENDS_${PN} = "\ +RRECOMMENDS_${SRCNAME} = "\ evas-engine-buffer \ evas-engine-fb \ evas-engine-software-generic \ @@ -51,9 +51,9 @@ RRECOMMENDS_${PN} = "\ # Some upgrade path tweaking AUTO_LIBNAME_PKGS = "" -RREPLACES_${PN} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0" +RREPLACES_${SRCNAME} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0" -RREPLACES_${PN}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests" +RREPLACES_${SRCNAME}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests" RREPLACES_evas-loader-pmaps = "liblibevas-ver-pre-svn-00-loader-pmaps libevas-ver-pre-svn-00-loader-pmaps " RREPLACES_evas-loader-eet = "liblibevas-ver-pre-svn-00-loader-eet libevas-ver-pre-svn-00-loader-eet " @@ -79,6 +79,6 @@ RREPLACES_evas-engine-software-x11 = "liblibevas-ver-pre-svn-00-engine-software- # disabling this, since (due to OE bugs) it drags in whole Gtk+ -#RRECOMMENDS_${PN} += "\ +#RRECOMMENDS_${SRCNAME} += "\ # libevas-loader-svg \ #" diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb index f84bd48f7a..21779818ca 100644 --- a/recipes/efl1/evas_svn.bb +++ b/recipes/efl1/evas_svn.bb @@ -1,5 +1,8 @@ require evas.inc -PR = "r3" +PR = "r4" + +EVAS_CPU_TWEAKS = "" +EVAS_CPU_TWEAKS_armv7a = "--enable-cpu-neon" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ @@ -60,4 +63,19 @@ EXTRA_OECONF = "\ --enable-convert-32-rgb-rot-0 \ --enable-convert-32-rgb-rot-90 \ --disable-convert-32-rgb-rot-180 \ - --enable-convert-32-rgb-rot-270" + --enable-convert-32-rgb-rot-270 \ + ${EVAS_CPU_TWEAKS}" + + +# either sgx or 6410 atm +GLES ?= "sgx" + +# This is a hack to get openGL|ES 2.x support enabled for people that have the SDK headers in staging. +# We put this in the main recipe, since it will just not build the gl stuff when the headers are missing + +# If the above sentence confuse you: everything is built and configured as before if you don't have the SDK + +EXTRA_OECONF += "\ + --enable-gl-x11 --enable-gl-flavor-gles --enable-gles-variety-${GLES} \ +" + diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb index 1bd3d6e5da..d143b0ad0c 100644 --- a/recipes/eglibc/eglibc_2.10.bb +++ b/recipes/eglibc/eglibc_2.10.bb @@ -3,12 +3,13 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.10" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SVN_REV="9124" EGLIBC_BRANCH="eglibc-2_10" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_10;rev=${SVN_REV};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://armv4t-interworking.patch;patch=1 \ + file://IO-acquire-lock-fix.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb index 6b27745f65..3efcb36d37 100644 --- a/recipes/eglibc/eglibc_2.9.bb +++ b/recipes/eglibc/eglibc_2.9.bb @@ -3,12 +3,13 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.9" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" SVN_REV="8690" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://armv4t-interworking.patch;patch=1 \ + file://IO-acquire-lock-fix.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index 1988350e6b..1a91af88d8 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -SRCREV = "9123" +SRCREV = "9170" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" PV = "2.10+svnr${SRCREV}" @@ -10,6 +10,7 @@ EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://armv4t-interworking.patch;patch=1 \ + file://IO-acquire-lock-fix.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/files/IO-acquire-lock-fix.patch b/recipes/eglibc/files/IO-acquire-lock-fix.patch new file mode 100644 index 0000000000..4d3e0613b1 --- /dev/null +++ b/recipes/eglibc/files/IO-acquire-lock-fix.patch @@ -0,0 +1,15 @@ +import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html + +Index: libc/bits/stdio-lock.h +=================================================================== +--- libc.orig/bits/stdio-lock.h 2009-10-28 14:34:19.000000000 -0700 ++++ libc/bits/stdio-lock.h 2009-10-28 14:34:54.000000000 -0700 +@@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _ + _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ + _IO_flockfile (_fp) + ++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp) ++ + # define _IO_release_lock(_fp) \ + _IO_funlockfile (_fp); \ + _IO_cleanup_region_end (0) diff --git a/recipes/eject/eject_2.1.5.bb b/recipes/eject/eject_2.1.5.bb index 6d53aee9a7..f90f8e6993 100644 --- a/recipes/eject/eject_2.1.5.bb +++ b/recipes/eject/eject_2.1.5.bb @@ -1,9 +1,10 @@ DESCRIPTION = "Eject allows removable media (typically a CD-ROM, floppy disk, tape, or JAZ or ZIP disk) to be ejected under software control." +HOMEPAGE = "http://eject.sourceforge.net/" LICENSE = "GPLv2" inherit autotools gettext -SRC_URI = "http://ca.geocities.com/jefftranter@rogers.com/eject-${PV}.tar.gz" +SRC_URI = "http://sources.openembedded.org/eject-2.1.5.tar.gz" S = "${WORKDIR}/${PN}" diff --git a/recipes/exalt/exalt-daemon/init b/recipes/exalt/exalt-daemon/init deleted file mode 100644 index cbceed1793..0000000000 --- a/recipes/exalt/exalt-daemon/init +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -set -e - -#need dbus and hald - -start() { - echo -n "Starting Exalt daemon..." - start-stop-daemon --start --exec /usr/sbin/exalt-daemon \ - --pidfile /var/run/exaltd.pid - echo "done." -} - -stop() { - echo -n "Stopping Exalt daemon..." - start-stop-daemon --stop --exec /usr/sbin/exalt-daemon \ - --pidfile /var/run/exaltd.pid - echo "done." -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - sleep 2 - start - ;; - *) - echo "Usage: $(basename $0) {start|stop|restart}" - exit 1 -esac - -exit 0 diff --git a/recipes/exalt/exalt-daemon_svn.bb b/recipes/exalt/exalt-daemon_svn.bb deleted file mode 100644 index 8f5e9afa29..0000000000 --- a/recipes/exalt/exalt-daemon_svn.bb +++ /dev/null @@ -1,13 +0,0 @@ -require exalt.inc - -DEPENDS = "evas edbus libexalt" - -SRC_URI += "file://init" - -do_install_append() { - install -D -m 0755 "${WORKDIR}/init" "${D}${sysconfdir}/dbus-1/event.d/40exaltd" -} - -FILES_${PN} += "${sysconfdir}/dbus-1/event.d/" - -EXALT_MODULE = "daemon" diff --git a/recipes/exalt/exalt-module/autotools-fix.patch b/recipes/exalt/exalt-module/autotools-fix.patch deleted file mode 100644 index 8f3b3deb51..0000000000 --- a/recipes/exalt/exalt-module/autotools-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: module/Makefile.am -=================================================================== ---- module.orig/Makefile.am 2008-04-16 17:39:03.000000000 +0800 -+++ module/Makefile.am 2008-04-16 17:39:05.000000000 +0800 -@@ -26,7 +26,6 @@ - # the module .so file - INCLUDES = -I. \ - -I$(top_srcdir) \ -- -I$(includedir) \ - @EXALT_CFLAGS@ \ - @e_cflags@ - diff --git a/recipes/exalt/exalt-module_svn.bb b/recipes/exalt/exalt-module_svn.bb deleted file mode 100644 index 0a28a1a206..0000000000 --- a/recipes/exalt/exalt-module_svn.bb +++ /dev/null @@ -1,19 +0,0 @@ -require exalt.inc - -DEPENDS = "edbus libexalt-dbus" -RDEPENDS_${PN} = "exalt" - -SRC_URI += "file://autotools-fix.patch;patch=1;minrev=78" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -FILES_${PN} += "${libdir}/enlightenment/modules/module_exalt/*.edj \ - ${libdir}/enlightenment/modules/module_exalt/*/*.so \ - ${libdir}/enlightenment/modules/module_exalt/*.desktop \ - ${libdir}/enlightenment/modules/module_exalt/module_exalt" -FILES_${PN}-dev += "${libdir}/enlightenment/modules/module_exalt/*/*.a \ - ${libdir}/enlightenment/modules/module_exalt/*/*.la" -FILES_${PN}-dbg += "${libdir}/enlightenment/modules/module_exalt/*/.debug" -FILES_${PN}-locale += "${libdir}/enlightenment/modules/module_exalt/locale" - -EXALT_MODULE = "module" diff --git a/recipes/exalt/exalt.inc b/recipes/exalt/exalt.inc deleted file mode 100644 index 2e82be2d82..0000000000 --- a/recipes/exalt/exalt.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Exalt is a network manager for the windows manager Enlightenment DR17." -AUTHOR = "John Lee <john_lee@openmoko.com>" -HOMEPAGE = "http://watchwolf.fr/wiki/doku.php?id=exalt" -PV = "0.0.0+svnr${SRCREV}" - -SRC_URI = "svn://svn.berlios.de/exalt/trunk;module=${EXALT_MODULE};proto=svn" - -S = "${WORKDIR}/${EXALT_MODULE}" - -inherit autotools pkgconfig - -EXALT_MODULE ?= "${PN}" diff --git a/recipes/exalt/exalt_svn.bb b/recipes/exalt/exalt_svn.bb deleted file mode 100644 index 0ed46a2e96..0000000000 --- a/recipes/exalt/exalt_svn.bb +++ /dev/null @@ -1,4 +0,0 @@ -require exalt.inc - -DEPENDS = "ecore etk edbus libexalt libexalt-dbus" -RDEPENDS_${PN} = "exalt-daemon" diff --git a/recipes/exalt/libexalt-dbus_svn.bb b/recipes/exalt/libexalt-dbus_svn.bb deleted file mode 100644 index e40766bfe5..0000000000 --- a/recipes/exalt/libexalt-dbus_svn.bb +++ /dev/null @@ -1,9 +0,0 @@ -require exalt.inc - -DEPENDS = "ecore edbus libexalt" - -do_stage() { - autotools_stage_all -} - -EXALT_MODULE = "libexalt_dbus" diff --git a/recipes/exalt/libexalt_svn.bb b/recipes/exalt/libexalt_svn.bb deleted file mode 100644 index cd70d52c77..0000000000 --- a/recipes/exalt/libexalt_svn.bb +++ /dev/null @@ -1,8 +0,0 @@ -require exalt.inc - -DEPENDS = "ecore eet ecore edbus evas wpa-supplicant dhcp" -RDEPENDS_${PN} = "wpa-supplicant dhclient" - -do_stage() { - autotools_stage_all -} diff --git a/recipes/fastjar/fastjar-native.inc b/recipes/fastjar/fastjar-native.inc index df4d260713..e4d7084138 100644 --- a/recipes/fastjar/fastjar-native.inc +++ b/recipes/fastjar/fastjar-native.inc @@ -1,18 +1,8 @@ -DESCRIPTION = "jar replacement written in C." -HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "GPL" - -INC_PR = "r2" - DEPENDS = "zlib-native" -SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz" - S = "${WORKDIR}/fastjar-${PV}" -inherit autotools native +inherit native do_configure () { gnu-configize || die "failure running gnu-configize" diff --git a/recipes/fastjar/fastjar-native_0.95.bb b/recipes/fastjar/fastjar-native_0.95.bb index 6d2cdb4f24..342bf7ccfc 100644 --- a/recipes/fastjar/fastjar-native_0.95.bb +++ b/recipes/fastjar/fastjar-native_0.95.bb @@ -1,3 +1,4 @@ +require fastjar.inc require fastjar-native.inc PR = "${INC_PR}.1" diff --git a/recipes/fastjar/fastjar-native_0.98.bb b/recipes/fastjar/fastjar-native_0.98.bb index 6d2cdb4f24..342bf7ccfc 100644 --- a/recipes/fastjar/fastjar-native_0.98.bb +++ b/recipes/fastjar/fastjar-native_0.98.bb @@ -1,3 +1,4 @@ +require fastjar.inc require fastjar-native.inc PR = "${INC_PR}.1" diff --git a/recipes/fastjar/fastjar.inc b/recipes/fastjar/fastjar.inc new file mode 100644 index 0000000000..7c5439edb4 --- /dev/null +++ b/recipes/fastjar/fastjar.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "jar replacement written in C." +HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "zlib" + +INC_PR = "r3" + +SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz" + +inherit autotools + +PACKAGES =+ "${PN}-grepjar" +FILES_${PN}-grepjar = "${bindir}/grepjar" diff --git a/recipes/fastjar/fastjar_0.98.bb b/recipes/fastjar/fastjar_0.98.bb new file mode 100644 index 0000000000..35392f23ee --- /dev/null +++ b/recipes/fastjar/fastjar_0.98.bb @@ -0,0 +1 @@ +require fastjar.inc diff --git a/recipes/gnome-mplayer/gecko-mediaplayer/gecko-mplayer-svn.diff b/recipes/gnome-mplayer/gecko-mediaplayer/gecko-mplayer-svn.diff new file mode 100644 index 0000000000..929d02540a --- /dev/null +++ b/recipes/gnome-mplayer/gecko-mediaplayer/gecko-mplayer-svn.diff @@ -0,0 +1,480 @@ +Index: configure +=================================================================== +--- configure (revision 328) ++++ configure (working copy) +@@ -639,6 +639,7 @@ + am__EXEEXT_TRUE + LTLIBOBJS + LIBOBJS ++plugindir + GIO_DEFINES + GIO_LIBS + GIO_CFLAGS +@@ -775,6 +776,7 @@ + enable_schemas_install + with_gconf + with_gio ++with_plugin_dir + enable_caching + ' + ac_precious_vars='build_alias +@@ -1444,6 +1446,7 @@ + Directory for installing schema files. + --with-gconf Use Gconf to store preferences + --with-gio Use GIO for file I/O ++ --with-plugin-dir=dir Directory where plugins are stored + + Some influential environment variables: + CC C compiler command +@@ -9640,6 +9643,16 @@ + fi + + ++ ++# Check whether --with-plugin_dir was given. ++if test "${with_plugin_dir+set}" = set; then ++ withval=$with_plugin_dir; plugindir=$withval ++else ++ plugindir='$(libdir)/mozilla/plugins' ++fi ++ ++ ++ + # Check whether --enable-caching was given. + if test "${enable_caching+set}" = set; then + enableval=$enable_caching; usecache=$enableval +Index: Makefile.in +=================================================================== +--- Makefile.in (revision 328) ++++ Makefile.in (working copy) +@@ -239,6 +239,7 @@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ ++plugindir = @plugindir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +Index: configure.in +=================================================================== +--- configure.in (revision 328) ++++ configure.in (working copy) +@@ -114,6 +114,13 @@ + AC_SUBST(GIO_LIBS) + ]) + ++AC_ARG_WITH([plugin_dir], ++ [AS_HELP_STRING([--with-plugin-dir=dir], ++ [Directory where plugins are stored])], ++ [plugindir=$withval], ++ [plugindir='$(libdir)/mozilla/plugins']) ++AC_SUBST(plugindir) ++ + AC_ARG_ENABLE(caching, + AC_HELP_STRING([--disable-caching],[Disable caching of remote media to local storage]), + [usecache=$enableval],[usecache=yes]) +Index: src/plugin.cpp +=================================================================== +--- src/plugin.cpp (revision 328) ++++ src/plugin.cpp (working copy) +@@ -42,9 +42,9 @@ + #include "plugin_setup.h" + #include "plugin_types.h" + #include "plugin_dbus.h" +-#include "nsIPrefBranch.h" +-#include "nsIPrefService.h" +-#include "nsIServiceManager.h" ++#include <nsIPrefBranch.h> ++#include <nsIPrefService.h> ++#include <nsIServiceManager.h> + + nsIPrefBranch *prefBranch = NULL; + nsIPrefService *prefService = NULL; +@@ -170,9 +170,9 @@ + { + gchar *jscript; + +- jscript = g_strdup_printf("javascript:obj=document.getElementById('%s');" +- "e=document.createEvent('Events');" +- "e.initEvent('%s',true,true);" "obj.dispatchEvent(e);", id, event); ++ jscript = g_strdup_printf("javascript:obj_gmp=document.getElementById('%s');" ++ "e_gmp=document.createEvent('Events');" ++ "e_gmp.initEvent('%s',true,true);" "obj_gmp.dispatchEvent(e_gmp);", id, event); + NPN_GetURL(mInstance, jscript, NULL); + g_free(jscript); + } +@@ -259,6 +259,7 @@ + console(NULL), + controls(NULL), + user_agent(NULL), ++player_backend(NULL), + disable_context_menu(FALSE), + disable_fullscreen(FALSE), + post_dom_events(FALSE), +@@ -354,6 +355,8 @@ + store = gm_pref_store_new("gecko-mediaplayer"); + if (store != NULL) { + debug_level = gm_pref_store_get_int(store, DEBUG_LEVEL); ++ player_backend = gm_pref_store_get_string(store, PLAYER_BACKEND); ++ printf("Using player backend of '%s'\n",player_backend); + gm_pref_store_free(store); + } + +@@ -458,10 +461,16 @@ + } + + if (!player_launched && mWidth > 0 && mHeight > 0) { +- app_name = g_find_program_in_path("gnome-mplayer"); +- if (app_name == NULL) +- app_name = g_find_program_in_path("gnome-mplayer-minimal"); +- ++ app_name = NULL; ++ if (player_backend != NULL) { ++ app_name = g_find_program_in_path(player_backend); ++ } ++ if (app_name == NULL) { ++ app_name = g_find_program_in_path("gnome-mplayer"); ++ if (app_name == NULL) ++ app_name = g_find_program_in_path("gnome-mplayer-minimal"); ++ } ++ + argvn[arg++] = g_strdup_printf("%s", app_name); + g_free(app_name); + argvn[arg++] = g_strdup_printf("--window=%i", (gint) mWindow); +@@ -643,6 +652,14 @@ + g_free(path); + } + //printf("Leaving destroy stream src = %s\n", item->src); ++ ++ } else if (reason == NPRES_NETWORK_ERR) { ++ item = (ListItem *) stream->notifyData; ++ if (item) { ++ printf("Destroy Stream, network error, item is %s\n", item->src); ++ } else { ++ printf("Destory Stream, network error, item is NULL\n"); ++ } + } else { + item = (ListItem *) stream->notifyData; + // item = list_find(playlist, (gchar*)stream->url); +@@ -692,9 +709,19 @@ + */ + } + } else { +- if (item) ++ if (item) { + item->played = TRUE; +- if (!item->streaming) { ++ if (!item->streaming) { ++ item = list_find_next_playable(playlist); ++ if (item) { ++ if (item->retrieved) { ++ open_location(this, item, TRUE); ++ } else { ++ NPN_GetURLNotify(mInstance, item->src, NULL, item); ++ } ++ } ++ } ++ } else { + item = list_find_next_playable(playlist); + if (item) { + if (item->retrieved) { +@@ -703,7 +730,7 @@ + NPN_GetURLNotify(mInstance, item->src, NULL, item); + } + } +- } ++ } + } + } + +Index: src/Makefile.in +=================================================================== +--- src/Makefile.in (revision 328) ++++ src/Makefile.in (working copy) +@@ -57,34 +57,45 @@ + $(am__objects_1) + gecko_mediaplayer_dvx_so_OBJECTS = \ + $(am_gecko_mediaplayer_dvx_so_OBJECTS) +-gecko_mediaplayer_dvx_so_DEPENDENCIES = libgmlib/libgmlib.a ++am__DEPENDENCIES_1 = ++gecko_mediaplayer_dvx_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_dvx_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_dvx_so_LDFLAGS) $(LDFLAGS) -o $@ + am_gecko_mediaplayer_qt_so_OBJECTS = plugin_types_qt.$(OBJEXT) \ + $(am__objects_1) + gecko_mediaplayer_qt_so_OBJECTS = \ + $(am_gecko_mediaplayer_qt_so_OBJECTS) +-gecko_mediaplayer_qt_so_DEPENDENCIES = libgmlib/libgmlib.a ++gecko_mediaplayer_qt_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_qt_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_qt_so_LDFLAGS) $(LDFLAGS) -o $@ + am_gecko_mediaplayer_rm_so_OBJECTS = plugin_types_rm.$(OBJEXT) \ + $(am__objects_1) + gecko_mediaplayer_rm_so_OBJECTS = \ + $(am_gecko_mediaplayer_rm_so_OBJECTS) +-gecko_mediaplayer_rm_so_DEPENDENCIES = libgmlib/libgmlib.a ++gecko_mediaplayer_rm_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_rm_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_rm_so_LDFLAGS) $(LDFLAGS) -o $@ + am_gecko_mediaplayer_wmp_so_OBJECTS = plugin_types_wmp.$(OBJEXT) \ + $(am__objects_1) + gecko_mediaplayer_wmp_so_OBJECTS = \ + $(am_gecko_mediaplayer_wmp_so_OBJECTS) +-gecko_mediaplayer_wmp_so_DEPENDENCIES = libgmlib/libgmlib.a ++gecko_mediaplayer_wmp_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_wmp_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_wmp_so_LDFLAGS) $(LDFLAGS) -o $@ + am_gecko_mediaplayer_so_OBJECTS = plugin_types_std.$(OBJEXT) \ + $(am__objects_1) + gecko_mediaplayer_so_OBJECTS = $(am_gecko_mediaplayer_so_OBJECTS) +-gecko_mediaplayer_so_DEPENDENCIES = libgmlib/libgmlib.a ++gecko_mediaplayer_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_so_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +@@ -265,6 +276,7 @@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ ++plugindir = @plugindir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +@@ -312,42 +324,42 @@ + npp_gate.cpp \ + npupp.h + +-install_libexecdir = $(libdir)/mozilla/plugins ++install_libexecdir = $(plugindir) + gecko_mediaplayer_so_SOURCES = \ + plugin_types_std.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_so_CFLAGS = -fPIC +-gecko_mediaplayer_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + gecko_mediaplayer_qt_so_SOURCES = \ + plugin_types_qt.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_qt_so_CFLAGS = -fPIC +-gecko_mediaplayer_qt_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + gecko_mediaplayer_wmp_so_SOURCES = \ + plugin_types_wmp.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_wmp_so_CFLAGS = -fPIC +-gecko_mediaplayer_wmp_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + gecko_mediaplayer_dvx_so_SOURCES = \ + plugin_types_dvx.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_dvx_so_CFLAGS = -fPIC +-gecko_mediaplayer_dvx_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + gecko_mediaplayer_rm_so_SOURCES = \ + plugin_types_rm.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_rm_so_CFLAGS = -fPIC +-gecko_mediaplayer_rm_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + all: all-recursive + + .SUFFIXES: +Index: src/plugin.h +=================================================================== +--- src/plugin.h (revision 328) ++++ src/plugin.h (working copy) +@@ -84,6 +84,7 @@ + #define DISABLE_DVX "disable_dvx" + #define DEBUG_LEVEL "debug_level" + #define DISABLE_MIDI "disable_midi" ++#define PLAYER_BACKEND "player_backend" + + typedef enum { + PLAYING, +@@ -189,6 +190,7 @@ + gchar *console; + gchar *controls; + gchar *user_agent; ++ gchar *player_backend; + + // events + gboolean post_dom_events; +Index: src/plugin_dbus.cpp +=================================================================== +--- src/plugin_dbus.cpp (revision 328) ++++ src/plugin_dbus.cpp (working copy) +@@ -109,6 +109,14 @@ + return DBUS_HANDLER_RESULT_HANDLED; + } + ++ if (g_ascii_strcasecmp(dbus_message_get_member(message), "ListDump") == 0) { ++ ++ printf("playlist:\n"); ++ list_dump(instance->playlist); ++ ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } ++ + if (g_ascii_strcasecmp(dbus_message_get_member(message), "RequestById") == 0) { + dbus_error_init(&error); + if (dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID)) { +@@ -773,6 +781,10 @@ + + result = TRUE; + ++ } else if (g_ascii_strcasecmp(message, "/DEBUG") == 0) { ++ ++ result = TRUE; ++ + } else { + + if (instance->playlist != NULL) { +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am (revision 328) ++++ src/Makefile.am (working copy) +@@ -39,7 +39,7 @@ + npp_gate.cpp \ + npupp.h + +-install_libexecdir = $(libdir)/mozilla/plugins ++install_libexecdir = $(plugindir) + install_libexec_PROGRAMS = \ + gecko-mediaplayer.so \ + gecko-mediaplayer-qt.so \ +@@ -52,40 +52,40 @@ + $(COMMONCODE) + + gecko_mediaplayer_so_CFLAGS = -fPIC +-gecko_mediaplayer_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + gecko_mediaplayer_qt_so_SOURCES = \ + plugin_types_qt.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_qt_so_CFLAGS = -fPIC +-gecko_mediaplayer_qt_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + gecko_mediaplayer_wmp_so_SOURCES = \ + plugin_types_wmp.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_wmp_so_CFLAGS = -fPIC +-gecko_mediaplayer_wmp_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + gecko_mediaplayer_dvx_so_SOURCES = \ + plugin_types_dvx.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_dvx_so_CFLAGS = -fPIC +-gecko_mediaplayer_dvx_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + gecko_mediaplayer_rm_so_SOURCES = \ + plugin_types_rm.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_rm_so_CFLAGS = -fPIC +-gecko_mediaplayer_rm_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + indent: + indent -kr -l100 -i4 -nut *.cpp +Index: src/plugin_list.cpp +=================================================================== +--- src/plugin_list.cpp (revision 328) ++++ src/plugin_list.cpp (working copy) +@@ -356,7 +356,7 @@ + return list; + } else { + while (p != NULL) { +- urlptr = (gchar *) memmem(p,datalen - (p - data), "url ", 4); ++ urlptr = (gchar *) memmem_compat(p,datalen - (p - data), "url ", 4); + + + if (urlptr == NULL) { +@@ -385,7 +385,7 @@ + item->id = -1; + list = g_list_append(list, newitem); + } +- p = (gchar *) memmem(urlptr,datalen - (urlptr - data),"mmdr",4); ++ p = (gchar *) memmem_compat(urlptr,datalen - (urlptr - data),"mmdr",4); + } + + } +Index: ChangeLog +=================================================================== +--- ChangeLog (revision 328) ++++ ChangeLog (working copy) +@@ -1,3 +1,11 @@ ++Developement ++ Allow for configurable backend (fosfor or gnome-mplayer or something else) ++ Make dom event javascript a little more unique ++ React to Network Errors in DestroyStream differently ++ Added /DEBUG path for debugging purposes ++ Added ListDump dbus method ++ konqueror patch from Christian.Morales.Vega ++ plugin-dir patch from Christian.Morales.Vega + 0.9.8 + When cancelling a stream (USER_BREAK) and the cancelled one is streaming + don't automatically load the next item on the playlist +Index: gecko-mediaplayer.schemas +=================================================================== +--- gecko-mediaplayer.schemas (revision 328) ++++ gecko-mediaplayer.schemas (working copy) +@@ -62,5 +62,17 @@ + </locale> + </schema> + ++ <schema> ++ <key>/schemas/apps/gecko-mediaplayer/preferences/player_backend</key> ++ <applyto>/apps/gecko-mediaplayer/preferences/player_backend</applyto> ++ <owner>gecko-mediaplayer</owner> ++ <type>string</type> ++ <default></default> ++ <locale name="C"> ++ <short>Backend to use</short> ++ <long>Backend to use</long> ++ </locale> ++ </schema> ++ + </schemalist> + </gconfschemafile> diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb index d56fb28fd7..33d0be4aa2 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb +++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb @@ -4,32 +4,29 @@ LICENSE = "GPL" DEPENDS = "firefox gtk+ gconf dbus-glib" RDEPENDS = "firefox gnome-mplayer" -PR = "r1" +PR = "r3" inherit autotools SRC_URI = "http://gecko-mediaplayer.googlecode.com/files/${P}.tar.gz \ + file://gecko-mplayer-svn.diff;patch=1;pnum=0 \ file://extensions \ " # Yes, this needs to match the firefox version you are building *exactly* -MOZILLA_HOME = firefox-3.5.2 +MOZILLA_HOME = "firefox-3.5.4" do_install_append() { - install -d ${D}${libdir}/${MOZILLA_HOME} - mv ${D}${libdir}/mozilla/plugins ${D}${libdir}/${MOZILLA_HOME} - cp -dpR ${WORKDIR}/extens* ${D}${libdir}/${MOZILLA_HOME}/ + ln -sf ${libdir}/mozilla ${D}${libdir}/${MOZILLA_HOME} + cp -dpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/ } - -#EXTRA_OEMAKE = "-I${STAGING_INCDIR}/${MOZILLA_HOME} -I${STAGING_INCDIR}/linux" - PACKAGES =+ "${PN}-firefox-hack" RDEPENDS_${PN}-firefox-hack = "${PN}" -FILES_${PN}-firefox-hack = "${libdir}/${MOZILLA_HOME}/extensions" +FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions" FILES_${PN} += "${sysconfdir}/* \ - ${libdir}/${MOZILLA_HOME}/*" -FILES_${PN}-dbg += "${libdir}/${MOZILLA_HOME}/plugins/.debug/*" + ${libdir}/mozilla/* ${libdir}/${MOZILLA_HOME}" +FILES_${PN}-dbg += "${libdir}/mozilla*/plugins/.debug/*" diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc index 5d72eb8d02..9b69f3a609 100644 --- a/recipes/gstreamer/gst-plugins.inc +++ b/recipes/gstreamer/gst-plugins.inc @@ -3,7 +3,7 @@ DESCRIPTION = "Plugins for GStreamer" DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" -INC_PR = "r6" +INC_PR = "r7" PACKAGES_DYNAMIC = "gst-plugin-*" @@ -35,7 +35,7 @@ python populate_packages_prepend () { metapkg_rdepends = [] packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.count('locale'): + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.count('locale') and not pkg.count('-static'): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) diff --git a/recipes/gthumb/gthumb_2.10.11.bb b/recipes/gthumb/gthumb_2.10.11.bb index dc75a0bfb9..94f37a04d5 100644 --- a/recipes/gthumb/gthumb_2.10.11.bb +++ b/recipes/gthumb/gthumb_2.10.11.bb @@ -5,7 +5,9 @@ DEPENDS = "gtk+ libexif libgnome libgnomeui libgnomeprintui" inherit gnome -FILES_${PN} += "${datadir}/gnome* ${datadir}/application-registry/*" +PR = "r1" + +FILES_${PN} += "${libdir}/*.so ${datadir}/gnome* ${datadir}/application-registry/*" FILES_${PN}-dbg += "${libdir}/gthumb/modules/.debug" diff --git a/recipes/images/ti-demo-x11-image.bb b/recipes/images/ti-demo-x11-image.bb new file mode 100644 index 0000000000..e37d183be9 --- /dev/null +++ b/recipes/images/ti-demo-x11-image.bb @@ -0,0 +1,31 @@ +# TI X11 demo image + +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" + +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-input-keyboard \ +" + +ANGSTROM_EXTRA_INSTALL ?= "" +SPLASH = "exquisite exquisite-themes exquisite-theme-angstrom" + +export IMAGE_BASENAME = "ti-demo-x11-image" + +DEPENDS = "task-base" +IMAGE_INSTALL = "\ + ${XSERVER} \ + ${ANGSTROM_EXTRA_INSTALL} \ + task-demo-x11 \ + ${SPLASH} \ + " + +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image + diff --git a/recipes/libgtkstylus/files/gtkstylus.sh b/recipes/libgtkstylus/files/gtkstylus.sh index b1302ede0e..623ddae84b 100644 --- a/recipes/libgtkstylus/files/gtkstylus.sh +++ b/recipes/libgtkstylus/files/gtkstylus.sh @@ -1,5 +1,5 @@ #!/bin/sh -GTK_MODULES=libgtkstylus.so +GTK_MODULES=${GTK_MODULES}:libgtkstylus.so export GTK_MODULES diff --git a/recipes/libgtkstylus/libgtkstylus_0.3.bb b/recipes/libgtkstylus/libgtkstylus_0.3.bb index e19a8a9f26..5912b2dab8 100644 --- a/recipes/libgtkstylus/libgtkstylus_0.3.bb +++ b/recipes/libgtkstylus/libgtkstylus_0.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GTK plugin for stylus based systems" SECTION = "libs" DEPENDS = "gtk+" LICENSE = "LGPL" -PR = "r5" +PR = "r6" inherit autotools @@ -16,4 +16,3 @@ do_install_append() { } FILES_${PN} = "/etc ${libdir}/gtk-2.0/*/modules/*.so*" - diff --git a/recipes/linux/linux-2.6.31/boc01/005-091008-isl12024.patch b/recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch index 401ce4d9c8..9daab5acaa 100644 --- a/recipes/linux/linux-2.6.31/boc01/005-091008-isl12024.patch +++ b/recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch @@ -1,37 +1,44 @@ +Support for the ISL12024 RTC, EEPROM and unique ID. + +Signed-off-by: Jeremy Laine <jeremy.laine@m4x.org> + Index: linux-2.6.31/drivers/misc/eeprom/at24.c =================================================================== ---- linux-2.6.31.orig/drivers/misc/eeprom/at24.c 2009-10-19 16:55:01.000000000 +0200 -+++ linux-2.6.31/drivers/misc/eeprom/at24.c 2009-10-19 16:55:05.000000000 +0200 +--- linux-2.6.31.orig/drivers/misc/eeprom/at24.c 2009-09-10 00:13:59.000000000 +0200 ++++ linux-2.6.31/drivers/misc/eeprom/at24.c 2009-11-03 11:17:22.000000000 +0100 @@ -115,6 +115,8 @@ { "spd", AT24_DEVICE_MAGIC(2048 / 8, AT24_FLAG_READONLY | AT24_FLAG_IRUGO) }, { "24c04", AT24_DEVICE_MAGIC(4096 / 8, 0) }, -+ /* Intersil RTC/Unique-ID isl12024 eeprom handled here */ ++ /* Intersil isl12024 eeprom */ + { "isl12024-eeprom", AT24_DEVICE_MAGIC(4096 / 8, AT24_FLAG_ADDR16) }, /* 24rf08 quirk is handled at i2c-core */ { "24c08", AT24_DEVICE_MAGIC(8192 / 8, 0) }, { "24c16", AT24_DEVICE_MAGIC(16384 / 8, 0) }, Index: linux-2.6.31/drivers/rtc/Kconfig =================================================================== ---- linux-2.6.31.orig/drivers/rtc/Kconfig 2009-10-19 16:55:01.000000000 +0200 -+++ linux-2.6.31/drivers/rtc/Kconfig 2009-10-19 16:55:05.000000000 +0200 -@@ -128,6 +128,12 @@ - - if I2C +--- linux-2.6.31.orig/drivers/rtc/Kconfig 2009-09-10 00:13:59.000000000 +0200 ++++ linux-2.6.31/drivers/rtc/Kconfig 2009-11-03 11:13:42.000000000 +0100 +@@ -193,6 +193,15 @@ + This driver can also be built as a module. If so, the module + will be called rtc-isl1208. +config RTC_DRV_ISL12024 -+ tristate "Intersil 12024 RTC/Unique-ID" ++ tristate "Intersil 12024" + help -+ If you say yes .... -+ This driver can also be built as a module. ++ If you say yes here you get support for the Intersil ISL12024 ++ RTC chip. This driver also exposes the chip's unique ID. ++ ++ This driver can also be built as a module. If so, the module ++ will be called rtc-isl12024. + - config RTC_DRV_DS1307 - tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025" + config RTC_DRV_X1205 + tristate "Xicor/Intersil X1205" help Index: linux-2.6.31/drivers/rtc/Makefile =================================================================== ---- linux-2.6.31.orig/drivers/rtc/Makefile 2009-10-19 16:55:01.000000000 +0200 -+++ linux-2.6.31/drivers/rtc/Makefile 2009-10-19 16:55:05.000000000 +0200 +--- linux-2.6.31.orig/drivers/rtc/Makefile 2009-09-10 00:13:59.000000000 +0200 ++++ linux-2.6.31/drivers/rtc/Makefile 2009-11-03 11:13:42.000000000 +0100 @@ -40,6 +40,7 @@ obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o @@ -43,20 +50,23 @@ Index: linux-2.6.31/drivers/rtc/Makefile Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/rtc/rtc-isl12024.c 2009-10-19 16:57:37.000000000 +0200 -@@ -0,0 +1,465 @@ ++++ linux-2.6.31/drivers/rtc/rtc-isl12024.c 2009-11-03 11:14:33.000000000 +0100 +@@ -0,0 +1,457 @@ +/* -+ * Intersil ISL12024 class driver -+ * ++ * Intersil ISL12024 rtc class driver + * + * Copyright (C) 2007, CenoSYS (www.cenosys.com). -+ * ++ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu). ++ * + * Guillaume Ligneul <guillaume.ligneul@gmail.com> + * Sylvain Giroudon <sylvain.giroudon@goobie.fr> + * Jeremy Laine <jeremy.laine@bolloretelecom.eu> + * -+ * This software program is licensed subject to the GNU General Public License -+ * (GPL).Version 2,June 1991, available at http://www.fsf.org/copyleft/gpl.html ++ * Based on rtc-x1205. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. + */ + +#include <linux/module.h> @@ -67,36 +77,7 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + +#define DRV_VERSION "0.3" + -+#define ISL12024_CCR_BASE 0x30 /* Base address of CCR */ -+#define ISL12024_ALM0_BASE 0x00 /* Base address of ALARM0 */ -+#define ISL12024_INT_AL0E 0x20 /* Alarm 0 enable */ -+ -+/* Register map */ -+ -+/* device id section */ -+#define ISL12024_REG_ID 0x20 -+ -+/* rtc section */ -+#define ISL12024_REG_HR_MIL (1<<7) /* 24h/12h mode */ -+#define ISL12024_REG_HR_PM (1<<5) /* PM/AM bit in 12h mode */ -+#define ISL12024_REG_SC 0x30 -+#define ISL12024_REG_DT 0x33 /* Date */ -+#define ISL12024_REG_MO 0x34 /* Month */ -+#define ISL12024_REG_YR 0x35 /* Year */ -+#define ISL12024_REG_DW 0x36 -+#define ISL12024_REG_Y2K 0x37 -+#define ISL12024_RTC_SECTION_LEN 8 -+ -+/* control/status section */ -+#define ISL12024_REG_SR 0x3F -+#define ISL12024_REG_SR_BAT (1<<7) /* battery */ -+#define ISL12024_REG_SR_AL1 (1<<6) /* alarm 0 */ -+#define ISL12024_REG_SR_AL0 (1<<5) /* alarm 1 */ -+#define ISL12024_REG_SR_OSCF (1<<4) /* oscillator fail */ -+#define ISL12024_REG_SR_RWEL (1<<2) /* register write enable latch */ -+#define ISL12024_REG_SR_WEL (1<<1) /* write enable latch */ -+#define ISL12024_REG_SR_RTCF (1<<0) /* rtc fail */ -+#define ISL12024_REG_INT 0x11 ++/* offsets into CCR area */ + +#define CCR_SEC 0 +#define CCR_MIN 1 @@ -107,8 +88,31 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c +#define CCR_WDAY 6 +#define CCR_Y2K 7 + -+static int isl12024_get_status(struct i2c_client *client, unsigned char *sr); -+static int isl12024_fix_osc(struct i2c_client *client); ++/* alarm0 section */ ++#define ISL12024_REG_ALARM0 0x08 /* Base address of ALARM0 */ ++ ++/* device id section */ ++#define ISL12024_REG_ID 0x20 ++#define ISL12024_ID_SECTION_LEN 8 ++ ++/* rtc section */ ++#define ISL12024_REG_RTC 0x30 /* Base address of RTC */ ++#define ISL12024_REG_HR_MIL (1<<7) /* 24h/12h mode */ ++#define ISL12024_REG_HR_PM (1<<5) /* AM/PM bit in 12h mode */ ++#define ISL12024_RTC_SECTION_LEN 8 ++ ++/* control/status section */ ++#define ISL12024_REG_SR 0x3F ++#define ISL12024_REG_SR_BAT (1<<7) /* battery */ ++#define ISL12024_REG_SR_AL1 (1<<6) /* alarm 0 */ ++#define ISL12024_REG_SR_AL0 (1<<5) /* alarm 1 */ ++#define ISL12024_REG_SR_OSCF (1<<4) /* oscillator fail */ ++#define ISL12024_REG_SR_RWEL (1<<2) /* register write enable latch */ ++#define ISL12024_REG_SR_WEL (1<<1) /* write enable latch */ ++#define ISL12024_REG_SR_RTCF (1<<0) /* rtc fail */ ++#define ISL12024_REG_INT 0x11 ++ ++#define ISL12024_INT_AL0E 0x20 /* Alarm 0 enable */ + +static struct i2c_driver isl12024_driver; + @@ -117,70 +121,68 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + unsigned len) +{ + int ret; -+ u8 dt_addr[2]; ++ u8 dt_addr[2]; + + struct i2c_msg msgs[2] = { -+ { -+ .addr = client->addr, -+ .flags = 0, -+ .len = 2, -+ .buf = dt_addr, -+ }, -+ { -+ .addr = client->addr, -+ .flags = I2C_M_RD, -+ .len = len , -+ .buf = buf, -+ }, ++ { ++ .addr = client->addr, ++ .flags = 0, ++ .len = 2, ++ .buf = dt_addr, ++ }, ++ { ++ .addr = client->addr, ++ .flags = I2C_M_RD, ++ .len = len, ++ .buf = buf, ++ }, + }; + + dt_addr[0] = 0; + dt_addr[1] = reg; + + ret = i2c_transfer(client->adapter, msgs, 2); -+ if ( ret < 0) { -+ dev_err(&client->dev, "read error\n"); -+ return -EIO; ++ if (ret < 0) { ++ dev_err(&client->dev, "read error (%i)\n", ret); ++ return ret; + } -+ return ret; ++ return 0; +} + -+static int isl12024_i2c_validate_client(struct i2c_client *client) ++static int ++isl12024_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], ++ unsigned len) +{ -+ u8 regs[ISL12024_RTC_SECTION_LEN] = { 0, }; -+ u8 zero_mask[ISL12024_RTC_SECTION_LEN] = { -+ 0x80, 0x80, 0x40, 0xc0, 0xe0, 0x00, 0xf8, 0xc6 -+ }; -+ -+ int i; + int ret; ++ u8 i2c_buf[10]; + -+ ret = isl12024_i2c_read_regs(client, ISL12024_REG_SC, regs, ISL12024_RTC_SECTION_LEN); -+ -+ if (ret < 0) -+ return ret; ++ i2c_buf[0] = 0; ++ i2c_buf[1] = reg; ++ memcpy(&i2c_buf[2], &buf[0], len); + -+ for (i = 0; i < ISL12024_RTC_SECTION_LEN; ++i) { -+ if (regs[i] & zero_mask[i]) /* check if bits are cleared */ -+ return -ENODEV; ++ ret = i2c_master_send(client, i2c_buf, len + 2); ++ if (ret != len + 2) { ++ dev_err(&client->dev, "write error (%d)\n", ret); ++ return -EIO; + } -+ + return 0; +} + +static int isl12024_read_time(struct i2c_client *client, -+ struct rtc_time *tm) ++ struct rtc_time *tm, u8 reg_base) +{ + unsigned char sr; + int err; + u8 regs[ISL12024_RTC_SECTION_LEN] = { 0, }; + -+ if (isl12024_get_status(client, &sr) < 0) { ++ if (isl12024_i2c_read_regs(client, ISL12024_REG_SR, &sr, ++ sizeof(sr)) < 0) { + dev_err(&client->dev, "reading SR failed\n"); + return -EIO; + } + -+ err = isl12024_i2c_read_regs(client, ISL12024_REG_SC, regs, ISL12024_RTC_SECTION_LEN); ++ err = isl12024_i2c_read_regs(client, reg_base, regs, ++ ISL12024_RTC_SECTION_LEN); + + if (err < 0) { + dev_err(&client->dev, "reading RTC section failed\n"); @@ -190,15 +192,15 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + tm->tm_sec = bcd2bin(regs[0]); + tm->tm_min = bcd2bin(regs[1]); + -+ { /* HR field has a more complex interpretation */ -+ const u8 _hr = regs[2]; -+ if (_hr & ISL12024_REG_HR_MIL) /* 24h format */ -+ tm->tm_hour = bcd2bin(_hr & 0x3f); -+ else { // 12h format -+ tm->tm_hour = bcd2bin(_hr & 0x1f); -+ if (_hr & ISL12024_REG_HR_PM) /* PM flag set */ -+ tm->tm_hour += 12; -+ } ++ /* HR field has a more complex interpretation */ ++ if (regs[2] & ISL12024_REG_HR_MIL) { ++ /* 24h format */ ++ tm->tm_hour = bcd2bin(regs[2] & 0x3f); ++ } else { ++ /* 12h format */ ++ tm->tm_hour = bcd2bin(regs[2] & 0x1f); ++ if (regs[2] & ISL12024_REG_HR_PM) /* PM flag set */ ++ tm->tm_hour += 12; + } + + tm->tm_mday = bcd2bin(regs[3]); @@ -209,36 +211,18 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + return rtc_valid_tm(tm); +} + -+static int isl12024_get_status(struct i2c_client *client, unsigned char *sr) -+{ -+ static unsigned char sr_addr[2] = { 0, ISL12024_REG_SR }; -+ -+ struct i2c_msg msgs[] = { -+ { client->addr, 0, 2, sr_addr }, /* setup read ptr */ -+ { client->addr, I2C_M_RD, 1, sr }, /* read status */ -+ }; -+ -+ /* read status register */ -+ if (i2c_transfer(client->adapter, &msgs[0], 2) != 2) { -+ dev_err(&client->dev, "%s: read error\n", __func__); -+ return -EIO; -+ } -+ -+ return 0; -+} -+ +static int isl12024_set_datetime(struct i2c_client *client, struct rtc_time *tm, -+ int datetoo, u8 reg_base, unsigned char alm_enable) ++ int datetoo, u8 reg_base, ++ unsigned char alm_enable) +{ + int i, xfer, nbytes; + unsigned char buf[8]; -+ unsigned char rdata[10] = { 0, reg_base }; + + static const unsigned char wel[3] = { 0, ISL12024_REG_SR, -+ ISL12024_REG_SR_WEL }; ++ ISL12024_REG_SR_WEL }; + + static const unsigned char rwel[3] = { 0, ISL12024_REG_SR, -+ ISL12024_REG_SR_WEL | ISL12024_REG_SR_RWEL }; ++ ISL12024_REG_SR_WEL | ISL12024_REG_SR_RWEL }; + + static const unsigned char diswe[3] = { 0, ISL12024_REG_SR, 0 }; + @@ -272,17 +256,19 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + } + + /* If writing alarm registers, set compare bits on registers 0-4 */ -+ if (reg_base < ISL12024_CCR_BASE) ++ if (reg_base == ISL12024_REG_ALARM0) + for (i = 0; i <= 4; i++) + buf[i] |= 0x80; + + /* this sequence is required to unlock the chip */ -+ if ((xfer = i2c_master_send(client, wel, 3)) != 3) { ++ xfer = i2c_master_send(client, wel, 3); ++ if (xfer != 3) { + dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer); + return -EIO; + } + -+ if ((xfer = i2c_master_send(client, rwel, 3)) != 3) { ++ xfer = i2c_master_send(client, rwel, 3); ++ if (xfer != 3) { + dev_err(&client->dev, "%s: rwel - %d\n", __func__, xfer); + return -EIO; + } @@ -292,20 +278,12 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + nbytes = 8; + else + nbytes = 3; -+ for (i = 0; i < nbytes; i++) -+ rdata[2+i] = buf[i]; -+ -+ xfer = i2c_master_send(client, rdata, nbytes+2); -+ if (xfer != nbytes+2) { -+ dev_err(&client->dev, -+ "%s: result=%d addr=%02x, data=%02x\n", -+ __func__, -+ xfer, rdata[1], rdata[2]); -+ return -EIO; -+ } ++ xfer = isl12024_i2c_set_regs(client, reg_base, buf, nbytes); ++ if (xfer < 0) ++ return xfer; + + /* If we wrote to the nonvolatile region, wait 10msec for write cycle*/ -+ if (reg_base < ISL12024_CCR_BASE) { ++ if (reg_base == ISL12024_REG_ALARM0) { + unsigned char al0e[3] = { 0, ISL12024_REG_INT, 0 }; + + msleep(10); @@ -316,7 +294,7 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + xfer = i2c_master_send(client, rwel, 3); + if (xfer != 3) { + dev_err(&client->dev, -+ "%s: aloe rwel - %d\n", ++ "%s: al0e rwel - %d\n", + __func__, + xfer); + return -EIO; @@ -339,7 +317,8 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + } + + /* disable further writes */ -+ if ((xfer = i2c_master_send(client, diswe, 3)) != 3) { ++ xfer = i2c_master_send(client, diswe, 3); ++ if (xfer != 3) { + dev_err(&client->dev, "%s: diswe - %d\n", __func__, xfer); + return -EIO; + } @@ -354,31 +333,51 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + + tm.tm_hour = tm.tm_min = tm.tm_sec = 0; + -+ err = isl12024_set_datetime(client, &tm, 0, ISL12024_CCR_BASE, 0); -+ if ( err < 0 ) -+ dev_err(&client->dev, "unable to restart the oscillator (%d)\n", err); ++ err = isl12024_set_datetime(client, &tm, 0, ISL12024_REG_RTC, 0); ++ if (err < 0) ++ dev_err(&client->dev, ++ "unable to restart the oscillator (%d)\n", err); + + return err; +} + +static int isl12024_rtc_read_time(struct device *dev, struct rtc_time *tm) +{ -+ return isl12024_read_time(to_i2c_client(dev), tm); -+ ++ return isl12024_read_time(to_i2c_client(dev), tm, ++ ISL12024_REG_RTC); +} + +static int isl12024_rtc_set_time(struct device *dev, struct rtc_time *tm) +{ -+ return isl12024_set_datetime(to_i2c_client(dev), -+ tm, 1, ISL12024_CCR_BASE, 0); ++ return isl12024_set_datetime(to_i2c_client(dev), tm, 1, ++ ISL12024_REG_RTC, 0); ++} ++ ++static int isl12024_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) ++{ ++ unsigned char intr; ++ int err; ++ struct i2c_client *client = to_i2c_client(dev); ++ ++ err = isl12024_i2c_read_regs(client, ISL12024_REG_INT, &intr, ++ sizeof(intr)); ++ if (err < 0) ++ return err; ++ alrm->enabled = (intr & ISL12024_INT_AL0E) ? 1 : 0; ++ ++ return isl12024_read_time(client, &alrm->time, ISL12024_REG_ALARM0); ++} ++ ++static int isl12024_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) ++{ ++ return isl12024_set_datetime(to_i2c_client(dev), &alrm->time, 1, ++ ISL12024_REG_ALARM0, alrm->enabled); +} + +static int +isl12024_rtc_proc(struct device *dev, struct seq_file *seq) +{ -+ + /* Nothing to do */ -+ + return 0; +} + @@ -386,19 +385,23 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + .proc = isl12024_rtc_proc, + .read_time = isl12024_rtc_read_time, + .set_time = isl12024_rtc_set_time, ++ .read_alarm = isl12024_rtc_read_alarm, ++ .set_alarm = isl12024_rtc_set_alarm, +}; + -+static ssize_t isl12024_show_id(struct device *dev, struct device_attribute *attr, -+ char *buf) ++static ssize_t isl12024_show_id(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) +{ + struct i2c_client *client = to_i2c_client(dev); + int err; -+ int len = 0; ++ ssize_t len = 0; + int i; -+ u8 id_buffer[ISL12024_RTC_SECTION_LEN]; ++ u8 id_buffer[ISL12024_ID_SECTION_LEN]; + + /* Read unique id from eeprom */ -+ err = isl12024_i2c_read_regs(client, ISL12024_REG_ID, id_buffer, sizeof(id_buffer)); ++ err = isl12024_i2c_read_regs(client, ISL12024_REG_ID, id_buffer, ++ sizeof(id_buffer)); + if (err < 0) { + dev_err(&client->dev, "reading RTC section failed\n"); + return err; @@ -423,26 +426,22 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) + return -ENODEV; + -+ if (isl12024_i2c_validate_client(client) < 0) -+ return -ENODEV; -+ -+ dev_info(&client->dev, -+ "chip found, driver version " DRV_VERSION "\n"); ++ dev_info(&client->dev, ++ "chip found, driver version " DRV_VERSION "\n"); + + rtc = rtc_device_register(isl12024_driver.driver.name, + &client->dev, &isl12024_rtc_ops, + THIS_MODULE); -+ + if (IS_ERR(rtc)) + return PTR_ERR(rtc); + + i2c_set_clientdata(client, rtc); + -+ rc = isl12024_get_status(client, &sr); -+ if (rc < 0) { -+ dev_err(&client->dev, "reading status failed\n"); -+ goto exit_unregister; -+ } ++ rc = isl12024_i2c_read_regs(client, ISL12024_REG_SR, &sr, sizeof(sr)); ++ if (rc < 0) { ++ dev_err(&client->dev, "reading status failed\n"); ++ goto exit_unregister; ++ } + + /* Check for power failures and enable the osc */ + if (sr & ISL12024_REG_SR_RTCF) { @@ -477,18 +476,18 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c +} + +static const struct i2c_device_id isl12024_id[] = { -+ { "isl12024", 0 }, -+ { } ++ { "isl12024", 0 }, ++ { } +}; +MODULE_DEVICE_TABLE(i2c, isl12024_id); + +static struct i2c_driver isl12024_driver = { -+ .driver = { -+ .name = "rtc-isl12024", -+ }, -+ .probe = isl12024_probe, -+ .remove = isl12024_remove, -+ .id_table = isl12024_id, ++ .driver = { ++ .name = "rtc-isl12024", ++ }, ++ .probe = isl12024_probe, ++ .remove = isl12024_remove, ++ .id_table = isl12024_id, +}; + +/* module init/exit */ diff --git a/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch b/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch index c71f9e6289..12f5435599 100644 --- a/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch +++ b/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch @@ -1,7 +1,7 @@ Index: linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c =================================================================== ---- linux-2.6.31.orig/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-10-29 16:31:14.000000000 +0100 -+++ linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-10-29 17:23:51.000000000 +0100 +--- linux-2.6.31.orig/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-09-10 00:13:59.000000000 +0200 ++++ linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-10-30 12:44:52.000000000 +0100 @@ -13,6 +13,7 @@ * option) any later version. */ @@ -18,7 +18,7 @@ Index: linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c #include "mpc83xx.h" -@@ -79,7 +81,22 @@ +@@ -79,7 +81,21 @@ static int __init declare_of_platform_devices(void) { @@ -29,13 +29,12 @@ Index: linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c + of_platform_bus_probe(NULL, of_bus_ids, NULL); + -+ /* activate USB, RFID and touch board */ ++ /* activate USB and RFID */ + np = of_find_compatible_node(NULL, NULL, "fsl,mpc8313-exio"); + if (np) + { + gpio_direction_output(217, 1); // EXIO1 : USB + gpio_direction_output(219, 1); // EXIO3 : RFID -+ gpio_direction_output(220, 1); // EXIO4 : Touch board + of_node_put(np); + } return 0; diff --git a/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch b/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch index d82f8b1e54..ae5428ddd0 100644 --- a/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch +++ b/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch @@ -1,7 +1,7 @@ Index: linux-2.6.31/drivers/input/misc/Kconfig =================================================================== ---- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-19 16:32:13.000000000 +0200 -+++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-19 16:49:22.000000000 +0200 +--- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-30 12:50:24.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-30 13:20:50.000000000 +0100 @@ -269,4 +269,14 @@ To compile this driver as a module, choose M here: the @@ -19,8 +19,8 @@ Index: linux-2.6.31/drivers/input/misc/Kconfig endif Index: linux-2.6.31/drivers/input/misc/Makefile =================================================================== ---- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-19 16:32:13.000000000 +0200 -+++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-19 16:49:22.000000000 +0200 +--- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-30 12:50:24.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-30 13:20:50.000000000 +0100 @@ -26,3 +26,4 @@ obj-$(CONFIG_INPUT_UINPUT) += uinput.o obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o @@ -29,8 +29,8 @@ Index: linux-2.6.31/drivers/input/misc/Makefile Index: linux-2.6.31/drivers/input/misc/capsense-btns.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/input/misc/capsense-btns.c 2009-10-19 16:49:22.000000000 +0200 -@@ -0,0 +1,440 @@ ++++ linux-2.6.31/drivers/input/misc/capsense-btns.c 2009-10-30 13:21:11.000000000 +0100 +@@ -0,0 +1,443 @@ +/* + * CAPSENSE Interface driver + * @@ -185,9 +185,12 @@ Index: linux-2.6.31/drivers/input/misc/capsense-btns.c + changed = capsense->key_state ^ new_state; + for (i = 0; i < ARRAY_SIZE(input_keymap); i++) + if (changed & (1 << i)) ++ { ++ input_event(dev->input, EV_MSC, MSC_SCAN, i); + input_report_key(dev->input, input_keymap[i], (new_state & (1 << i))); ++ input_sync(dev->input); ++ } + capsense->key_state = new_state; -+ input_sync(dev->input); +} + + @@ -474,7 +477,7 @@ Index: linux-2.6.31/drivers/input/misc/capsense-btns.c Index: linux-2.6.31/drivers/input/misc/capsense-procfs.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/input/misc/capsense-procfs.c 2009-10-19 16:50:35.000000000 +0200 ++++ linux-2.6.31/drivers/input/misc/capsense-procfs.c 2009-10-30 13:20:03.000000000 +0100 @@ -0,0 +1,380 @@ +/* + * CAPSENSE Interface driver diff --git a/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch new file mode 100644 index 0000000000..6b2dba1337 --- /dev/null +++ b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch @@ -0,0 +1,244 @@ +Index: linux-2.6.31/drivers/input/misc/Kconfig +=================================================================== +--- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-30 14:22:53.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-30 14:22:53.000000000 +0100 +@@ -270,6 +270,13 @@ + To compile this driver as a module, choose M here: the + module will be called dm355evm_keys. + ++config INPUT_BOC_BTNS ++ tristate "BoC buttons interface" ++ select INPUT_POLLDEV ++ help ++ To compile this driver as a module, choose M here: ++ the module will be called boc-btns. ++ + config INPUT_CAPSENSE_BTNS + tristate "CAPSENSE CY8C201xx buttons interface" + select INPUT_POLLDEV +Index: linux-2.6.31/drivers/input/misc/Makefile +=================================================================== +--- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-30 14:22:53.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-30 14:22:53.000000000 +0100 +@@ -26,4 +26,5 @@ + obj-$(CONFIG_INPUT_UINPUT) += uinput.o + obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o + obj-$(CONFIG_INPUT_YEALINK) += yealink.o ++obj-$(CONFIG_INPUT_BOC_BTNS) += boc-btns.o + obj-$(CONFIG_INPUT_CAPSENSE_BTNS) += capsense-btns.o +Index: linux-2.6.31/drivers/input/misc/boc-btns.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31/drivers/input/misc/boc-btns.c 2009-10-30 14:24:42.000000000 +0100 +@@ -0,0 +1,211 @@ ++/* ++ * Buttons for BoC ++ * ++ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu). ++ * ++ * Jeremy Lainé <jeremy.laine@bolloretelecom.eu> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include <linux/init.h> ++#include <linux/gpio.h> ++#include <linux/input-polldev.h> ++#include <linux/module.h> ++#include <linux/platform_device.h> ++ ++#define BUTTONS_POLL_INTERVAL 30 /* msec */ ++ ++struct input_button { ++ unsigned char gpio; ++ unsigned char active_low; ++}; ++ ++static struct input_button input_buttons[] = { ++ { 220, 1 }, // WPS button (active low) ++ { 231, 0 }, // reset button ++}; ++ ++static unsigned short input_keymap[] = { ++ KEY_F2, ++ KEY_F3, ++}; ++ ++struct buttons_dev { ++ struct input_polled_dev *poll_dev; ++ int state[ARRAY_SIZE(input_keymap)]; ++}; ++ ++/* ++ * Buttons events handling ++ */ ++ ++static void handle_buttons(struct input_polled_dev *dev) ++{ ++ int i, value; ++ struct buttons_dev *bdev = dev->private; ++ struct input_dev *input = dev->input; ++ ++ // read GPIO ++ for (i = 0; i < ARRAY_SIZE(input_keymap); i++) ++ { ++ value = gpio_get_value(input_buttons[i].gpio) ? 1 : 0; ++ if (input_buttons[i].active_low) ++ value = !value; ++ if (value != bdev->state[i]) ++ { ++ input_event(input, EV_MSC, MSC_SCAN, i); ++ input_report_key(input, input_keymap[i], value); ++ input_sync(input); ++ bdev->state[i] = value; ++ } ++ } ++} ++ ++/* ++ * Device initialisation ++ */ ++ ++static int __devinit boc_buttons_probe(struct platform_device *pdev) ++{ ++ struct buttons_dev *bdev; ++ struct input_polled_dev *poll_dev; ++ struct input_dev *input; ++ int error, i; ++ ++ for (i = 0; i < ARRAY_SIZE(input_keymap); i++) ++ { ++ if (gpio_request(input_buttons[i].gpio, NULL) < 0) ++ return -ENODEV; ++ } ++ ++ bdev = kzalloc(sizeof(struct buttons_dev), GFP_KERNEL); ++ if (!bdev) ++ return -ENOMEM; ++ ++ poll_dev = input_allocate_polled_device(); ++ if (!poll_dev) { ++ error = -ENOMEM; ++ goto out_allocated; ++ } ++ ++ poll_dev->private = bdev; ++ poll_dev->poll = handle_buttons; ++ poll_dev->poll_interval = BUTTONS_POLL_INTERVAL; ++ ++ input = poll_dev->input; ++ input->name = "BoC buttons"; ++ input->phys = "boc/input0"; ++ input->id.bustype = BUS_HOST; ++ input->dev.parent = &pdev->dev; ++ ++ input->keycode = input_keymap; ++ input->keycodemax = ARRAY_SIZE(input_keymap); ++ input->keycodesize = sizeof(unsigned short); ++ ++ input_set_capability(input, EV_MSC, MSC_SCAN); ++ set_bit(EV_KEY, input->evbit); ++ for (i = 0; i < ARRAY_SIZE(input_keymap); i++) ++ { ++ set_bit(input_keymap[i], input->keybit); ++ bdev->state[i] = 0; ++ } ++ ++ bdev->poll_dev = poll_dev; ++ dev_set_drvdata(&pdev->dev, bdev); ++ ++ error = input_register_polled_device(poll_dev); ++ if (error < 0) ++ goto out_polled; ++ ++ return 0; ++ ++out_polled: ++ input_free_polled_device(poll_dev); ++out_allocated: ++ kfree(bdev); ++ return error; ++} ++ ++static int __devexit boc_buttons_remove(struct platform_device *pdev) ++{ ++ struct device *dev = &pdev->dev; ++ struct buttons_dev *bdev = dev_get_drvdata(dev); ++ int i; ++ ++ input_unregister_polled_device(bdev->poll_dev); ++ input_free_polled_device(bdev->poll_dev); ++ kfree(bdev); ++ dev_set_drvdata(dev, NULL); ++ ++ for (i = 0; i < ARRAY_SIZE(input_keymap); i++) ++ gpio_free(input_buttons[i].gpio); ++ ++ return 0; ++} ++ ++/* ++ * Driver initialisation ++ */ ++ ++static struct platform_driver boc_buttons_driver = { ++ .probe = boc_buttons_probe, ++ .remove = __devexit_p(boc_buttons_remove), ++ .driver = { ++ .name = "boc-btns", ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static struct platform_device *boc_buttons_device; ++ ++static int __init boc_buttons_init(void) ++{ ++ int err; ++ ++ err = platform_driver_register(&boc_buttons_driver); ++ if (err) ++ return err; ++ ++ boc_buttons_device = platform_device_alloc("boc-btns", -1); ++ if (!boc_buttons_device) { ++ err = -ENOMEM; ++ goto err_unregister_driver; ++ } ++ ++ err = platform_device_add(boc_buttons_device); ++ if (err) ++ goto err_free_device; ++ ++ return 0; ++ ++err_free_device: ++ platform_device_put(boc_buttons_device); ++err_unregister_driver: ++ platform_driver_unregister(&boc_buttons_driver); ++ return err; ++} ++ ++static void __exit boc_buttons_exit(void) ++{ ++ platform_device_unregister(boc_buttons_device); ++ platform_driver_unregister(&boc_buttons_driver); ++} ++ ++MODULE_AUTHOR("Jeremy Laine <jeremy.laine@m4x.org>"); ++MODULE_DESCRIPTION("BoC input driver"); ++MODULE_LICENSE("GPL"); ++module_init(boc_buttons_init); ++module_exit(boc_buttons_exit); diff --git a/recipes/linux/linux-2.6.31/boc01/defconfig b/recipes/linux/linux-2.6.31/boc01/defconfig index ad7856ce85..ae2b9b510e 100644 --- a/recipes/linux/linux-2.6.31/boc01/defconfig +++ b/recipes/linux/linux-2.6.31/boc01/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.31.3 -# Wed Oct 28 11:48:05 2009 +# Fri Oct 30 14:31:19 2009 # # CONFIG_PPC64 is not set @@ -1061,7 +1061,7 @@ CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers @@ -1089,6 +1089,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_UINPUT is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +CONFIG_INPUT_BOC_BTNS=y CONFIG_INPUT_CAPSENSE_BTNS=y # diff --git a/recipes/linux/linux-bug/defconfig b/recipes/linux/linux-bug/defconfig index c0b29901fa..2a82b584f3 100644 --- a/recipes/linux/linux-bug/defconfig +++ b/recipes/linux/linux-bug/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.27.2 -# Wed Oct 7 15:10:57 2009 +# Mon Nov 2 11:40:05 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -343,6 +343,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set +# CONFIG_IP_VS is not set CONFIG_IPV6=m # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_ROUTER_PREF is not set @@ -363,7 +364,138 @@ CONFIG_IPV6_TUNNEL=m # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_IPV6_MROUTE is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set @@ -379,6 +511,7 @@ CONFIG_IPV6_TUNNEL=m # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_SCHED is not set +CONFIG_NET_CLS_ROUTE=y # # Network testing @@ -461,6 +594,7 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MISC_DEVICES is not set +CONFIG_EEPROM_93CX6=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -542,16 +676,23 @@ CONFIG_LIBERTAS_GSPI=m CONFIG_LIBERTAS_BMI=m CONFIG_LIBERTAS_DEBUG=y CONFIG_USB_ZD1201=m -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8187 is not set +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8187=m # CONFIG_MAC80211_HWSIM is not set # CONFIG_P54_COMMON is not set # CONFIG_IWLWIFI_LEDS is not set # CONFIG_HOSTAP is not set # CONFIG_B43 is not set # CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +# CONFIG_RT2X00_DEBUG is not set # # USB Network Adapters @@ -566,9 +707,9 @@ CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_GL620A is not set # CONFIG_USB_NET_NET1080 is not set -# CONFIG_USB_NET_PLUSB is not set -# CONFIG_USB_NET_MCS7830 is not set -# CONFIG_USB_NET_RNDIS_HOST is not set +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m # CONFIG_USB_NET_CDC_SUBSET is not set # CONFIG_USB_NET_ZAURUS is not set # CONFIG_WAN is not set @@ -870,7 +1011,14 @@ CONFIG_FB_MXC_ASYNC_PANEL_IFC_16_BIT=y CONFIG_FB_BUG=y # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_VGG2432A4 is not set +# CONFIG_LCD_PLATFORM is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=m +# CONFIG_BACKLIGHT_CORGI is not set # # Display device support @@ -951,7 +1099,7 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_MON is not set +CONFIG_USB_MON=y # # USB Host Controller Drivers @@ -969,6 +1117,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_U132_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_GADGET_MUSB_HDRC is not set @@ -1006,7 +1155,7 @@ CONFIG_USB_STORAGE=y # # USB Imaging devices # -# CONFIG_USB_MDC800 is not set +CONFIG_USB_MDC800=m # CONFIG_USB_MICROTEK is not set # @@ -1059,26 +1208,30 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=m # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_ADUTUX is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_BERRY_CHARGE is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYPRESS_CY7C63 is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGET is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_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_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_ISIGHTFW=m CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -1599,9 +1752,13 @@ CONFIG_CRC_CCITT=m CONFIG_CRC_ITU_T=m CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff --git a/recipes/linux/linux-bug_2.6.27.2.bb b/recipes/linux/linux-bug_2.6.27.2.bb index 8c83f9ab7f..bb4d11fb3a 100644 --- a/recipes/linux/linux-bug_2.6.27.2.bb +++ b/recipes/linux/linux-bug_2.6.27.2.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Linux kernel for bug" PV_append = "+svnr${SRCREV}" KV = "2.6.27.2" -PR = "r29" +PR = "r30" COMPATIBLE_MACHINE = "bug" SVN_PRJ = "bug-linux-${KV}" -SRCREV = "10199" +SRCREV = "10371" SRC_URI = "svn://svn.buglabs.net/bug/branches/R1.4/qa;module=${SVN_PRJ};proto=svn \ file://defconfig \ diff --git a/recipes/linux/linux-kirkwood/openrd-base/defconfig b/recipes/linux/linux-kirkwood/openrd-base/defconfig index 1271b90cd9..159eed3000 100644 --- a/recipes/linux/linux-kirkwood/openrd-base/defconfig +++ b/recipes/linux/linux-kirkwood/openrd-base/defconfig @@ -1,14 +1,11 @@ -# leon was here +# # Automatically generated make config: don't edit -# Linux kernel version: 2.6.31-rc9 -# Mon Sep 14 00:31:10 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y @@ -32,7 +29,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -44,32 +41,32 @@ CONFIG_SYSVIPC_SYSCTL=y # # RCU Subsystem # -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_TREE_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_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 # CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set -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 is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -85,33 +82,26 @@ CONFIG_SHMEM=y CONFIG_AIO=y # -# Performance Counters +# Kernel Performance Events And Counters # CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_SLUB_DEBUG is not set CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_MARKERS=y -CONFIG_OPROFILE=y +# CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_KRETPROBES=y +# CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y # # GCOV-based kernel profiling # -# CONFIG_GCOV_KERNEL is not set -# CONFIG_SLOW_WORK is not set +CONFIG_SLOW_WORK=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -122,7 +112,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y CONFIG_LBDAF=y -# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -142,6 +132,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # # System Type # +CONFIG_MMU=y # CONFIG_ARCH_AAEC2000 is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set @@ -156,6 +147,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_ARCH_STMP3XXX is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_NOMADIK is not set # CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set @@ -178,22 +170,25 @@ CONFIG_ARCH_KIRKWOOD=y # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5PC1XX is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_U300 is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_BCMRING is not set # # Marvell Kirkwood Implementations # -# CONFIG_MACH_DB88F6281_BP is not set -# CONFIG_MACH_RD88F6192_NAS is not set -# CONFIG_MACH_RD88F6281 is not set -# CONFIG_MACH_MV88F6281GTW_GE is not set -# CONFIG_MACH_SHEEVAPLUG is not set -# CONFIG_MACH_TS219 is not set +CONFIG_MACH_DB88F6281_BP=y +CONFIG_MACH_RD88F6192_NAS=y +CONFIG_MACH_RD88F6281=y +CONFIG_MACH_MV88F6281GTW_GE=y +CONFIG_MACH_SHEEVAPLUG=y +CONFIG_MACH_TS219=y CONFIG_MACH_OPENRD_BASE=y +CONFIG_MACH_OPENRD_CLIENT=y CONFIG_PLAT_ORION=y # @@ -204,7 +199,7 @@ CONFIG_CPU_FEROCEON=y # CONFIG_CPU_FEROCEON_OLD_ID is not set CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y -CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_PABRT_LEGACY=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_COPY_FEROCEON=y CONFIG_CPU_TLB_FEROCEON=y @@ -220,6 +215,7 @@ CONFIG_ARM_THUMB=y CONFIG_OUTER_CACHE=y CONFIG_CACHE_FEROCEON_L2=y # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set +CONFIG_ARM_L1_CACHE_SHIFT=5 # # Bus support @@ -228,7 +224,6 @@ CONFIG_PCI=y CONFIG_PCI_SYSCALL=y # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_PCI_LEGACY=y -CONFIG_PCI_DEBUG=y # CONFIG_PCI_STUB is not set # CONFIG_PCI_IOV is not set # CONFIG_PCCARD is not set @@ -244,6 +239,8 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y CONFIG_HZ=100 CONFIG_AEABI=y @@ -264,6 +261,7 @@ CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ALIGNMENT_TRAP=y CONFIG_UACCESS_WITH_MEMCPY=y @@ -273,9 +271,10 @@ CONFIG_UACCESS_WITH_MEMCPY=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Power Management @@ -323,40 +322,210 @@ CONFIG_XFRM=y # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y +# CONFIG_IP_MULTIPLE_TABLES is not set +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y # 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_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set # CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set +CONFIG_SYN_COOKIES=y # 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_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_LRO=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_DEFAULT_BIC is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_TIPC is not set +CONFIG_NETFILTER=y +CONFIG_NETFILTER_DEBUG=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +# CONFIG_NF_CT_PROTO_UDPLITE is not set +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set +CONFIG_NETFILTER_XT_MATCH_SCTP=m +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m +# CONFIG_BRIDGE_NF_EBTABLES is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_CCID3_RTO=100 +CONFIG_IP_DCCP_TFRC_LIB=y +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +CONFIG_RDS=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set # CONFIG_ATM is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_BRIDGE=m CONFIG_NET_DSA=y # CONFIG_NET_DSA_TAG_DSA is not set CONFIG_NET_DSA_TAG_EDSA=y @@ -366,9 +535,11 @@ CONFIG_NET_DSA_MV88E6XXX=y # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set # CONFIG_NET_DSA_MV88E6131 is not set CONFIG_NET_DSA_MV88E6123_61_65=y -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y # CONFIG_DECNET is not set -# CONFIG_LLC2 is not set +CONFIG_LLC=m +CONFIG_LLC2=m # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set @@ -378,41 +549,64 @@ CONFIG_NET_DSA_MV88E6123_61_65=y # CONFIG_PHONET is not set # CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set +CONFIG_NET_CLS_ROUTE=y # CONFIG_DCB is not set # # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_TCPPROBE 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_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +# CONFIG_BT_HCIBTUSB is not set +# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT_MRVL is not set # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y CONFIG_CFG80211=y +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set -# CONFIG_CFG80211_DEBUGFS is not set +CONFIG_CFG80211_DEFAULT_PS=y +CONFIG_CFG80211_DEFAULT_PS_VALUE=1 CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=y +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=y -CONFIG_MAC80211_DEFAULT_PS=y -CONFIG_MAC80211_DEFAULT_PS_VALUE=1 - -# -# Rate control algorithm selection -# +# CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" -# CONFIG_MAC80211_LEDS is not set -# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set @@ -426,20 +620,19 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel" # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set # CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_TESTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_AFS_PARTS is not set @@ -452,7 +645,8 @@ CONFIG_MTD_CHAR=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set -# CONFIG_NFTL is not set +CONFIG_NFTL=y +CONFIG_NFTL_RW=y # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set # CONFIG_SSFDC is not set @@ -471,7 +665,7 @@ CONFIG_MTD_CFI_NOSWAP=y CONFIG_MTD_CFI_GEOMETRY=y CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y -# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set +CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set @@ -484,7 +678,7 @@ CONFIG_MTD_CFI_INTELEXT=y # CONFIG_MTD_CFI_AMDSTD is not set CONFIG_MTD_CFI_STAA=y CONFIG_MTD_CFI_UTIL=y -# CONFIG_MTD_RAM is not set +CONFIG_MTD_RAM=m # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set @@ -497,7 +691,7 @@ CONFIG_MTD_PHYSMAP=y # CONFIG_MTD_ARM_INTEGRATOR is not set # CONFIG_MTD_IMPA7 is not set # CONFIG_MTD_INTEL_VR_NOR is not set -# CONFIG_MTD_PLATRAM is not set +CONFIG_MTD_PLATRAM=m # # Self-contained MTD device drivers @@ -506,9 +700,12 @@ CONFIG_MTD_PHYSMAP=y # CONFIG_MTD_DATAFLASH is not set CONFIG_MTD_M25P80=y CONFIG_M25PXX_USE_FAST_READ=y +# CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 # CONFIG_MTD_BLOCK2MTD is not set # @@ -547,21 +744,7 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 # # UBI debugging options # -CONFIG_MTD_UBI_DEBUG=y -# CONFIG_MTD_UBI_DEBUG_MSG is not set -CONFIG_MTD_UBI_DEBUG_PARANOID=y -# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set -# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set -# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set -# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set - -# -# Additional UBI debugging messages -# -# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set -# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set -# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set -# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set +# CONFIG_MTD_UBI_DEBUG is not set # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_CPQ_DA is not set @@ -571,14 +754,37 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set +CONFIG_BLK_DEV_UB=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m # CONFIG_MG_DISK is not set -# CONFIG_MISC_DEVICES is not set +CONFIG_MISC_DEVICES=y +# 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_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_93CX6=m +# CONFIG_CB710_CORE is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -590,19 +796,19 @@ CONFIG_SCSI=y CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set -# CONFIG_SCSI_PROC_FS is not set +CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set +CONFIG_CHR_DEV_ST=m # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SG=y # CONFIG_CHR_DEV_SCH is not set -# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set @@ -613,12 +819,14 @@ CONFIG_SCSI_WAIT_SCAN=m # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +# CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set +CONFIG_ISCSI_TCP=m # CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set # CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_ACARD is not set @@ -655,11 +863,14 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set # CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y CONFIG_SATA_PMP=y CONFIG_SATA_AHCI=y # CONFIG_SATA_SIL24 is not set @@ -681,6 +892,7 @@ CONFIG_SATA_MV=y # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X is not set # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set @@ -708,6 +920,7 @@ CONFIG_SATA_MV=y # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set # CONFIG_PATA_RZ1000 is not set # CONFIG_PATA_SC1200 is not set # CONFIG_PATA_SERVERWORKS is not set @@ -716,8 +929,29 @@ CONFIG_SATA_MV=y # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_SCH is not set -# CONFIG_MD is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y +CONFIG_MD_LINEAR=y +CONFIG_MD_RAID0=y +CONFIG_MD_RAID1=y +# CONFIG_MD_RAID10 is not set +CONFIG_MD_RAID456=y +CONFIG_MD_RAID6_PQ=y +# CONFIG_ASYNC_RAID6_TEST is not set +# CONFIG_MD_MULTIPATH is not set +# CONFIG_MD_FAULTY is not set +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=y +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set # CONFIG_FUSION is not set # @@ -739,7 +973,7 @@ CONFIG_NETDEVICES=y # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set +CONFIG_TUN=m # CONFIG_VETH is not set # CONFIG_ARCNET is not set CONFIG_PHYLIB=y @@ -791,7 +1025,7 @@ CONFIG_NET_PCI=y # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set -# CONFIG_E100 is not set +CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set @@ -805,13 +1039,14 @@ CONFIG_NET_PCI=y # CONFIG_TLAN is not set # CONFIG_KS8842 is not set # CONFIG_KS8851 is not set +# CONFIG_KS8851_MLL is not set # CONFIG_VIA_RHINE is not set # CONFIG_SC92031 is not set # CONFIG_ATL2 is not set CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set +CONFIG_E1000=y # CONFIG_E1000E is not set # CONFIG_IP1000 is not set # CONFIG_IGB is not set @@ -835,10 +1070,7 @@ CONFIG_MV643XX_ETH=y # CONFIG_JME is not set # CONFIG_NETDEV_10000 is not set # CONFIG_TR is not set - -# -# Wireless LAN -# +CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y CONFIG_LIBERTAS=y @@ -847,31 +1079,96 @@ CONFIG_LIBERTAS_SDIO=y # CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set # CONFIG_LIBERTAS_THINFIRM is not set -# CONFIG_ATMEL is not set -# CONFIG_AT76C50X_USB is not set -# CONFIG_PRISM54 is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8180 is not set -# CONFIG_RTL8187 is not set -# CONFIG_ADM8211 is not set -# CONFIG_MAC80211_HWSIM is not set -# CONFIG_MWL8K is not set -# CONFIG_P54_COMMON is not set +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +CONFIG_MAC80211_HWSIM=m +CONFIG_MWL8K=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +CONFIG_P54_LEDS=y +CONFIG_ATH_COMMON=m # CONFIG_ATH5K is not set # CONFIG_ATH9K is not set # CONFIG_AR9170_USB is not set -# CONFIG_IPW2100 is not set -# CONFIG_IPW2200 is not set -# CONFIG_IWLWIFI is not set -# CONFIG_HOSTAP is not set -# CONFIG_B43 is not set -# CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set -# CONFIG_HERMES is not set -# CONFIG_WL12XX is not set -# CONFIG_IWM is not set +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLAGN=m +# CONFIG_IWL4965 is not set +# CONFIG_IWL5000 is not set +CONFIG_IWL3945=m +# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +CONFIG_HOSTAP=m +# CONFIG_HOSTAP_FIRMWARE is not set +# CONFIG_HOSTAP_PLX is not set +# CONFIG_HOSTAP_PCI is not set +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +# CONFIG_B43_SDIO is not set +CONFIG_B43_PHY_LP=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +# CONFIG_RT2400PCI is not set +# CONFIG_RT2500PCI is not set +# CONFIG_RT61PCI is not set +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_HT=y +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_HERMES=m +CONFIG_HERMES_CACHE_FW_ON_INIT=y +# CONFIG_PLX_HERMES is not set +# CONFIG_TMD_HERMES is not set +# CONFIG_NORTEL_HERMES is not set +# CONFIG_PCI_HERMES is not set +CONFIG_WL12XX=m +# CONFIG_WL1251 is not set +# CONFIG_WL1271 is not set +CONFIG_IWM=m # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -880,21 +1177,44 @@ CONFIG_LIBERTAS_SDIO=y # # USB Network Adapters # -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +# CONFIG_USB_BELKIN is not set +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_INT51X1=m # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set # CONFIG_NET_FC is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y # CONFIG_ISDN is not set +CONFIG_PHONE=y +# CONFIG_PHONE_IXJ is not set # # Input device support @@ -910,7 +1230,7 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -918,20 +1238,46 @@ CONFIG_INPUT_EVDEV=y # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set CONFIG_KEYBOARD_ATKBD=y +# CONFIG_QT2160 is not set # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=y # CONFIG_KEYBOARD_MATRIX is not set # CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES 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_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=m +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_MOUSE_SYNAPTICS_I2C is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +# CONFIG_INPUT_POWERMATE is not set +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # # Hardware I/O ports @@ -977,7 +1323,8 @@ CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_IPMI_HANDLER is not set -# CONFIG_HW_RANDOM is not set +CONFIG_HW_RANDOM=m +# CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_RAW_DRIVER is not set @@ -985,6 +1332,7 @@ CONFIG_LEGACY_PTY_COUNT=16 CONFIG_DEVPORT=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_HELPER_AUTO=y @@ -1040,16 +1388,12 @@ CONFIG_I2C_MV64XXX=y # 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=y -# CONFIG_SPI_DEBUG is not set CONFIG_SPI_MASTER=y # @@ -1064,9 +1408,13 @@ CONFIG_SPI_ORION=y # # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y -# CONFIG_DEBUG_GPIO is not set # CONFIG_GPIO_SYSFS is not set # @@ -1084,24 +1432,39 @@ CONFIG_GPIOLIB=y # PCI GPIO expanders: # # CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set # # SPI GPIO expanders: # # CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set + +# +# AC97 GPIO expanders: +# # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set -# CONFIG_THERMAL_HWMON is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -# CONFIG_SSB is not set +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y # # Multifunction device drivers @@ -1117,19 +1480,215 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_TC6393XB is not set # CONFIG_PMIC_DA903X is not set # CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13783 is not set # CONFIG_AB3100_CORE is not set # CONFIG_EZX_PCAP is not set -# CONFIG_MEDIA_SUPPORT is not set +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_CUSTOMISE=y +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L1=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_BT848 is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_SAA7134 is not set +# CONFIG_VIDEO_MXB is not set +# CONFIG_VIDEO_HEXIUM_ORION is not set +# CONFIG_VIDEO_HEXIUM_GEMINI is not set +# CONFIG_VIDEO_CX88 is not set +# CONFIG_VIDEO_IVTV is not set +# CONFIG_VIDEO_CAFE_CCIC is not set +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_USB_DRIVERS=y +# CONFIG_USB_VIDEO_CLASS is not set +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +# CONFIG_USB_M5602 is not set +# CONFIG_USB_STV06XX is not set +# CONFIG_USB_GL860 is not set +# CONFIG_USB_GSPCA_CONEX is not set +# CONFIG_USB_GSPCA_ETOMS is not set +# CONFIG_USB_GSPCA_FINEPIX is not set +# CONFIG_USB_GSPCA_JEILINJ is not set +# CONFIG_USB_GSPCA_MARS is not set +# CONFIG_USB_GSPCA_MR97310A is not set +# CONFIG_USB_GSPCA_OV519 is not set +# CONFIG_USB_GSPCA_OV534 is not set +# CONFIG_USB_GSPCA_PAC207 is not set +# CONFIG_USB_GSPCA_PAC7311 is not set +# CONFIG_USB_GSPCA_SN9C20X is not set +# CONFIG_USB_GSPCA_SONIXB is not set +# CONFIG_USB_GSPCA_SONIXJ is not set +# CONFIG_USB_GSPCA_SPCA500 is not set +# CONFIG_USB_GSPCA_SPCA501 is not set +# CONFIG_USB_GSPCA_SPCA505 is not set +# CONFIG_USB_GSPCA_SPCA506 is not set +# CONFIG_USB_GSPCA_SPCA508 is not set +# CONFIG_USB_GSPCA_SPCA561 is not set +# CONFIG_USB_GSPCA_SQ905 is not set +# CONFIG_USB_GSPCA_SQ905C is not set +# CONFIG_USB_GSPCA_STK014 is not set +# CONFIG_USB_GSPCA_SUNPLUS is not set +# CONFIG_USB_GSPCA_T613 is not set +# CONFIG_USB_GSPCA_TV8532 is not set +# CONFIG_USB_GSPCA_VC032X is not set +# CONFIG_USB_GSPCA_ZC3XX is not set +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_RADIO_ADAPTERS=y +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_I2C_SI4713 is not set +# CONFIG_RADIO_SI4713 is not set +# CONFIG_USB_DSBR is not set +# CONFIG_RADIO_SI470X is not set +# CONFIG_USB_MR800 is not set +# CONFIG_RADIO_TEA5764 is not set +# CONFIG_DAB is not set # # Graphics support # +CONFIG_VGA_ARB=y # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set -# CONFIG_FB 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 is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# 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 is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA 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_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 is not set # @@ -1142,10 +1701,117 @@ CONFIG_SSB_POSSIBLE=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -# CONFIG_SOUND is not set +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 is not set +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +# CONFIG_SND_MIXER_OSS is not set +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +# CONFIG_SND_DEBUG_VERBOSE is not set +CONFIG_SND_PCM_XRUN_DEBUG=y +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_PCI=y +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CTXFI is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_HIFIER is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LX6464ES is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +CONFIG_SND_ARM=y +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y -# CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set # @@ -1158,39 +1824,33 @@ CONFIG_USB_HID=y # # 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_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_ZEROPLUS is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -1206,6 +1866,8 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -1221,12 +1883,18 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y # 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 is not set -# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USB_ISP1362_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 +# CONFIG_USB_MUSB_HDRC is not set +# CONFIG_USB_GADGET_MUSB_HDRC is not set # # USB Device Class drivers @@ -1248,7 +1916,7 @@ CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE_DATAFAB=y CONFIG_USB_STORAGE_FREECOM=y # CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_USBAT is not set +CONFIG_USB_STORAGE_USBAT=y CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_JUMPSHOT=y @@ -1267,7 +1935,53 @@ CONFIG_USB_STORAGE_JUMPSHOT=y # # USB port drivers # -# CONFIG_USB_SERIAL is not set +CONFIG_USB_SERIAL=m +# CONFIG_USB_EZUSB is not set +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_AIRCABLE is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_CH341 is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_CP210X is not set +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +CONFIG_USB_SERIAL_FTDI_SIO=m +# CONFIG_USB_SERIAL_FUNSOFT is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_IUU is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set +# CONFIG_USB_SERIAL_MOTOROLA is not set +# CONFIG_USB_SERIAL_NAVMAN is not set +# CONFIG_USB_SERIAL_PL2303 is not set +# CONFIG_USB_SERIAL_OTI6858 is not set +# CONFIG_USB_SERIAL_QUALCOMM is not set +# CONFIG_USB_SERIAL_SPCP8X5 is not set +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIEMENS_MPI is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +# CONFIG_USB_SERIAL_SYMBOL is not set +# CONFIG_USB_SERIAL_TI is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OPTION is not set +# CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL_OPTICON is not set +# CONFIG_USB_SERIAL_DEBUG is not set # # USB Miscellaneous drivers @@ -1290,10 +2004,46 @@ CONFIG_USB_STORAGE_JUMPSHOT=y # 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_TEST=m # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_VST is not set -# CONFIG_USB_GADGET is not set +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +CONFIG_USB_GADGET_R8A66597=y +CONFIG_USB_R8A66597=m +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C_HSOTG is not set +# CONFIG_USB_GADGET_IMX is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_CI13XXX is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LANGWELL is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_FILE_STORAGE_TEST=y +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set # # OTG and related infrastructure @@ -1316,14 +2066,17 @@ CONFIG_SDIO_UART=y # # MMC/SD/SDIO Host Controller Drivers # -# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_SDHCI=y +# CONFIG_MMC_SDHCI_PCI is not set +# CONFIG_MMC_SDHCI_PLTFM is not set +# CONFIG_MMC_AT91 is not set +# CONFIG_MMC_ATMELMCI is not set # CONFIG_MMC_TIFM_SD is not set CONFIG_MMC_MVSDIO=y # CONFIG_MMC_SPI is not set # CONFIG_MMC_CB710 is not set # CONFIG_MMC_VIA_SDMMC is not set # CONFIG_MEMSTICK is not set -# CONFIG_ACCESSIBILITY is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -1351,6 +2104,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # iptables trigger is under Netfilter config (LED target) # +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -1394,6 +2149,7 @@ CONFIG_RTC_DRV_S35390A=y # CONFIG_RTC_DRV_R9701 is not set # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set # # Platform RTC drivers @@ -1429,8 +2185,11 @@ CONFIG_DMA_ENGINE=y # CONFIG_ASYNC_TX_DMA is not set # CONFIG_DMATEST is not set # CONFIG_AUXDISPLAY is not set -# CONFIG_REGULATOR is not set # CONFIG_UIO is not set + +# +# TI VLYNQ +# # CONFIG_STAGING is not set # @@ -1442,25 +2201,41 @@ CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set # CONFIG_EXT3_FS_XATTR is not set -# CONFIG_EXT4_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=y +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set -# CONFIG_XFS_FS is not set +CONFIG_JFS_FS=y +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_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_QUOTACTL=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m +CONFIG_CUSE=m # # Caches @@ -1484,7 +2259,9 @@ 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 +CONFIG_NTFS_FS=y +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y # # Pseudo filesystems @@ -1496,7 +2273,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set -# CONFIG_CONFIGFS_FS is not set +CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set @@ -1509,14 +2286,21 @@ CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -# CONFIG_UBIFS_FS is not set +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set CONFIG_CRAMFS=y CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_EMBEDDED is not set @@ -1529,22 +2313,34 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_NILFS2_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set CONFIG_ROOT_NFS=y -# CONFIG_NFSD is not set +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y -# CONFIG_RPCSEC_GSS_KRB5 is not set +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -1552,8 +2348,24 @@ CONFIG_SUNRPC=y # # Partition Types # -# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y @@ -1599,13 +2411,14 @@ CONFIG_NLS_UTF8=y # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set -CONFIG_DEBUG_FS=y +# CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set @@ -1622,7 +2435,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_PREEMPT is not set +CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -1645,46 +2458,15 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_LKDTM is not set -# CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_PAGE_POISONING is not set -CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_TRACING=y CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_ENABLE_DEFAULT_TRACERS is not set -# CONFIG_BOOT_TRACER is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_FTRACE is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set CONFIG_ARM_UNWIND=y CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -# CONFIG_DEBUG_STACK_USAGE is not set -CONFIG_DEBUG_LL=y -# CONFIG_DEBUG_ICEDCC is not set # # Security options @@ -1693,12 +2475,17 @@ CONFIG_DEBUG_LL=y # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_XOR_BLOCKS=y +CONFIG_ASYNC_CORE=y +CONFIG_ASYNC_MEMCPY=y +CONFIG_ASYNC_XOR=y +CONFIG_ASYNC_PQ=y +CONFIG_ASYNC_RAID6_RECOV=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 @@ -1711,7 +2498,7 @@ 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_NULL=y CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_AUTHENC is not set @@ -1727,7 +2514,7 @@ CONFIG_CRYPTO_WORKQUEUE=y # # Block modes # -CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CBC=y # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_ECB=y @@ -1738,23 +2525,25 @@ CONFIG_CRYPTO_PCBC=m # # Hash modes # -# CONFIG_CRYPTO_HMAC is not set +CONFIG_CRYPTO_HMAC=y # CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set # # Digest # CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_MD4 is not set -# CONFIG_CRYPTO_MD5 is not set -# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_GHASH is not set +CONFIG_CRYPTO_MD4=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m # CONFIG_CRYPTO_RMD128 is not set # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set -# CONFIG_CRYPTO_SHA1 is not set -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_WP512 is not set @@ -1764,33 +2553,35 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANUBIS is not set CONFIG_CRYPTO_ARC4=y -# CONFIG_CRYPTO_BLOWFISH is not set +CONFIG_CRYPTO_BLOWFISH=y # 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_CAST5=y +CONFIG_CRYPTO_CAST6=y +CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set +CONFIG_CRYPTO_TEA=y +CONFIG_CRYPTO_TWOFISH=y +CONFIG_CRYPTO_TWOFISH_COMMON=y # # Compression # -# CONFIG_CRYPTO_DEFLATE is not set +CONFIG_CRYPTO_DEFLATE=y # CONFIG_CRYPTO_ZLIB is not set -# CONFIG_CRYPTO_LZO is not set +CONFIG_CRYPTO_LZO=y # # Random Number Generation # # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_MV_CESA is not set # CONFIG_CRYPTO_DEV_HIFN_795X is not set -CONFIG_BINARY_PRINTF=y +# CONFIG_BINARY_PRINTF is not set # # Library routines @@ -1806,6 +2597,13 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y diff --git a/recipes/linux/linux-kirkwood/openrd-base/openrd-base-enable-pcie.patch b/recipes/linux/linux-kirkwood/openrd-base/openrd-base-enable-pcie.patch new file mode 100644 index 0000000000..165334b632 --- /dev/null +++ b/recipes/linux/linux-kirkwood/openrd-base/openrd-base-enable-pcie.patch @@ -0,0 +1,22 @@ +Index: git/arch/arm/mach-kirkwood/openrd_base-setup.c +=================================================================== +--- git.orig/arch/arm/mach-kirkwood/openrd_base-setup.c 2009-09-19 19:31:45.000000000 +0200 ++++ git/arch/arm/mach-kirkwood/openrd_base-setup.c 2009-09-19 19:31:54.000000000 +0200 +@@ -70,8 +70,17 @@ + kirkwood_ge00_init(&openrd_base_ge00_data); + kirkwood_sata_init(&openrd_base_sata_data); + kirkwood_sdio_init(&openrd_base_mvsdio_data); ++ kirkwood_i2c_init(); + } + ++static int __init openrd_base_pci_init(void) ++{ ++ if (machine_is_openrd_base()) ++ kirkwood_pcie_init(); ++ return 0; ++} ++subsys_initcall(openrd_base_pci_init); ++ + MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board") + /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */ + .phys_io = KIRKWOOD_REGS_PHYS_BASE, diff --git a/recipes/linux/linux-kirkwood/openrd-client/defconfig b/recipes/linux/linux-kirkwood/openrd-client/defconfig index 24fe35a122..8e56415e92 100644 --- a/recipes/linux/linux-kirkwood/openrd-client/defconfig +++ b/recipes/linux/linux-kirkwood/openrd-client/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32-rc4 -# Wed Oct 14 16:21:38 2009 +# Fri Oct 30 11:17:30 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -31,7 +31,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -49,27 +49,23 @@ CONFIG_TREE_RCU=y CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 # CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set -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_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y @@ -92,7 +88,7 @@ CONFIG_AIO=y # CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y -CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG is not set CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y @@ -108,7 +104,6 @@ CONFIG_HAVE_KRETPROBES=y # CONFIG_SLOW_WORK=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -119,7 +114,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y CONFIG_LBDAF=y -# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -251,7 +246,7 @@ CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PREEMPT=y CONFIG_HZ=100 CONFIG_AEABI=y -CONFIG_OABI_COMPAT=y +# CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_HIGHMEM is not set @@ -278,9 +273,10 @@ CONFIG_UACCESS_WITH_MEMCPY=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyAM0 root=/dev/nfs rw nfsroot=10.4.50.31:/home/rshitrit/cramfs-1.1/cramfs-1.1/shoko2 mem=32M ip=10.4.50.99:10.4.50.31:::ARM:eth0:none" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Power Management @@ -296,8 +292,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y # # At least one emulation must be selected # -# CONFIG_FPE_NWFPE is not set -CONFIG_FPE_FASTFPE=y # CONFIG_VFP is not set # @@ -603,14 +597,18 @@ CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=y +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=y +# CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set -# CONFIG_MAC80211_LEDS is not set +CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set @@ -719,7 +717,7 @@ CONFIG_MTDRAM_ERASE_SIZE=128 # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set CONFIG_MTD_NAND=y -#CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_GPIO is not set @@ -758,17 +756,37 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_UB=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_BLK_DEV_XIP is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m # CONFIG_MG_DISK is not set -# CONFIG_MISC_DEVICES is not set +CONFIG_MISC_DEVICES=y +# 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_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_93CX6=m +# CONFIG_CB710_CORE is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -786,7 +804,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set +CONFIG_CHR_DEV_ST=m # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set @@ -804,6 +822,7 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set CONFIG_SCSI_ISCSI_ATTRS=m +# CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set CONFIG_SCSI_LOWLEVEL=y @@ -912,6 +931,7 @@ CONFIG_SATA_MV=y # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_SCH is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=y @@ -1061,29 +1081,96 @@ CONFIG_LIBERTAS_SDIO=y # CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set # CONFIG_LIBERTAS_THINFIRM is not set -# CONFIG_ATMEL is not set -# CONFIG_AT76C50X_USB is not set -# CONFIG_PRISM54 is not set +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_PRISM54=m CONFIG_USB_ZD1201=m -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8180 is not set -# CONFIG_RTL8187 is not set -# CONFIG_ADM8211 is not set -# CONFIG_MAC80211_HWSIM is not set -# CONFIG_MWL8K is not set -# CONFIG_P54_COMMON is not set -# CONFIG_ATH_COMMON is not set -# CONFIG_IPW2100 is not set -# CONFIG_IPW2200 is not set -# CONFIG_IWLWIFI is not set -# CONFIG_HOSTAP is not set -# CONFIG_B43 is not set -# CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set -# CONFIG_HERMES is not set -# CONFIG_WL12XX is not set -# CONFIG_IWM is not set +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +CONFIG_MAC80211_HWSIM=m +CONFIG_MWL8K=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +CONFIG_P54_LEDS=y +CONFIG_ATH_COMMON=m +# CONFIG_ATH5K is not set +# CONFIG_ATH9K is not set +# CONFIG_AR9170_USB is not set +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLAGN=m +# CONFIG_IWL4965 is not set +# CONFIG_IWL5000 is not set +CONFIG_IWL3945=m +# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +CONFIG_HOSTAP=m +# CONFIG_HOSTAP_FIRMWARE is not set +# CONFIG_HOSTAP_PLX is not set +# CONFIG_HOSTAP_PCI is not set +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +# CONFIG_B43_SDIO is not set +CONFIG_B43_PHY_LP=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +# CONFIG_RT2400PCI is not set +# CONFIG_RT2500PCI is not set +# CONFIG_RT61PCI is not set +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_HT=y +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_HERMES=m +CONFIG_HERMES_CACHE_FW_ON_INIT=y +# CONFIG_PLX_HERMES is not set +# CONFIG_TMD_HERMES is not set +# CONFIG_NORTEL_HERMES is not set +# CONFIG_PCI_HERMES is not set +CONFIG_WL12XX=m +# CONFIG_WL1251 is not set +# CONFIG_WL1271 is not set +CONFIG_IWM=m # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -1092,20 +1179,41 @@ CONFIG_USB_ZD1201=m # # USB Network Adapters # -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +# CONFIG_USB_BELKIN is not set +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_INT51X1=m # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set # CONFIG_NET_FC is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y # CONFIG_ISDN is not set CONFIG_PHONE=y # CONFIG_PHONE_IXJ is not set @@ -1154,7 +1262,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set -# CONFIG_MOUSE_SERIAL is not set +CONFIG_MOUSE_SERIAL=m # CONFIG_MOUSE_APPLETOUCH is not set # CONFIG_MOUSE_BCM5974 is not set # CONFIG_MOUSE_VSXXXAA is not set @@ -1164,12 +1272,12 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y -# CONFIG_INPUT_ATI_REMOTE is not set -# CONFIG_INPUT_ATI_REMOTE2 is not set -# CONFIG_INPUT_KEYSPAN_REMOTE is not set +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m # CONFIG_INPUT_POWERMATE is not set -# CONFIG_INPUT_YEALINK is not set -# CONFIG_INPUT_CM109 is not set +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set @@ -1348,7 +1456,17 @@ CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -# CONFIG_SSB is not set +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y # # Multifunction device drivers @@ -1388,28 +1506,42 @@ CONFIG_VIDEO_MEDIA=m # CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_CUSTOMISE=y CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m CONFIG_MEDIA_TUNER_TDA9887=m CONFIG_MEDIA_TUNER_TEA5761=m CONFIG_MEDIA_TUNER_TEA5767=m CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS53L32A=m CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_MT9V011=m CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_CX25840=m CONFIG_VIDEO_CX2341X=m # CONFIG_VIDEO_VIVI is not set @@ -1464,27 +1596,31 @@ CONFIG_USB_GSPCA=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -# CONFIG_VIDEO_HDPVR is not set -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_VIDEO_CX231XX is not set -# CONFIG_VIDEO_USBVISION is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_QUICKCAM_MESSENGER is not set -# CONFIG_USB_ET61X251 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set -# CONFIG_USB_SN9C102 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_ZC0301 is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y -# CONFIG_USB_ZR364XX is not set -# CONFIG_USB_STKWEBCAM is not set -# CONFIG_USB_S2255 is not set +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_GEMTEK_PCI is not set # CONFIG_RADIO_MAXIRADIO is not set @@ -1573,10 +1709,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y @@ -1693,41 +1826,33 @@ CONFIG_USB_HID=y # # 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_TWINHAN=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_WACOM=m -CONFIG_HID_ZEROPLUS=y -# CONFIG_ZEROPLUS_FF is not set +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_ZEROPLUS is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -1743,6 +1868,8 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -2076,12 +2203,26 @@ CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set # CONFIG_EXT3_FS_XATTR is not set -# CONFIG_EXT4_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y +CONFIG_JBD2=y +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set +CONFIG_JFS_FS=y +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set @@ -2092,6 +2233,7 @@ CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set +CONFIG_QUOTACTL=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m @@ -2133,7 +2275,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set -# CONFIG_CONFIGFS_FS is not set +CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set @@ -2146,15 +2288,17 @@ CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_UBIFS_FS=y -# CONFIG_UBIFS_FS_XATTR is not set +CONFIG_UBIFS_FS_XATTR=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y @@ -2195,7 +2339,8 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set # CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_XATTR is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set @@ -2278,10 +2423,8 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_FS is not set # 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_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y @@ -2425,8 +2568,6 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m diff --git a/recipes/linux/linux-kirkwood/sheevaplug/defconfig b/recipes/linux/linux-kirkwood/sheevaplug/defconfig index 24fe35a122..8e56415e92 100644 --- a/recipes/linux/linux-kirkwood/sheevaplug/defconfig +++ b/recipes/linux/linux-kirkwood/sheevaplug/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32-rc4 -# Wed Oct 14 16:21:38 2009 +# Fri Oct 30 11:17:30 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -31,7 +31,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -49,27 +49,23 @@ CONFIG_TREE_RCU=y CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 # CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set -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_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y @@ -92,7 +88,7 @@ CONFIG_AIO=y # CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y -CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG is not set CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y @@ -108,7 +104,6 @@ CONFIG_HAVE_KRETPROBES=y # CONFIG_SLOW_WORK=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -119,7 +114,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y CONFIG_LBDAF=y -# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -251,7 +246,7 @@ CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PREEMPT=y CONFIG_HZ=100 CONFIG_AEABI=y -CONFIG_OABI_COMPAT=y +# CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_HIGHMEM is not set @@ -278,9 +273,10 @@ CONFIG_UACCESS_WITH_MEMCPY=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyAM0 root=/dev/nfs rw nfsroot=10.4.50.31:/home/rshitrit/cramfs-1.1/cramfs-1.1/shoko2 mem=32M ip=10.4.50.99:10.4.50.31:::ARM:eth0:none" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Power Management @@ -296,8 +292,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y # # At least one emulation must be selected # -# CONFIG_FPE_NWFPE is not set -CONFIG_FPE_FASTFPE=y # CONFIG_VFP is not set # @@ -603,14 +597,18 @@ CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=y +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=y +# CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set -# CONFIG_MAC80211_LEDS is not set +CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set @@ -719,7 +717,7 @@ CONFIG_MTDRAM_ERASE_SIZE=128 # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set CONFIG_MTD_NAND=y -#CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_GPIO is not set @@ -758,17 +756,37 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_UB=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_BLK_DEV_XIP is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m # CONFIG_MG_DISK is not set -# CONFIG_MISC_DEVICES is not set +CONFIG_MISC_DEVICES=y +# 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_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_93CX6=m +# CONFIG_CB710_CORE is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -786,7 +804,7 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set +CONFIG_CHR_DEV_ST=m # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set @@ -804,6 +822,7 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set CONFIG_SCSI_ISCSI_ATTRS=m +# CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set CONFIG_SCSI_LOWLEVEL=y @@ -912,6 +931,7 @@ CONFIG_SATA_MV=y # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_SCH is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=y @@ -1061,29 +1081,96 @@ CONFIG_LIBERTAS_SDIO=y # CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set # CONFIG_LIBERTAS_THINFIRM is not set -# CONFIG_ATMEL is not set -# CONFIG_AT76C50X_USB is not set -# CONFIG_PRISM54 is not set +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_PRISM54=m CONFIG_USB_ZD1201=m -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8180 is not set -# CONFIG_RTL8187 is not set -# CONFIG_ADM8211 is not set -# CONFIG_MAC80211_HWSIM is not set -# CONFIG_MWL8K is not set -# CONFIG_P54_COMMON is not set -# CONFIG_ATH_COMMON is not set -# CONFIG_IPW2100 is not set -# CONFIG_IPW2200 is not set -# CONFIG_IWLWIFI is not set -# CONFIG_HOSTAP is not set -# CONFIG_B43 is not set -# CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set -# CONFIG_HERMES is not set -# CONFIG_WL12XX is not set -# CONFIG_IWM is not set +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_ADM8211=m +CONFIG_MAC80211_HWSIM=m +CONFIG_MWL8K=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +CONFIG_P54_LEDS=y +CONFIG_ATH_COMMON=m +# CONFIG_ATH5K is not set +# CONFIG_ATH9K is not set +# CONFIG_AR9170_USB is not set +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLAGN=m +# CONFIG_IWL4965 is not set +# CONFIG_IWL5000 is not set +CONFIG_IWL3945=m +# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +CONFIG_HOSTAP=m +# CONFIG_HOSTAP_FIRMWARE is not set +# CONFIG_HOSTAP_PLX is not set +# CONFIG_HOSTAP_PCI is not set +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +# CONFIG_B43_SDIO is not set +CONFIG_B43_PHY_LP=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +# CONFIG_RT2400PCI is not set +# CONFIG_RT2500PCI is not set +# CONFIG_RT61PCI is not set +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_HT=y +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_HERMES=m +CONFIG_HERMES_CACHE_FW_ON_INIT=y +# CONFIG_PLX_HERMES is not set +# CONFIG_TMD_HERMES is not set +# CONFIG_NORTEL_HERMES is not set +# CONFIG_PCI_HERMES is not set +CONFIG_WL12XX=m +# CONFIG_WL1251 is not set +# CONFIG_WL1271 is not set +CONFIG_IWM=m # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -1092,20 +1179,41 @@ CONFIG_USB_ZD1201=m # # USB Network Adapters # -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +# CONFIG_USB_BELKIN is not set +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_INT51X1=m # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set # CONFIG_NET_FC is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y # CONFIG_ISDN is not set CONFIG_PHONE=y # CONFIG_PHONE_IXJ is not set @@ -1154,7 +1262,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set -# CONFIG_MOUSE_SERIAL is not set +CONFIG_MOUSE_SERIAL=m # CONFIG_MOUSE_APPLETOUCH is not set # CONFIG_MOUSE_BCM5974 is not set # CONFIG_MOUSE_VSXXXAA is not set @@ -1164,12 +1272,12 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y -# CONFIG_INPUT_ATI_REMOTE is not set -# CONFIG_INPUT_ATI_REMOTE2 is not set -# CONFIG_INPUT_KEYSPAN_REMOTE is not set +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m # CONFIG_INPUT_POWERMATE is not set -# CONFIG_INPUT_YEALINK is not set -# CONFIG_INPUT_CM109 is not set +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set @@ -1348,7 +1456,17 @@ CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -# CONFIG_SSB is not set +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y # # Multifunction device drivers @@ -1388,28 +1506,42 @@ CONFIG_VIDEO_MEDIA=m # CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_CUSTOMISE=y CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m CONFIG_MEDIA_TUNER_TDA9887=m CONFIG_MEDIA_TUNER_TEA5761=m CONFIG_MEDIA_TUNER_TEA5767=m CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS53L32A=m CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_MT9V011=m CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_CX25840=m CONFIG_VIDEO_CX2341X=m # CONFIG_VIDEO_VIVI is not set @@ -1464,27 +1596,31 @@ CONFIG_USB_GSPCA=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -# CONFIG_VIDEO_HDPVR is not set -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_VIDEO_CX231XX is not set -# CONFIG_VIDEO_USBVISION is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_QUICKCAM_MESSENGER is not set -# CONFIG_USB_ET61X251 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set -# CONFIG_USB_SN9C102 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_ZC0301 is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y -# CONFIG_USB_ZR364XX is not set -# CONFIG_USB_STKWEBCAM is not set -# CONFIG_USB_S2255 is not set +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_GEMTEK_PCI is not set # CONFIG_RADIO_MAXIRADIO is not set @@ -1573,10 +1709,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y @@ -1693,41 +1826,33 @@ CONFIG_USB_HID=y # # 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_TWINHAN=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_WACOM=m -CONFIG_HID_ZEROPLUS=y -# CONFIG_ZEROPLUS_FF is not set +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_ZEROPLUS is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -1743,6 +1868,8 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -2076,12 +2203,26 @@ CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set # CONFIG_EXT3_FS_XATTR is not set -# CONFIG_EXT4_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y +CONFIG_JBD2=y +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set +CONFIG_JFS_FS=y +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set @@ -2092,6 +2233,7 @@ CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set +CONFIG_QUOTACTL=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m @@ -2133,7 +2275,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set -# CONFIG_CONFIGFS_FS is not set +CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set @@ -2146,15 +2288,17 @@ CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_UBIFS_FS=y -# CONFIG_UBIFS_FS_XATTR is not set +CONFIG_UBIFS_FS_XATTR=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y @@ -2195,7 +2339,8 @@ CONFIG_RPCSEC_GSS_KRB5=m CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set # CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_XATTR is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set @@ -2278,10 +2423,8 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_FS is not set # 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_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y @@ -2425,8 +2568,6 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m diff --git a/recipes/linux/linux-kirkwood_2.6.31.bb b/recipes/linux/linux-kirkwood_2.6.31.bb index a40a09e49a..49833a488e 100644 --- a/recipes/linux/linux-kirkwood_2.6.31.bb +++ b/recipes/linux/linux-kirkwood_2.6.31.bb @@ -18,6 +18,8 @@ SRCREV = "8cb424312d88810bb62edbeef42a510725ceb482" SRC_URI = "git://git.marvell.com/orion.git;protocol=git \ file://defconfig" +SRC_URI_append_openrd-base = " file://openrd-base-enable-pcie.patch;patch=1" + # update machine types list for ARM architecture, only for machines that need it do_arm_mach_types() { if test ${MACHINE} == openrd-base; then diff --git a/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_1.patch b/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_1.patch new file mode 100644 index 0000000000..627f03c785 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_1.patch @@ -0,0 +1,11 @@ +--- /tmp/elf.h 2009-11-03 20:29:16.000000000 +0100 ++++ git/arch/arm/include/asm/elf.h 2009-11-03 20:29:40.000000000 +0100 +@@ -50,6 +50,8 @@ + #define R_ARM_ABS32 2 + #define R_ARM_CALL 28 + #define R_ARM_JUMP24 29 ++#define R_ARM_MOVW_ABS_NC 43 ++#define R_ARM_MOVT_ABS 44 + + /* + * These are used to set parameters in the core dumps. diff --git a/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_2.patch b/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_2.patch new file mode 100644 index 0000000000..caa8dd533d --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_2.patch @@ -0,0 +1,33 @@ +--- /tmp/module.c 2009-11-03 20:30:56.000000000 +0100 ++++ git/arch/arm/kernel/module.c 2009-11-03 20:34:33.000000000 +0100 +@@ -83,6 +83,7 @@ + unsigned long loc; + Elf32_Sym *sym; + s32 offset; ++ s32 addend; + + offset = ELF32_R_SYM(rel->r_info); + if (offset < 0 || offset > (symsec->sh_size / sizeof(Elf32_Sym))) { +@@ -132,6 +133,22 @@ + *(u32 *)loc |= offset & 0x00ffffff; + break; + ++ case R_ARM_MOVW_ABS_NC: ++ case R_ARM_MOVT_ABS: ++ offset = sym->st_value; ++ ++ addend = ((*(u32 *)loc >> 4) & 0xf000) | (*(u32 *)loc &0xfff); ++ addend = (addend ^ 0x8000) - 0x8000; ++ offset += addend; ++ ++ if (ELF32_R_TYPE(rel->r_info) == R_ARM_MOVT_ABS) ++ offset >>= 16; ++ ++ *(u32 *)loc &= 0xfff0f000; ++ *(u32 *)loc |= offset & 0xfff; ++ *(u32 *)loc |= (offset & 0xf000) << 4; ++ break; ++ + default: + printk(KERN_ERR "%s: unknown relocation: %u\n", + module->name, ELF32_R_TYPE(rel->r_info)); diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index 465d5adc00..130f9a8f69 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -166,6 +166,8 @@ SRC_URI_append = " \ file://arch-has-holes.diff;patch=1 \ file://cache/l1cache-shift.patch;patch=1 \ file://cache/copy-page-tweak.patch;patch=1 \ + file://2.6.29_relocation_1.patch;patch=1 \ + file://2.6.29_relocation_2.patch;patch=1 \ " diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index 0956afdf75..15597104b6 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -25,11 +25,12 @@ SRC_URI_append_boc01 = "\ file://boc01.dts \ file://boc01.dts.v1 \ file://004-081205-usb.patch;patch=1 \ - file://005-091008-isl12024.patch;patch=1 \ + file://005-091103-isl12024.patch;patch=1 \ file://007-091005-lm73.patch;patch=1 \ file://011-091028-gpio.patch;patch=1 \ file://012-091019-capsense.patch;patch=1 \ file://013-091015-lcd.patch;patch=1 \ + file://014-091030-buttons.patch;patch=1 \ " SRC_URI_append_collie = "\ diff --git a/recipes/matchbox-config-gtk/files/no-handed.patch b/recipes/matchbox-config-gtk/files/no-handed.patch new file mode 100644 index 0000000000..9ab51ecedc --- /dev/null +++ b/recipes/matchbox-config-gtk/files/no-handed.patch @@ -0,0 +1,33 @@ +Index: appearance/mb-appearance.c +=================================================================== +--- appearance/mb-appearance.c (revision 1614) ++++ appearance/mb-appearance.c (working copy) +@@ -300,11 +300,13 @@ + gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button), + gconf_value_get_string (value)); + } else if (strcmp (key, HANDED_KEY) == 0) { ++#if 0 + GEnumValue *e; + e = g_enum_get_value_by_name (g_type_class_ref (GTK_TYPE_CORNER_TYPE), + gconf_value_get_string (value)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (handed_check), + e->value == GTK_CORNER_TOP_RIGHT); ++#endif + } + } + +@@ -395,12 +397,13 @@ + gtk_container_add (GTK_CONTAINER (align), font_button); + + /* Left/Right Handed */ +- ++#if 0 + frame = new_frame (_("Orientation"), &align); + gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0); + handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed")); + g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL); + gtk_container_add (GTK_CONTAINER (align), handed_check); ++#endif + + gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); + g_signal_connect (gconf, "value-changed", G_CALLBACK (on_gconf_value_changed), NULL); diff --git a/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb index ec11e45ad7..bc6c0511dd 100644 --- a/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb +++ b/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb @@ -1,11 +1,14 @@ -DESCRIPTION = "Matchbox gtk theme configuration application." +DESCRIPTION = "Matchbox GTK+ theme configuration application." LICENSE = "GPL" -DEPENDS = "gconf libglade gtk+" +DEPENDS = "gconf gtk+" RDEPENDS = "settings-daemon" -PV = "0.0+svn${SRCDATE}" + +PV = "0.0+svnr${SRCREV}" + S = "${WORKDIR}/${PN}" -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" +SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ + file://no-handed.patch;patch=1;pnum=0" inherit autotools pkgconfig diff --git a/recipes/mozilla/firefox-3.5.4/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.5.4/0001-Remove-Werror-from-build.patch new file mode 100644 index 0000000000..008dabbe8d --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.5.4/0002-Fix-security-cross-compile-cpu-detection-error.patch new file mode 100644 index 0000000000..ce8d4d9948 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.5.4/010_FPU_IS_ARM_FPA_xslt.diff new file mode 100644 index 0000000000..854100c4c3 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.5.4/Bug339782.additional.fix.diff new file mode 100644 index 0000000000..0848e730d3 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.5.4/Bug385583.nspr.jmp_buf.eabi.diff new file mode 100644 index 0000000000..486440c30e --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.5.4/Bug405992.atomic.nspr.diff new file mode 100644 index 0000000000..f54f916a6a --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/configure-wchart.patch b/recipes/mozilla/firefox-3.5.4/configure-wchart.patch new file mode 100644 index 0000000000..36ee2a0ba4 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/jemalloc-tls.patch b/recipes/mozilla/firefox-3.5.4/jemalloc-tls.patch new file mode 100644 index 0000000000..d1d740989e --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.5.4/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/linkage-problem.patch b/recipes/mozilla/firefox-3.5.4/linkage-problem.patch new file mode 100644 index 0000000000..28bffd1e22 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/mozconfig b/recipes/mozilla/firefox-3.5.4/mozconfig new file mode 100644 index 0000000000..d8d3f3923d --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/plugins-dir.patch b/recipes/mozilla/firefox-3.5.4/plugins-dir.patch new file mode 100644 index 0000000000..2c8b8e9bd1 --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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.4/security-cross.patch b/recipes/mozilla/firefox-3.5.4/security-cross.patch new file mode 100644 index 0000000000..b6c32fe52f --- /dev/null +++ b/recipes/mozilla/firefox-3.5.4/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_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb new file mode 100644 index 0000000000..48e2709855 --- /dev/null +++ b/recipes/mozilla/firefox_3.5.4.bb @@ -0,0 +1,78 @@ +DEPENDS += "cairo" + +PR = "r1" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \ + file://jsautocfg.h \ + file://security-cross.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://Bug339782.additional.fix.diff;patch=1 \ + file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ + file://Bug405992.atomic.nspr.diff;patch=1 \ + file://jemalloc-tls.patch;patch=1 \ + file://0001-Remove-Werror-from-build.patch;patch=1 \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ + file://plugins-dir.patch;patch=1 \ + file://firefox-plugin.pc \ + file://firefox-xpcom.pc \ + file://nspr.pc \ +" + +S = "${WORKDIR}/mozilla-1.9.1" + +inherit mozilla +require firefox.inc + +EXTRA_OECONF += " --enable-official-branding " + + +export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk +} + +do_stage() { + install -d ${STAGING_INCDIR}/firefox-${PV} + cd ${S}/dist/sdk/include + cp -a obsolete ${STAGING_INCDIR}/firefox-${PV}/ + rm -rf obsolete + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ + done + cd ${S}/dist/include/plugin + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ + done + cd ${S}/nsprpub/pr/include + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ + done + cd ${S}/xpcom/base + headers=`find . -name "*.idl"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ + done + + for pc in ${WORKDIR}/*.pc ; do + sed -i s:3.5.2:${PV}:g $pc + done + + install -d ${PKG_CONFIG_DIR} + install -m 0644 ${WORKDIR}/firefox-plugin.pc ${PKG_CONFIG_DIR} + install -m 0644 ${WORKDIR}/firefox-xpcom.pc ${PKG_CONFIG_DIR} + install -m 0644 ${WORKDIR}/nspr.pc ${PKG_CONFIG_DIR} + install -m 0755 ${S}/xpcom/typelib/xpidl/host_xpidl ${STAGING_BINDIR_NATIVE}/xpidl + + # removes 2 lines that call absent headers + sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h +} diff --git a/recipes/mozilla/firefox_3.5b4.bb b/recipes/mozilla/firefox_3.5b4.bb new file mode 100644 index 0000000000..149ee3cbdf --- /dev/null +++ b/recipes/mozilla/firefox_3.5b4.bb @@ -0,0 +1,46 @@ +DEPENDS += "cairo" + +PV = "3.0.1+3.5b4" +MOZPV = "3.5b4" +PR = "r1" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/source/firefox-${MOZPV}-source.tar.bz2 \ + file://jsautocfg.h \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ +" + +S = "${WORKDIR}/mozilla-1.9.1" + +DEFAULT_PREFERENCE = "-10" + +inherit mozilla +require firefox.inc + +export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +do_configure_prepend() { + sed -i -e s:'head -1':'head -n1':g client.mk + oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure +} + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \ + -e s:'$(OS_TEST)':${TARGET_ARCH}:g \ + ${S}/security/coreconf/Linux.mk +} + +do_stage() { + install -d ${STAGING_INCDIR}/firefox-${MOZPV} + cd dist/sdk/include + rm -rf obsolete + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${MOZPV}/ + done + # removes 2 lines that call absent headers + sed -e '178,179d' ${STAGING_INCDIR}/firefox-${MOZPV}/nsIServiceManager.h +} + diff --git a/recipes/mozilla/firefox_hg.bb b/recipes/mozilla/firefox_hg.bb new file mode 100644 index 0000000000..17a46ee1c8 --- /dev/null +++ b/recipes/mozilla/firefox_hg.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Mozilla Mobile browser" +DEPENDS += "autoconf213-native cairo alsa-lib sqlite3" + +PV = "3.4+3.5b4" +MOZPV = "3.5b4" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=8c9a6d851018 \ + file://jsautocfg.h \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ +" + +S = "${WORKDIR}/mozilla-central" + +inherit mozilla +require firefox.inc + +PARALLEL_MAKE = "" +export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +export LIBXUL_DIST="${S}/objdir/xulrunner/dist/" +CFLAGS_append = " -DMOZ_GFX_OPTIMIZE_MOBILE " + +do_configure_prepend() { + sed -i -e 's:head\ -1:head\ -n1:g' client.mk + oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure +} + +do_compile_prepend() { + # A compile time assert is broken: + # http://mxr.mozilla.org/mozilla-central/source/nsprpub/pr/include/prlog.h#259 + for i in $(find ${S} -name "autoconf.mk") ; do + sed -i -e s:fsigned-char:fno-signed-char:g $i + done + + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \ + -e s:'$(OS_TEST)':${TARGET_ARCH}:g \ + ${S}/security/coreconf/Linux.mk +} + + +do_stage() { + : +} + + +FILES_${PN} += "${libdir}/fennec" + diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb index 09c52ecbc2..b6718cb0cb 100644 --- a/recipes/mysql/mysql_4.1.22.bb +++ b/recipes/mysql/mysql_4.1.22.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/" SECTION = "libs" LICENSE = "GPL" DEPENDS = "ncurses" -PR = "r3" +PR = "r4" SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -39,8 +39,8 @@ do_stage() { } do_stage_append() { - sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'\', ${STAGING_BINDIR_CROSS}/mysql_config - sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'\', ${STAGING_BINDIR_CROSS}/mysql_config + 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() { diff --git a/recipes/mythtv/mythplugins/MythBackend.php.patch b/recipes/mythtv/mythplugins/MythBackend.php.patch new file mode 100644 index 0000000000..95cf86e49f --- /dev/null +++ b/recipes/mythtv/mythplugins/MythBackend.php.patch @@ -0,0 +1,13 @@ +Index: mythplugins-0.22rc1/mythweb/classes/MythBackend.php +=================================================================== +--- mythplugins-0.22rc1.orig/mythweb/classes/MythBackend.php ++++ mythplugins-0.22rc1/mythweb/classes/MythBackend.php +@@ -111,7 +111,7 @@ class MythBackend { + } + + public function setTimezone() { +- if (!is_string($_SESSION['backend']['timezone']['value']) || $_SESSION['backend']['timezone']['last_check_time'] - time() > 60*60*24) { ++ if (!is_string($_SESSION['backend']['timezone']['value']) || time() - $_SESSION['backend']['timezone']['last_check_time'] () > 60*60*24) { + $response = $this->sendCommand('QUERY_TIME_ZONE'); + $timezone = str_replace(' ', '_', $response[0]); + $_SESSION['backend']['timezone']['value'] = $timezone; diff --git a/recipes/mythtv/mythplugins/configure.patch b/recipes/mythtv/mythplugins/configure.patch new file mode 100644 index 0000000000..fd747a92e5 --- /dev/null +++ b/recipes/mythtv/mythplugins/configure.patch @@ -0,0 +1,13 @@ +Index: mythplugins-0.22rc1/configure +=================================================================== +--- mythplugins-0.22rc1.orig/configure ++++ mythplugins-0.22rc1/configure +@@ -730,7 +730,7 @@ if test "$music" = "yes" ; then + fi + + if test "$taglib" = "yes" ; then +- echo "INCLUDEPATH += `taglib-config --prefix`/include/taglib" >> ./mythmusic/mythmusic/config.pro ++ echo "INCLUDEPATH += `taglib-config --cflags | sed 's:-I::'`" >> ./mythmusic/mythmusic/config.pro + fi + fi + diff --git a/recipes/mythtv/mythplugins/mytharchive.pro.patch b/recipes/mythtv/mythplugins/mytharchive.pro.patch new file mode 100644 index 0000000000..e5ea1808a9 --- /dev/null +++ b/recipes/mythtv/mythplugins/mytharchive.pro.patch @@ -0,0 +1,41 @@ +Index: mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro +=================================================================== +--- mythplugins-0.22rc2.orig/mytharchive/mytharchive/mytharchive.pro ++++ mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro +@@ -32,28 +32,28 @@ SOURCES += dbcheck.cpp archiveutil.cpp s + SOURCES += mythburn.cpp themeselector.cpp editmetadata.cpp thumbfinder.cpp + SOURCES += exportnative.cpp importnative.cpp + +-burnuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default ++burnuifiles.path = $${PREFIX}/share/mythtv/themes/default + burnuifiles.files = mythburn-ui.xml + +-scriptfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/scripts ++scriptfiles.path = $${PREFIX}/share/mythtv/mytharchive/scripts + scriptfiles.files = ../mythburn/scripts/* + +-introfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/intro ++introfiles.path = $${PREFIX}/share/mythtv/mytharchive/intro + introfiles.files = ../mythburn/intro/*.mpg + +-musicfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/music ++musicfiles.path = $${PREFIX}/share/mythtv/mytharchive/music + musicfiles.files = ../mythburn/music/*.ac3 + +-imagefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/images ++imagefiles.path = $${PREFIX}/share/mythtv/mytharchive/images + imagefiles.files = ../mythburn/images/*.png + +-themefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/themes ++themefiles.path = $${PREFIX}/share/mythtv/mytharchive/themes + themefiles.files = ../mythburn/themes/* + +-profilefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/encoder_profiles ++profilefiles.path = $${PREFIX}/share/mythtv/mytharchive/encoder_profiles + profilefiles.files = ../mythburn/encoder_profiles/*.xml + +-nativeuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default ++nativeuifiles.path = $${PREFIX}/share/mythtv/themes/default + nativeuifiles.files = mythnative-ui.xml + + INSTALLS += scriptfiles introfiles themefiles imagefiles musicfiles diff --git a/recipes/mythtv/mythplugins/mythplugins_wo_qtopengl.diff b/recipes/mythtv/mythplugins/mythplugins_wo_qtopengl.diff new file mode 100644 index 0000000000..c0eb9d3075 --- /dev/null +++ b/recipes/mythtv/mythplugins/mythplugins_wo_qtopengl.diff @@ -0,0 +1,129 @@ +diff --git a/mythplugins/mytharchive/mytharchive/mytharchive.pro b/mythplugins/mytharchive/mytharchive/mytharchive.pro +index bf7f717..d20e0f7 100644 +--- mythplugins/mytharchive/mytharchive/mytharchive.pro ++++ mythplugins/mytharchive/mytharchive/mytharchive.pro +@@ -14,7 +14,7 @@ LIBS += -lmythavcodec-$$LIBVERSION + LIBS += -lmythavformat-$$LIBVERSION + LIBS += -lmythswscale-$$LIBVERSION + +-TEMPLATE = lib opengl ++TEMPLATE = lib + CONFIG += plugin thread + TARGET = mytharchive + target.path = $${LIBDIR}/mythtv/plugins +@@ -61,6 +61,7 @@ INSTALLS += profilefiles burnuifiles + INSTALLS += nativeuifiles + + #The following line was inserted by qt3to4 +-QT += xml sql opengl ++QT += xml sql ++using_opengl:QT += opengl + + include ( ../../libs-targetfix.pro ) +diff --git a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro +index ae073c1..90e413e 100644 +--- mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro ++++ mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro +@@ -9,7 +9,8 @@ INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libswscale + DEPENDPATH *= $${INCLUDEPATH} + + TEMPLATE = app +-CONFIG += thread opengl ++CONFIG += thread ++using_opengl:CONFIG += opengl + + target.path = $${PREFIX}/bin + +@@ -27,4 +28,5 @@ LIBS += -lmythavcodec-$$LIBVERSION + LIBS += -lmythavformat-$$LIBVERSION + LIBS += -lmythswscale-$$LIBVERSION + +-QT += xml sql opengl ++QT += xml sql ++using_opengl:QT += opengl +diff --git a/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro b/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro +index 98a8a9d..f689c0c 100644 +--- mythplugins/mythbrowser/mythbrowser/mythbrowser.pro ++++ mythplugins/mythbrowser/mythbrowser/mythbrowser.pro +@@ -2,10 +2,12 @@ include (../../mythconfig.mak ) + include (../../settings.pro ) + include (../../programs-libs.pro ) + +-QT += network xml sql opengl webkit ++QT += network xml sql webkit ++using_opengl:QT += opengl + + TEMPLATE = lib +-CONFIG += thread opengl plugin warn_on ++CONFIG += thread plugin warn_on ++using_opengl:CONFIG += opengl + TARGET = mythbrowser + target.path = $${LIBDIR}/mythtv/plugins + INSTALLS += target +diff --git a/mythplugins/mythflix/mythflix/mythflix.pro b/mythplugins/mythflix/mythflix/mythflix.pro +index 5ffa22e..4359f77 100644 +--- mythplugins/mythflix/mythflix/mythflix.pro ++++ mythplugins/mythflix/mythflix/mythflix.pro +@@ -25,6 +25,7 @@ SOURCES += newsengine.cpp dbcheck.cpp flixutil.cpp + + + #The following line was inserted by qt3to4 +-QT += network xml sql opengl qt3support ++QT += network xml sql qt3support ++using_opengl:QT += opengl + + include ( ../../libs-targetfix.pro ) +diff --git a/mythplugins/mythgallery/mythgallery/mythgallery.pro b/mythplugins/mythgallery/mythgallery/mythgallery.pro +index cf8219a..4542477 100644 +--- mythplugins/mythgallery/mythgallery/mythgallery.pro ++++ mythplugins/mythgallery/mythgallery/mythgallery.pro +@@ -37,6 +37,7 @@ opengl { + + + #The following line was inserted by qt3to4 +-QT += network opengl sql xml ++QT += network sql xml ++using_opengl:QT += opengl + + include ( ../../libs-targetfix.pro ) +diff --git a/mythplugins/mythgame/mythgame/mythgame.pro b/mythplugins/mythgame/mythgame/mythgame.pro +index b1f371a..39e7847 100644 +--- mythplugins/mythgame/mythgame/mythgame.pro ++++ mythplugins/mythgame/mythgame/mythgame.pro +@@ -23,6 +23,7 @@ use_hidesyms { + LIBS += -lz + + #The following line was inserted by qt3to4 +-QT += xml sql opengl qt3support ++QT += xml sql qt3support ++using_opengl:QT += opengl + + include ( ../../libs-targetfix.pro ) +diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.pro b/mythplugins/mythmusic/mythmusic/mythmusic.pro +index 177a5bc..1153405 100644 +--- mythplugins/mythmusic/mythmusic/mythmusic.pro ++++ mythplugins/mythmusic/mythmusic/mythmusic.pro +@@ -3,7 +3,8 @@ include ( ../../settings.pro ) + include ( ../../programs-libs.pro ) + include (config.pro) + +-QT += xml sql opengl qt3support network ++QT += xml sql qt3support network ++using_opengl:QT += opengl + + !exists( config.pro ) { + error(Missing config.pro: please run the configure script) +diff --git a/mythplugins/mythvideo/mtd/mtd.pro b/mythplugins/mythvideo/mtd/mtd.pro +index 7c3c357..d63d170 100644 +--- mythplugins/mythvideo/mtd/mtd.pro ++++ mythplugins/mythvideo/mtd/mtd.pro +@@ -5,7 +5,8 @@ include ( ../../programs-libs.pro ) + QT += sql xml network + + TEMPLATE = app +-CONFIG += thread opengl ++CONFIG += thread ++using_opengl:CONFIG += opengl + TARGET = mtd + target.path = $${PREFIX}/bin + INSTALLS += target diff --git a/recipes/mythtv/mythplugins/sysroot.patch b/recipes/mythtv/mythplugins/sysroot.patch new file mode 100644 index 0000000000..4cf344d2d7 --- /dev/null +++ b/recipes/mythtv/mythplugins/sysroot.patch @@ -0,0 +1,197 @@ +Index: mythplugins/programs-libs.pro +=================================================================== +--- mythplugins/programs-libs.pro (revision 22430) ++++ mythplugins/programs-libs.pro (working copy) +@@ -4,7 +4,7 @@ + INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmyth + DEPENDPATH *= $${INCLUDEPATH} + +-LIBS += -L$${LIBDIR} $$EXTRA_LIBS -lmythdb-$$LIBVERSION ++LIBS += -L$${SYSROOT}$${LIBDIR} $$EXTRA_LIBS -lmythdb-$$LIBVERSION + LIBS += -lmythavutil-$$LIBVERSION -lmythavcodec-$$LIBVERSION + LIBS += -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION -lmythupnp-$$LIBVERSION + +Index: mythplugins/configure +=================================================================== +--- mythplugins/configure (revision 22430) ++++ mythplugins/configure (working copy) +@@ -266,24 +266,25 @@ + + has_library() + { +- if test -f /etc/ld.so.conf ; then +- LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` +- else +- LIBPATHS='' +- fi ++ LIBPATHS='' ++ if test "x$sysroot" = "x" ; then ++ if test -f /etc/ld.so.conf ; then ++ LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` ++ fi + +- LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " +- # Mac OS X has a different variable for this: +- LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " ++ LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " ++ # Mac OS X has a different variable for this: ++ LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " + +- # recurse down just one level, should be enough in most cases +- if test -f /etc/ld.so.conf ; then +- INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` +- SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` +- for x in $SRCH ; do +- LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` +- LIBPATHS="$LIBPATHS $LP_APPEND" +- done ++ # recurse down just one level, should be enough in most cases ++ if test -f /etc/ld.so.conf ; then ++ INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` ++ SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` ++ for x in $SRCH ; do ++ LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` ++ LIBPATHS="$LIBPATHS $LP_APPEND" ++ done ++ fi + fi + + LIBPATHS="`echo $LIBPATHS $sysroot$prefix/$libdir_name $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " +@@ -300,8 +301,10 @@ + has_header() + { + HPATHS="$sysroot$prefix/include $sysroot/usr/local/include $sysroot/usr/include $sysroot/usr/include/g++-v3 $sysroot/usr/X11R6/include $sysroot/" +- INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` +- HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` " ++ if test "x$sysroot" = "x" ; then ++ INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` ++ HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` " ++ fi + + HAS_IT="no" + for HPATH in $HPATHS ; do +@@ -689,7 +692,7 @@ + if test "$sdl" = "yes" ; then + echo " libvisual support will be included in MythMusic" + echo "#define LIBVISUAL_SUPPORT 1" >> ./mythmusic/mythmusic/config.h +- echo "INCLUDEPATH += /usr/include/libvisual-0.4" >> ./mythmusic/mythmusic/config.pro ++ echo "INCLUDEPATH += ${sysroot}/usr/include/libvisual-0.4" >> ./mythmusic/mythmusic/config.pro + echo "LIBS += -lvisual-0.4" >> ./mythmusic/mythmusic/config.pro + else + echo " libvisual support will not be included in MythMusic (requires SDL support)" +Index: mythplugins/settings.pro +=================================================================== +--- mythplugins/settings.pro (revision 22430) ++++ mythplugins/settings.pro (working copy) +@@ -3,8 +3,8 @@ + LIBVERSION = 0.22 + + INCLUDEPATH += $${SYSROOT}$${PREFIX}/include +-#INCLUDEPATH += /usr/include/cdda +-#INCLUDEPATH += /usr/include/FLAC ++#INCLUDEPATH += $${SYSROOT}/usr/include/cdda ++#INCLUDEPATH += $${SYSROOT}/usr/include/FLAC + + LIBS *= -L$${SYSROOT}$${PREFIX}/$${LIBDIRNAME} + +Index: mythplugins/mythgallery/mythgallery/mythgallery.pro +=================================================================== +--- mythplugins/mythgallery/mythgallery/mythgallery.pro (revision 22430) ++++ mythplugins/mythgallery/mythgallery/mythgallery.pro (working copy) +@@ -14,7 +14,7 @@ + target.path = $${LIBDIR}/mythtv/plugins + INSTALLS += target + +-INCLUDEPATH += $${PREFIX}/include/mythtv ++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv + + # Input + HEADERS += iconview.h singleview.h +Index: mythplugins/mythweather/mythweather/mythweather.pro +=================================================================== +--- mythplugins/mythweather/mythweather/mythweather.pro (revision 22430) ++++ mythplugins/mythweather/mythweather/mythweather.pro (working copy) +@@ -13,8 +13,8 @@ + QMAKE_COPY_DIR = sh ../../cpsvndir + win32:QMAKE_COPY_DIR = sh ../../cpsimple + +-INCLUDEPATH += $${PREFIX}/include/mythtv +-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui ++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv ++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui + + datafiles.path = $${PREFIX}/share/mythtv/mythweather/ + datafiles.files = weather-screens.xml +Index: mythplugins/mythflix/mythflix/mythflix.pro +=================================================================== +--- mythplugins/mythflix/mythflix/mythflix.pro (revision 22430) ++++ mythplugins/mythflix/mythflix/mythflix.pro (working copy) +@@ -8,7 +8,7 @@ + target.path = $${LIBDIR}/mythtv/plugins + INSTALLS += target + +-INCLUDEPATH += $${PREFIX}/include/mythtv ++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv + + installfiles.path = $${PREFIX}/share/mythtv/mythflix + installfiles.files = netflix-rss.xml +Index: mythplugins/mythmovies/mythmovies/mythmovies.pro +=================================================================== +--- mythplugins/mythmovies/mythmovies/mythmovies.pro (revision 22430) ++++ mythplugins/mythmovies/mythmovies/mythmovies.pro (working copy) +@@ -10,7 +10,7 @@ + target.path = $${LIBDIR}/mythtv/plugins + INSTALLS += target + +-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui ++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui + + # Input + HEADERS += moviesui.h helperobjects.h moviessettings.h +Index: mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro +=================================================================== +--- mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro (revision 22430) ++++ mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro (working copy) +@@ -8,7 +8,7 @@ + target.path = $${LIBDIR}/mythtv/plugins + INSTALLS += target + +-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui ++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui + + # Input + HEADERS += zmconsole.h zmplayer.h zmevents.h zmliveplayer.h zmdefines.h +Index: mythplugins/mythnews/mythnews/mythnews.pro +=================================================================== +--- mythplugins/mythnews/mythnews/mythnews.pro (revision 22430) ++++ mythplugins/mythnews/mythnews/mythnews.pro (working copy) +@@ -10,9 +10,9 @@ + target.path = $${LIBDIR}/mythtv/plugins + INSTALLS += target + +-INCLUDEPATH += $${PREFIX}/include/mythtv +-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui +-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythdb ++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv ++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui ++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythdb + + installfiles.path = $${PREFIX}/share/mythtv/mythnews + installfiles.files = news-sites.xml +Index: mythplugins/targetdep.pro +=================================================================== +--- mythplugins/targetdep.pro (revision 22430) ++++ mythplugins/targetdep.pro (working copy) +@@ -10,10 +10,10 @@ + MYTH_LIB_EXT =$${LIBVERSION}.$${QMAKE_EXTENSION_LIB} + + +-DEPLIBS = $${LIBDIR} ++DEPLIBS = $${SYSROOT}$${LIBDIR} + + # On Windows, dlls were installed with exes: +-mingw : DEPLIBS = $${PREFIX}/bin ++mingw : DEPLIBS = $${SYSROOT}$${PREFIX}/bin + + TARGETDEPS += $${DEPLIBS}/libmyth-$${MYTH_SHLIB_EXT} + TARGETDEPS += $${DEPLIBS}/libmythdb-$${MYTH_SHLIB_EXT} diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb new file mode 100644 index 0000000000..31025329a3 --- /dev/null +++ b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb @@ -0,0 +1,258 @@ +# todo: add mythweb +DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia" +RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \ + mythgame mythmusic mythmovies mythnews mythvideo mythweather" +PV = "0.21+0.22rc2" +PR = "r3" + +QMAKE_PROFILES = "mythplugins.pro" + +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2 \ + file://sysroot.patch;patch=1 \ + file://mythplugins_wo_qtopengl.diff;patch=1 \ + file://configure.patch;patch=1 \ + file://mytharchive.pro.patch;patch=1 \ + " + +S = "${WORKDIR}/mythplugins-0.22rc2" + +inherit qmake2 qt4x11 + +EXTRA_OECONF = " \ + --cross-prefix=${TARGET_PREFIX} \ + --sysroot=${STAGING_DIR_HOST} \ + --prefix=${prefix} \ + --with-libdir-name=${STAGING_LIBDIR} \ + --disable-opengl \ + \ + --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${TARGET_LDFLAGS}" \ + ${EXTRA_MYTHTVCONF} \ +" + +do_configure() { + ${S}/configure --qmake=qmake2 ${EXTRA_OECONF} +} +do_install () { + oe_runmake install INSTALL_ROOT="${D}" +} + +PACKAGES =+ "mytharchive mytharchive-dbg \ + mythbrowser mythbrowser-dbg \ + mythflix mythflix-dbg \ + mythgallery mythgallery-dbg \ + mythgame mythgame-dbg \ + mythmovies mythmovies-dbg \ + mythmusic mythmusic-dbg \ + mythnews mythnews-dbg \ + mythvideo mythvideo-dbg \ + mythweather mythweather-dbg" + +FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \ + ${bindir}/mytharchivehelper \ + ${datadir}/mythtv/i18n/mytharchive* \ + ${datadir}/mythtv/mytharchive/* \ + ${datadir}/mythtv/archiveformat.xml \ + ${datadir}/mythtv/archivemenu.xml \ + ${datadir}/mythtv/archiveutils.xml \ + ${datadir}/mythtv/themes/default/mytharchive-ui.xml \ + ${datadir}/mythtv/themes/default/mythburn-ui.xml \ + ${datadir}/mythtv/themes/default/mythnative-ui.xml \ + ${datadir}/mythtv/themes/default/ma_*.png \ + ${datadir}/mythtv/themes/default/mb_progressbar_background.png \ + ${datadir}/mythtv/themes/default/mb_progressbar_fill.png \ + ${datadir}/mythtv/themes/default-wide/mytharchive-ui.xml \ + ${datadir}/mythtv/themes/default-wide/mythburn-ui.xml \ + ${datadir}/mythtv/themes/default-wide/mythnative-ui.xml \ + " +FILES_mytharchive-dbg = "${bindir}/.debug/mytharchivehelper \ + ${libdir}/mythtv/plugins/.debug/libmytharchive.so" +FILES_mythbrowser = "${libdir}/mythtv/plugins/libmythbrowser.so \ + ${bindir}/mythbrowser \ + ${datadir}/mythtv/i18n/mythbrowser* \ + ${datadir}/mythtv/themes/default/browser-ui.xml \ + ${datadir}/mythtv/themes/default-wide/browser-ui.xml \ + " +FILES_mythbrowser-dbg = "${libdir}/mythtv/plugins/.debug/libmythbrowser.so" +FILES_mythflix = "${libdir}/mythtv/plugins/libmythflix.so \ + ${datadir}/mythtv/i18n/mythflix* \ + ${datadir}/mythtv/mythflix/* \ + ${datadir}/mythtv/netflix_menu.xml \ + ${datadir}/mythtv/themes/default/mythflix_background.png \ + ${datadir}/mythtv/themes/default/netflix-ui.xml \ + ${datadir}/mythtv/themes/default-wide/netflix-ui.xml \ + ${datadir}/mythtv/themes/default/title_netflix.png \ + ${datadir}/mythtv/themes/default-wide/netflix-bg.png \ + " +FILES_mythflix-dbg = "${libdir}/mythtv/plugins/.debug/libmythflix.so" +FILES_mythgallery = "${libdir}/mythtv/plugins/libmythgallery.so \ + ${datadir}/mythtv/i18n/mythgallery* \ + ${datadir}/mythtv/themes/default/gallery*.png \ + ${datadir}/mythtv/themes/default/gallery-ui.xml \ + ${datadir}/mythtv/themes/default-wide/gallery-ui.xml \ + " +FILES_mythgallery-dbg = "${libdir}/mythtv/plugins/.debug/libmythgallery.so" +FILES_mythgame = "${libdir}/mythtv/plugins/libmythgame.so \ + ${datadir}/mythtv/i18n/mythgame* \ + ${datadir}/mythtv/game_settings.xml \ + ${datadir}/mythtv/themes/default/game-ui.xml \ + ${datadir}/mythtv/themes/default-wide/game-ui.xml \ + " +FILES_mythgame-dbg = "${libdir}/mythtv/plugins/.debug/libmythgame.so" +FILES_mythmovies = "${libdir}/mythtv/plugins/libmythmovies.so \ + ${bindir}/ignyte \ + ${datadir}/mythtv/mythmovies/* \ + ${datadir}/mythtv/i18n/mythmovies* \ + ${datadir}/mythtv/themes/default/movies-ui.xml \ + ${datadir}/mythtv/themes/default-wide/movies-ui.xml \ + " +FILES_mythmovies-dbg = "${bindir}/.debug/ignyte \ + ${libdir}/mythtv/plugins/.debug/libmythmovies.so" +FILES_mythmusic = "${libdir}/mythtv/plugins/libmythmusic.so \ + ${datadir}/mythtv/mythmusic/* \ + ${datadir}/mythtv/i18n/mythmusic* \ + ${datadir}/mythtv/music_settings.xml \ + ${datadir}/mythtv/musicmenu.xml \ + ${datadir}/mythtv/themes/default/selectionbar.png \ + ${datadir}/mythtv/themes/default/mm_browser_back_reg.png \ + ${datadir}/mythtv/themes/default/music-sel-bg.png \ + ${datadir}/mythtv/themes/default/mm_rip_banner.png \ + ${datadir}/mythtv/themes/default/mm_prev_on.png \ + ${datadir}/mythtv/themes/default/next_button_off.png \ + ${datadir}/mythtv/themes/default/mm_next_pushed.png \ + ${datadir}/mythtv/themes/default/stop_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_folder.png \ + ${datadir}/mythtv/themes/default/mm_left_arrow.png \ + ${datadir}/mythtv/themes/default/rew_button_on.png \ + ${datadir}/mythtv/themes/default/next_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_trans_background.png \ + ${datadir}/mythtv/themes/default/prev_button_off.png \ + ${datadir}/mythtv/themes/default/mm_browser_back_sel.png \ + ${datadir}/mythtv/themes/default/ff_button_off.png \ + ${datadir}/mythtv/themes/default/mm_volume_tick.png \ + ${datadir}/mythtv/themes/default/stop_button_off.png \ + ${datadir}/mythtv/themes/default/mm_progress-fg.png \ + ${datadir}/mythtv/themes/default/mm_rip_background.png \ + ${datadir}/mythtv/themes/default/rew_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_next_off.png \ + ${datadir}/mythtv/themes/default/mm_next_on.png \ + ${datadir}/mythtv/themes/default/pause_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_nothumb.png \ + ${datadir}/mythtv/themes/default/stop_button_on.png \ + ${datadir}/mythtv/themes/default/mm_blackhole_border.png \ + ${datadir}/mythtv/themes/default/mm_prev_pushed.png \ + ${datadir}/mythtv/themes/default/pause_button_on.png \ + ${datadir}/mythtv/themes/default/play_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_progress_foreground.png \ + ${datadir}/mythtv/themes/default/pause_button_off.png \ + ${datadir}/mythtv/themes/default/play_button_off.png \ + ${datadir}/mythtv/themes/default/mm_progress_background.png \ + ${datadir}/mythtv/themes/default/mm_up_arrow.png \ + ${datadir}/mythtv/themes/default/prev_button_on.png \ + ${datadir}/mythtv/themes/default/mm_volume_background.png \ + ${datadir}/mythtv/themes/default/ff_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_prev_off.png \ + ${datadir}/mythtv/themes/default/miniplayer_background.png \ + ${datadir}/mythtv/themes/default/mm_progress-bg.png \ + ${datadir}/mythtv/themes/default/track_info_background.png \ + ${datadir}/mythtv/themes/default/mm_waiting.png \ + ${datadir}/mythtv/themes/default/play_button_on.png \ + ${datadir}/mythtv/themes/default/prev_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_right_arrow.png \ + ${datadir}/mythtv/themes/default/ff_button_on.png \ + ${datadir}/mythtv/themes/default/mm_down_arrow.png \ + ${datadir}/mythtv/themes/default/next_button_on.png \ + ${datadir}/mythtv/themes/default/mm_rating.png \ + ${datadir}/mythtv/themes/default/rew_button_off.png \ + ${datadir}/mythtv/themes/default/mm-titlelines.png \ + ${datadir}/mythtv/themes/default-wide/music-sel-bg.png \ + ${datadir}/mythtv/themes/default-wide/mm_blackhole_border.png \ + ${datadir}/mythtv/themes/default-wide/mm_volume_background.png \ + ${datadir}/mythtv/themes/default-wide/mm_waiting.png \ + ${datadir}/mythtv/themes/default-wide/mm-titlelines.png \ + ${datadir}/mythtv/themes/default/music-ui.xml \ + ${datadir}/mythtv/themes/default-wide/music-ui.xml \ + " +FILES_mythmusic-dbg = "${libdir}/mythtv/plugins/.debug/libmythmusic.so" +FILES_mythnews = "${libdir}/mythtv/plugins/libmythnews.so \ + ${datadir}/mythtv/mythnews/* \ + ${datadir}/mythtv/i18n/mythnews* \ + ${datadir}/mythtv/themes/default/enclosures.png \ + ${datadir}/mythtv/themes/default/need-download.png \ + ${datadir}/mythtv/themes/default/podcast.png \ + ${datadir}/mythtv/themes/default/news-info-bg.png \ + ${datadir}/mythtv/themes/default/news-ui.xml \ + ${datadir}/mythtv/themes/default-wide/news-ui.xml \ + " +FILES_mythnews-dbg = "${libdir}/mythtv/plugins/.debug/libmythnews.so" +FILES_mythvideo = "${libdir}/mythtv/plugins/libmythvideo.so \ + ${bindir}/mtd \ + ${datadir}/mythtv/mythvideo/* \ + ${datadir}/mythtv/i18n/mythvideo* \ + ${datadir}/mythtv/themes/default/md_progress_background.png \ + ${datadir}/mythtv/themes/default/md_rip_banner.png \ + ${datadir}/mythtv/themes/default/mv_level_none.png \ + ${datadir}/mythtv/themes/default/mv_browse_background.png \ + ${datadir}/mythtv/themes/default/mv_itemdetail_popup.png \ + ${datadir}/mythtv/themes/default/mv_filerequest.png \ + ${datadir}/mythtv/themes/default/mv_level_high.png \ + ${datadir}/mythtv/themes/default/mv_results_popup.png \ + ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \ + ${datadir}/mythtv/themes/default/mv_level_low.png \ + ${datadir}/mythtv/themes/default/mv_level_lowest.png \ + ${datadir}/mythtv/themes/default/mv_level_medium.png \ + ${datadir}/mythtv/themes/default/mv_browse_selector.png \ + ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \ + ${datadir}/mythtv/themes/default-wide/mv_browse_selector.png \ + ${datadir}/mythtv/themes/default-wide/mv_browse_background.png \ + ${datadir}/mythtv/themes/default-wide/mv_browse_nocover_large.png \ + ${datadir}/mythtv/themes/default-wide/mv_itemdetail_popup.png \ + ${datadir}/mythtv/themes/default-wide/movies-ui.xml \ + ${datadir}/mythtv/themes/default/dvd-ui.xml \ + ${datadir}/mythtv/themes/default-wide/dvd-ui.xml \ + ${datadir}/mythtv/themes/default/video-ui.xml \ + ${datadir}/mythtv/themes/default-wide/video-ui.xml \ + ${datadir}/mythtv/video_settings.xml \ + ${datadir}/mythtv/videomenu.xml \ + " +FILES_mythvideo-dbg = "${bindir}/.debug/mtd \ + ${libdir}/mythtv/plugins/.debug/libmythvideo.so" +FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \ + ${datadir}/mythtv/mythweather/* \ + ${datadir}/mythtv/i18n/mythweather* \ + ${datadir}/mythtv/themes/default-wide/mw-background.png \ + ${datadir}/mythtv/themes/default-wide/mw-lines.png \ + ${datadir}/mythtv/themes/default-wide/mw-map-sat.png \ + ${datadir}/mythtv/themes/default-wide/mw-map.png \ + ${datadir}/mythtv/themes/default-wide/mw-popup.png \ + ${datadir}/mythtv/themes/default-wide/weather-ui.xml \ + ${datadir}/mythtv/themes/default/cloudy.png \ + ${datadir}/mythtv/themes/default/fair.png \ + ${datadir}/mythtv/themes/default/flurries.png \ + ${datadir}/mythtv/themes/default/fog.png \ + ${datadir}/mythtv/themes/default/logo.png \ + ${datadir}/mythtv/themes/default/lshowers.png \ + ${datadir}/mythtv/themes/default/mcloudy.png \ + ${datadir}/mythtv/themes/default/mw_background.png \ + ${datadir}/mythtv/themes/default/mw_checked.png \ + ${datadir}/mythtv/themes/default/mw_checked_high.png \ + ${datadir}/mythtv/themes/default/mw_lines.png \ + ${datadir}/mythtv/themes/default/mw_map-sat.png \ + ${datadir}/mythtv/themes/default/mw_map.png \ + ${datadir}/mythtv/themes/default/mw_popup.png \ + ${datadir}/mythtv/themes/default/mw_shading.png \ + ${datadir}/mythtv/themes/default/mw_unchecked.png \ + ${datadir}/mythtv/themes/default/mw_unchecked_high.png \ + ${datadir}/mythtv/themes/default/mwmain.png \ + ${datadir}/mythtv/themes/default/pcloudy.png \ + ${datadir}/mythtv/themes/default/rainsnow.png \ + ${datadir}/mythtv/themes/default/showers.png \ + ${datadir}/mythtv/themes/default/snowshow.png \ + ${datadir}/mythtv/themes/default/sunny.png \ + ${datadir}/mythtv/themes/default/thunshowers.png \ + ${datadir}/mythtv/themes/default/unknown.png \ + ${datadir}/mythtv/themes/default/weather-ui.xml \ + ${datadir}/mythtv/weather_settings.xml \ + " +FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so" diff --git a/recipes/mythtv/myththemes_0.21+0.22rc2.bb b/recipes/mythtv/myththemes_0.21+0.22rc2.bb new file mode 100644 index 0000000000..a3be987fe9 --- /dev/null +++ b/recipes/mythtv/myththemes_0.21+0.22rc2.bb @@ -0,0 +1,19 @@ +inherit qmake2 + +PV = "0.21+0.22rc2" +PR = "r0" + +FILES_${PN} =+ "${datadir}" + +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2" + +S = "${WORKDIR}/myththemes-0.22rc2" + +do_configure() { + ${S}/configure --qmake=qmake2 --sysroot=${STAGING_DIR_HOST} --prefix=${prefix} +} + +do_install () { + oe_runmake install INSTALL_ROOT=${D} +} + diff --git a/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch b/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch new file mode 100644 index 0000000000..748c88d9fc --- /dev/null +++ b/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch @@ -0,0 +1,61 @@ +Index: mythtv/configure +=================================================================== +--- mythtv/configure (revision 22430) ++++ mythtv/configure (working copy) +@@ -919,27 +919,27 @@ + #deprecated, use check_lib or check_lib2 instead + has_library() + { +- if test -f /etc/ld.so.conf ; then +- LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` +- else +- LIBPATHS='' +- fi ++ LIBPATHS='' ++ if test "x${sysroot}" = "x" ; then ++ if test -f /etc/ld.so.conf ; then ++ LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` ++ fi ++ LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " ++ # Mac OS X has a different variable for this: ++ LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " + +- LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " +- # Mac OS X has a different variable for this: +- LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " +- +- # recurse down just one level, should be enough in most cases +- if test -f /etc/ld.so.conf ; then +- INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` +- SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` +- for x in $SRCH ; do +- LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` +- LIBPATHS="$LIBPATHS $LP_APPEND" +- done ++ # recurse down just one level, should be enough in most cases ++ if test -f /etc/ld.so.conf ; then ++ INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` ++ SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` ++ for x in $SRCH ; do ++ LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` ++ LIBPATHS="$LIBPATHS $LP_APPEND" ++ done ++ fi + fi + +- LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " ++ LIBPATHS="`echo $LIBPATHS $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " + + HAS_IT="no" + for LIBPATH in $LIBPATHS ; do +@@ -4252,8 +4252,8 @@ + # -L from early in the link line, to ignore any old installed libmyth* + # Note: Qt uses QMAKE_INCDIR_QT to build an absolute path for include + # directories, it cannot be modified. +-QMAKE_LIBDIR_QT -= $libdir +-LATE_LIBS += -L$libdir ++QMAKE_LIBDIR_QT -= ${sysroot}${libdir} ++LATE_LIBS += -L${sysroot}${libdir} + EOF + + diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1 diff --git a/recipes/mythtv/mythtv_0.21+0.22rc2.bb b/recipes/mythtv/mythtv_0.21+0.22rc2.bb new file mode 100644 index 0000000000..38608797eb --- /dev/null +++ b/recipes/mythtv/mythtv_0.21+0.22rc2.bb @@ -0,0 +1,113 @@ +require mythtv.inc + +RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" +PV = "0.21+0.22rc2" +PR = "r0" +REALPV = "0.22" + +#DEFAULT_PREFERENCE = "-1" +ALLOW_EMPTY_${PN} = "1" + +QMAKE_PROFILES = "mythtv.pro" + +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2 \ + file://configure.patch;patch=1 \ + " + +S = "${WORKDIR}/mythtv-0.22rc2" + +inherit qmake2 qt4x11 + +EXTRA_MYTHTVCONF_armv7a = "--cpu=cortex-a8" +EXTRA_MYTHTVCONF_armv5te = "--cpu=armv5te" +EXTRA_MYTHTVCONF ?= "" +EXTRA_OECONF = " \ + --cross-prefix=${TARGET_PREFIX} \ + --sysroot=${STAGING_DIR_HOST} \ + --prefix=${prefix} \ + --arch=${TARGET_ARCH} \ + \ + --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${TARGET_LDFLAGS}" \ + ${EXTRA_MYTHTVCONF} \ +" + +do_configure_prepend() { +# it's not autotools anyway, so we call ./configure directly + find . -name "Makefile"|xargs rm -f + ./configure --qmake=qmake2 \ + --disable-altivec \ + --disable-opengl \ + --disable-stripping \ + --disable-xvmc \ + --enable-v4l \ + --enable-audio-oss \ + --enable-dvb \ + --enable-libmp3lame \ + --dvb-path=${STAGING_INCDIR} \ + --without-bindings=perl,python \ + ${EXTRA_OECONF} +} +do_stage() { + install -d ${STAGING_INCDIR} + install -d ${STAGING_INCDIR}/${PN} + install -d ${STAGING_INCDIR}/${PN}/dvdnav + install -d ${STAGING_INCDIR}/${PN}/dvdread + install -d ${STAGING_INCDIR}/${PN}/libavcodec + install -d ${STAGING_INCDIR}/${PN}/libavformat + install -d ${STAGING_INCDIR}/${PN}/libavutil + install -d ${STAGING_INCDIR}/${PN}/libmyth + install -d ${STAGING_INCDIR}/${PN}/libmythdb + install -d ${STAGING_INCDIR}/${PN}/libmythui + install -d ${STAGING_INCDIR}/${PN}/libswscale + install -d ${STAGING_INCDIR}/${PN}/mpeg2dec + install -d ${STAGING_INCDIR}/${PN}/upnp + install -m 0644 ${D}/${includedir}/${PN}/*.h ${STAGING_INCDIR}/${PN} + install -m 0644 ${D}/${includedir}/${PN}/mythconfig.mak ${STAGING_INCDIR}/${PN} + install -m 0644 ${D}/${includedir}/${PN}/dvdnav/*.h ${STAGING_INCDIR}/${PN}/dvdnav + install -m 0644 ${D}/${includedir}/${PN}/dvdread/*.h ${STAGING_INCDIR}/${PN}/dvdread + install -m 0644 ${D}/${includedir}/${PN}/libavcodec/*.h ${STAGING_INCDIR}/${PN}/libavcodec + install -m 0644 ${D}/${includedir}/${PN}/libavformat/*.h ${STAGING_INCDIR}/${PN}/libavformat + install -m 0644 ${D}/${includedir}/${PN}/libavutil/*.h ${STAGING_INCDIR}/${PN}/libavutil + install -m 0644 ${D}/${includedir}/${PN}/libmyth/*.h ${STAGING_INCDIR}/${PN}/libmyth + install -m 0644 ${D}/${includedir}/${PN}/libmythdb/*.h ${STAGING_INCDIR}/${PN}/libmythdb + install -m 0644 ${D}/${includedir}/${PN}/libmythui/*.h ${STAGING_INCDIR}/${PN}/libmythui + install -m 0644 ${D}/${includedir}/${PN}/libswscale/*.h ${STAGING_INCDIR}/${PN}/libswscale + install -m 0644 ${D}/${includedir}/${PN}/mpeg2dec/*.h ${STAGING_INCDIR}/${PN}/mpeg2dec + install -m 0644 ${D}/${includedir}/${PN}/upnp/*.h ${STAGING_INCDIR}/${PN}/upnp + # next part may need to be done better + cp -R ${D}/${libdir}/* ${STAGING_LIBDIR} + # ugly chmod ahead + chmod -R ugo+r ${STAGING_LIBDIR} +} + +PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" +PACKAGES_DYNAMIC = "mythtv-theme-*" + +FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug" +FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode" +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}" + +mythlibs = "mythdb mythavutil mythavcodec mythavformat mythswscale mythhdhomerun myth mythtv mythui mythfreemheg mythupnp mythlivemedia" + +python __anonymous () { + import bb + mythlibs = bb.data.getVar('mythlibs', d).split() + pv = bb.data.expand(bb.data.getVar("REALPV", d), d) + for m in mythlibs: + bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d) + bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d) + packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split()) + bb.data.setVar("PACKAGES", packages, d) +} +python populate_packages_prepend () { + new_packages = [] + def the_hook(file, pkg, pattern, format, basename): + new_packages.append(pkg) + do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True) + bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d) +} diff --git a/recipes/mythtv/mythtv_0.22rc1.bb b/recipes/mythtv/mythtv_0.22rc1.bb deleted file mode 100644 index b7cadb3c4a..0000000000 --- a/recipes/mythtv/mythtv_0.22rc1.bb +++ /dev/null @@ -1,89 +0,0 @@ -require mythtv.inc - -inherit qmake2 qt4x11 - -DEFAULT_PREFERENCE = "-1" - -PV = "0.21+0.22rc1" -PR = "r2" -REALPV = "0.22" - -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc1.tar.bz2" - -S = "${WORKDIR}/mythtv-0.22rc1" - -QMAKE_PROFILES = "mythtv.pro" - -mythlibs = "mythdb mythavutil mythavcodec mythavformat mythswscale mythhdhomerun myth mythtv mythui mythfreemheg mythupnp mythlivemedia" -PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" - -FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug" -FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode" -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}" -RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" -ALLOW_EMPTY_${PN} = "1" - -PACKAGES_DYNAMIC = "mythtv-theme-*" - -python __anonymous () { - import bb - - mythlibs = bb.data.getVar('mythlibs', d).split() - pv = bb.data.expand(bb.data.getVar("REALPV", d), d) - - for m in mythlibs: - bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d) - bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d) - - packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split()) - - bb.data.setVar("PACKAGES", packages, d) -} - -EXTRA_MYTHTVCONF_armv7a = "--cpu=cortex-a8" -EXTRA_MYTHTVCONF_armv5te = "--cpu=armv5te" -EXTRA_MYTHTVCONF ?= "" - -EXTRA_OECONF = " \ - --cross-prefix=${TARGET_PREFIX} \ - --sysroot=${STAGING_DIR_HOST} \ - --prefix=${prefix} \ - \ - --arch=${TARGET_ARCH} \ - --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ - --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ - --extra-ldflags="${TARGET_LDFLAGS}" \ - ${EXTRA_MYTHTVCONF} \ -" - -do_configure_prepend() { -# it's not autotools anyway, so we call ./configure directly - find . -name "Makefile"|xargs rm -f - - ./configure --qmake=qmake2 \ - --disable-altivec \ - --disable-opengl \ - --disable-stripping \ - --disable-xvmc \ - --enable-v4l \ - --enable-audio-oss \ - --enable-dvb \ - --enable-libmp3lame \ - --dvb-path=${STAGING_INCDIR} \ - --without-bindings=perl,python \ - ${EXTRA_OECONF} -} - -python populate_packages_prepend () { - new_packages = [] - - def the_hook(file, pkg, pattern, format, basename): - new_packages.append(pkg) - - do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True) - - bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d) -} diff --git a/recipes/neon/neon_0.25.5.bb b/recipes/neon/neon_0.25.5.bb index 9151a74665..0f99c0ba9b 100644 --- a/recipes/neon/neon_0.25.5.bb +++ b/recipes/neon/neon_0.25.5.bb @@ -13,6 +13,7 @@ SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \ inherit autotools binconfig lib_package pkgconfig EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" +EXTRA_AUTORECONF=" -I ${S}/macros " do_stage() { autotools_stage_all diff --git a/recipes/neon/neon_0.26.0.bb b/recipes/neon/neon_0.26.0.bb index 3a234851aa..4df99f7b2c 100644 --- a/recipes/neon/neon_0.26.0.bb +++ b/recipes/neon/neon_0.26.0.bb @@ -11,6 +11,7 @@ SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz" inherit autotools binconfig lib_package pkgconfig EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" +EXTRA_AUTORECONF=" -I ${S}/macros " do_stage () { autotools_stage_all diff --git a/recipes/ntp/ntp-4.2.4p7/ntpdate b/recipes/ntp/ntp-4.2.4p7/ntpdate new file mode 100755 index 0000000000..784b029ad5 --- /dev/null +++ b/recipes/ntp/ntp-4.2.4p7/ntpdate @@ -0,0 +1,49 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/bin + +test -x /usr/bin/ntpdate || exit 0 + +if test -f /etc/default/ntpdate ; then +. /etc/default/ntpdate +else +NTPSERVERS="pool.ntp.org" +fi + +test -n "$NTPSERVERS" || exit 0 + +# This is a heuristic: The idea is that if a static interface is brought +# up, that is a major event, and we can put in some extra effort to fix +# the system time. Feel free to change this, especially if you regularly +# bring up new network interfaces. +if [ "$METHOD" = static ]; then + OPTS="-b" +fi + +if [ "$METHOD" = loopback ]; then + exit 0 +fi + +( + +LOCKFILE=/var/lock/ntpdate + +# Avoid running more than one at a time +if [ -x /usr/bin/lockfile-create ]; then + lockfile-create $LOCKFILE + lockfile-touch $LOCKFILE & + LOCKTOUCHPID="$!" +fi + +if /usr/bin/ntpdate -s $OPTS $NTPSERVERS 2>/dev/null; then + if [ "$UPDATE_HWCLOCK" = "yes" ]; then + hwclock --systohc || : + fi +fi + +if [ -x /usr/bin/lockfile-create ] ; then + kill $LOCKTOUCHPID + lockfile-remove $LOCKFILE +fi + +) & diff --git a/recipes/ntp/ntp_4.2.4p7.bb b/recipes/ntp/ntp_4.2.4p7.bb index 5e24e8adb1..4109c40c29 100644 --- a/recipes/ntp/ntp_4.2.4p7.bb +++ b/recipes/ntp/ntp_4.2.4p7.bb @@ -1,6 +1,6 @@ require ntp.inc -PR = "r0" +PR = "r1" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://tickadj.c.patch;patch=1 \ @@ -17,24 +17,24 @@ FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/n FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd" FILES_${PN}-tickadj = "${bindir}/tickadj" FILES_ntp-utils = "${bindir}/*" +FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate" do_install_append() { install -d ${D}/${sysconfdir}/init.d install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir} - install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/init.d install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d + install -d ${D}/${sysconfdir}/network/if-up.d + install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d } pkg_postinst_ntpdate() { if test "x$D" != "x"; then exit 1 else - if ! grep -q ntpdate /etc/cron/crontabs/root; then + if ! grep -q -s ntpdate /etc/cron/crontabs/root; then echo "adding crontab" test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs echo "30 * * * * /usr/bin/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root fi - update-rc.d -s busybox-cron defaults - update-rc.d -s ntpdate defaults 30 fi } diff --git a/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb b/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb new file mode 100644 index 0000000000..f671e15165 --- /dev/null +++ b/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb @@ -0,0 +1,9 @@ +require openvpn.inc + +SRC_URI = "http://openvpn.net/release/openvpn-2.1_rc20.tar.gz \ + file://openvpn" + +S = "${WORKDIR}/openvpn-2.1_rc20" + +# I want openvpn to be able to read password from file (hrw) +EXTRA_OECONF += "--enable-password-save" diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index c146c75b79..aa91955c3a 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -4,13 +4,14 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "curl gpgme" PV = "0.1.6+svnr${SRCREV}" -INC_PR = "r15" +INC_PR = "r16" FILESPATHPKG =. "opkg:" SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ file://opkg_unarchive.patch;patch=1;maxrev=201 \ - file://opkg-intercept-cleanup.patch;patch=1" + file://opkg-intercept-cleanup.patch;patch=1 \ + file://isatty.patch;patch=1" SRC_URI += "file://configure" diff --git a/recipes/opkg/opkg/isatty.patch b/recipes/opkg/opkg/isatty.patch new file mode 100644 index 0000000000..c935f153d1 --- /dev/null +++ b/recipes/opkg/opkg/isatty.patch @@ -0,0 +1,64 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +Don't prompt for user input from stdin if it's not a tty. Fixes a minor +memory leak while we're at it, as the code was strdup'ing the malloc'd string +read from stdin without ever freeing the original. +--- + libopkg/libopkg.c | 13 ++++++++----- + libopkg/opkg_install.c | 3 +++ + libopkg/user.c | 10 +++++++--- + 3 files changed, 18 insertions(+), 8 deletions(-) + +--- trunk.orig/libopkg/libopkg.c ++++ trunk/libopkg/libopkg.c +@@ -71,11 +71,14 @@ int default_opkg_status_callback(char *n + char* default_opkg_response_callback(char *question) + { + char *response = NULL; +- printf("%s",question); +- fflush(stdout); +- do { +- response = (char *)file_read_line_alloc(stdin); +- } while (response == NULL); ++ if (isatty(fileno(stdin))) ++ { ++ printf("%s",question); ++ fflush(stdout); ++ do { ++ response = (char *)file_read_line_alloc(stdin); ++ } while (response == NULL); ++ } + return response; + } + +--- trunk.orig/libopkg/user.c ++++ trunk/libopkg/user.c +@@ -44,9 +44,13 @@ char *get_user_response(const char *form + len = vsnprintf(question,question_len,format,ap); + va_end(ap); + } while (len > question_len); +- response = strdup(opkg_cb_response(question)); +- str_chomp(response); +- str_tolower(response); ++ ++ response = opkg_cb_response(question); ++ if (response) ++ { ++ str_chomp(response); ++ str_tolower(response); ++ } + + return response; + } +--- trunk.orig/libopkg/opkg_install.c ++++ trunk/libopkg/opkg_install.c +@@ -1613,6 +1613,9 @@ static int user_prefers_old_conffile(con + " D : show the differences between the versions (if diff is installed)\n" + " The default action is to keep your current version.\n" + " *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name); ++ if (!response) ++ return 1; ++ + if (strcmp(response, "y") == 0 + || strcmp(response, "i") == 0 + || strcmp(response, "yes") == 0) { diff --git a/recipes/perl/libxml-parser-perl_2.36.bb b/recipes/perl/libxml-parser-perl_2.36.bb new file mode 100644 index 0000000000..c96489b2de --- /dev/null +++ b/recipes/perl/libxml-parser-perl_2.36.bb @@ -0,0 +1,21 @@ +SECTION = "libs" +LICENSE = "Artistic" +DEPENDS += "expat expat-native" + +SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" + +S = "${WORKDIR}/XML-Parser-${PV}" + +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" + +inherit cpan + +do_compile() { + export LIBC="$(find ${STAGING_DIR}/lib -name 'libc-*.so')" + cpan_do_compile +} + + + +FILES_${PN} = "${PERLLIBDIRS}/auto/XML/Parser/Expat/* \ + ${PERLLIBDIRS}/XML" diff --git a/recipes/powervr-drivers/bc-cat-omap3-module/rc.bccat b/recipes/powervr-drivers/bc-cat-omap3-module/rc.bccat new file mode 100644 index 0000000000..eeb3fdc141 --- /dev/null +++ b/recipes/powervr-drivers/bc-cat-omap3-module/rc.bccat @@ -0,0 +1,22 @@ +#!/bin/sh +# +# install bc-cat module and create device nodes +# +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +case "$1" in + start) echo -n "install bc-cat kernel module... " + modprobe -f bc-cat + rm -rf /dev/bc_cat + mknod /dev/bc_cat c `awk "\\$2==\"bc_cat\" {print \\$1}" /proc/devices` 0 + echo "done" + ;; + stop) echo -n "removing bc-cat kernel module... " + rmmod bc-cat + echo "done" + rm -rf /dev/bc_cat + ;; + *) echo "$0 <start/stop>" + ;; +esac + diff --git a/recipes/powervr-drivers/bc-cat-omap3-module_0.1.0.bb b/recipes/powervr-drivers/bc-cat-omap3-module_0.1.0.bb new file mode 100644 index 0000000000..7f5cc70b5d --- /dev/null +++ b/recipes/powervr-drivers/bc-cat-omap3-module_0.1.0.bb @@ -0,0 +1,2 @@ +require bc-cat.inc + diff --git a/recipes/powervr-drivers/bc-cat.inc b/recipes/powervr-drivers/bc-cat.inc new file mode 100644 index 0000000000..4213113393 --- /dev/null +++ b/recipes/powervr-drivers/bc-cat.inc @@ -0,0 +1,51 @@ +DESCRIPTION = "Video texture streaming via IMG 3rdparty bufferclass (bc-cat) module" +DEPENDS = "libgles-omap3" +inherit module + +SRC_URI="http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/OMAP35x_AM35x_Video_Texture_Streaming/1_0/exports/bc-cat-${PV}.tar.gz \ + file://rc.bccat \ +" + +S=${WORKDIR}/bc-cat-${PV} + +PACKAGES += " ${PN}-tests" +INSANE_SKIP_${PN}-tests = True +INSANE_SKIP_${PN} = True +FILES_${PN} = "${sysconfdir} /lib/modules/${KERNEL_VERSION}/drivers/gpu/bc-cat/bc_cat.ko" +FILES_${PN}-tests = "/usr/demos/bc-cat/*" +RDEPENDS_${PN}-tests += "${PN}" + +inherit update-rc.d + +INITSCRIPT_NAME = "bccat-init" +INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ." + +do_compile () { + # build kernel module + cd ${S}/module + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + make GSDK_KM_DIR=${STAGING_INCDIR} \ + KERNEL_DIR=${STAGING_KERNEL_DIR} \ + CROSS_COMPILE=${TARGET_PREFIX} + + # build test application + cd ${S}/test + make GSDK_KM_DIR=${STAGING_INCDIR} \ + KERNEL_DIR=${STAGING_KERNEL_DIR} \ + CROSS_COMPILE=${TARGET_PREFIX} \ + X11BUILD=1 +} + +do_install () { + # install kernel module + install -d ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu/bc-cat + cp ${S}/module/bc_cat.ko ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu/bc-cat + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/rc.bccat ${D}${sysconfdir}/init.d/bccat-init + + # install test app + install -d ${D}/usr/demos/bc-cat + cp ${S}/test/gles1_bc_mmap ${D}/usr/demos/bc-cat/ + cp ${S}/test/gles1_bc_webcam ${D}/usr/demos/bc-cat/ +} + diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index 23c084c207..79dcf59dd0 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -52,7 +52,7 @@ BINLOCATION ?= "${S}/gfx_rel" PACKAGES += " xserver-kdrive-powervrsgx ${PN}-tests ${PN}-demos" -FILES_${PN} = "${sysconfdir} ${libdir}/lib*.so.* ${libdir}/ES*/* ${bindir}/pvrsrvinit ${bindir}/*/*" +FILES_${PN} = "${sysconfdir} ${libdir}/lib*.so.* ${libdir}/ES*/* ${bindir}/pvrsrvinit ${bindir}/cputype ${bindir}/*/*" FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx" FILES_${PN}-tests = "${bindir}" FILES_${PN}-demos = "${prefix}/demos ${prefix}/share/applications " @@ -101,9 +101,10 @@ do_install () { install -d ${D}${includedir} cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${D}${includedir}/ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/ - cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES/ - cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES2/ - cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${D}${includedir}/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES/ || true + cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES2/ || true + cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${D}${includedir}/ || true + cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/V* ${D}${includedir}/ || true cp -pPr ${S}/include/*.h ${D}${includedir} || true install -d ${D}${sysconfdir}/init.d/ @@ -111,7 +112,7 @@ do_install () { install -d ${D}${sysconfdir} echo "[default]" > ${D}${sysconfdir}/powervr.ini - echo "WindowSystem=libpvrPVR2D_FLIPWSEGL.so" >> ${D}${sysconfdir}/powervr.ini + echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so" >> ${D}${sysconfdir}/powervr.ini install -d ${D}${prefix}/demos/OGLES/ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Binaries/CommonX11/Demos/* ${D}${prefix}/demos/OGLES/ @@ -129,12 +130,16 @@ do_stage () { cp -pP ${BINLOCATION}/*.a ${STAGING_LIBDIR} install -d ${STAGING_INCDIR} + cp -pPR ${S}/GFX_Linux_KM/include4 ${STAGING_INCDIR}/ + cp -pPR ${S}/GFX_Linux_KM/services4 ${STAGING_INCDIR}/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${STAGING_INCDIR}/ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${STAGING_INCDIR}/ - cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES/ - cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES2/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES/ || true + cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES2/ || true cp -pPr ${S}/include/*.h ${STAGING_INCDIR} || true - cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${STAGING_INCDIR}/ + cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${STAGING_INCDIR}/ || true + cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/V* ${STAGING_INCDIR}/ || true } pkg_postinst() { diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb index 3a90c4e68a..8b51813389 100644 --- a/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb +++ b/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "1" # download required binary distribution from: # http://software-dl.ti.com/dsps/forms/export.html?prod_no=/OMAP35x_Graphics_SDK_setuplinux_3_00_00_09.bin -PR = "r1" +PR = "r2" SGXPV = "3_00_00_09" IMGPV = "1.3.13.1832" diff --git a/recipes/prelink/prelink_20061027.bb b/recipes/prelink/prelink_20061027.bb index b650c2c2f1..83f33f382c 100644 --- a/recipes/prelink/prelink_20061027.bb +++ b/recipes/prelink/prelink_20061027.bb @@ -4,7 +4,7 @@ DESCRIPTION = " The prelink package contains a utility which modifies ELF shared and executables, so that far fewer relocations need to be resolved at \ runtime and thus programs come up faster." LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \ file://prelink.conf \ @@ -35,12 +35,15 @@ if [ "x$D" != "x" ]; then exit 1 fi -prelink -a +. ${sysconfdir}/cron.daily/prelink } pkg_prerm_prelink() { #!/bin/sh -prelink -au +if [ -f ${sysconfdir}/prelink.cache ]; then + prelink -au + rm -f ${sysconfdir}/prelink.cache +fi } diff --git a/recipes/prelink/prelink_20071009.bb b/recipes/prelink/prelink_20071009.bb index b650c2c2f1..83f33f382c 100644 --- a/recipes/prelink/prelink_20071009.bb +++ b/recipes/prelink/prelink_20071009.bb @@ -4,7 +4,7 @@ DESCRIPTION = " The prelink package contains a utility which modifies ELF shared and executables, so that far fewer relocations need to be resolved at \ runtime and thus programs come up faster." LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \ file://prelink.conf \ @@ -35,12 +35,15 @@ if [ "x$D" != "x" ]; then exit 1 fi -prelink -a +. ${sysconfdir}/cron.daily/prelink } pkg_prerm_prelink() { #!/bin/sh -prelink -au +if [ -f ${sysconfdir}/prelink.cache ]; then + prelink -au + rm -f ${sysconfdir}/prelink.cache +fi } diff --git a/recipes/proxy-libintl/proxy-libintl_20080418.bb b/recipes/proxy-libintl/proxy-libintl_20080418.bb index 6b91f530f3..dccd3eabe2 100644 --- a/recipes/proxy-libintl/proxy-libintl_20080418.bb +++ b/recipes/proxy-libintl/proxy-libintl_20080418.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" SECTION = "libs" LICENSE = "LGPL" -PR = "r2" +PR = "r3" PROVIDES = "virtual/libintl" SRC_URI = " \ @@ -18,6 +18,7 @@ FILES_${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" FILES_${PN} = "${libdir}/libintl.so" CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}" +TARGET_CC_ARCH += "${LDFLAGS}" do_compile() { cd ${WORKDIR}/src/proxy-libintl diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index 59c973f208..adf3bbc6c0 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -6,7 +6,7 @@ LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -INC_PR = "r12" +INC_PR = "r13" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ diff --git a/recipes/taglib/taglib_1.5.bb b/recipes/taglib/taglib_1.5.bb index 507b8ce159..6c90d75ea4 100644 --- a/recipes/taglib/taglib_1.5.bb +++ b/recipes/taglib/taglib_1.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "TagLib is a library for reading and editing the meta-data of seve SECTION = "libs/multimedia" HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \ file://add_missing_exports_fix.diff;patch=1 \ @@ -17,6 +17,7 @@ inherit cmake pkgconfig binconfig do_stage() { install -d ${STAGING_INCDIR}/${PN} install -m 0644 ${D}/${includedir}/${PN}/*.h ${STAGING_INCDIR}/${PN} + install -m 0644 ${D}/${includedir}/${PN}/*.tcc ${STAGING_INCDIR}/${PN} oe_libinstall -C ${PN} -so libtag ${STAGING_LIBDIR} } diff --git a/recipes/tasks/task-demo-x11.bb b/recipes/tasks/task-demo-x11.bb new file mode 100644 index 0000000000..39b68e7b43 --- /dev/null +++ b/recipes/tasks/task-demo-x11.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "Task for ti-demo-x11" + +PR = "r1" + +inherit task + +ECONFIG ?= "places e-wm-config-angstrom e-wm-config-angstrom-touchscreen e-wm-config-angstrom-widescreen e-wm-config-default" + +RDEPENDS_${PN} = "\ + task-base-extended \ + task-gstreamer-ti \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + angstrom-zeroconf-audio \ + angstrom-led-config \ + gpe-scap \ + mime-support e-wm ${ECONFIG} \ + xterm \ + firefox midori \ + hicolor-icon-theme gnome-icon-theme \ + mplayer \ + angstrom-gnome-icon-theme-enable \ + picodlp-control \ + connman-gnome \ + gnome-bluetooth \ + alsa-utils-aplay \ + alsa-utils-alsamixer \ + libgles-omap3 \ + libgles-omap3-demos \ + libgles-omap3-tests \ + bc-cat-omap3-module-tests \ +" + +# Install all kernel modules +RRECOMMENDS_${PN} += " \ + kernel-modules \ + rt73-firmware \ + zd1211-firmware \ +" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +RRECOMMENDS_${PN}_append_armv7a = " \ + gnash gnash-browser-plugin \ + omapfbplay \ +" + diff --git a/recipes/tasks/task-gstreamer-ti.bb b/recipes/tasks/task-gstreamer-ti.bb index cf05c7ce6b..e7e13e5635 100644 --- a/recipes/tasks/task-gstreamer-ti.bb +++ b/recipes/tasks/task-gstreamer-ti.bb @@ -1,18 +1,28 @@ -# Task for dsp accelerated gstreamer plugins +# Task for installing gstreamer plugins on TI platforms -PR = "r1" +PR = "r2" -DEPENDS = "gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-ffmpeg gstreamer-ti gst-openmax" +DEPENDS = "gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly" + +GST_CODEC_ELEMENT = " \ + gstreamer-ti \ + gstreamer-ti-demo-script \ +" + +GST_CODEC_ELEMENT_am3517-evm = "\ + gst-ffmpeg \ + gst-omapfb \ +" RDEPENDS_${PN} = " \ -gst-plugins-base-meta \ -gst-plugins-good-meta \ -gst-plugins-bad-meta \ -gst-plugins-ugly-meta \ -gst-ffmpeg \ -gst-openmax \ -gstreamer-ti \ + gst-plugins-base-meta \ + gst-plugins-good-meta \ + gst-plugins-bad-meta \ + gst-plugins-ugly-meta \ + ${GST_CODEC_ELEMENT} \ " inherit task +PACKAGE_ARCH = "${MACHINE_ARCH}" + diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch b/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch index 27e1c731f5..7a76f370bc 100644 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch +++ b/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch @@ -1,6 +1,6 @@ diff -uNr ticodecplugin/configure.ac ticodecplugin.new/configure.ac --- ticodecplugin/configure.ac 2009-09-05 00:04:51.000000000 -0500 -+++ ticodecplugin.new/configure.ac 2009-10-10 15:50:24.000000000 -0500 ++++ ticodecplugin.new/configure.ac 2009-10-28 06:35:20.000000000 -0500 @@ -25,6 +25,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") @@ -10,14 +10,14 @@ diff -uNr ticodecplugin/configure.ac ticodecplugin.new/configure.ac dnl check for tools AC_PROG_CC diff -uNr ticodecplugin/src/Makefile.am ticodecplugin.new/src/Makefile.am ---- ticodecplugin/src/Makefile.am 2009-10-10 14:27:46.000000000 -0500 -+++ ticodecplugin.new/src/Makefile.am 2009-10-10 15:50:24.000000000 -0500 +--- ticodecplugin/src/Makefile.am 2009-10-28 06:27:14.000000000 -0500 ++++ ticodecplugin.new/src/Makefile.am 2009-10-28 06:35:20.000000000 -0500 @@ -4,16 +4,16 @@ plugin_LTLIBRARIES = libgstticodecplugin.la # sources used to compile this plug-in --libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c -+libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c omapfb.c yuv.S +-libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c ++libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c omapfb.c yuv.S # flags used to compile this plugin # add other _CFLAGS and _LIBS as needed @@ -34,18 +34,18 @@ diff -uNr ticodecplugin/src/Makefile.am ticodecplugin.new/src/Makefile.am # XDC Configuration CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecplugin.c ---- ticodecplugin/src/gstticodecplugin.c 2009-10-10 14:27:46.000000000 -0500 -+++ ticodecplugin.new/src/gstticodecplugin.c 2009-10-10 15:52:51.000000000 -0500 -@@ -46,6 +46,7 @@ - #include "gsttividenc1.h" +--- ticodecplugin/src/gstticodecplugin.c 2009-10-28 06:27:14.000000000 -0500 ++++ ticodecplugin.new/src/gstticodecplugin.c 2009-10-28 06:36:28.000000000 -0500 +@@ -47,6 +47,7 @@ #include "gsttiaudenc1.h" #include "gsttividresize.h" + #include "gsttidmaiperf.h" +#include "omapfb.h" /* entry point to initialize the plug-in * initialize the plug-in itself -@@ -153,6 +154,13 @@ - GST_TYPE_TIVIDRESIZE)) +@@ -161,6 +162,13 @@ + GST_TYPE_DMAIPERF)) return FALSE; + env_value = getenv("GST_omapdmaifbsink_DISABLE"); @@ -60,7 +60,7 @@ diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecp diff -uNr ticodecplugin/src/omapfb.c ticodecplugin.new/src/omapfb.c --- ticodecplugin/src/omapfb.c 1969-12-31 18:00:00.000000000 -0600 -+++ ticodecplugin.new/src/omapfb.c 2009-10-10 15:50:24.000000000 -0500 ++++ ticodecplugin.new/src/omapfb.c 2009-10-28 06:35:20.000000000 -0500 @@ -0,0 +1,1005 @@ +/* + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com> @@ -1069,7 +1069,7 @@ diff -uNr ticodecplugin/src/omapfb.c ticodecplugin.new/src/omapfb.c +} diff -uNr ticodecplugin/src/omapfb.h ticodecplugin.new/src/omapfb.h --- ticodecplugin/src/omapfb.h 1969-12-31 18:00:00.000000000 -0600 -+++ ticodecplugin.new/src/omapfb.h 2009-10-10 15:50:24.000000000 -0500 ++++ ticodecplugin.new/src/omapfb.h 2009-10-28 06:35:20.000000000 -0500 @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com> @@ -1215,7 +1215,7 @@ diff -uNr ticodecplugin/src/omapfb.h ticodecplugin.new/src/omapfb.h +#endif /* GST_OMAPFB_H */ diff -uNr ticodecplugin/src/yuv.S ticodecplugin.new/src/yuv.S --- ticodecplugin/src/yuv.S 1969-12-31 18:00:00.000000000 -0600 -+++ ticodecplugin.new/src/yuv.S 2009-10-10 15:50:24.000000000 -0500 ++++ ticodecplugin.new/src/yuv.S 2009-10-28 06:35:20.000000000 -0500 @@ -0,0 +1,117 @@ +/* + Copyright (C) 2008 Mans Rullgard diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-omap3530-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-omap3530-rc.sh new file mode 100644 index 0000000000..9a19cf926b --- /dev/null +++ b/recipes/ti/gstreamer-ti/gstreamer-ti-omap3530-rc.sh @@ -0,0 +1,71 @@ +#!/bin/sh +# +# configure kernel modules for TI DSP based gstreamer plugin +# +# Default Memory Map +# +# Start Addr Size Description +# ------------------------------------------- +# 0x80000000 99 MB Linux +# 0x86300000 16 MB CMEM +# 0x87300000 13 MB CODEC SERVER +# + +# Disable XDM 0.9 elements +export GST_TI_TIViddec_DISABLED=1 +export GST_TI_TIAuddec_DISABLED=1 +export GST_TI_TIVidenc_DISABLED=1 +export GST_TI_TIImgdec_DISABLED=1 +export GST_TI_TIImgenc_DISABLED=1 + +load_module() { + # + # CMEM Allocation + # 1x5250000 Circular buffer + # 6x829440,1x691200 Video buffers (max D1 PAL) + # 1x345600 Underlying software components (codecs, etc.) + # 1x1 Dummy buffer used during final flush + modprobe cmemk allowOverlap=1 phys_start=0x86300000 phys_end=0x87300000 \ + pools=1x5250000,6x829440,1x345600,1x691200,1x1 + + # insert DSP/BIOS Link driver + modprobe dsplinkk + + # insert Local Power Manager driver + modprobe lpm_omap3530 + + # insert SDMA driver + modprobe sdmak +} + +unload_module() { + rmmod cmemk + rmmod lpm_omap3530 + rmmod dsplinkk + rmmod sdmak +} + +case "$1" in + start) + echo -n "Loading kernel modules for gstreamer-ti... " + load_module + echo " done" + ;; + stop) + echo -n "Unloading kernel module ..." + unload_module + echo " done" + ;; + restart) + echo -n "Unloading kernel module ..." + unload_module + echo " done" + echo -n "Loading kernel modules for gstreamer-ti... " + load_module + echo " done" + ;; + *) + echo "$0 <start/stop/restart>" + ;; +esac + diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb index a916bae749..099ca1d91b 100644 --- a/recipes/ti/gstreamer-ti_svn.bb +++ b/recipes/ti/gstreamer-ti_svn.bb @@ -2,15 +2,19 @@ DESCRIPTION = "Gstreamer plugin for TI Davinci and OMAP processors" require ti-paths.inc +inherit update-rc.d inherit autotools DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly" +GST_TI_RC_SCRIPT_armv7a="gstreamer-ti-omap3530-rc.sh" + # Fetch source from svn repo -SRCREV = "407" +SRCREV = "459" SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ file://gstreamer-ti-tracker-462.patch;patch=1 \ file://gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch;patch=1 \ + file://${GST_TI_RC_SCRIPT} \ " SRC_URI_append_armv7a = " \ @@ -22,6 +26,8 @@ PR = "r37" PV = "svnr${SRCREV}" S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" +INITSCRIPT_NAME = "gstti-init" +INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ." XDC_TARGET = gnu.targets.arm.GCArmv5T XDC_PLATFORM_dm6446-evm = ti.platforms.evmDM6446 @@ -58,6 +64,9 @@ do_install_prepend () { echo "modprobe sdmak" >> ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh fi chmod 0755 ${D}/${installdir}/gst -R + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/${GST_TI_RC_SCRIPT} ${D}${sysconfdir}/init.d/gstti-init } pkg_postinst_gstreamer-ti-demo-script () { @@ -75,7 +84,7 @@ gst-plugins-bad-meta \ gst-plugins-ugly-meta \ ti-dmai-apps" -FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so ${sysconfdir}" FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-0.10/*.la" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" diff --git a/recipes/ti/ti-dsplink-module_1.61.3.bb b/recipes/ti/ti-dsplink-module_1.61.3.bb index c19ed7e8c7..2cdf1a8e28 100644 --- a/recipes/ti/ti-dsplink-module_1.61.3.bb +++ b/recipes/ti/ti-dsplink-module_1.61.3.bb @@ -8,7 +8,7 @@ DEPENDS += "virtual/kernel perl-native ti-dspbios-native ti-cgt6x-native update # tconf from xdctools dislikes '.' in pwd :/ #This is a kernel module, don't set PR directly -MACHINE_KERNEL_PR_append = "a" +MACHINE_KERNEL_PR_append = "b" PV = "1613" SRC_URI = "http://install.source.dir.local/dsplink_1_61_03.tar.gz \ @@ -40,6 +40,10 @@ STAGING_TI_XDCTOOL_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native" do_compile() { + # asm/page.h is gone with linux-libc-headers 2.6.31. + # We can safely sed it out since it has been empty for the past 2 years + sed -i /page.h/d ${S}/dsplink/gpp/src/api/Linux/drv_api.c + # Run perl script to create appropriate makefiles (v1.60 and up) ( cd ${DSPLINK} diff --git a/recipes/u-boot/u-boot-omap3pandora_git.bb b/recipes/u-boot/u-boot-omap3pandora_git.bb index e9e88fabe4..77634aa080 100644 --- a/recipes/u-boot/u-boot-omap3pandora_git.bb +++ b/recipes/u-boot/u-boot-omap3pandora_git.bb @@ -3,24 +3,17 @@ require u-boot.inc COMPATIBLE_MACHINE = "omap3-pandora" # Latest SRCREV for the final shipping boards. -SRCREV = "0ffcce5dad2153f5f3094f9114b1ae50aef2f5ad" - -# Latest SRCREV for the rev2 < boards. -#SRCREV = "f1cc097b8a8c3c5e1bb6fbec906cfedd939c5be3" +SRCREV = "70532c1152662f88ba1e0627c96307d93536508f" PROVIDES = "u-boot" PV = "pandora+${PR}+gitr${SRCREV}" -PR ="r2" +PR ="r3" PE = "1" SRC_URI = "git://git.openpandora.org/pandora-u-boot.git;branch=master;protocol=git \ " -# Rev 2 tree -#SRC_URI = "git://git.openpandora.org/pandora-u-boot.git;branch=rev3;protocol=git \ -#" - UBOOT_MACHINE_omap3-pandora = "omap3_pandora_config" S = "${WORKDIR}/git" diff --git a/recipes/u-boot/u-boot.inc b/recipes/u-boot/u-boot.inc index 8ab0282743..6fdbaac87f 100644 --- a/recipes/u-boot/u-boot.inc +++ b/recipes/u-boot/u-boot.inc @@ -13,6 +13,7 @@ PARALLEL_MAKE="" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" UBOOT_MACHINE ?= "${MACHINE}_config" +UBOOT_BINARY ?= "u-boot.bin" UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin" UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin" @@ -39,7 +40,7 @@ do_install () { do_deploy () { install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} + install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} cd ${DEPLOY_DIR_IMAGE} diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 15c3060a39..59c0598f97 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 ="r32" +PR ="r33" FILESPATHPKG =. "u-boot-git:" @@ -143,6 +143,9 @@ SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch;patch=1 \ file://uboot-eabi-fix-HACK2.patch;patch=1 \ file://corgi-standard-partitioning.patch;patch=1 \ " +SRC_URI_sheevaplug = "git://git.denx.de/u-boot-marvell.git;protocol=git;branch=testing" +SRCREV_sheevaplug = "119b9942da2e450d4e525fc004208dd7f7d062e0" + S = "${WORKDIR}/git" @@ -158,6 +161,14 @@ do_configure_prepend_c7x0() { sed -i s:ROOT_FLASH_SIZE:${ROOT_FLASH_SIZE}:g ${S}/include/configs/corgi.h } +do_compile_append_sheevaplug() { + oe_runmake u-boot.kwb +} + +UBOOT_IMAGE_sheevaplug = "u-boot-${MACHINE}-${PV}-${PR}.kwb" +UBOOT_BINARY_sheevaplug = "u-boot.kwb" +UBOOT_SYMLINK_sheevaplug ?= "u-boot-${MACHINE}.kwb" + do_deploy_prepend_mini2440() { cp ${S}/u-boot-nand16k.bin ${S}/u-boot.bin } diff --git a/recipes/usbutils/usbutils_0.86.bb b/recipes/usbutils/usbutils_0.86.bb new file mode 100644 index 0000000000..436331dd5a --- /dev/null +++ b/recipes/usbutils/usbutils_0.86.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Host side USB console utilities." +SECTION = "base" +DEPENDS += "virtual/libusb0" +LICENSE = "GPL" +PRIORITY = "optional" + +SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz \ + " +inherit autotools + +EXTRA_OECONF = "--program-prefix=" +sbindir = "/sbin" +bindir = "/bin" + +FILES_${PN} += "${datadir}/usb*" + +do_configure_prepend() { + rm -rf ${S}/libusb +} diff --git a/recipes/xchat/xchat_2.8.6.bb b/recipes/xchat/xchat_2.8.6.bb new file mode 100644 index 0000000000..9be5bd385f --- /dev/null +++ b/recipes/xchat/xchat_2.8.6.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Full-featured IRC chat client with scripting support" +LICENSE = "GPL" +HOMEPAGE = "http://www.xchat.org" +SECTION = "x11/network" +DEPENDS = "libgcrypt zlib gtk+" +DEPENDS += "gdk-pixbuf-csource-native" +PR = "r0" + +SRC_URI = "http://www.xchat.org/files/source/2.8/xchat-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF = "\ + --disable-perl \ + --disable-python \ +" + +#Fix little bug that slipped into the 2.8.6 release, already fixed upstream. +do_compile_prepend() { + sed -i 's/GtkType/GType/' ${s}src/fe-gtk/xtext.{c,h} +} + +FILES_${PN} += "${datadir}/dbus-1" + +FILES_${PN}-dbg += "${libdir}/xchat/plugins/.debug" diff --git a/recipes/xfce-base/xfce4-panel_4.6.2.bb b/recipes/xfce-base/xfce4-panel_4.6.2.bb new file mode 100644 index 0000000000..403dc71dbc --- /dev/null +++ b/recipes/xfce-base/xfce4-panel_4.6.2.bb @@ -0,0 +1,31 @@ +# xfce4-panel OE build file + +DESCRIPTION = "Xfce4 Panel" +DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck" +SECTION = "x11" +PR = "r1" + +inherit xfce46 + +EXTRA_OECONF += " --enable-startup-notification" + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +python populate_packages_prepend() { + plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d) + plugin_name = bb.data.expand('${PN}-plugin-%s', d) + do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + '${PN} plugin for %s', extra_depends='', prepend=True, + aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop', + '${sysconfdir}/xdg/xfce/panel/%s-*', + '${datadir}/icons/hicolor/48x48/apps/*-%s.png', + '${bindir}/*%s*']) +} + +PACKAGES_DYNAMIC = "${PN}-plugin-*" diff --git a/recipes/xorg-lib/pixman/neon-24bpp.patch b/recipes/xorg-lib/pixman/neon-24bpp.patch new file mode 100644 index 0000000000..edfd367626 --- /dev/null +++ b/recipes/xorg-lib/pixman/neon-24bpp.patch @@ -0,0 +1,264 @@ +From b101c115102b83bb1fc4e28de6136dd4940796bc Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka <siarhei.siamashka@nokia.com> +Date: Fri, 30 Oct 2009 17:02:14 +0000 +Subject: ARM: initial 24bpp support + +--- +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 35e6a7e..7f91ced 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -977,3 +977,32 @@ generate_composite_function \ + pixman_composite_over_8888_n_8888_process_pixblock_head, \ + pixman_composite_over_8888_n_8888_process_pixblock_tail, \ + pixman_composite_over_8888_n_8888_process_pixblock_tail_head ++ ++/******************************************************************************/ ++ ++.macro pixman_composite_src_0888_0888_process_pixblock_head ++.endm ++ ++.macro pixman_composite_src_0888_0888_process_pixblock_tail ++.endm ++ ++.macro pixman_composite_src_0888_0888_process_pixblock_tail_head ++ vst3.8 {d0, d1, d2}, [DST_W]! ++ vld3.8 {d0, d1, d2}, [SRC]! ++ cache_preload 8, 8 ++.endm ++ ++generate_composite_function \ ++ pixman_composite_src_0888_0888_asm_neon, 24, 0, 24, \ ++ FLAG_DST_WRITEONLY, \ ++ 8, /* number of pixels, processed in a single block */ \ ++ 10, /* prefetch distance */ \ ++ default_init, \ ++ default_cleanup, \ ++ pixman_composite_src_0888_0888_process_pixblock_head, \ ++ pixman_composite_src_0888_0888_process_pixblock_tail, \ ++ pixman_composite_src_0888_0888_process_pixblock_tail_head, \ ++ 0, /* dst_w_basereg */ \ ++ 0, /* dst_r_basereg */ \ ++ 0, /* src_basereg */ \ ++ 0 /* mask_basereg */ +diff --git a/pixman/pixman-arm-neon-asm.h b/pixman/pixman-arm-neon-asm.h +index a2941ae..1653ef4 100644 +--- a/pixman/pixman-arm-neon-asm.h ++++ b/pixman/pixman-arm-neon-asm.h +@@ -95,6 +95,14 @@ + op&.&elem_size {d®1[idx]}, [&mem_operand&]! + .endm + ++.macro pixldst3 op, elem_size, reg1, reg2, reg3, mem_operand ++ op&.&elem_size {d®1, d®2, d®3}, [&mem_operand&]! ++.endm ++ ++.macro pixldst30 op, elem_size, reg1, reg2, reg3, idx, mem_operand ++ op&.&elem_size {d®1[idx], d®2[idx], d®3[idx]}, [&mem_operand&]! ++.endm ++ + .macro pixldst numbytes, op, elem_size, basereg, mem_operand, abits + .if numbytes == 32 + pixldst4 op, elem_size, %(basereg+4), %(basereg+5), \ +@@ -134,6 +142,18 @@ + .if (bpp == 32) && (numpix == 8) && (DEINTERLEAVE_32BPP_ENABLED != 0) + pixldst4 vld4, 8, %(basereg+4), %(basereg+5), \ + %(basereg+6), %(basereg+7), mem_operand, abits ++.elseif (bpp == 24) && (numpix == 8) ++ pixldst3 vld3, 8, %(basereg+3), %(basereg+4), %(basereg+5), mem_operand ++.elseif (bpp == 24) && (numpix == 4) ++ pixldst30 vld3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 4, mem_operand ++ pixldst30 vld3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 5, mem_operand ++ pixldst30 vld3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 6, mem_operand ++ pixldst30 vld3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 7, mem_operand ++.elseif (bpp == 24) && (numpix == 2) ++ pixldst30 vld3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 2, mem_operand ++ pixldst30 vld3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 3, mem_operand ++.elseif (bpp == 24) && (numpix == 1) ++ pixldst30 vld3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 1, mem_operand + .else + pixldst %(numpix * bpp / 8), vld1, %(bpp), basereg, mem_operand, abits + .endif +@@ -145,6 +165,18 @@ + .if (bpp == 32) && (numpix == 8) && (DEINTERLEAVE_32BPP_ENABLED != 0) + pixldst4 vst4, 8, %(basereg+4), %(basereg+5), \ + %(basereg+6), %(basereg+7), mem_operand, abits ++.elseif (bpp == 24) && (numpix == 8) ++ pixldst3 vst3, 8, %(basereg+3), %(basereg+4), %(basereg+5), mem_operand ++.elseif (bpp == 24) && (numpix == 4) ++ pixldst30 vst3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 4, mem_operand ++ pixldst30 vst3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 5, mem_operand ++ pixldst30 vst3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 6, mem_operand ++ pixldst30 vst3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 7, mem_operand ++.elseif (bpp == 24) && (numpix == 2) ++ pixldst30 vst3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 2, mem_operand ++ pixldst30 vst3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 3, mem_operand ++.elseif (bpp == 24) && (numpix == 1) ++ pixldst30 vst3, 8, %(basereg+0), %(basereg+1), %(basereg+2), 1, mem_operand + .else + pixldst %(numpix * bpp / 8), vst1, %(bpp), basereg, mem_operand, abits + .endif +@@ -334,6 +366,8 @@ fname: + + .if src_bpp == 32 + .set src_bpp_shift, 2 ++.elseif src_bpp == 24 ++ .set src_bpp_shift, 0 + .elseif src_bpp == 16 + .set src_bpp_shift, 1 + .elseif src_bpp == 8 +@@ -345,6 +379,8 @@ fname: + .endif + .if mask_bpp == 32 + .set mask_bpp_shift, 2 ++.elseif mask_bpp == 24 ++ .set mask_bpp_shift, 0 + .elseif mask_bpp == 8 + .set mask_bpp_shift, 0 + .elseif mask_bpp == 0 +@@ -354,6 +390,8 @@ fname: + .endif + .if dst_w_bpp == 32 + .set dst_bpp_shift, 2 ++.elseif dst_w_bpp == 24 ++ .set dst_bpp_shift, 0 + .elseif dst_w_bpp == 16 + .set dst_bpp_shift, 1 + .elseif dst_w_bpp == 8 +@@ -398,6 +436,19 @@ fname: + PF mov PF_CTL, H, lsl #4 + PF add PF_CTL, #(prefetch_distance - 0x10) + ++.if src_bpp == 24 ++ sub SRC_STRIDE, SRC_STRIDE, W ++ sub SRC_STRIDE, SRC_STRIDE, W, lsl #1 ++.endif ++.if mask_bpp == 24 ++ sub MASK_STRIDE, MASK_STRIDE, W ++ sub MASK_STRIDE, MASK_STRIDE, W, lsl #1 ++.endif ++.if dst_w_bpp == 24 ++ sub DST_STRIDE, DST_STRIDE, W ++ sub DST_STRIDE, DST_STRIDE, W, lsl #1 ++.endif ++ + init + .if regs_shortage + push {r0, r1} +@@ -412,7 +463,8 @@ fname: + cmp W, #(pixblock_size * 2) + blt 8f + 0: +- /* ensure 16 byte alignment of the destination buffer */ ++ /* ensure 16 byte alignment of the destination buffer, except for 24bpp */ ++.if dst_w_bpp != 24 + tst DST_R, #0xF + beq 2f + +@@ -454,6 +506,7 @@ fname: + .endif + .endr + 2: ++.endif + + pixld_a pixblock_size, dst_r_bpp, \ + (dst_r_basereg - pixblock_size * dst_r_bpp / 64), DST_R +@@ -520,11 +573,13 @@ fname: + .if mask_bpp != 0 + add MASK, MASK, MASK_STRIDE, lsl #mask_bpp_shift + .endif ++.if (dst_w_bpp != 24) + sub DST_W, DST_W, W, lsl #dst_bpp_shift +-.if src_bpp != 0 ++.endif ++.if (src_bpp != 24) && (src_bpp != 0) + sub SRC, SRC, W, lsl #src_bpp_shift + .endif +-.if mask_bpp != 0 ++.if (mask_bpp != 24) && (mask_bpp != 0) + sub MASK, MASK, W, lsl #mask_bpp_shift + .endif + subs H, H, #1 +@@ -539,7 +594,7 @@ fname: + cleanup + pop {r4-r12, pc} /* exit */ + +-8: /* handle small rectangle, width up to 15 pixels */ ++8: /* handle small rectangle, width up to (pixblock_size * 2 - 1) pixels */ + tst W, #pixblock_size + beq 1f + pixld pixblock_size, dst_r_bpp, \ +@@ -592,11 +647,13 @@ fname: + .if mask_bpp != 0 + add MASK, MASK, MASK_STRIDE, lsl #mask_bpp_shift + .endif ++.if (dst_w_bpp != 24) + sub DST_W, DST_W, W, lsl #dst_bpp_shift +-.if src_bpp != 0 ++.endif ++.if (src_bpp != 24) && (src_bpp != 0) + sub SRC, SRC, W, lsl #src_bpp_shift + .endif +-.if mask_bpp != 0 ++.if (mask_bpp != 24) && (mask_bpp != 0) + sub MASK, MASK, W, lsl #mask_bpp_shift + .endif + subs H, H, #1 +diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c +index 2811099..f3f38a9 100644 +--- a/pixman/pixman-arm-neon.c ++++ b/pixman/pixman-arm-neon.c +@@ -2065,6 +2065,43 @@ neon_composite_src_8888_8888 (pixman_implementation_t *imp, + } + + void ++pixman_composite_src_0888_0888_asm_neon (int32_t w, ++ int32_t h, ++ uint8_t *dst, ++ int32_t dst_stride, ++ uint8_t *src, ++ int32_t src_stride); ++ ++static void ++neon_composite_src_0888_0888 (pixman_implementation_t *imp, ++ pixman_op_t op, ++ pixman_image_t * src_image, ++ pixman_image_t * mask_image, ++ pixman_image_t * dst_image, ++ int32_t src_x, ++ int32_t src_y, ++ int32_t mask_x, ++ int32_t mask_y, ++ int32_t dest_x, ++ int32_t dest_y, ++ int32_t width, ++ int32_t height) ++{ ++ uint8_t *dst_line; ++ uint8_t *src_line; ++ int32_t dst_stride, src_stride; ++ ++ PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, ++ src_stride, src_line, 3); ++ PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, ++ dst_stride, dst_line, 3); ++ ++ pixman_composite_src_0888_0888_asm_neon (width, height, ++ dst_line, dst_stride, ++ src_line, src_stride); ++} ++ ++void + pixman_composite_over_8888_8888_asm_neon (int32_t w, + int32_t h, + uint32_t *dst, +@@ -2449,6 +2486,7 @@ static const pixman_fast_path_t arm_neon_fast_path_array[] = + { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, neon_composite_src_8888_8888, 0 }, + { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, neon_composite_src_8888_8888, 0 }, + { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_src_0565_0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_r8g8b8, PIXMAN_null, PIXMAN_r8g8b8, neon_composite_src_0888_0888, 0 }, + { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, neon_composite_over_8888_0565, 0 }, + { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, neon_composite_over_8888_0565, 0 }, + { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, neon_composite_over_8888_8888, 0 }, +-- +cgit v0.8.2 diff --git a/recipes/xorg-lib/pixman/prefetch.patch b/recipes/xorg-lib/pixman/prefetch.patch new file mode 100644 index 0000000000..c2e856ec25 --- /dev/null +++ b/recipes/xorg-lib/pixman/prefetch.patch @@ -0,0 +1,298 @@ +From d0044bfbd596f22ed1560579ea6537b39f3dc1af Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka <siarhei.siamashka@nokia.com> +Date: Thu, 29 Oct 2009 19:06:42 +0000 +Subject: ARM: Don't emit prefetch code if prefetch distance is set to 0 + +Also it is now possible to disable prefetch globally with +a configuration macro +--- +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index bca499a..35e6a7e 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -219,33 +219,33 @@ + vshrn.u16 d7, q2, #3 + vsli.u16 q2, q2, #5 + vshll.u8 q14, d16, #8 +- add PF_X, PF_X, #8 ++ PF add PF_X, PF_X, #8 + vshll.u8 q8, d19, #8 +- tst PF_CTL, #0xF ++ PF tst PF_CTL, #0xF + vsri.u8 d6, d6, #5 +- addne PF_X, PF_X, #8 ++ PF addne PF_X, PF_X, #8 + vmvn.8 d3, d3 +- subne PF_CTL, PF_CTL, #1 ++ PF subne PF_CTL, PF_CTL, #1 + vsri.u8 d7, d7, #6 + vshrn.u16 d30, q2, #2 + vmull.u8 q10, d3, d6 +- pld [PF_SRC, PF_X, lsl #src_bpp_shift] ++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift] + vmull.u8 q11, d3, d7 + vmull.u8 q12, d3, d30 +- pld [PF_DST, PF_X, lsl #dst_bpp_shift] ++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift] + vsri.u16 q14, q8, #5 +- cmp PF_X, ORIG_W ++ PF cmp PF_X, ORIG_W + vshll.u8 q9, d18, #8 + vrshr.u16 q13, q10, #8 +- subge PF_X, PF_X, ORIG_W ++ PF subge PF_X, PF_X, ORIG_W + vrshr.u16 q3, q11, #8 + vrshr.u16 q15, q12, #8 +- subges PF_CTL, PF_CTL, #0x10 ++ PF subges PF_CTL, PF_CTL, #0x10 + vsri.u16 q14, q9, #11 +- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! + vraddhn.u16 d20, q10, q13 + vraddhn.u16 d23, q11, q3 +- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]! + vraddhn.u16 d22, q12, q15 + vst1.16 {d28, d29}, [DST_W, :128]! + .endm +@@ -323,20 +323,20 @@ generate_composite_function \ + + .macro pixman_composite_src_8888_0565_process_pixblock_tail_head + vsri.u16 q14, q8, #5 +- add PF_X, PF_X, #8 +- tst PF_CTL, #0xF ++ PF add PF_X, PF_X, #8 ++ PF tst PF_CTL, #0xF + vld4.8 {d0, d1, d2, d3}, [SRC]! +- addne PF_X, PF_X, #8 +- subne PF_CTL, PF_CTL, #1 ++ PF addne PF_X, PF_X, #8 ++ PF subne PF_CTL, PF_CTL, #1 + vsri.u16 q14, q9, #11 +- cmp PF_X, ORIG_W +- pld [PF_SRC, PF_X, lsl #src_bpp_shift] ++ PF cmp PF_X, ORIG_W ++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift] + vshll.u8 q8, d1, #8 + vst1.16 {d28, d29}, [DST_W, :128]! +- subge PF_X, PF_X, ORIG_W +- subges PF_CTL, PF_CTL, #0x10 ++ PF subge PF_X, PF_X, ORIG_W ++ PF subges PF_CTL, PF_CTL, #0x10 + vshll.u8 q14, d2, #8 +- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! + vshll.u8 q9, d0, #8 + .endm + +@@ -363,20 +363,20 @@ generate_composite_function \ + + .macro pixman_composite_add_8000_8000_process_pixblock_tail_head + vld1.8 {d0, d1, d2, d3}, [SRC]! +- add PF_X, PF_X, #32 +- tst PF_CTL, #0xF ++ PF add PF_X, PF_X, #32 ++ PF tst PF_CTL, #0xF + vld1.8 {d4, d5, d6, d7}, [DST_R, :128]! +- addne PF_X, PF_X, #32 +- subne PF_CTL, PF_CTL, #1 ++ PF addne PF_X, PF_X, #32 ++ PF subne PF_CTL, PF_CTL, #1 + vst1.8 {d28, d29, d30, d31}, [DST_W, :128]! +- cmp PF_X, ORIG_W +- pld [PF_SRC, PF_X, lsl #src_bpp_shift] +- pld [PF_DST, PF_X, lsl #dst_bpp_shift] +- subge PF_X, PF_X, ORIG_W +- subges PF_CTL, PF_CTL, #0x10 ++ PF cmp PF_X, ORIG_W ++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift] ++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift] ++ PF subge PF_X, PF_X, ORIG_W ++ PF subges PF_CTL, PF_CTL, #0x10 + vqadd.u8 q14, q0, q2 +- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! +- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]! + vqadd.u8 q15, q1, q3 + .endm + +@@ -418,32 +418,32 @@ generate_composite_function \ + .macro pixman_composite_over_8888_8888_process_pixblock_tail_head + vld4.8 {d4, d5, d6, d7}, [DST_R, :128]! + vrshr.u16 q14, q8, #8 +- add PF_X, PF_X, #8 +- tst PF_CTL, #0xF ++ PF add PF_X, PF_X, #8 ++ PF tst PF_CTL, #0xF + vrshr.u16 q15, q9, #8 + vrshr.u16 q12, q10, #8 + vrshr.u16 q13, q11, #8 +- addne PF_X, PF_X, #8 +- subne PF_CTL, PF_CTL, #1 ++ PF addne PF_X, PF_X, #8 ++ PF subne PF_CTL, PF_CTL, #1 + vraddhn.u16 d28, q14, q8 + vraddhn.u16 d29, q15, q9 +- cmp PF_X, ORIG_W ++ PF cmp PF_X, ORIG_W + vraddhn.u16 d30, q12, q10 + vraddhn.u16 d31, q13, q11 + vqadd.u8 q14, q0, q14 + vqadd.u8 q15, q1, q15 + vld4.8 {d0, d1, d2, d3}, [SRC]! +- pld [PF_SRC, PF_X, lsl #src_bpp_shift] ++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift] + vmvn.8 d22, d3 +- pld [PF_DST, PF_X, lsl #dst_bpp_shift] ++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift] + vst4.8 {d28, d29, d30, d31}, [DST_W, :128]! +- subge PF_X, PF_X, ORIG_W ++ PF subge PF_X, PF_X, ORIG_W + vmull.u8 q8, d22, d4 +- subges PF_CTL, PF_CTL, #0x10 ++ PF subges PF_CTL, PF_CTL, #0x10 + vmull.u8 q9, d22, d5 +- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! + vmull.u8 q10, d22, d6 +- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]! + vmull.u8 q11, d22, d7 + .endm + +diff --git a/pixman/pixman-arm-neon-asm.h b/pixman/pixman-arm-neon-asm.h +index d276ab9..a2941ae 100644 +--- a/pixman/pixman-arm-neon-asm.h ++++ b/pixman/pixman-arm-neon-asm.h +@@ -58,6 +58,11 @@ + #define RESPECT_STRICT_ALIGNMENT 1 + + /* ++ * If set to nonzero value, prefetch is globally disabled ++ */ ++#define PREFETCH_GLOBALLY_DISABLED 0 ++ ++/* + * Definitions of supplementary pixld/pixst macros (for partial load/store of + * pixel data) + */ +@@ -218,37 +223,43 @@ + * pixels processing like simple copy. Anyway, having prefetch is a must + * when working with graphics data. + */ ++.macro PF a, x:vararg ++.if (ADVANCED_PREFETCH_ENABLED != 0) && (PREFETCH_GLOBALLY_DISABLED == 0) ++ a x ++.endif ++.endm ++ + .macro cache_preload std_increment, boost_increment + .if (src_bpp_shift >= 0) || (dst_r_bpp != 0) || (mask_bpp_shift >= 0) + .if regs_shortage +- ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */ ++ PF ldr ORIG_W, [sp] /* If we are short on regs, ORIG_W is kept on stack */ + .endif + .if std_increment != 0 +- add PF_X, PF_X, #std_increment ++ PF add PF_X, PF_X, #std_increment + .endif +- tst PF_CTL, #0xF +- addne PF_X, PF_X, #boost_increment +- subne PF_CTL, PF_CTL, #1 +- cmp PF_X, ORIG_W ++ PF tst PF_CTL, #0xF ++ PF addne PF_X, PF_X, #boost_increment ++ PF subne PF_CTL, PF_CTL, #1 ++ PF cmp PF_X, ORIG_W + .if src_bpp_shift >= 0 +- pld [PF_SRC, PF_X, lsl #src_bpp_shift] ++ PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift] + .endif + .if dst_r_bpp != 0 +- pld [PF_DST, PF_X, lsl #dst_bpp_shift] ++ PF pld, [PF_DST, PF_X, lsl #dst_bpp_shift] + .endif + .if mask_bpp_shift >= 0 +- pld [PF_MASK, PF_X, lsl #mask_bpp_shift] ++ PF pld, [PF_MASK, PF_X, lsl #mask_bpp_shift] + .endif +- subge PF_X, PF_X, ORIG_W +- subges PF_CTL, PF_CTL, #0x10 ++ PF subge PF_X, PF_X, ORIG_W ++ PF subges PF_CTL, PF_CTL, #0x10 + .if src_bpp_shift >= 0 +- ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]! + .endif + .if dst_r_bpp != 0 +- ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_DST, DST_STRIDE, lsl #dst_bpp_shift]! + .endif + .if mask_bpp_shift >= 0 +- ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]! ++ PF ldrgeb DUMMY, [PF_MASK, MASK_STRIDE, lsl #mask_bpp_shift]! + .endif + .endif + .endm +@@ -297,6 +308,12 @@ fname: + PF_DST .req r12 + PF_MASK .req r14 + ++.if prefetch_distance == 0 ++ .set ADVANCED_PREFETCH_ENABLED, 0 ++.else ++ .set ADVANCED_PREFETCH_ENABLED, 1 ++.endif ++ + .if mask_bpp == 0 + ORIG_W .req r7 /* saved original width */ + DUMMY .req r8 /* temporary register */ +@@ -374,12 +391,12 @@ fname: + ldr MASK_STRIDE, [sp, #52] + .endif + mov DST_R, DST_W +- mov PF_SRC, SRC +- mov PF_DST, DST_R +- mov PF_MASK, MASK +- mov PF_CTL, H, lsl #4 +- /* pf_ctl = 10 | ((h - 1) << 4) */ +- add PF_CTL, #(prefetch_distance - 0x10) ++ PF mov PF_SRC, SRC ++ PF mov PF_DST, DST_R ++ PF mov PF_MASK, MASK ++ /* PF_CTL = prefetch_distance | ((h - 1) << 4) */ ++ PF mov PF_CTL, H, lsl #4 ++ PF add PF_CTL, #(prefetch_distance - 0x10) + + init + .if regs_shortage +@@ -412,7 +429,7 @@ fname: + .else + add DST_R, DST_R, #lowbit + .endif +- add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp) ++ PF add PF_X, PF_X, #(lowbit * 8 / dst_w_bpp) + sub W, W, #(lowbit * 8 / dst_w_bpp) + 1: + .endif +@@ -444,7 +461,7 @@ fname: + (src_basereg - pixblock_size * src_bpp / 64), SRC + pixld pixblock_size, mask_bpp, \ + (mask_basereg - pixblock_size * mask_bpp / 64), MASK +- add PF_X, PF_X, #pixblock_size ++ PF add PF_X, PF_X, #pixblock_size + process_pixblock_head + cache_preload 0, pixblock_size + subs W, W, #(pixblock_size * 2) +@@ -468,7 +485,7 @@ fname: + pixld chunk_size, src_bpp, src_basereg, SRC + pixld chunk_size, mask_bpp, mask_basereg, MASK + pixld_a chunk_size, dst_r_bpp, dst_r_basereg, DST_R +- add PF_X, PF_X, #chunk_size ++ PF add PF_X, PF_X, #chunk_size + 1: + .endif + .endr +-- +cgit v0.8.2 diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index 8a0ee265fd..ffca7becce 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -4,10 +4,10 @@ DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" PV = "0.17.1" -PR = "r2" +PR = "r3" PR_append = "+gitr${SRCREV}" -SRCREV = "dc46ad274a47d351bacf3c2167c359d23dbaf8b3" +SRCREV = "67bf739187cd43b5fff754b25693f76bb788d1fa" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" @@ -22,6 +22,8 @@ file://0007-ARM-Enabled-new-NEON-optimizations.patch;patch=1 \ file://pixman-28986.patch;patch=1 \ file://nearest-neighbour.patch;patch=1 \ file://over-8888-0565.patch;patch=1 \ +file://prefetch.patch;patch=1 \ +file://neon-24bpp.patch;patch=1 \ " S = "${WORKDIR}/git" diff --git a/recipes/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf new file mode 100644 index 0000000000..446ac9777f --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-conf/omap3-pandora/xorg.conf @@ -0,0 +1,24 @@ +Section "Module" + Load "extmod" + Load "dbe" +EndSection + +Section "Monitor" + Identifier "Builtin Default Monitor" +EndSection + +Section "Device" + Identifier "Builtin Default fbdev Device 0" + Driver "omapfb" +EndSection + +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf index 983bb0823a..446ac9777f 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/omap3-touchbook/xorg.conf @@ -1,29 +1,24 @@ -Section "Module" - Load "extmod" - Load "dbe" - Load "glx" - Load "freetype" - Load "type1" - Load "record" - Load "dri" -EndSection +Section "Module" + Load "extmod" + Load "dbe" +EndSection -Section "Monitor" +Section "Monitor" Identifier "Builtin Default Monitor" -EndSection +EndSection -Section "Device" +Section "Device" Identifier "Builtin Default fbdev Device 0" Driver "omapfb" -EndSection +EndSection -Section "Screen" - Identifier "Builtin Default fbdev Screen 0" - Device "Builtin Default fbdev Device 0" - Monitor "Builtin Default Monitor" -EndSection +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" + Monitor "Builtin Default Monitor" +EndSection -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Builtin Default fbdev Screen 0" -EndSection +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 37d200ba5d..ceaf199932 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r12" +PR = "r14" SRC_URI = "file://xorg.conf" |