diff options
| author |   Graeme Gregory <dp@xora.org.uk> | 2009-09-29 15:03:41 +0100 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-09-29 15:03:41 +0100 |
| commit | 20b087cc637f86cbb1b503a487084e9c4fc73a88 (patch) | |
| tree | bf6ffc8853dfa76ff71d1bf3792b7f28e3a561f8 | |
| parent | 279d3f6e11eb9e76a1a3e977a28f92450875b2ce (diff) | |
| parent | 0834a71b91d99bfedd4659a25fb844e253518fe2 (diff) | |
| download | openembedded-20b087cc637f86cbb1b503a487084e9c4fc73a88.tar.gz | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
28 files changed, 660 insertions, 307 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index b8a90104b4..5d850401ea 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -6622,6 +6622,10 @@ sha256=a24640d8ca9c485d7611880193f18e5ae62af07e3b9464904f3602277f1d4097 md5=414181781fb0923f884a38503e8e56da sha256=270e2e423a0b8e90091fd6f38422c488b67a23494d671764b9ed2e17ca802e16 +[http://pypi.python.org/packages/source/f/flup/flup-1.0.2.tar.gz] +md5=24dad7edc5ada31dddd49456ee8d5254 +sha256=4bad317a5fc1ce3d4fe5e9b6d846ec38a8023e16876785d4f88102f2c8097dd9 + [http://pypi.python.org/packages/source/f/flup/flup-1.0.tar.gz] md5=530801fe835fd9a680457e443eb95578 sha256=dd943b9746997bb6e49820187998dd26a58b2d0f886a45c166209e6d7d35aa32 @@ -11234,6 +11238,10 @@ sha256=f59292de39b9a4010414bd120a494226399767148efa37278bd53d9613167964 md5=b1e814c7f5ef2a5033e4c3e5162ac694 sha256=27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601 +[http://downloads.sourceforge.net/hplip/hplip-2.8.10.tar.gz] +md5=a9ad78c4f0d884caac6b176b3cb9bf21 +sha256=8e34e2bc5974fd0f4ab71fbb42ac76fe3074fb2a09960452e4a1a157a77e00f1 + [http://thegraveyard.org/files/hsetroot-1.0.2.tar.gz] md5=f599770a6411dcfe216c37b280fad9bc sha256=d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7 @@ -25378,6 +25386,10 @@ sha256=ac091ba9b2e2e9aff293969b3405b145c09789e59ac0caab2247211a19e09a8a md5=8ffa2ff763badd5de7592004d8d69a63 sha256=197c29803790efc0273bb4577d54629d0769a3b49b091c6430eb6704fd69824f +[http://download.videolan.org/pub/videolan/vlc/1.0.2/vlc-1.0.2.tar.bz2] +md5=69d4e30fe4fc2691780fbeacd40359d2 +sha256=38b176fd495f3254db74e03977235a0a2212fc6533d7cd1a4c3dddc495b074f0 + [http://www.lavrsen.dk/foswiki/pub/Motion/VideoFourLinuxLoopbackDevice/vloopback-1.2.tar.gz] md5=1b63bf5b3d2b7fae63497d285789aec5 sha256=d5af0c07aa53a6c93e92a6dd83f34dd9a08a05a0c0169c8ca8b15b023fdadf80 @@ -25882,6 +25894,10 @@ sha256=fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342 md5=25fcaa86a53333d416d5e837fb47ba7d sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21 +[http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090928-2245.tar.bz2] +md5=99870531113dafd01026c01a96c5fcbb +sha256=8b435c02ed0a09d039c0a89c8ddc5470e1885630a5dcedfe3d8bc60a6d63ab69 + [http://archive.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz] md5=fc805051f0fe505c7a4b1b5c8db9b9e3 sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043 diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 03e5c8ec23..83cf820f9b 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -8,11 +8,11 @@ PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" PREFERRED_VERSION_glib-2.0 = "2.22.0" PREFERRED_VERSION_glib-2.0-native = "2.22.0" -PREFERRED_VERSION_glibmm = "2.18.0" +PREFERRED_VERSION_glibmm = "2.22.1" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.18.0" -PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_gtkmm = "2.18.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" diff --git a/recipes/classpath/classpath-native.inc b/recipes/classpath/classpath-native.inc index dba97769e7..e7570c4f98 100644 --- a/recipes/classpath/classpath-native.inc +++ b/recipes/classpath/classpath-native.inc @@ -34,6 +34,7 @@ EXTRA_OECONF = "\ --enable-tools \ --includedir=${STAGING_INCDIR}/classpath \ --with-vm=java \ + --enable-tool-wrappers \ " do_stage() { diff --git a/recipes/classpath/classpath-native_0.97.2.bb b/recipes/classpath/classpath-native_0.97.2.bb index 0024136b97..8a2c36b5c7 100644 --- a/recipes/classpath/classpath-native_0.97.2.bb +++ b/recipes/classpath/classpath-native_0.97.2.bb @@ -1,6 +1,6 @@ require classpath-native.inc -PR = "r4" +PR = "r5" # The code affected by the javanet-local patch # is usually not compiled. However if someone changes diff --git a/recipes/classpath/classpath-native_0.98.bb b/recipes/classpath/classpath-native_0.98.bb index 710958a550..9f4c8f9077 100644 --- a/recipes/classpath/classpath-native_0.98.bb +++ b/recipes/classpath/classpath-native_0.98.bb @@ -3,7 +3,7 @@ require classpath-native.inc # Deadlocks occur on at least amd64 hosts. DEFAULT_PREFERENCE = "-1" -PR = "r0" +PR = "r1" # The code affected by the javanet-local patch # is usually not compiled. However if someone changes diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc index 15808a11b4..74208c5543 100644 --- a/recipes/gnome-mplayer/gnome-mplayer.inc +++ b/recipes/gnome-mplayer/gnome-mplayer.inc @@ -6,6 +6,10 @@ LICENSE = "GPL" DEPENDS = "gtk+ gconf dbus-glib" RDEPENDS = "mplayer" -inherit autotools pkgconfig gconf +inherit gnome SRC_URI = "http://gnome-mplayer.googlecode.com/files/${P}.tar.gz" + +FILES_${PN} += "${datadir}/icons" + + diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb new file mode 100644 index 0000000000..37502adb4e --- /dev/null +++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb @@ -0,0 +1,3 @@ +require gnome-mplayer.inc + +PR = "r6" diff --git a/recipes/gnome/libsoup-2.4_2.27.91.bb b/recipes/gnome/libsoup-2.4_2.27.91.bb index ae503065c0..1fce0ff1e3 100644 --- a/recipes/gnome/libsoup-2.4_2.27.91.bb +++ b/recipes/gnome/libsoup-2.4_2.27.91.bb @@ -1,7 +1,9 @@ DESCRIPTION = "An HTTP library implementation in C" SECTION = "x11/gnome/libs" LICENSE = "GPL" -DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3" +DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3 gnome-keyring" + +PR = "r1" inherit gnome diff --git a/recipes/gstreamer/gst-plugin-gles/omap3_disable_depth_attachment.patch b/recipes/gstreamer/gst-plugin-gles/omap3_disable_depth_attachment.patch new file mode 100644 index 0000000000..1b4cf15c8f --- /dev/null +++ b/recipes/gstreamer/gst-plugin-gles/omap3_disable_depth_attachment.patch @@ -0,0 +1,45 @@ +--- /tmp/gstgldisplay.c 2009-09-28 00:49:48.000000000 +0530 ++++ git/gst-libs/gst/gl/gstgldisplay.c 2009-09-28 02:35:00.000000000 +0530 +@@ -1252,12 +1252,12 @@ gst_gl_display_thread_init_download (Gst + default: + g_assert_not_reached (); + } +- ++#if 0 + //attach the depth render buffer to the FBO + glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, + GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, + display->download_depth_buffer); +- ++#endif + gst_gl_display_check_framebuffer_status (); + + g_assert (glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT) == +@@ -1555,11 +1555,11 @@ gst_gl_display_thread_gen_fbo (GstGLDisp + //attach the texture to the FBO to renderer to + glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, + GL_TEXTURE_RECTANGLE_ARB, fake_texture, 0); +- ++#if 0 + //attach the depth render buffer to the FBO + glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, display->generated_depth_buffer); +- ++#endif + g_assert (glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT) == + GL_FRAMEBUFFER_COMPLETE_EXT); + +@@ -2443,11 +2443,11 @@ gst_gl_display_thread_init_upload_fbo (G + //attach the texture to the FBO to renderer to + glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, + GL_TEXTURE_RECTANGLE_ARB, fake_texture, 0); +- ++#if 0 + //attach the depth render buffer to the FBO + glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, display->upload_depth_buffer); +- ++#endif + gst_gl_display_check_framebuffer_status (); + + g_assert (glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT) == diff --git a/recipes/gstreamer/gst-plugin-gles_git.bb b/recipes/gstreamer/gst-plugin-gles_git.bb new file mode 100644 index 0000000000..68c1241191 --- /dev/null +++ b/recipes/gstreamer/gst-plugin-gles_git.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "GStreamer OpenGL/GLES2 plugins" +LICENSE = "LGPL" + +SRCREV = "18f5c4875006606b28aa9aa366abbc5dd1e16b60" +SRCREV_common = "792d198f3f694e5475d1467b5ae9371a23baf7a3" +PR_append = "+gitr${SRCREV}" +PV = "0.10" + +DEPENDS = "virtual/libsdl libgles-omap3 gstreamer gst-plugins-base" + + +SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-plugins-gl;protocol=git \ + http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.23.tar.bz2 \ + file://omap3_disable_depth_attachment.patch;patch=1 \ +" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-tests --disable-examples" + +do_configure_prepend () { + cp -rf ${WORKDIR}/gstreamer-0.10.23/common/* ${S}/common/ + cp -rf ${WORKDIR}/gstreamer-0.10.23/po/* ${S}/po/ + sed -i -e '/po /d' ${S}/Makefile.am +} + +do_configure () { + #Hack to force GLES2 + acl_cv_hardcode_libdir_flag_spec= ac_cv_header_GL_gl_h=no autotools_do_configure + + #Hack to disable Werror (treat warning as errors) + for i in $(find "${S}" -name Makefile) ; do + sed -i -e 's:-Wl,-rpath-link,${STAGING_LIBDIR}::g' -e s:\Werror\:\Wno-error\:g $i + done +} + +GST_LIBV = 0.10 + +do_install() { + install -d ${D}${libdir}/gstreamer-${GST_LIBV}/ + install -m 0755 gst/gl/.libs/libgstopengl.so ${D}${libdir}/gstreamer-${GST_LIBV} + install -m 0755 gst-libs/gst/gl/.libs/libgstgl-0.10.so.0.0.0 ${D}${libdir}/libgstgl-0.10.so.0 +} + + +FILES_${PN} = "${libdir}/gstreamer-0.10/libgstopengl.so \ + ${libdir}/libgstgl-0.10.so.0" + +FILES_${PN}-dev += "\ + ${libdir}/gstreamer-0.10/libgstopengl.* \ +" + +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" + +INSANE_SKIP_${PN} = True + diff --git a/recipes/hplip/hplip-2.8.10/cross-build.patch b/recipes/hplip/hplip-2.8.10/cross-build.patch new file mode 100644 index 0000000000..3bf32513c3 --- /dev/null +++ b/recipes/hplip/hplip-2.8.10/cross-build.patch @@ -0,0 +1,165 @@ +Index: hplip-2.8.10/Makefile.am +=================================================================== +--- hplip-2.8.10.orig/Makefile.am 2008-10-31 18:25:17.000000000 -0400 ++++ hplip-2.8.10/Makefile.am 2008-11-10 12:18:45.000000000 -0500 +@@ -47,6 +47,7 @@ + hp_LDADD = libhpmud.la $(DBUS_LIBS) + hp_CFLAGS = $(DBUS_CFLAGS) + ++if !EMBEDDED_BUILD + # hp-mkuri. + hp_mkuridir = $(bindir) + hp_mkuri_PROGRAMS = hp-mkuri +@@ -110,6 +111,7 @@ + noinst_PROGRAMS += ptest + ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h + ptest_LDADD = libhpmud.la ++endif + + # data + modelsdir = $(hplipdir)/data/models +@@ -127,6 +129,7 @@ + dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz + dist_models_DATA = data/models/models.dat + ++if !EMBEDDED_BUILD + if GUI_BUILD + dist_images_16x16_DATA = data/images/16x16/* + dist_images_24x24_DATA = data/images/24x24/* +@@ -147,7 +150,9 @@ + data/localization/hplip_pt.qm data/localization/hplip_ru.qm data/localization/hplip_zh.qm + dist_noinst_DATA += data/localization/hplip_de.ts data/localization/hplip_es.ts data/localization/hplip_fr.ts data/localization/hplip_it.ts \ + data/localization/hplip_pt.ts data/localization/hplip_ru.ts data/localization/hplip_zh.ts ++endif + ++if !EMBEDDED_BUILD + # pcard + pcarddir = $(hplipdir)/pcard + dist_pcard_SCRIPTS = pcard/__init__.py pcard/photocard.py +@@ -170,6 +175,7 @@ + cupsext_la_SOURCES = prnt/cupsext/cupsext.c + cupsext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) + cupsext_la_LIBADD = -lcups ++endif + + # ip library + lib_LTLIBRARIES += libhpip.la +@@ -223,6 +229,7 @@ + endif + libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" + ++if !EMBEDDED_BUILD + # hpmudext + hpmudextdir = $(pyexecdir) + hpmudext_LTLIBRARIES = hpmudext.la +@@ -232,8 +239,9 @@ + hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) + + # hpmud.rules +-rulesdir = /etc/udev/rules.d ++rulesdir = $(sysconfdir)/udev/rules.d + dist_rules_DATA = data/rules/55-hpmud.rules ++endif + + # ui (qt3) + if GUI_BUILD +@@ -327,6 +335,7 @@ + # cherrypy/filters/virtualhostfilter.py cherrypy/filters/gzipfilter.py cherrypy/filters/wsgiappfilter.py \ + # cherrypy/filters/logdebuginfofilter.py cherrypy/filters/xmlrpcfilter.py + ++if !EMBEDDED_BUILD + # hppgsz + noinst_PROGRAMS += hppgsz + hppgsz_SOURCES = $(apdk_SOURCES) prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h +@@ -337,11 +346,13 @@ + # hplip.desktop + hplip_desktopdir = $(icondir) + hplip_desktop_DATA = hplip.desktop ++endif + + # hplip.conf +-hplip_confdir = /etc/hp ++hplip_confdir = $(sysconfdir)/hp + hplip_conf_DATA = hplip.conf + ++if !EMBEDDED_BUILD + # hplip-systray.desktop + hplip_systraydir = $(systraydir) + hplip_systray_DATA = hplip-systray.desktop +@@ -350,14 +361,17 @@ + hplipjsdir = $(cupsfilterdir) + hplipjs_PROGRAMS = hplipjs + hplipjs_SOURCES = prnt/filters/hplipjs.c ++endif + + endif # if HPLIP_BUILD + ++if !EMBEDDED_BUILD + # foomatic-rip-hplip + if RIP_INSTALL + ripdir = $(cupsfilterdir) + dist_rip_SCRIPTS = prnt/hpijs/foomatic-rip-hplip + endif ++endif + + # hpijs + bin_PROGRAMS = hpijs +@@ -416,6 +430,7 @@ + dist_cupsdrv_DATA = $(foomatic_drv) + endif + ++if !EMBEDDED_BUILD + install-data-hook: + if HPLIP_BUILD + # If scanner build, add hpaio entry to sane dll.conf. +@@ -455,6 +470,7 @@ + # Remove fax support. + rm -f $(DESTDIR)$(hpfaxdir)/hpfax + endif ++endif + + rpm_unleaded: + epm -f rpm hpliplite UNLEADED=1 hplip.list +Index: hplip-2.8.10/configure.in +=================================================================== +--- hplip-2.8.10.orig/configure.in 2008-10-31 18:26:57.000000000 -0400 ++++ hplip-2.8.10/configure.in 2008-11-06 18:00:46.000000000 -0500 +@@ -127,6 +127,8 @@ + fi + AM_CONDITIONAL(NETWORK_BUILD, test x$network_build = xyes) + ++AM_CONDITIONAL(EMBEDDED_BUILD, test 1=1) ++ + AC_MSG_CHECKING([for parallel port build]) + AC_ARG_ENABLE(pp_build, + [ --enable-pp-build enable parallel port build (default=yes)], +@@ -205,16 +207,16 @@ + AM_CONDITIONAL(SHADOW_BUILD, test x$shadow_build = xyes) + + AC_ARG_WITH(cupsbackenddir, AC_HELP_STRING([--with-cupsbackenddir=DIR], [set cups backend install directory [default=/usr/lib/cups/backend]]), +- cupsbackenddir=$withval, cupsbackenddir="/usr/lib/cups/backend") ++ cupsbackenddir=$withval, cupsbackenddir="$prefix/lib/cups/backend") + + AC_ARG_WITH(cupsfilterdir, AC_HELP_STRING([--with-cupsfilterdir=DIR], [set cups filter install directory [default=/usr/lib/cups/filter]]), +- cupsfilterdir=$withval, cupsfilterdir="/usr/lib/cups/filter") ++ cupsfilterdir=$withval, cupsfilterdir="$prefix/lib/cups/filter") + + AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hplip.desktop install directory [default=/usr/share/applications]]), +- icondir=$withval, icondir="/usr/share/applications") ++ icondir=$withval, icondir="$prefix/share/applications") + + AC_ARG_WITH(systraydir, AC_HELP_STRING([--with-systraydir=DIR], [set hplip-systray.desktop install directory [default=/etc/xdg/autostart]]), +- systraydir=$withval, systraydir="/etc/xdg/autostart") ++ systraydir=$withval, systraydir="$sysconfdir/xdg/autostart") + + AC_ARG_WITH(hpppddir, AC_HELP_STRING([--with-hpppddir=DIR], [set hp ppd install directory [default=datadir/ppd/HP]]), + hpppddir=$withval, hpppddir="$datadir/ppd/HP") +@@ -335,7 +337,7 @@ + PYTHONINCLUDEDIR=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print get_python_inc();"` + AC_MSG_RESULT("using $PYTHONINCLUDEDIR") + AC_ARG_VAR(PYTHONINCLUDEDIR, [path to Python.h C header file]) +- AC_CHECK_HEADERS(python$PYTHON_VERSION/Python.h, ,[AC_MSG_ERROR([cannot find python-devel support], 6)]) ++ AC_CHECK_HEADERS($PYTHONINCLUDEDIR/Python.h, ,[AC_MSG_ERROR([cannot find python-devel support], 6)]) + fi + + if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes"; then diff --git a/recipes/hplip/hplip_2.8.10.bb b/recipes/hplip/hplip_2.8.10.bb new file mode 100644 index 0000000000..7f8c0e1c36 --- /dev/null +++ b/recipes/hplip/hplip_2.8.10.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "HP Linux Imaging and Printing" +LICENSE = "GPL, MIT" + +# currently, we build a stripped down version that only includes IJS +# and components required to implement a minimal printing system +# for embedded systems. + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \ + file://cross-build.patch;patch=1" + +PR = "r1" + +inherit autotools + +EXTRA_OECONF = ' \ + BUILD_SYS="" HOST_SYS="" \ + --disable-network-build \ + --disable-doc-build \ + --disable-pp-build \ + --disable-scan-build \ + --disable-gui-build \ + --disable-fax-build \ + --disable-dbus-build \ + --disable-foomatic-drv-install \ + --disable-foomatic-rip-hplip-install \ + ' + +# needed by python checks in configure +EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' + +PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend" + +# need to snag the debug file or OE will fail on backend package +FILES_${PN}-dbg += "\ + ${libdir}/cups/backend/.debug + +FILES_${PN}-ppd = "\ + ${datadir}/ppd" + +FILES_${PN}-cups = "\ + ${datadir}/cups" + +FILES_${PN}-backend = "\ + ${libdir}/cups/backend" + diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb index c71811dd4e..1566deba61 100644 --- a/recipes/jamvm/jamvm-initial_1.4.5.bb +++ b/recipes/jamvm/jamvm-initial_1.4.5.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "zlib-native classpath-initial jikes-initial" -PR = "r0" +PR = "r1" PROVIDES = "virtual/java-initial" @@ -19,12 +19,16 @@ ARM_INSTRUCTION_SET = "arm" inherit native autotools +# libdir must be modified so that jamvm-initial and -native +# do not interfere EXTRA_OECONF = "\ --with-classpath-install-dir=${prefix} \ --program-suffix=-initial \ + --libdir=${STAGING_LIBDIR}/jamvm-initial \ " -CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" +# jamvm-initial has to run some binaries which need lots of memory. +CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB" do_compile() { oe_runmake \ diff --git a/recipes/jamvm/jamvm-initial_1.5.0.bb b/recipes/jamvm/jamvm-initial_1.5.0.bb index a1c415dd62..1566deba61 100644 --- a/recipes/jamvm/jamvm-initial_1.5.0.bb +++ b/recipes/jamvm/jamvm-initial_1.5.0.bb @@ -19,12 +19,16 @@ ARM_INSTRUCTION_SET = "arm" inherit native autotools +# libdir must be modified so that jamvm-initial and -native +# do not interfere EXTRA_OECONF = "\ --with-classpath-install-dir=${prefix} \ --program-suffix=-initial \ + --libdir=${STAGING_LIBDIR}/jamvm-initial \ " -CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" +# jamvm-initial has to run some binaries which need lots of memory. +CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB" do_compile() { oe_runmake \ diff --git a/recipes/lesstif/lesstif_0.95.0.bb b/recipes/lesstif/lesstif_0.95.0.bb index cb348e70db..5af87e3d41 100644 --- a/recipes/lesstif/lesstif_0.95.0.bb +++ b/recipes/lesstif/lesstif_0.95.0.bb @@ -1,7 +1,7 @@ SECTION = "libs" DESCRIPTION = "Free OSM/Motif implementation." LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/lesstif/${BP}.tar.bz2 \ @@ -40,7 +40,7 @@ addtask preconfigure after do_patch before do_configure EXTRA_OECONF = "\ --with-gnu-ld --disable-verbose --disable-build-12 --disable-build-20 \ --enable-build-21 --enable-xrender --enable-production --without-motif \ - --x-includes=. \ + --x-includes=. --x-libraries=. \ " PACKAGES += "${PN}-bin" diff --git a/recipes/linux/linux-mini2440-2.6.29+git/defconfig-mini2440 b/recipes/linux/linux-mini2440-2.6.31+git/defconfig index 9e71cbe0ee..71152187ac 100644 --- a/recipes/linux/linux-mini2440-2.6.29+git/defconfig-mini2440 +++ b/recipes/linux/linux-mini2440-2.6.31+git/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.29.3 -# Sun May 10 15:49:07 2009 +# Linux kernel version: 2.6.30 +# Wed Jun 17 15:34:49 2009 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -39,6 +39,7 @@ CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set @@ -65,6 +66,9 @@ CONFIG_IPC_NS=y # CONFIG_NET_NS is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -74,6 +78,7 @@ CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set +# CONFIG_STRIP_ASM_SYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -93,11 +98,13 @@ CONFIG_SLUB_DEBUG=y CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_CLK=y +# CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -110,7 +117,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y CONFIG_LBD=y -# CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_BLK_DEV_BSG is not set CONFIG_BLK_DEV_INTEGRITY=y @@ -139,6 +145,7 @@ CONFIG_FREEZER=y # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_GEMINI is not set # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set @@ -159,6 +166,7 @@ CONFIG_FREEZER=y # CONFIG_ARCH_ORION5X is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MMP is not set # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set CONFIG_ARCH_S3C2410=y @@ -287,9 +295,10 @@ CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HZ=200 CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set -CONFIG_ARCH_FLATMEM_HAS_HOLES=y +# CONFIG_ARCH_HAS_HOLES_MEMORYMODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -302,6 +311,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y CONFIG_UNEVICTABLE_LRU=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_ALIGNMENT_TRAP=y # @@ -311,8 +322,7 @@ CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set -CONFIG_KEXEC=y -CONFIG_ATAGS_PROC=y +# CONFIG_KEXEC is not set # # CPU Power Management @@ -352,7 +362,6 @@ CONFIG_NET=y # # Networking options # -CONFIG_COMPAT_NET_DEV_OPS=y CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -441,6 +450,7 @@ CONFIG_LLC=m # CONFIG_LAPB is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set @@ -475,21 +485,19 @@ CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIVHCI=m # CONFIG_AF_RXRPC is not set -# CONFIG_PHONET is not set CONFIG_FIB_RULES=y CONFIG_WIRELESS=y -CONFIG_CFG80211=m +CONFIG_CFG80211=y CONFIG_CFG80211_REG_DEBUG=y -CONFIG_NL80211=y CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y -CONFIG_LIB80211=m +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=m +CONFIG_MAC80211=y # # Rate control algorithm selection @@ -626,21 +634,17 @@ CONFIG_MTD_QINFO_PROBE=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=65536 -# CONFIG_BLK_DEV_XIP is not set -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set # CONFIG_C2PORT is not set # @@ -649,7 +653,7 @@ CONFIG_MISC_DEVICES=y CONFIG_EEPROM_AT24=y # CONFIG_EEPROM_AT25 is not set # CONFIG_EEPROM_LEGACY is not set -# CONFIG_EEPROM_93CX6 is not set +CONFIG_EEPROM_93CX6=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -692,9 +696,11 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_SRP_ATTRS is not set # CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set # CONFIG_ATA is not set # CONFIG_MD is not set CONFIG_NETDEVICES=y +CONFIG_COMPAT_NET_DEV_OPS=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set @@ -710,6 +716,7 @@ CONFIG_DM9000=y CONFIG_DM9000_DEBUGLEVEL=4 # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set # CONFIG_ENC28J60 is not set +# CONFIG_ETHOC is not set # CONFIG_SMC911X is not set # CONFIG_SMSC911X is not set # CONFIG_DNET is not set @@ -732,14 +739,17 @@ CONFIG_WLAN_80211=y CONFIG_LIBERTAS=m # CONFIG_LIBERTAS_USB is not set CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set -# CONFIG_LIBERTAS_THINFIRM is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8187 is not set +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AT76C50X_USB=m +CONFIG_USB_ZD1201=m +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_AR9170_USB is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -747,7 +757,16 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y # CONFIG_B43LEGACY is not set CONFIG_ZD1211RW=m CONFIG_ZD1211RW_DEBUG=y -# CONFIG_RT2X00 is not set +CONFIG_RT2X00=y +# CONFIG_RT2500USB is not set +CONFIG_RT73USB=y +CONFIG_RT2X00_LIB_USB=y +CONFIG_RT2X00_LIB=y +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -760,20 +779,28 @@ CONFIG_ZD1211RW_DEBUG=y # 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_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +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=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=m # CONFIG_WAN is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -# CONFIG_PPPOE is not set -# CONFIG_PPPOL2TP is not set +# CONFIG_PPP is not set # CONFIG_SLIP is not set -CONFIG_SLHC=m # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -784,18 +811,18 @@ CONFIG_SLHC=m # CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=y -# CONFIG_INPUT_POLLDEV is not set +CONFIG_INPUT_POLLDEV=y # # Userland interfaces # CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers @@ -830,6 +857,10 @@ CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y CONFIG_TOUCHSCREEN_FILTER_MEAN=y CONFIG_TOUCHSCREEN_FILTER_LINEAR=y # CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879_I2C is not set +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set CONFIG_TOUCHSCREEN_S3C2410=y # CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set @@ -877,14 +908,16 @@ CONFIG_DEVKMEM=y # CONFIG_SERIAL_SAMSUNG=y CONFIG_SERIAL_SAMSUNG_UARTS=3 +# CONFIG_SERIAL_SAMSUNG_DEBUG is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_S3C2440=y +# CONFIG_SERIAL_MAX3100 is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=128 +CONFIG_LEGACY_PTY_COUNT=16 CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m @@ -892,6 +925,7 @@ CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set @@ -933,9 +967,8 @@ CONFIG_I2C_SIMTEC=y # CONFIG_SENSORS_PCF8574 is not set # CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_MAX6875 is not set -CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_TSL2550=y # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -984,67 +1017,8 @@ CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_MCP23S08 is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_AD7414 is not set -# CONFIG_SENSORS_AD7418 is not set -# CONFIG_SENSORS_ADCXX is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1029 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ADT7462 is not set -# CONFIG_SENSORS_ADT7470 is not set -# CONFIG_SENSORS_ADT7473 is not set -# CONFIG_SENSORS_ADT7475 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_F71882FG is not set -# CONFIG_SENSORS_F75375S is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IBMAEM is not set -# CONFIG_SENSORS_IBMPEX is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM70 is not set -CONFIG_SENSORS_LM75=y -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_LM93 is not set -# CONFIG_SENSORS_LTC4245 is not set -# CONFIG_SENSORS_MAX1111 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_MAX6650 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_PC87427 is not set -# CONFIG_SENSORS_DME1737 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47M192 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_ADS7828 is not set -# CONFIG_SENSORS_THMC50 is not set -# CONFIG_SENSORS_VT1211 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83791D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83793 is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83L786NG is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_HWMON is not set CONFIG_THERMAL=m -# CONFIG_THERMAL_HWMON is not set CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -1103,7 +1077,7 @@ CONFIG_VIDEO_MEDIA=m # # CONFIG_MEDIA_ATTACH is not set CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA9887=m @@ -1112,6 +1086,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m CONFIG_MEDIA_TUNER_MT20XX=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -1136,6 +1111,7 @@ CONFIG_SOC_CAMERA_PLATFORM=m # CONFIG_VIDEO_SH_MOBILE_CEU 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 @@ -1143,6 +1119,7 @@ CONFIG_USB_GSPCA=m # CONFIG_USB_GSPCA_ETOMS is not set # CONFIG_USB_GSPCA_FINEPIX 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 @@ -1155,6 +1132,8 @@ CONFIG_USB_GSPCA=m # 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 @@ -1162,7 +1141,9 @@ CONFIG_USB_GSPCA=m # CONFIG_USB_GSPCA_VC032X is not set CONFIG_USB_GSPCA_ZC3XX=m # CONFIG_VIDEO_PVRUSB2 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 @@ -1176,6 +1157,7 @@ CONFIG_USB_GSPCA_ZC3XX=m # CONFIG_USB_STV680 is not set # CONFIG_USB_ZC0301 is not set # CONFIG_USB_PWC 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 @@ -1202,103 +1184,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # # Supported DVB Frontends # - -# -# Customise DVB Frontends -# # CONFIG_DVB_FE_CUSTOMISE is not set - -# -# Multistandard (satellite) frontends -# -# CONFIG_DVB_STB0899 is not set -# CONFIG_DVB_STB6100 is not set - -# -# DVB-S (satellite) frontends -# -# CONFIG_DVB_CX24110 is not set -# CONFIG_DVB_CX24123 is not set -# CONFIG_DVB_MT312 is not set -# CONFIG_DVB_S5H1420 is not set -# CONFIG_DVB_STV0288 is not set -# CONFIG_DVB_STB6000 is not set -# CONFIG_DVB_STV0299 is not set -# CONFIG_DVB_TDA8083 is not set -# CONFIG_DVB_TDA10086 is not set -# CONFIG_DVB_TDA8261 is not set -# CONFIG_DVB_VES1X93 is not set -# CONFIG_DVB_TUNER_ITD1000 is not set -# CONFIG_DVB_TUNER_CX24113 is not set -# CONFIG_DVB_TDA826X is not set -# CONFIG_DVB_TUA6100 is not set -# CONFIG_DVB_CX24116 is not set -# CONFIG_DVB_SI21XX is not set - -# -# DVB-T (terrestrial) frontends -# -# CONFIG_DVB_SP8870 is not set -# CONFIG_DVB_SP887X is not set -# CONFIG_DVB_CX22700 is not set -# CONFIG_DVB_CX22702 is not set -# CONFIG_DVB_DRX397XD is not set -# CONFIG_DVB_L64781 is not set -# CONFIG_DVB_TDA1004X is not set -# CONFIG_DVB_NXT6000 is not set -# CONFIG_DVB_MT352 is not set -# CONFIG_DVB_ZL10353 is not set -# CONFIG_DVB_DIB3000MB is not set -# CONFIG_DVB_DIB3000MC is not set -# CONFIG_DVB_DIB7000M is not set -# CONFIG_DVB_DIB7000P is not set -# CONFIG_DVB_TDA10048 is not set - -# -# DVB-C (cable) frontends -# -# CONFIG_DVB_VES1820 is not set -# CONFIG_DVB_TDA10021 is not set -# CONFIG_DVB_TDA10023 is not set -# CONFIG_DVB_STV0297 is not set - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -# CONFIG_DVB_NXT200X is not set -# CONFIG_DVB_OR51211 is not set -# CONFIG_DVB_OR51132 is not set -# CONFIG_DVB_BCM3510 is not set -# CONFIG_DVB_LGDT330X is not set -# CONFIG_DVB_LGDT3304 is not set -# CONFIG_DVB_S5H1409 is not set -# CONFIG_DVB_AU8522 is not set -# CONFIG_DVB_S5H1411 is not set - -# -# ISDB-T (terrestrial) frontends -# -# CONFIG_DVB_S921 is not set - -# -# Digital terrestrial only tuners/PLL -# -# CONFIG_DVB_PLL is not set -# CONFIG_DVB_TUNER_DIB0070 is not set - -# -# SEC control devices for DVB-S -# -# CONFIG_DVB_LNBP21 is not set -# CONFIG_DVB_ISL6405 is not set -# CONFIG_DVB_ISL6421 is not set -# CONFIG_DVB_LGS8GL5 is not set - -# -# Tools to develop new frontends -# -# CONFIG_DVB_DUMMY_FE is not set -# CONFIG_DVB_AF9013 is not set # CONFIG_DAB is not set # @@ -1335,6 +1221,7 @@ CONFIG_FB_S3C2410=y # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y # CONFIG_LCD_LTV350QV is not set @@ -1377,8 +1264,7 @@ CONFIG_FONT_MINI_4x6=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y -# CONFIG_LOGO_ARMWORKS_CLUT224 is not set +# CONFIG_LOGO_LINUX_CLUT224 is not set CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y CONFIG_SND=y @@ -1386,6 +1272,7 @@ CONFIG_SND_TIMER=y CONFIG_SND_PCM=y CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y @@ -1430,15 +1317,17 @@ CONFIG_USB_HIDDEV=y # # Special HID drivers # -CONFIG_HID_COMPAT=y 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_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 @@ -1481,6 +1370,7 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_C67X00_HCD is not set # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set @@ -1496,26 +1386,26 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_ACM=m # CONFIG_USB_PRINTER is not set -CONFIG_USB_WDM=m +CONFIG_USB_WDM=y # CONFIG_USB_TMC is not set # -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # # -# see USB_STORAGE Help for more information +# also be needed; see USB_STORAGE Help for more info # CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_DATAFAB=m # CONFIG_USB_STORAGE_FREECOM is not set -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m # CONFIG_USB_STORAGE_ONETOUCH is not set # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set @@ -1539,7 +1429,7 @@ CONFIG_USB_SERIAL=m # 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_CP2101=m +# 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 @@ -1563,11 +1453,13 @@ CONFIG_USB_SERIAL_FTDI_SIO=m # 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=m # 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 @@ -1590,7 +1482,6 @@ CONFIG_USB_SERIAL_SPCP8X5=m # 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 @@ -1640,6 +1531,7 @@ CONFIG_USB_CDC_COMPOSITE=m # OTG and related infrastructure # # CONFIG_USB_GPIO_VBUS is not set +# CONFIG_NOP_USB_XCEIV is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -1669,7 +1561,12 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_S3C24XX=y # CONFIG_LEDS_PCA9532 is not set CONFIG_LEDS_GPIO=y +CONFIG_LEDS_GPIO_PLATFORM=y +# CONFIG_LEDS_LP5521 is not set # CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_PWM is not set +# CONFIG_LEDS_BD2802 is not set # # LED Triggers @@ -1678,7 +1575,12 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y +# CONFIG_LEDS_TRIGGER_GPIO is not set CONFIG_LEDS_TRIGGER_DEFAULT_ON=y + +# +# iptables trigger is under Netfilter config (LED target) +# CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -1746,6 +1648,7 @@ CONFIG_DMADEVICES=y # # DMA Devices # +# CONFIG_AUXDISPLAY is not set # CONFIG_REGULATOR is not set # CONFIG_UIO is not set # CONFIG_STAGING is not set @@ -1759,9 +1662,10 @@ CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4_FS is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set @@ -1780,10 +1684,15 @@ CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set CONFIG_AUTOFS_FS=y CONFIG_AUTOFS4_FS=y -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m CONFIG_GENERIC_ACL=y # +# Caches +# +# CONFIG_FSCACHE is not set + +# # CD-ROM/DVD Filesystems # # CONFIG_ISO9660_FS is not set @@ -1797,7 +1706,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=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y # # Pseudo filesystems @@ -1823,7 +1734,7 @@ 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_SUMMARY=y # CONFIG_JFFS2_FS_XATTR is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y @@ -1838,8 +1749,13 @@ CONFIG_CRAMFS=y # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set CONFIG_ROMFS_FS=y +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y # 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 @@ -1853,11 +1769,17 @@ CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -# CONFIG_SUNRPC_REGISTER_V4 is not set CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y +# CONFIG_CIFS_UPCALL is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DFS_UPCALL 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 @@ -1886,10 +1808,10 @@ CONFIG_EFI_PARTITION=y # CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_850=y CONFIG_NLS_CODEPAGE_852=m CONFIG_NLS_CODEPAGE_855=m CONFIG_NLS_CODEPAGE_857=m @@ -1910,7 +1832,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m @@ -1920,10 +1842,10 @@ CONFIG_NLS_ISO8859_7=m CONFIG_NLS_ISO8859_9=m CONFIG_NLS_ISO8859_13=m CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_ISO8859_15=y CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m +CONFIG_NLS_UTF8=y # CONFIG_DLM is not set # @@ -1942,6 +1864,9 @@ CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set @@ -1966,7 +1891,6 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set -CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set @@ -1975,7 +1899,9 @@ CONFIG_FRAME_POINTER=y # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_PAGE_POISONING is not set CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_TRACING_SUPPORT=y # # Tracers @@ -1983,17 +1909,24 @@ CONFIG_HAVE_FUNCTION_TRACER=y # CONFIG_FUNCTION_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_EVENT_TRACER is not set # CONFIG_BOOT_TRACER is not set # CONFIG_TRACE_BRANCH_PROFILING is not set # CONFIG_STACK_TRACER is not set -# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set -CONFIG_DEBUG_USER=y +CONFIG_ARM_UNWIND=y +# CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_ERRORS is not set # CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set +CONFIG_DEBUG_S3C_PORT=y CONFIG_DEBUG_S3C_UART=0 # @@ -2020,10 +1953,12 @@ CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m @@ -2093,6 +2028,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m # Compression # CONFIG_CRYPTO_DEFLATE=m +# CONFIG_CRYPTO_ZLIB is not set CONFIG_CRYPTO_LZO=m # @@ -2100,6 +2036,7 @@ CONFIG_CRYPTO_LZO=m # CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_HW=y +# CONFIG_BINARY_PRINTF is not set # # Library routines @@ -2117,6 +2054,9 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=m CONFIG_LZO_DECOMPRESS=m -CONFIG_PLIST=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/recipes/linux/linux-mini2440_2.6.29+git.bb b/recipes/linux/linux-mini2440_2.6.29+git.bb deleted file mode 100644 index e57697b664..0000000000 --- a/recipes/linux/linux-mini2440_2.6.29+git.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Linux Kernel for mini2440 development board" -SECTION = "kernel" -LICENSE = "GPL" -MACHINE_KERNEL_PR = "r9" - -GGSRC = "http://www.xora.org.uk/oe/patches/" - -SRCREV = "${AUTOREV}" - -SRC_URI = "git://repo.or.cz/linux-2.6/mini2440.git;protocol=git;branch=mini2440-stable-v2.6.29 \ - file://defconfig-mini2440" - -S = "${WORKDIR}/git" - -inherit kernel - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = "(mini2440|micro2440)" - -do_configure() { - install ${WORKDIR}/defconfig-mini2440 ${S}/.config - oe_runmake oldconfig -} - -KERNEL_RELEASE = "2.6.29" diff --git a/recipes/linux/linux-mini2440_2.6.31+git.bb b/recipes/linux/linux-mini2440_2.6.31+git.bb new file mode 100644 index 0000000000..5e25a2058e --- /dev/null +++ b/recipes/linux/linux-mini2440_2.6.31+git.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Linux Kernel for mini2440 / micro2440 development boards" +SECTION = "kernel" +LICENSE = "GPL" +PR = "r0" + +require linux.inc + +SRCREV = "${AUTOREV}" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_mini2440 = "1" +DEFAULT_PREFERENCE_micro2440 = "1" + +SRC_URI = "git://repo.or.cz/linux-2.6/mini2440.git;protocol=git;branch=mini2440-stable-v2.6.31 \ + file://defconfig" + +S = "${WORKDIR}/git" + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "(mini2440|micro2440)" + +KERNEL_RELEASE = "2.6.31" diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb index 429510c086..547e668491 100644 --- a/recipes/opencv/opencv-samples_svn.bb +++ b/recipes/opencv/opencv-samples_svn.bb @@ -9,7 +9,7 @@ DEPENDS = "opencv" SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \ " -SRCREV = "2027" +SRCREV = "2196" PV = "1.0.0+1.1pre1+svnr${SRCREV}" S = "${WORKDIR}/opencv" @@ -17,17 +17,23 @@ S = "${WORKDIR}/opencv" do_install() { cd samples/c install -d ${D}/${bindir} + install -d ${D}/${datadir}/opencv/samples + + cp * ${D}/${datadir}/opencv/samples || true for i in *.c; do echo "compiling $i" ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv` || true install -m 0755 `basename $i .c` ${D}/${bindir} || true + rm ${D}/${datadir}/opencv/samples/`basename $i .c` || true done for i in *.cpp; do echo "compiling $i" ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv` || true install -m 0755 `basename $i .cpp` ${D}/${bindir} || true + rm ${D}/${datadir}/opencv/samples/`basename $i .cpp` || true done } -FILES_${PN} += "${bindir}" +FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*" +FILES_${PN} += "${bindir} ${datadir}/opencv" diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb index ce54d8c773..ab14c58e43 100644 --- a/recipes/opencv/opencv_svn.bb +++ b/recipes/opencv/opencv_svn.bb @@ -11,12 +11,12 @@ DEPENDS = "ffmpeg gtk+ libtool swig swig-native python jpeg zlib libpng tiff gli SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \ file://acinclude.m4" -SRCREV = "2027" +SRCREV = "2196" PV = "1.0.0+1.1pre1+svnr${SRCREV}" S = "${WORKDIR}/opencv" -inherit distutils-base autotools pkgconfig +inherit distutils-base autotools_stage pkgconfig cmake EXTRA_OECONF = " \ --disable-debug \ @@ -29,16 +29,19 @@ EXTRA_OECONF = " \ --enable-apps \ --enable-optimization \ --disable-sse \ - --without-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR} \ + --with-swig \ + --with-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR} \ " export BUILD_SYS export HOST_SYS export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" +export PYTHON=${STAGING_BINDIR_NATIVE}/python do_configure_prepend() { cp ${WORKDIR}/acinclude.m4 ${S} sed -i -e /AC_CONFIG_MACRO_DIR/d -e /AZ_PYTHON_CSPEC/d ${S}/configure.in + sed -i -e s:samples::g -e 's: doc::g' ${S}/Makefile.am } TARGET_CC_ARCH += "-I${S}/include " @@ -55,16 +58,15 @@ python populate_packages_prepend () { } FILES_${PN} = "" -FILES_${PN}-doc += "${datadir}/opencv/" -FILES_${PN}-apps = "${bindir}/*" +FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv/" FILES_${PN}-dbg += "${libdir}/.debug" FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" +INSANE_SKIP_python-opencv = True DESCRIPTION_python-opencv = "Python bindings to opencv" FILES_python-opencv = "${libdir}/*/site-packages/*" RDEPENDS_python-opencv = "python-core" -do_stage() { - autotools_stage_all +do_stage_append() { + cp ${S}/include/opencv/*.h ${STAGING_INCDIR}/opencv/ } - diff --git a/recipes/python/python-django_1.0.2.bb b/recipes/python/python-django_1.0.2.bb index 0c572eeeda..572e1906a9 100644 --- a/recipes/python/python-django_1.0.2.bb +++ b/recipes/python/python-django_1.0.2.bb @@ -16,11 +16,12 @@ DISTUTILS_INSTALL_ARGS = "--root=${D} --prefix=${prefix}" RDEPENDS_${PN} = "\ python-email \ + python-html \ python-netserver \ python-pickle \ python-pprint \ python-shell \ - python-sqlite \ + python-sqlite3 \ python-textutils \ python-threading \ python-unixadmin \ diff --git a/recipes/python/python-flup_1.0.1.bb b/recipes/python/python-flup_1.0.2.bb index d5f865da11..d5f865da11 100644 --- a/recipes/python/python-flup_1.0.1.bb +++ b/recipes/python/python-flup_1.0.2.bb diff --git a/recipes/t1lib/t1lib_5.0.2.bb b/recipes/t1lib/t1lib_5.0.2.bb index 5da31f7d09..36acb77f52 100644 --- a/recipes/t1lib/t1lib_5.0.2.bb +++ b/recipes/t1lib/t1lib_5.0.2.bb @@ -1,8 +1,8 @@ DESCRIPTION = "A Type1 Font Rastering Library" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/libx11" -PR = "r4" +DEPENDS = "virtual/libx11 libxaw" +PR = "r5" LICENSE = "LGPL GPL" SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \ file://configure.patch;patch=1 \ diff --git a/recipes/tslib/tslib/tslib-pluginsld.patch b/recipes/tslib/tslib/tslib-pluginsld.patch new file mode 100644 index 0000000000..37ef80879e --- /dev/null +++ b/recipes/tslib/tslib/tslib-pluginsld.patch @@ -0,0 +1,36 @@ + plugins/Makefile.am | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 3b902c2..4c4ef8b 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -114,15 +114,19 @@ pluginexec_LTLIBRARIES = \ + + variance_la_SOURCES = variance.c + variance_la_LDFLAGS = -module $(LTVSN) ++variance_la_LIBADD = $(top_builddir)/src/libts.la + + dejitter_la_SOURCES = dejitter.c + dejitter_la_LDFLAGS = -module $(LTVSN) ++dejitter_la_LIBADD = $(top_builddir)/src/libts.la + + linear_la_SOURCES = linear.c + linear_la_LDFLAGS = -module $(LTVSN) ++linear_la_LIBADD = $(top_builddir)/src/libts.la + + pthres_la_SOURCES = pthres.c + pthres_la_LDFLAGS = -module $(LTVSN) ++pthres_la_LIBADD = $(top_builddir)/src/libts.la + + # hw access + corgi_la_SOURCES = corgi-raw.c +@@ -148,6 +152,7 @@ tatung_la_LDFLAGS = -module $(LTVSN) + + input_la_SOURCES = input-raw.c + input_la_LDFLAGS = -module $(LTVSN) ++input_la_LIBADD = $(top_builddir)/src/libts.la + + linear_h2200_la_SOURCES = linear-h2200.c + linear_h2200_la_LDFLAGS = -module $(LTVSN) + diff --git a/recipes/tslib/tslib_1.0.bb b/recipes/tslib/tslib_1.0.bb index 1929ee0557..58a0e35bd1 100644 --- a/recipes/tslib/tslib_1.0.bb +++ b/recipes/tslib/tslib_1.0.bb @@ -1,6 +1,7 @@ SRC_URI = "http://download.berlios.de/tslib/${BP}.tar.bz2 \ file://fix_version.patch;patch=1 \ - file://tslib-nopressure.patch;patch=1" -PR = "${INC_PR}.2" + file://tslib-nopressure.patch;patch=1 \ + file://tslib-pluginsld.patch;patch=1" +PR = "${INC_PR}.3" include tslib.inc diff --git a/recipes/vlc/vlc_1.0.2.bb b/recipes/vlc/vlc_1.0.2.bb new file mode 100644 index 0000000000..bd967cff44 --- /dev/null +++ b/recipes/vlc/vlc_1.0.2.bb @@ -0,0 +1,44 @@ +# This recipe packages vlc as a library as well, so qt4 dependencies +# can be avoided when ony the library is installed. +# Would be cool if when newer vlc is added to OE and older ones are phased +# out that could be made the default. + +require vlc.inc + +# ffmpeg from git (library version => 52) is required +# libtool-native must be >= 2.2.4 +DEPENDS += "libdvdcss libdvdread" + +EXTRA_OECONF += "\ + --enable-dvdread \ +" + +LEAD_SONAME = "libvlc.so.2" + +PACKAGES =+ "libvlc-dbg libvlc-dev libvlc" + +FILES_libvlc-dev = "${libdir}/lib*.so" + +FILES_libvlc-dbg = "\ + ${libdir}/.debug \ + ${libdir}/vlc/meta_engine/.debug \ + ${libdir}/vlc/audio_filter/.debug ${libdir}/vlc/audio_output/.debug \ + ${libdir}/vlc/demux/.debug ${libdir}/vlc/control/.debug \ + ${libdir}/vlc/gui/.debug ${libdir}/vlc/packetizer/.debug \ + ${libdir}/vlc/audio_mixer/.debug ${libdir}/vlc/stream_out/.debug \ + ${libdir}/vlc/mux/.debug ${libdir}/vlc/access/.debug \ + ${libdir}/vlc/visualization/.debug ${libdir}/vlc/access_filter/.debug \ + ${libdir}/vlc/access_output/.debug ${libdir}/vlc/video_output/.debug \ + ${libdir}/vlc/services_discovery/.debug ${libdir}/vlc/video_chroma/.debug \ + ${libdir}/vlc/video_codec/.debug ${libdir}/vlc/video_filter/.debug \ + ${libdir}/vlc/misc/.debug ${libdir}/vlc/codec/.debug \ + " + +FILES_libvlc = "${libdir}/lib*.so.*" + +FILES_${PN} += "${bindir}/vlc \ + ${datadir}/applications \ + ${datadir}/vlc/ \ + " + +FILES_${PN}-dbg += "${libdir}/vlc/*/.debug" diff --git a/recipes/vlc/x264_0.0.bb b/recipes/vlc/x264_0.0.bb deleted file mode 100644 index b716afc416..0000000000 --- a/recipes/vlc/x264_0.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "h264 encoder" -LICENSE = "GPL" - -X264PV = "snapshot-20090127-2245" - -SRC_URI = "http://download.videolan.org/pub/videolan/x264/snapshots/x264-${X264PV}.tar.bz2" - -S = "${WORKDIR}/${PN}-${X264PV}" - -inherit autotools lib_package - -EXTRA_OECONF = " --enable-shared " - -do_stage() { - autotools_stage_all -} - - - - diff --git a/recipes/vlc/x264_r2245.bb b/recipes/vlc/x264_r2245.bb index 8d1036fa76..a347bd9039 100644 --- a/recipes/vlc/x264_r2245.bb +++ b/recipes/vlc/x264_r2245.bb @@ -1,8 +1,8 @@ DESCRIPTION = "H.264 encoder" LICENSE = "GPL" -PR = "r3" +PR = "r4" -X264PV = "snapshot-20090127-2245" +X264PV = "snapshot-20090928-2245" SRC_URI = "http://download.videolan.org/pub/videolan/x264/snapshots/x264-${X264PV}.tar.bz2" |