From a96a9a1166d85ffae0d97188ff1e986b8efb046b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 6 Jan 2010 18:37:14 +0100 Subject: netbook-launcher-efl: add 0.2.0.0 liblauncher: add 0.1.8 --- recipes/netbook-launcher/liblauncher_0.1.8.bb | 10 ++++++++++ recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 recipes/netbook-launcher/liblauncher_0.1.8.bb create mode 100644 recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb (limited to 'recipes') diff --git a/recipes/netbook-launcher/liblauncher_0.1.8.bb b/recipes/netbook-launcher/liblauncher_0.1.8.bb new file mode 100644 index 0000000000..b0cc555f85 --- /dev/null +++ b/recipes/netbook-launcher/liblauncher_0.1.8.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "A library to build launchers" +LICENSE = "GPLv3,LGPLv2.1,LGPLv3" + +DEPENDS = "glib-2.0 libwnck virtual/libx11 gconf gnome-menus" + +SRC_URI = "http://launchpad.net/liblauncher/0.1/${PV}/+download/liblauncher-${PV}.tar.gz" + +inherit autotools + + diff --git a/recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb b/recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb new file mode 100644 index 0000000000..007bee9493 --- /dev/null +++ b/recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "This is a version of netbook-launcher using Enlightenment Foundation Libraries (EFL) so it would run in systems without 3D acceleration required by Clutter." +LICENSE = "GPLv3" + +DEPENDS = "liblauncher libxau dbus-glib gtk+ libgnome libgnomeui edje edje-native libnotify libcanberra evas eina ecore elementary eet" + +inherit gnome + +SRC_URI = "http://launchpad.net/launch-lite-proj/trunk/alpha-0.2.0/+download/netbook-launcher-efl-${PV}.tar.gz" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" + -- cgit v1.2.3 From 21fd017229fb1210b07c68aa0b75f72d8e0c1e89 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 6 Jan 2010 19:04:36 +0100 Subject: human-icon-theme: add 0.35 --- recipes/netbook-launcher/human-icon-theme_0.35.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 recipes/netbook-launcher/human-icon-theme_0.35.bb (limited to 'recipes') diff --git a/recipes/netbook-launcher/human-icon-theme_0.35.bb b/recipes/netbook-launcher/human-icon-theme_0.35.bb new file mode 100644 index 0000000000..578f78a23f --- /dev/null +++ b/recipes/netbook-launcher/human-icon-theme_0.35.bb @@ -0,0 +1,16 @@ +DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" + +LICENSE = "CC-BY-SA" +RDEPENDS = "hicolor-icon-theme" +RRECOMMENDS = "librsvg-gtk" + +inherit gnome + +SRC_URI = "https://launchpad.net/ubuntu/lucid/+source/human-icon-theme/${PV}/+files/human-icon-theme_${PV}.tar.gz" + +do_install_prepend() { + sed -i -e s:/usr/lib/icon-naming-utils/:${STAGING_DIR_NATIVE}/${libexecdir}/:g Makefile +} + +PACKAGE_ARCH = "all" +FILES_${PN} += "${datadir}/*" -- cgit v1.2.3 From 2bc2e6b801236fe9768da3be3711e60b44753bb1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 7 Jan 2010 09:50:49 +0100 Subject: pidgin: update to 2.6.4 --- .../pidgin/angstrom/purple-OE-branding-25.patch | 16 ++++++++++++++++ recipes/pidgin/pidgin_2.6.4.bb | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 recipes/pidgin/pidgin/angstrom/purple-OE-branding-25.patch create mode 100644 recipes/pidgin/pidgin_2.6.4.bb (limited to 'recipes') diff --git a/recipes/pidgin/pidgin/angstrom/purple-OE-branding-25.patch b/recipes/pidgin/pidgin/angstrom/purple-OE-branding-25.patch new file mode 100644 index 0000000000..cd1ac49e56 --- /dev/null +++ b/recipes/pidgin/pidgin/angstrom/purple-OE-branding-25.patch @@ -0,0 +1,16 @@ +Index: pidgin-2.5.0/libpurple/protocols/irc/irc.h +=================================================================== +--- pidgin-2.5.0.orig/libpurple/protocols/irc/irc.h 2008-08-19 01:53:38.000000000 +0000 ++++ pidgin-2.5.0/libpurple/protocols/irc/irc.h 2008-08-27 11:15:58.000000000 +0000 +@@ -36,9 +36,9 @@ + + #define IRC_DEFAULT_CHARSET "UTF-8" + #define IRC_DEFAULT_AUTODETECT FALSE +-#define IRC_DEFAULT_ALIAS "purple" ++#define IRC_DEFAULT_ALIAS "Angstrom-user" + +-#define IRC_DEFAULT_QUIT "Leaving." ++#define IRC_DEFAULT_QUIT "Powered by Angstrom: http://www.angstrom-distribution.org/" + + #define IRC_INITIAL_BUFSIZE 1024 + diff --git a/recipes/pidgin/pidgin_2.6.4.bb b/recipes/pidgin/pidgin_2.6.4.bb new file mode 100644 index 0000000000..7ced40d9c3 --- /dev/null +++ b/recipes/pidgin/pidgin_2.6.4.bb @@ -0,0 +1,19 @@ +require pidgin.inc +PR = "${INC_PR}.0" + +DEPENDS += "farsight2 libidn" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch;patch=1 \ + file://pidgin.desktop-set-icon.patch;patch=1 \ + file://purple-OE-branding-25.patch;patch=1 \ + file://pidgin-cross-python.patch;patch=1 \ +" + +EXTRA_OECONF += "\ + --disable-gtkspell \ + --disable-meanwhile \ + --disable-nm \ + --disable-screensaver \ +" -- cgit v1.2.3 From d27fb2aec799ec77bb645541d7bd3fc9aa63529d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 6 Jan 2010 12:22:16 +0800 Subject: qt4x11: Cease out the qt4x11 PROVIDER * The LGPL and Commercial edition are actually the same tarball. * If someone sees the need he can take qt qt4-recipes and specify -commercial in the compilation. --- recipes/qt4/qt4-x11-free.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'recipes') diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index ade148bab6..dffe3a0d17 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -4,7 +4,6 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" -PROVIDES = "qt4x11" INC_PR = "r14" -- cgit v1.2.3 From d542c62b5af575ecfa6c4e353b1d57c27d3e12c3 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 4 Jan 2010 15:37:05 +0800 Subject: qt4: Make the gles variants for Embedded and X11 provide the normal variant This way a distribution/user can set PREFERRED_PROVIDER_qt4-embedded = "qt4-embedded-gles" to select the GLES/OpenVG runtime. The default is qt4-embedded as GLES require a dedicated library most of the time provided as a binary blob by the vendor requiring the user to manually download and store it at the right place. For X11 we already have a PREFERRED_PROVIDER setting in place and don't need to update. Acked-by: Koen Kooi --- recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled | 1 + recipes/qt4/qt4-embedded-gles_4.6.0.bb | 1 + recipes/qt4/qt4-x11-free-gles_4.5.2.bb | 1 + recipes/qt4/qt4-x11-free-gles_4.6.0.bb | 1 + recipes/qt4/qt4-x11-free-gles_git.bb.disabled | 1 + 5 files changed, 5 insertions(+) (limited to 'recipes') diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled index 5aa07c2ebb..a888e7d6be 100644 --- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled +++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled @@ -9,6 +9,7 @@ require qt4-embedded_${PV}.bb LICENSE = "LGPLv2.1 GPLv3" DEPENDS += "virtual/egl" +PROVIDES += "qt4-embedded" SRC_URI += "file://sgx-hack.patch;patch=1" export EXTRA_QMAKE_MUNGE = " glmunge " diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb index 04e074f9dd..915dd0734f 100644 --- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb +++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb @@ -1,6 +1,7 @@ require qt4-embedded.inc PR = "${INC_PR}.1" +PROVIDES += "qt4-embedded" QT_GLFLAGS = "-opengl es2 -openvg" require qt-4.6.0.inc diff --git a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb index cd81841269..a3f60bf982 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb @@ -11,6 +11,7 @@ require qt4-x11-free_${PV}.bb PR = "${INC_PR}.3" DEPENDS += "virtual/egl" +PROVIDES += "qt4-x11-free" #SRC_URI += "file://sgx-hack.patch;patch=1" SRC_URI += "file://hack-out-pg_config.patch;patch=1" diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb index 089992c142..8d09d89f8d 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb @@ -13,5 +13,6 @@ QT_CONFIG_FLAGS += " \ FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" DEPENDS += "virtual/egl" +PROVIDES += "qt4-x11-free" diff --git a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled index 22db2dfa8d..59778910b5 100644 --- a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled +++ b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled @@ -5,6 +5,7 @@ FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:" QT_GLFLAGS = "-opengl es1 -openvg" require qt4-x11-free.inc +PROVIDES = "qt4-x11-free" LICENSE = "LGPLv2.1 GPLv3" PR = "${INC_PR}.0+gitr${SRCREV}" -- cgit v1.2.3 From be4bdd0ffa8d542606c0c66f6784dff1977e2945 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 7 Jan 2010 13:27:11 +0800 Subject: qtwebkit-performance-utilities: Add new recipe These are some simple benchmarks and utilities for QtWebKit --- .../webkit/qtwebkit-performance-utilities-e_git.bb | 4 +++ recipes/webkit/qtwebkit-performance-utilities.inc | 33 ++++++++++++++++++++++ .../webkit/qtwebkit-performance-utilities_git.bb | 4 +++ 3 files changed, 41 insertions(+) create mode 100644 recipes/webkit/qtwebkit-performance-utilities-e_git.bb create mode 100644 recipes/webkit/qtwebkit-performance-utilities.inc create mode 100644 recipes/webkit/qtwebkit-performance-utilities_git.bb (limited to 'recipes') diff --git a/recipes/webkit/qtwebkit-performance-utilities-e_git.bb b/recipes/webkit/qtwebkit-performance-utilities-e_git.bb new file mode 100644 index 0000000000..5342d02a78 --- /dev/null +++ b/recipes/webkit/qtwebkit-performance-utilities-e_git.bb @@ -0,0 +1,4 @@ +inherit qt4e + +require qtwebkit-performance-utilities.inc +PR = "${INC_PR}.0" diff --git a/recipes/webkit/qtwebkit-performance-utilities.inc b/recipes/webkit/qtwebkit-performance-utilities.inc new file mode 100644 index 0000000000..e61f22ce71 --- /dev/null +++ b/recipes/webkit/qtwebkit-performance-utilities.inc @@ -0,0 +1,33 @@ +DESCRIPTION = "QtWebKit Performance Utilities" +LICENSE = "GPLv3" + +INC_PR = "r0" + +DEPENDS = "gd" + +SRC_URI = "git://gitorious.org/qtwebkit/performance.git;protocol=git" +S = "${WORKDIR}/git" +PV = "0.1+gitr${SRCREV}" + +EXTRA_QMAKEVARS_PRE = "INSTALL_DIR=${bindir}" + +FILES_${PN} = "${bindir}/qtwebkit-benchmark/*" +FILES_${PN}-dbg = "${bindir}/qtwebkit-benchmark/.debug/*" + +# package memusage stat +PACKAGES += "memusagestat-dbg memusagestat" +FILES_memusagestat = "${bindir}/*" +FILES_memusagestat-dbg = "${bindir}/.debug/*" + + +do_compile_append() { + cd ${S}/host-tools/memusagestat + ${CC} -o memusagestat memusagestat.c ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -lgd +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} + cd ${S}/host-tools/memusagestat + install -d ${D}${bindir} + install -m 0755 memusagestat ${D}/${bindir} +} diff --git a/recipes/webkit/qtwebkit-performance-utilities_git.bb b/recipes/webkit/qtwebkit-performance-utilities_git.bb new file mode 100644 index 0000000000..17735dff54 --- /dev/null +++ b/recipes/webkit/qtwebkit-performance-utilities_git.bb @@ -0,0 +1,4 @@ +inherit qt4x11 + +require ${PN}.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From af57250cfa11ac8e043d7580e1948e480094cfaa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 7 Jan 2010 10:46:30 +0100 Subject: gimp: add 2.6.8 --- recipes/gimp/gimp_2.6.8.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipes/gimp/gimp_2.6.8.bb (limited to 'recipes') diff --git a/recipes/gimp/gimp_2.6.8.bb b/recipes/gimp/gimp_2.6.8.bb new file mode 100644 index 0000000000..c1edbb7a11 --- /dev/null +++ b/recipes/gimp/gimp_2.6.8.bb @@ -0,0 +1,8 @@ +require gimp.inc + +DEPENDS += "webkit-gtk lcms gegl hal" + +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-${PV}.tar.bz2 \ + " + + -- cgit v1.2.3 From 43bb6f65a72d3d3f81bc917fd27957ccdf20abe2 Mon Sep 17 00:00:00 2001 From: Marco Cavallini Date: Thu, 7 Jan 2010 11:34:42 +0100 Subject: xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf : added mouse support --- .../xserver-xorg-conf/ronetix-pm9263/xorg.conf | 49 ++++++++++++++++++---- 1 file changed, 42 insertions(+), 7 deletions(-) (limited to 'recipes') diff --git a/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf index 7f3eb7797f..bdd6d71404 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf @@ -1,11 +1,46 @@ -Section "ServerLayout" - Identifier "default" - InputDevice "atmel-ts" "CorePointer" +# +# X11 configuration for Ronetix PM9263 device. +# (C)2009 Koan sas - www.KoanSoftware.com +# + +Section "Monitor" + Identifier "Display" +EndSection + +Section "Device" + Identifier "fbdevice" + Driver "fbdev" + Option "fbdev" "/dev/fb0" + Option "shadowfb" "true" +EndSection + +Section "Screen" + Identifier "fbscreen" + Device "fbdevice" + Monitor "Display" EndSection Section "InputDevice" - Identifier "atmel-ts" - Driver "evdev" - Option "SwapAxes" "1" - Option "Device" "/dev/input/touchscreen0" + Identifier "atmel-ts" + Driver "evdev" + Option "SwapAxes" "1" + Option "Device" "/dev/input/touchscreen0" EndSection + +Section "InputDevice" + Identifier "Generic Mouse" + Driver "mouse" + Option "CorePointer" +EndSection + +Section "ServerLayout" + Identifier "Layout" + Screen "fbscreen" + InputDevice "Generic Mouse" + InputDevice "atmel-ts" "CorePointer" +EndSection + +Section "ServerFlags" + Option "AutoAddDevices" "false" +EndSection + -- cgit v1.2.3 From 611662a49470299f3851db2823d76d4827700ff9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 11:53:42 +0100 Subject: libeflvala: move from recipes/freesmartphone to recipes/efl --- recipes/efl1/libeflvala_git.bb | 15 +++++++++++++++ recipes/freesmartphone/libeflvala_git.bb | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 recipes/efl1/libeflvala_git.bb delete mode 100644 recipes/freesmartphone/libeflvala_git.bb (limited to 'recipes') diff --git a/recipes/efl1/libeflvala_git.bb b/recipes/efl1/libeflvala_git.bb new file mode 100644 index 0000000000..9040bbd10a --- /dev/null +++ b/recipes/efl1/libeflvala_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Vala meets the Enlightenment Foundation Libraries" +AUTHOR = "Michael 'Mickey' Lauer " +LICENSE = "LGPL" +SECTION = "devel" +DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary" +PV = "0.0.1.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools_stage pkgconfig vala + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}/*" diff --git a/recipes/freesmartphone/libeflvala_git.bb b/recipes/freesmartphone/libeflvala_git.bb deleted file mode 100644 index 9040bbd10a..0000000000 --- a/recipes/freesmartphone/libeflvala_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Vala meets the Enlightenment Foundation Libraries" -AUTHOR = "Michael 'Mickey' Lauer " -LICENSE = "LGPL" -SECTION = "devel" -DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary" -PV = "0.0.1.0+gitr${SRCREV}" -PR = "r0" - -SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master" -S = "${WORKDIR}/git" - -inherit autotools_stage pkgconfig vala - -PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}/*" -- cgit v1.2.3 From ee6762f166a4769c8326d552ca59f431b705e86e Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 27 Oct 2009 13:57:49 +0000 Subject: connman: move test utils to separate package, shr config do not disable usb0 on startup Signed-off-by: Klaus Kurzmann --- recipes/connman/connman.inc | 4 +++- recipes/connman/connman_git.bb | 4 +++- recipes/connman/files/shr/connman | 42 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100755 recipes/connman/files/shr/connman (limited to 'recipes') diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc index eb7aa1ab52..5b2f0cc409 100644 --- a/recipes/connman/connman.inc +++ b/recipes/connman/connman.inc @@ -54,7 +54,7 @@ python populate_packages_prepend() { PACKAGES_DYNAMIC = "${PN}-plugin-*" -PACKAGES += "${PN}-scripts" +PACKAGES += "${PN}-scripts ${PN}-test-utils" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ @@ -64,6 +64,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${libdir}/bonobo/servers \ ${datadir}/dbus-1/system-services/*" +FILES_${PN}-test-utils += "${libdir}/connman/test/*" + FILES_${PN}-scripts += "${libdir}/connman/scripts" FILES_${PN}-dbg += "${libdir}/connman/*/.debug" FILES_${PN}-dev += "${libdir}/connman/*/*.la" diff --git a/recipes/connman/connman_git.bb b/recipes/connman/connman_git.bb index 523d39ba2f..c0cb890e20 100644 --- a/recipes/connman/connman_git.bb +++ b/recipes/connman/connman_git.bb @@ -20,12 +20,14 @@ EXTRA_OECONF = " \ --enable-fake \ " +EXTRA_OECONF_append_shr += "--disable-tools" + require connman.inc SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6" PV = "0.42+git" -PR = "r0" +PR = "r2" PR_append = ".gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/connman/files/shr/connman b/recipes/connman/files/shr/connman new file mode 100755 index 0000000000..708b1b4cd1 --- /dev/null +++ b/recipes/connman/files/shr/connman @@ -0,0 +1,42 @@ +#!/bin/sh + +DAEMON="/usr/sbin/connmand -I usb0" +PIDFILE=/var/run/connmand.pid +DESC="Connection Manager" + +if [ -f /etc/default/connman ] ; then + . /etc/default/connman +fi + +set -e + +do_start() { + $DAEMON +} + +do_stop() { + start-stop-daemon --stop --name connmand --quiet +} + +case "$1" in + start) + echo "Starting $DESC" + do_start + ;; + stop) + echo "Stopping $DESC" + do_stop + ;; + restart|force-reload) + echo "Restarting $DESC" + do_stop + sleep 1 + do_start + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 -- cgit v1.2.3 From 700fd19cd92638de8ea6986abd8bfc7c97aef7e2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 6 Jan 2010 15:27:52 +0100 Subject: fltk: add 1.1.10 --- recipes/fltk/fltk_1.1.10.bb | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 recipes/fltk/fltk_1.1.10.bb (limited to 'recipes') diff --git a/recipes/fltk/fltk_1.1.10.bb b/recipes/fltk/fltk_1.1.10.bb new file mode 100644 index 0000000000..778c0f35b8 --- /dev/null +++ b/recipes/fltk/fltk_1.1.10.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "FLTK is a cross-platform C++ GUI toolkit" +HOMEPAGE = "http://www.fltk.org" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" + +SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \ + file://disable_test.patch;patch=1 \ + " + +S = "${WORKDIR}/fltk-${PV}" + +inherit lib_package autotools_stage binconfig + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OECONF = "--enable-shared \ + --enable-threads \ + --enable-xdbe --enable-xft --enable-gl \ + --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}" + +do_configure() { + oe_runconf +} + +python populate_packages_prepend () { + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d) +} + +LEAD_SONAME = "libfltk.so" -- cgit v1.2.3 From 54c6f4eb5eb57e97ef365fc98638c402366a9cf9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 11:32:18 +0100 Subject: task-shr-feed: remove usbmode --- recipes/tasks/task-shr-feed.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'recipes') diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index be55bd225d..1c79fd24d2 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -80,7 +80,6 @@ RDEPENDS_${PN} += "\ sms-sentry \ cellhunter \ dillo2 \ - usbmode \ pyefl-sudoku \ tasks \ dates \ -- cgit v1.2.3 From f3472b0f09a31fe9d989cfa60d2d12d4c44d1a48 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 12:36:36 +0100 Subject: frameworkd: add patch for shr, merge from shr/merge --- .../frameworkd/oeventsd-use-opimd-signals.patch | 27 ++++++++++++++ recipes/freesmartphone/frameworkd_git.bb | 4 +++ recipes/freesmartphone/opimd-utils_git.bb | 42 ++++++++++++++++------ 3 files changed, 62 insertions(+), 11 deletions(-) create mode 100644 recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch (limited to 'recipes') diff --git a/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch new file mode 100644 index 0000000000..4dc5dd3a84 --- /dev/null +++ b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch @@ -0,0 +1,27 @@ +--- a/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:44:53.000000000 +0200 ++++ b/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:42:43.000000000 +0200 +@@ -197,8 +197,7 @@ + class IncomingMessageTrigger(DBusTrigger): + #============================================================================# + """ +- A custom dbus trigger for org.freesmartphone.GSM.SIM.IncomingStoredMessage +- TODO: change to opimd interface ++ A custom dbus trigger for org.freesmartphone.PIM.Messages.IncomingMessage + """ + + function_name = 'IncomingMessage' +@@ -207,10 +206,10 @@ + bus = dbus.SystemBus() + super(IncomingMessageTrigger, self).__init__( + bus, +- 'org.freesmartphone.ogsmd', +- '/org/freesmartphone/GSM/Device', +- 'org.freesmartphone.GSM.SIM', +- 'IncomingStoredMessage' ++ 'org.freesmartphone.opimd', ++ '/org/freesmartphone/PIM/Messages', ++ 'org.freesmartphone.PIM.Messages', ++ 'IncomingMessage' + ) + def on_signal(self, index): + logger.info("Receive IncomingMessage on index = %s" % index) diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb index 130fe55231..926fcf60a8 100644 --- a/recipes/freesmartphone/frameworkd_git.bb +++ b/recipes/freesmartphone/frameworkd_git.bb @@ -16,6 +16,8 @@ SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ file://frameworkd \ file://frameworkd.conf \ " +SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch;patch=1" + S = "${WORKDIR}/git" do_configure_append() { @@ -55,6 +57,8 @@ RDEPENDS_${PN} += "\ RRECOMMENDS_${PN} += "\ alsa-utils-amixer \ python-gst \ + python-phoneutils \ + python-vobject \ ppp \ " diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb index 5031ae5c13..68038f34c1 100644 --- a/recipes/freesmartphone/opimd-utils_git.bb +++ b/recipes/freesmartphone/opimd-utils_git.bb @@ -1,27 +1,47 @@ DESCRIPTION = "Test scripts for freesmartphone.org opimd interface" HOMEPAGE = "http://freesmartphone.org" +SHR_RELEASE ?= "shr" LICENSE ?= "GPL" +RDEPENDS = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd" SECTION = "x11/application" PV = "0.0.2+gitr${SRCREV}" PR = "r0" inherit setuptools -SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" -S = "${WORKDIR}/git" +PACKAGES =+ "\ + ${PN}-cli \ + ${PN}-notes \ + ${PN}-data \ +" -RDEPENDS = "\ - python-elementary \ - python-edbus \ - python-codecs \ - python-shell \ - \ +RDEPENDS_${PN} = "\ + ${PN}-data \ shr-settings \ - shr-theme \ - frameworkd \ pyphonelog \ + shr-theme \ +" + +RDEPENDS_${PN}-notes = "\ + ${PN}-data \ +" + +RRECOMMENDS_${PN} = "\ + ${PN}-notes \ + ${PN}-cli \ " +PACKAGE_ARCH_${PN}-cli = "all" +PACKAGE_ARCH_${PN}-data = "all" +PACKAGE_ARCH_${PN}-notes = "all" + +SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" +S = "${WORKDIR}/git" FILES_${PN} += "${sysconfdir}/X11/Xsession.d/89opimd-notifier" FILES_${PN} += "${prefix}/share/applications/" -FILES_${PN} += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN} += "${prefix}/share/pixmaps/" +FILES_${PN}-data += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN}-cli += "${prefix}/bin/opimd-cli" +FILES_${PN}-notes += "${prefix}/bin/opimd-notes" +FILES_${PN}-notes += "${prefix}/share/pixmaps/opimd-notes.png" +FILES_${PN}-notes += "${prefix}/share/applications/opimd-notes.desktop" -- cgit v1.2.3 From 2ccd9f2b121b27319fc8a51255e8ad0b879726b2 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 27 Oct 2009 07:44:09 +0000 Subject: vagalume: add index.theme from shr/merge Signed-off-by: Klaus Kurzmann --- recipes/vagalume/files/index.theme | 8 ++++++++ recipes/vagalume/vagalume_0.7.1.bb | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recipes/vagalume/files/index.theme (limited to 'recipes') diff --git a/recipes/vagalume/files/index.theme b/recipes/vagalume/files/index.theme new file mode 100644 index 0000000000..453acf0586 --- /dev/null +++ b/recipes/vagalume/files/index.theme @@ -0,0 +1,8 @@ +[Icon Theme] +Name=Vagalume +Comment=Vagalume icons +Directories=scalable/actions + +[scalable/actions] +Size=48 +Type=Scalable diff --git a/recipes/vagalume/vagalume_0.7.1.bb b/recipes/vagalume/vagalume_0.7.1.bb index 5b29ae17b6..6ef0d19829 100644 --- a/recipes/vagalume/vagalume_0.7.1.bb +++ b/recipes/vagalume/vagalume_0.7.1.bb @@ -2,13 +2,20 @@ DESCRIPTION = "Last.fm client" AUTHOR = "agarcia@igalia.com" HOMEPAGE = "http://vagalume.igalia.com/" SECTION = "x11" -DEPENDS = "gtk+ gstreamer" +DEPENDS = "gtk+ gstreamer curl gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}" +RDEPENDS = "curl gst-plugin-autodetect gst-plugin-audioconvert gst-plugin-alsa librsvg-gtk ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)}" RRECOMMENDS = "dbus-x11" +PR = "r2" SRC_URI = "http://vagalume.igalia.com/files/source/vagalume_${PV}.orig.tar.gz\ + file://index.theme \ " S = "${WORKDIR}/vagalume-${PV}.orig" inherit autotools FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + +do_install_append() { + install -m 0644 ${WORKDIR}/index.theme ${D}${datadir}/vagalume/icons/hicolor +} -- cgit v1.2.3 From 1700b4c84455186bc1d2f80bfc4ea65b51736cdb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 15 Nov 2009 18:11:53 +0100 Subject: libcanberra: add libcanberra-increase-buffer-size.patch from shr/import --- .../pulseaudio/files/libcanberra-increase-buffer-size.patch | 13 +++++++++++++ recipes/pulseaudio/libcanberra_0.14.bb | 5 +++-- recipes/pulseaudio/libcanberra_0.17.bb | 5 +++-- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch (limited to 'recipes') diff --git a/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch b/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch new file mode 100644 index 0000000000..1005d78689 --- /dev/null +++ b/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch @@ -0,0 +1,13 @@ +Index: libcanberra-0.14/src/alsa.c +=================================================================== +--- libcanberra-0.14.orig/src/alsa.c ++++ libcanberra-0.14/src/alsa.c +@@ -272,7 +272,7 @@ + return translate_error(ret); + } + +-#define BUFSIZE (16*1024) ++#define BUFSIZE (128*1024) + + static void* thread_func(void *userdata) { + struct outstanding *out = userdata; diff --git a/recipes/pulseaudio/libcanberra_0.14.bb b/recipes/pulseaudio/libcanberra_0.14.bb index f9388e17cf..85dca9a3fe 100644 --- a/recipes/pulseaudio/libcanberra_0.14.bb +++ b/recipes/pulseaudio/libcanberra_0.14.bb @@ -5,12 +5,13 @@ DEPENDS = "alsa-lib gstreamer gtk+ libvorbis pulseaudio" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r1" +PR = "r2" inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://libcanberra-increase-buffer-size.patch;patch=1" EXTRA_OECONF = "\ --enable-alsa \ diff --git a/recipes/pulseaudio/libcanberra_0.17.bb b/recipes/pulseaudio/libcanberra_0.17.bb index a0b63069f1..def42e6d0a 100644 --- a/recipes/pulseaudio/libcanberra_0.17.bb +++ b/recipes/pulseaudio/libcanberra_0.17.bb @@ -5,12 +5,13 @@ DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r2" +PR = "r3" inherit autotools_stage vala AUTOTOOLS_STAGE_PKGCONFIG = "1" -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://libcanberra-increase-buffer-size.patch;patch=1" EXTRA_OECONF = "\ --enable-alsa \ -- cgit v1.2.3 From 758da30df2ca3abbdad24c972f590eaa40e70930 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Nov 2009 03:53:23 +0000 Subject: update-alternatives-cworth: use latest installed alternative * if there is more alternatives with higest priority, use the one last in alternatives file (latest installed) * if target exists and its directory, remove link, otherwise new alternative link is created inside that direstory Signed-off-by: Martin Jansa --- .../update-alternatives-cworth-native_0.99.154.bb | 2 ++ .../update-alternatives-cworth.inc | 5 ++-- .../update-alternatives.use.last.patch | 34 ++++++++++++++++++++++ .../update-alternatives-cworth_0.99.154.bb | 2 ++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch (limited to 'recipes') diff --git a/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb b/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb index 40534b4bb4..455831cf1f 100644 --- a/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb +++ b/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb @@ -3,6 +3,8 @@ inherit native PROVIDES += "virtual/update-alternatives-native" +PR = "${INC_PR}.0" + do_stage () { install -d ${sbindir} \ ${libdir}/opkg/alternatives diff --git a/recipes/update-alternatives/update-alternatives-cworth.inc b/recipes/update-alternatives/update-alternatives-cworth.inc index f23bfe8bb4..2d8fd42c0c 100644 --- a/recipes/update-alternatives/update-alternatives-cworth.inc +++ b/recipes/update-alternatives/update-alternatives-cworth.inc @@ -1,7 +1,8 @@ LICENSE = "GPL" SECTION = "base" -SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')}" +SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://update-alternatives.use.last.patch;patch=1" S = "${WORKDIR}/ipkg/C" PACKAGE_ARCH = "all" -PR = "r1" +INC_PR = "r3" diff --git a/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch new file mode 100644 index 0000000000..7bd5bd268b --- /dev/null +++ b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch @@ -0,0 +1,34 @@ +diff -uNr C.orig/update-alternatives C/update-alternatives +--- C.orig/update-alternatives 2003-03-28 17:39:45.000000000 +0100 ++++ C/update-alternatives 2009-09-17 16:46:59.000000000 +0200 +@@ -97,8 +97,8 @@ + + ## path=`sed -ne "1!p" $ad/$name | sort -nr -k2 | head -1 | sed 's/ .*//'` + ## busybox safe: +- path=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/[^ ]* //'` +- if [ -z "$path" ]; then ++ prio=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/ [^ ]*$//'` ++ if [ -z "$prio" ]; then + echo "update-alternatives: removing $link as no more alternatives exist for it" + rm $ad/$name + if [ -L $link ]; then +@@ -107,11 +107,19 @@ + return 0 + fi + ++ ## find last line with highest priority ++ path=`grep "${prio}$" $ad/$name | tail -n 1 | sed 's/ [^ ]*$//'` ++ + if [ ! -e $link -o -L $link ]; then + local link_dir=`dirname $link` + if [ ! -d $link_dir ]; then + mkdir -p $link_dir + fi ++ if [ -h $link -a -d $link ]; then ++ # if $link exists and the target is directory, than ln -sf $path $link, doesn't replace link to that directory, but creates new link inside ++ echo "update-alternatives: Removing $link" ++ rm -f $link ++ fi + ln -sf $path $link + echo "update-alternatives: Linking $link to $path" + else diff --git a/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb b/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb index 6cab1e55ec..b95d6d5ff2 100644 --- a/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb +++ b/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb @@ -2,6 +2,8 @@ require update-alternatives-cworth.inc RPROVIDES_${PN} = "update-alternatives" +PR="${INC_PR}.0" + do_install () { install -d ${D}${sbindir} \ ${D}${sysconfdir}/alternatives \ -- cgit v1.2.3 From 9842ab0293d253d5ba59075fcc484618ddd895e2 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 23 Oct 2009 08:13:24 +0000 Subject: netbase: update config files for om-gta* Signed-off-by: Klaus Kurzmann --- recipes/netbase/netbase/om-gta01/interfaces | 5 +++-- recipes/netbase/netbase/om-gta02/interfaces | 7 ++++--- recipes/netbase/netbase_4.21.bb | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'recipes') diff --git a/recipes/netbase/netbase/om-gta01/interfaces b/recipes/netbase/netbase/om-gta01/interfaces index 56c485ef75..e595239758 100644 --- a/recipes/netbase/netbase/om-gta01/interfaces +++ b/recipes/netbase/netbase/om-gta01/interfaces @@ -16,14 +16,15 @@ iface eth1 inet dhcp # Ethernet/RNDIS gadget (g_ether) # ... or on host side, usbnet and random hwaddr -allow-hotplug usb0 +auto usb0 iface usb0 inet static address 192.168.0.202 netmask 255.255.255.0 network 192.168.0.0 - gateway 192.168.0.200 + up route add default gw 192.168.0.200 metric 8 up echo nameserver 208.67.222.222 >> /etc/resolv.conf up echo nameserver 208.67.220.220 >> /etc/resolv.conf + down route del default gw 192.168.0.200 metric 8 # Bluetooth networking iface bnep0 inet dhcp diff --git a/recipes/netbase/netbase/om-gta02/interfaces b/recipes/netbase/netbase/om-gta02/interfaces index ceedfc59c2..08bd3bb074 100644 --- a/recipes/netbase/netbase/om-gta02/interfaces +++ b/recipes/netbase/netbase/om-gta02/interfaces @@ -16,14 +16,15 @@ iface eth1 inet dhcp # Ethernet/RNDIS gadget (g_ether) # ... or on host side, usbnet and random hwaddr -allow-hotplug usb0 +auto usb0 iface usb0 inet static address 192.168.0.202 netmask 255.255.255.0 network 192.168.0.0 - gateway 192.168.0.200 - up echo nameserver 208.67.222.222 >> /etc/resolv.conf + up route add default gw 192.168.0.200 metric 8 + up echo nameserver 208.67.222.222 > /etc/resolv.conf up echo nameserver 208.67.220.220 >> /etc/resolv.conf + down route del default gw 192.168.0.200 metric 8 # Bluetooth networking iface bnep0 inet dhcp diff --git a/recipes/netbase/netbase_4.21.bb b/recipes/netbase/netbase_4.21.bb index 0ce40ba93e..c8b4d19869 100644 --- a/recipes/netbase/netbase_4.21.bb +++ b/recipes/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r39" +PR = "r40" inherit update-rc.d -- cgit v1.2.3 From cc1c330520dc780748eff80c89fa2e02616d5f6b Mon Sep 17 00:00:00 2001 From: Frederik Sdun Date: Thu, 15 Oct 2009 19:22:02 +0000 Subject: imagemagick:native: fix build error with space Signed-off-by: Frederik 'playya' Sdun Signed-off-by: Klaus Kurzmann --- recipes/imagemagick/files/fix_open_file.patch | 12 ++++++++++++ recipes/imagemagick/imagemagick_6.3.5-10.bb | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 recipes/imagemagick/files/fix_open_file.patch (limited to 'recipes') diff --git a/recipes/imagemagick/files/fix_open_file.patch b/recipes/imagemagick/files/fix_open_file.patch new file mode 100644 index 0000000000..8374e1e551 --- /dev/null +++ b/recipes/imagemagick/files/fix_open_file.patch @@ -0,0 +1,12 @@ +diff -rup ImageMagick-6.3.5.orig/magick/delegate.c ImageMagick-6.3.5/magick/delegate.c +--- ImageMagick-6.3.5.orig/magick/delegate.c 2009-10-15 18:40:06.000000000 +0200 ++++ ImageMagick-6.3.5/magick/delegate.c 2009-10-15 18:23:10.000000000 +0200 +@@ -769,7 +769,7 @@ static void CopyDelegateFile(const char + /* + Copy source file to destination. + */ +- destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT); ++ destination_file=open(destination, O_BINARY | O_CREAT, O_WRONLY); + if (destination_file == -1) + return; + source_file=open(source,O_RDONLY | O_BINARY); diff --git a/recipes/imagemagick/imagemagick_6.3.5-10.bb b/recipes/imagemagick/imagemagick_6.3.5-10.bb index cf9e82f3e2..8bd25e9d5a 100644 --- a/recipes/imagemagick/imagemagick_6.3.5-10.bb +++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb @@ -2,12 +2,13 @@ DESCRIPTION = "ImageMagick is an image convertion tools" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "tiff" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ file://PerlMagic_MakePatch;patch=1 \ file://makefile-am.patch;patch=1 \ - file://binconfig-fixes.patch;patch=1 " + file://binconfig-fixes.patch;patch=1 \ + file://fix_open_file.patch;patch=1 " IMVER = "6.3.5" -- cgit v1.2.3 From 2df4f2cfe72f40fb92c696674f2b3118ae386fab Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 13:08:25 +0100 Subject: gpe-theme-neo: add recipe from shr/merge * gpe-icons.inc: for switching gpe icon theme with u-a and merging installed alternatives of together * standard gpe-icons recipe with require gpe-icons.inc will follow later. I need to prepare some switch for distro to choose if u-a should be used for gpe-icons. --- recipes/gpe-icons/gpe-icons.inc | 36 ++++++++++++++++++++++++++++++++++ recipes/gpe-icons/gpe-theme-neo_git.bb | 25 +++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 recipes/gpe-icons/gpe-icons.inc create mode 100644 recipes/gpe-icons/gpe-theme-neo_git.bb (limited to 'recipes') diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc new file mode 100644 index 0000000000..0c23814b41 --- /dev/null +++ b/recipes/gpe-icons/gpe-icons.inc @@ -0,0 +1,36 @@ +SECTION = "gpe" +RDEPENDS += "gdk-pixbuf-loader-png" + +inherit update-alternatives + +INC_PR = "r3" + +ALTERNATIVE_NAME = "gpe-pixmaps" +ALTERNATIVE_LINK = "${datadir}/gpe/pixmaps" +ALTERNATIVE_PATH = "${datadir}/gpe/pixmaps.${PN}" +ALTERNATIVE_PRIORITY ?= 1 + +pkg_postinst() { + if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then + echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!" + echo "warn: It will be replaced with link managed by update-alternatives" + echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old." + echo "warn: It should be empty but probably isn't!" + echo "warn: Check what's left there and remove it manually." + mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old + fi + pixmap_dirs_root="${datadir}/gpe/" + cd ${pixmap_dirs_root} + for pixmap_dir in pixmaps.*; do + if [ "${pixmap_dir}"x == "pixmaps.${PN}"x ] ; then + continue; + fi + for pixmap in `find ${pixmap_dir}`; do + pixmap_target=`echo ${pixmap} | sed "s/${pixmap_dir}/pixmaps.${PN}/g"`; + if [ ! -e ${pixmap_target} ] ; then + cp -ra ${pixmap} ${pixmap_target}; + echo "${pixmap} merged"; + fi; + done + done +} diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb new file mode 100644 index 0000000000..192c8a7d8e --- /dev/null +++ b/recipes/gpe-icons/gpe-theme-neo_git.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "nEo GPE theme - a very fast, high contrast GPE theme" +SECTION = "gpe" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud Date: Wed, 18 Nov 2009 12:23:18 +0000 Subject: resolvconf: add version 1.45 from SHR Signed-off-by: Martin Jansa --- recipes/resolvconf/resolvconf_1.45.bb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 recipes/resolvconf/resolvconf_1.45.bb (limited to 'recipes') diff --git a/recipes/resolvconf/resolvconf_1.45.bb b/recipes/resolvconf/resolvconf_1.45.bb new file mode 100644 index 0000000000..2c210ef1ec --- /dev/null +++ b/recipes/resolvconf/resolvconf_1.45.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \ +information about currently available nameservers. It sets \ +itself up as the intermediary between programs that supply \ +nameserver information and programs that need nameserver \ +information." +SECTION = "console/network" +LICENSE = "GPL" +AUTHOR = "Thomas Hood" +HOMEPAGE = "http://packages.debian.org/resolvconf" +DEPENDS = "bash" +RDEPENDS = "bash" + +SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" + +do_compile () { + : +} + +do_install () { + install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface + install -d ${D}${mandir}/man8 ${D}${docdir}/${P} + cp -pPR etc/* ${D}${sysconfdir}/ + install -m 0755 bin/resolvconf ${D}${base_sbindir}/ + install -m 0644 README ${D}${docdir}/${P}/ + install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ +} + +PACKAGE_ARCH = "all" + -- cgit v1.2.3 From 676b651a8b7e1ed9d1a4ab15814fa93c9ef37c4f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 13:22:49 +0100 Subject: packagekit: add version 0.5.2 from SHR --- recipes/packagekit/packagekit_0.5.2.bb | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 recipes/packagekit/packagekit_0.5.2.bb (limited to 'recipes') diff --git a/recipes/packagekit/packagekit_0.5.2.bb b/recipes/packagekit/packagekit_0.5.2.bb new file mode 100644 index 0000000000..5cc4d9ecb8 --- /dev/null +++ b/recipes/packagekit/packagekit_0.5.2.bb @@ -0,0 +1,60 @@ +DESCRIPTION = "PackageKit package management abstraction" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ python cppunit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" +RDEPENDS_${PN} = "${IPKG_VARIANT}" + +inherit gnome autotools_stage + +SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \ + " + +PR = "r0" +PE = "2" + +S = "${WORKDIR}/PackageKit-${PV}" + +EXTRA_OECONF = "--with-security-framework=dummy \ + --with-default-backend=opkg \ + --enable-opkg \ + --enable-dummy \ + --disable-networkmanager \ + --disable-connman \ + --disable-tests \ + --disable-qt \ + --disable-gstreamer-plugin \ + --disable-local \ + --disable-strict \ + ac_cv_path_XMLTO=no \ + " + + +do_configure_prepend() { + mkdir -p m4 + echo "EXTRA_DIST=" > gtk-doc.make + sed -i -e s:0\.1\.5:0\.1\.6:g configure.ac +} + +do_configure_append() { + for i in $(find . -name Makefile) ; do + sed -i -e s:${STAGING_DIR_NATIVE}::g \ + -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \ + -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \ + $i + done +} + + +PACKAGES =+ "${PN}-website" +FILES_${PN}-website = "${datadir}/PackageKit/website" + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${libdir}/python*" + +PACKAGES =+ "${PN}-gtkmodule" +FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so" + +FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit" +FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug" +FILES_${PN}-dev += "${libdir}/packagekit-backend/*a ${libdir}/gtk-2.0/*/*a" -- cgit v1.2.3 From 61e57311398158f9dcba835d573afda63f3dbc2f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 16:26:45 +0100 Subject: gpe-theme-neo: kill SRCPV, sorry --- recipes/gpe-icons/gpe-theme-neo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb index 192c8a7d8e..3f0f7b1c7c 100644 --- a/recipes/gpe-icons/gpe-theme-neo_git.bb +++ b/recipes/gpe-icons/gpe-theme-neo_git.bb @@ -6,7 +6,7 @@ RDEPENDS = "gdk-pixbuf-loader-png gpe-filemanager gpe-sketchbook" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" PR = "${INC_PR}.0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" -- cgit v1.2.3 From 20e56bce4f4c951365b53e8c44d464a17f2ce79f Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Thu, 7 Jan 2010 17:54:33 +0100 Subject: connman: use libnl2 --- recipes/connman/connman.inc | 2 +- recipes/connman/connman_0.46.bb | 6 +++--- recipes/connman/files/link-against-libnl2.patch | 13 +++++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 recipes/connman/files/link-against-libnl2.patch (limited to 'recipes') diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc index 5b2f0cc409..9ea04e3e8d 100644 --- a/recipes/connman/connman.inc +++ b/recipes/connman/connman.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" SECTION = "libs/network" LICENSE = "GPL" # we need to define the depends here, the dynamic stuff is too late -DEPENDS = "libnl wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4" +DEPENDS = "libnl2 wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4" EXTRA_OECONF += "\ ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb index 814187ded6..9fcd7a780f 100644 --- a/recipes/connman/connman_0.46.bb +++ b/recipes/connman/connman_0.46.bb @@ -1,6 +1,5 @@ require connman.inc - -PR = "r3" +PR = "r5" EXTRA_OECONF += "\ --disable-gtk-doc \ @@ -15,6 +14,7 @@ EXTRA_OECONF += "\ --enable-dhclient \ --enable-resolvconf \ --enable-dnsproxy \ + --enable-tools \ --disable-novatel \ --disable-huawei \ --disable-hso \ @@ -32,7 +32,7 @@ EXTRA_OECONF += "\ SRC_URI = "\ http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ + file://link-against-libnl2.patch;patch=1 \ file://no_system_user_perms.patch;patch=1 \ file://connman \ " - diff --git a/recipes/connman/files/link-against-libnl2.patch b/recipes/connman/files/link-against-libnl2.patch new file mode 100644 index 0000000000..5be1618209 --- /dev/null +++ b/recipes/connman/files/link-against-libnl2.patch @@ -0,0 +1,13 @@ +Index: connman-0.46/configure.ac +=================================================================== +--- connman-0.46.orig/configure.ac ++++ connman-0.46/configure.ac +@@ -326,7 +326,7 @@ + AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], + [enable testing tools]), [enable_tools=${enableval}]) + if (test "${enable_tools}" = "yes"); then +- PKG_CHECK_MODULES(NETLINK, libnl-1, dummy=yes, ++ PKG_CHECK_MODULES(NETLINK, libnl-2.0, dummy=yes, + AC_MSG_ERROR(Netlink library is required)) + AC_SUBST(NETLINK_CFLAGS) + AC_SUBST(NETLINK_LIBS) -- cgit v1.2.3 From e34bd279e0001cad497b286abec6a7e77f484e79 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 7 Jan 2010 18:31:36 +0100 Subject: linux-kexecboot_2.6x: fix SRC_URI (origins from linux-kexecboot.inc) --- recipes/kexecboot/linux-kexecboot_2.6.29.bb | 2 +- recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb | 2 +- recipes/kexecboot/linux-kexecboot_2.6.32.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/kexecboot/linux-kexecboot_2.6.29.bb b/recipes/kexecboot/linux-kexecboot_2.6.29.bb index 37fee558dd..4064c98582 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.29.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.29.bb @@ -7,7 +7,7 @@ SRCREV = "58cf2f1425abfd3a449f9fe985e48be2d2555022" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc PR_append = "+gitr${SRCREV}" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ +SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" SRC_URI_append = " \ diff --git a/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb b/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb index f11a94029c..1ebcc37152 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb @@ -16,7 +16,7 @@ DEFAULT_PREFERENCE_poodle = "-1" DEFAULT_PREFERENCE_spitz = "1" DEFAULT_PREFERENCE_tosa = "-1" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \ +SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;name=rc3;patch=1 \ file://0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch;patch=1 \ file://defconfig" diff --git a/recipes/kexecboot/linux-kexecboot_2.6.32.bb b/recipes/kexecboot/linux-kexecboot_2.6.32.bb index b876e91988..2839ff2928 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.32.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.32.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_poodle = "-1" DEFAULT_PREFERENCE_spitz = "-1" DEFAULT_PREFERENCE_tosa = "-1" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ +SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ # file://v3-1-4-Add-support-for-LZO-compressed-kernels.patch;patch=1;status=pending \ # file://v3-2-4-Add-support-for-LZO-compressed-kernels-for-ARM.patch;patch=1;status=pending \ # file://v3-3-4-Add-support-for-LZO-compressed-kernels-on-x86.patch;patch=1;status=pending \ -- cgit v1.2.3 From 0fb0b4c624deea119b48adf6c876fe77f6f40787 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 7 Jan 2010 18:43:21 +0100 Subject: linux-kexecboot: uniform the SRC_URI (defconfig in kernel recipe) --- recipes/kexecboot/linux-kexecboot.inc | 4 +--- recipes/kexecboot/linux-kexecboot_2.6.24.bb | 2 +- recipes/kexecboot/linux-kexecboot_2.6.26.bb | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'recipes') diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc index 900e005cac..1cf556a99b 100644 --- a/recipes/kexecboot/linux-kexecboot.inc +++ b/recipes/kexecboot/linux-kexecboot.inc @@ -1,10 +1,8 @@ # We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: PR = "r17" -SRC_URI = "file://defconfig" - LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}' -SRC_URI += "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2" +SRC_URI = "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2" require ../linux/linux.inc diff --git a/recipes/kexecboot/linux-kexecboot_2.6.24.bb b/recipes/kexecboot/linux-kexecboot_2.6.24.bb index 82484f45a0..e950ab0abf 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.24.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.24.bb @@ -69,7 +69,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ file://binutils-buildid-arm.patch;patch=1 \ file://versatile-armv6.patch;patch=1 \ file://htcuni.patch;patch=1 \ - " + file://defconfig" # FIXMEs before made default # ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack diff --git a/recipes/kexecboot/linux-kexecboot_2.6.26.bb b/recipes/kexecboot/linux-kexecboot_2.6.26.bb index bf1dbb62bf..345d2ac764 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.26.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.26.bb @@ -52,7 +52,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \ file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \ file://htcuni.patch;patch=1 \ file://versatile-armv6.patch;patch=1 \ - " + file://defconfig" # FIXMEs before made default # ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack -- cgit v1.2.3 From 0987059c055bd7690a6b56314f14b85006111ff9 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 7 Jan 2010 19:34:56 +0100 Subject: linux-kexecboot: updated defconfig for 2.6.32 and 2.6.33-rc3 --- .../c7x0/defconfig | 397 ++++++++++++++------- .../linux-kexecboot-2.6.32/c7x0/defconfig | 262 ++++++++------ 2 files changed, 424 insertions(+), 235 deletions(-) (limited to 'recipes') diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig index 0215fe1d91..f3c39437cf 100644 --- a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig +++ b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32 -# Sat Dec 12 19:30:33 2009 +# Linux kernel version: 2.6.33-rc3 +# Thu Jan 7 19:25:14 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -33,13 +33,6 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_LZO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -51,6 +44,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_TREE_RCU=y # CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set @@ -63,37 +57,35 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz" +CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_RD_GZIP=y # CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_LZO is not set +CONFIG_RD_LZMA=y # CONFIG_INITRAMFS_COMPRESSION_NONE is not set -CONFIG_INITRAMFS_COMPRESSION_GZIP=y +# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set -# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set -# CONFIG_INITRAMFS_COMPRESSION_LZO is not set +CONFIG_INITRAMFS_COMPRESSION_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y +# CONFIG_UID16 is not set +# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_ELF_CORE is not set -CONFIG_BASE_FULL=y +# CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y -# CONFIG_AIO is not set +CONFIG_AIO=y # # Kernel Performance Events And Counters @@ -116,7 +108,7 @@ CONFIG_HAVE_CLK=y # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 +CONFIG_BASE_SMALL=1 # CONFIG_MODULES is not set CONFIG_BLOCK=y # CONFIG_LBDAF is not set @@ -127,14 +119,41 @@ CONFIG_BLOCK=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set CONFIG_IOSCHED_DEADLINE=y # CONFIG_IOSCHED_CFQ is not set -# CONFIG_DEFAULT_AS is not set CONFIG_DEFAULT_DEADLINE=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="deadline" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -163,6 +182,7 @@ CONFIG_MMU=y # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set # CONFIG_ARCH_LOKI is not set # CONFIG_ARCH_MV78XX0 is not set @@ -185,19 +205,57 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_U8500 is not set # # Intel PXA2xx/PXA3xx Implementations # + +# +# Intel/Marvell Dev Platforms (sorted by hardware release time) +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_MACH_ZYLONITE300 is not set +# CONFIG_MACH_ZYLONITE320 is not set +# CONFIG_MACH_LITTLETON is not set +# CONFIG_MACH_TAVOREVB is not set +# CONFIG_MACH_SAAR is not set + +# +# Third Party Dev Platforms (sorted by vendor name) +# +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_VIPER is not set +# CONFIG_MACH_ARCOM_ZEUS is not set +# CONFIG_MACH_BALLOON3 is not set +# CONFIG_MACH_CSB726 is not set +# CONFIG_MACH_ARMCORE is not set +# CONFIG_MACH_EM_X270 is not set +# CONFIG_MACH_EXEDA is not set +# CONFIG_MACH_CM_X300 is not set # CONFIG_ARCH_GUMSTIX is not set # CONFIG_MACH_INTELMOTE2 is not set # CONFIG_MACH_STARGATE2 is not set -# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_XCEP is not set +# CONFIG_TRIZEPS_PXA is not set # CONFIG_MACH_LOGICPD_PXA270 is not set -# CONFIG_MACH_MAINSTONE is not set +# CONFIG_MACH_PCM027 is not set +# CONFIG_MACH_COLIBRI is not set +# CONFIG_MACH_COLIBRI300 is not set +# CONFIG_MACH_COLIBRI320 is not set + +# +# End-user Products (sorted by vendor name) +# +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_H5000 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_MIOA701 is not set +# CONFIG_PXA_EZX is not set # CONFIG_MACH_MP900C is not set -# CONFIG_MACH_BALLOON3 is not set -# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_PALM is not set CONFIG_PXA_SHARPSL=y CONFIG_SHARPSL_PM=y # CONFIG_MACH_POODLE is not set @@ -208,30 +266,7 @@ CONFIG_MACH_HUSKY=y # CONFIG_MACH_SPITZ is not set # CONFIG_MACH_BORZOI is not set # CONFIG_MACH_TOSA is not set -# CONFIG_ARCH_VIPER is not set # CONFIG_ARCH_PXA_ESERIES is not set -# CONFIG_TRIZEPS_PXA is not set -# CONFIG_MACH_H5000 is not set -# CONFIG_MACH_EM_X270 is not set -# CONFIG_MACH_EXEDA is not set -# CONFIG_MACH_COLIBRI is not set -# CONFIG_MACH_COLIBRI300 is not set -# CONFIG_MACH_COLIBRI320 is not set -# CONFIG_MACH_ZYLONITE is not set -# CONFIG_MACH_LITTLETON is not set -# CONFIG_MACH_TAVOREVB is not set -# CONFIG_MACH_SAAR is not set -# CONFIG_MACH_ARMCORE is not set -# CONFIG_MACH_CM_X300 is not set -# CONFIG_MACH_H4700 is not set -# CONFIG_MACH_MAGICIAN is not set -# CONFIG_MACH_HIMALAYA is not set -# CONFIG_MACH_MIOA701 is not set -# CONFIG_MACH_PCM027 is not set -# CONFIG_ARCH_PXA_PALM is not set -# CONFIG_MACH_CSB726 is not set -# CONFIG_PXA_EZX is not set -# CONFIG_MACH_XCEP is not set CONFIG_PXA25x=y CONFIG_PXA_SHARP_C7xx=y CONFIG_PXA_SSP=y @@ -240,7 +275,6 @@ CONFIG_PLAT_PXA=y # # Processor Type # -CONFIG_CPU_32=y CONFIG_CPU_XSCALE=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y @@ -268,15 +302,16 @@ CONFIG_COMMON_CLKDEV=y # CONFIG_PCI_SYSCALL is not set # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_PCCARD=y -# CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y +# CONFIG_PCMCIA_LOAD_CIS is not set +# CONFIG_PCMCIA_IOCTL is not set # # PC-card bridges # +CONFIG_PCMCIA_SOC_COMMON=y CONFIG_PCMCIA_PXA2XX=y +# CONFIG_PCMCIA_DEBUG is not set # # Kernel Features @@ -305,12 +340,10 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_SPLIT_PTLOCK_CPUS=999999 # CONFIG_PHYS_ADDR_T_64BIT is n