diff options
103 files changed, 3278 insertions, 715 deletions
diff --git a/classes/scons.bbclass b/classes/scons.bbclass index 89b5da2d0e..534b3bd4c7 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -1,12 +1,12 @@ DEPENDS += "python-scons-native" scons_do_compile() { - ${STAGING_BINDIR_NATIVE}/scons || \ + ${STAGING_BINDIR_NATIVE}/scons PREFIX=${prefix} prefix=${prefix} || \ oefatal "scons build execution failed." } scons_do_install() { - ${STAGING_BINDIR_NATIVE}/scons install || \ + ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \ oefatal "scons install execution failed." } diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf index 4007f203ad..c88aa06697 100644 --- a/conf/distro/angstrom-2007.1-oabi.conf +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -3,6 +3,8 @@ require conf/distro/angstrom-2007.1.conf #this is a special version of angstrom for armv4 based machines that can't do EABI #see http://wiki.debian.org/ArmEabiPort for details on that +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" + #only glibc based builds are supported ATM TARGET_OS = "linux" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index b1d67e0405..ab59d392b8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -93,12 +93,13 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.2.1" #fix screen corruption issues -PREFERRED_VERSION_cairo = "1.3.10" +PREFERRED_VERSION_cairo = "1.3.12" #work around a segfault in gcc for armv4t PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3" @@ -225,7 +226,7 @@ EXTRA_STUFF ?= "" # Angstrom want to ship some extra stuff. This should be moved into task-base eventually -DISTRO_EXTRA_RDEPENDS = "\ +DISTRO_EXTRA_RDEPENDS += "\ update-modules module-init-tools modutils-initscripts \ sysvinit initscripts sysvinit-pidof \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ diff --git a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc deleted file mode 100644 index 7898f7b349..0000000000 --- a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -# Opie -#use 1337 mt version of opie to have a webbrowser -PALMTOP_USE_MULTITHREADED_QT = "yes" -QTE_VERSION = "2.3.10" -OPIE_VERSION = "1.2.2" -require conf/distro/include/preferred-opie-versions.inc diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index 95be1624f0..d8d9264699 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -4,7 +4,7 @@ #OLDEST_KERNEL = "2.6.16" TARGET_ARCH = "arm" PREFERRED_VERSION_compulab-pxa270 = "2.6.16" -GUI_MACHINE_CLASS = "bigscreen" +GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" PACKAGE_EXTRA_ARCHS = "armv4 armv5te" @@ -12,10 +12,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te" require conf/machine/include/tune-xscale.conf # used by sysvinit_2 -SERIAL_CONSOLE = "38400 ttySA0" +SERIAL_CONSOLE ?= "38400 ttySA0" # used by opie-collections.inc -ROOT_FLASH_SIZE = "32" +ROOT_FLASH_SIZE ?= "32" EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000" diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 86e9429506..1497e303c4 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -1,3 +1,5 @@ +require conf/machine/x86.conf + TARGET_ARCH = "i586" PACKAGE_EXTRA_ARCHS = "i386 i486" diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 2a34333bac..9428b9ce11 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -22,10 +22,15 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ + kernel-module-i2c-pxa" + # # Modules autoload and other boot properties # module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-h4000_audio = "snd-h4000_audio" module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/contrib/mtnpatch.py b/contrib/mtnpatch.py index f7abb6393d..4de9ecc460 100755 --- a/contrib/mtnpatch.py +++ b/contrib/mtnpatch.py @@ -30,7 +30,7 @@ def main(argv = None): print "%s add %s" % (mtncmd, fileName) else: print "%s drop -e %s" % (mtncmd, fileName) - elif cmd == "add": + elif cmd == "add" or cmd == "add_file" or cmd == "add_dir": if reverse: print "%s drop -e %s" % (mtncmd, fileName) else: diff --git a/packages/portmap/portmap-5-24/.mtn2git_empty b/packages/alsa/alsa-lib/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/portmap/portmap-5-24/.mtn2git_empty +++ b/packages/alsa/alsa-lib/.mtn2git_empty diff --git a/packages/alsa/alsa-lib/fix-tstamp-declaration.patch b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch new file mode 100644 index 0000000000..59b3b6d150 --- /dev/null +++ b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch @@ -0,0 +1,13 @@ +Index: alsa-lib-1.0.13/include/global.h +=================================================================== +--- alsa-lib-1.0.13.orig/include/global.h ++++ alsa-lib-1.0.13/include/global.h +@@ -29,6 +29,8 @@ + #define __ALSA_GLOBAL_H_ + + /* for timeval and timespec */ ++#define __need_timeval ++#define __need_timespec + #include <time.h> + + #ifdef __cplusplus diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb index 987a5901f4..8b6b7af409 100644 --- a/packages/alsa/alsa-lib_1.0.13.bb +++ b/packages/alsa/alsa-lib_1.0.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r0" +PR = "r1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, @@ -10,7 +10,8 @@ PR = "r0" #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index c7ac97d2e5..95fb0cf0c6 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r26" +PR = "r27" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -52,6 +52,7 @@ RDEPENDS_angstrom-gpe-task-base := "\ pango-module-basic-x \ pango-module-basic-fc \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \ " RDEPENDS_angstrom-gpe-task-pim := "\ diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb index b04cd86677..a42a87c50d 100644 --- a/packages/busybox/busybox_1.3.1.bb +++ b/packages/busybox/busybox_1.3.1.bb @@ -1,7 +1,6 @@ require busybox.inc DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_slugos = "1" SRC_URI = "file://defconfig" diff --git a/packages/cairo/cairo_1.3.10.bb b/packages/cairo/cairo_1.3.12.bb index 883884d15f..883884d15f 100644 --- a/packages/cairo/cairo_1.3.10.bb +++ b/packages/cairo/cairo_1.3.12.bb diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb index 55bdc019f0..26eaf78879 100644 --- a/packages/cairo/cairo_git.bb +++ b/packages/cairo/cairo_git.bb @@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" -PV = "1.3.11+git${SRCDATE}" +PV = "1.3.13+git${SRCDATE}" SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \ " diff --git a/packages/ruby/ruby-1.8.5/.mtn2git_empty b/packages/chibitracker/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ruby/ruby-1.8.5/.mtn2git_empty +++ b/packages/chibitracker/.mtn2git_empty diff --git a/packages/chibitracker/chibitracker_svn.bb b/packages/chibitracker/chibitracker_svn.bb new file mode 100644 index 0000000000..ec7d9284a2 --- /dev/null +++ b/packages/chibitracker/chibitracker_svn.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Chibitracker is an impulse tracker clone based on SDL" +LICENSE = "GPL" +HOMEPAGE = "http://www.chibitracker.com" +SECTION = "multimedia" +AUTHOR = "Juan Linietsky <reduzio@gmail.com>" +DEPENDS = "virtual/libsdl libsdl-mixer" +PV = "0.9.9+svn${SRCDATE}" + +SRC_URI = "svn://svn.berlios.de/chibitracker;module=trunk" +S = "${WORKDIR}/trunk" + +inherit scons + diff --git a/packages/clutter/.mtn2git_empty b/packages/clutter/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clutter/.mtn2git_empty diff --git a/packages/clutter/clutter-fpu.inc b/packages/clutter/clutter-fpu.inc new file mode 100644 index 0000000000..21a16feac2 --- /dev/null +++ b/packages/clutter/clutter-fpu.inc @@ -0,0 +1,6 @@ + +def get_clutter_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--without-fpu" + return "" + diff --git a/packages/clutter/clutter.inc b/packages/clutter/clutter.inc new file mode 100644 index 0000000000..b89070f3ea --- /dev/null +++ b/packages/clutter/clutter.inc @@ -0,0 +1,26 @@ +DESCRIPTION = "Clutter graphics library" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "virtual/libx11 mesa gstreamer gtk-doc cairo pango gtk+" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc " + +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require clutter-fpu.inc + +EXTRA_OECONF += "${@get_clutter_fpu_setting(bb, d)}" + +#Fix up some weirdness in the docs +do_configure_prepend() { + touch ${S}/gtk-doc.make + sed -i s:doc/reference/Makefile::g ${S}/configure.ac + sed -i s:doc::g ${S}/Makefile.am +} + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/clutter_svn.bb b/packages/clutter/clutter_svn.bb new file mode 100644 index 0000000000..9939221d8d --- /dev/null +++ b/packages/clutter/clutter_svn.bb @@ -0,0 +1,9 @@ +require clutter.inc + +PV = "0.2.0+svn${SRCDATE}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http" + +S = "${WORKDIR}/clutter" + + diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb index a617f5b45b..ad42b0868b 100644 --- a/packages/ezx/opentapi_svn.bb +++ b/packages/ezx/opentapi_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Open implementation of motorola's tapisrc" LICENSE = "GPLv2" PV = "0.0+svn${SRCDATE}" +PR = "r1" SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http \ file://opentapi.init \ @@ -10,7 +11,7 @@ SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http inherit update-rc.d INITSCRIPT_NAME = "opentapi" -INITSCRIPT_PARAMS = "defaults" +INITSCRIPT_PARAMS = "start 04 S ." S = "${WORKDIR}/${PN}" diff --git a/packages/freetype/freetype-2.3.0/.mtn2git_empty b/packages/freetype/freetype-2.3.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/freetype/freetype-2.3.0/.mtn2git_empty diff --git a/packages/freetype/freetype-2.3.0/configure.patch b/packages/freetype/freetype-2.3.0/configure.patch new file mode 100644 index 0000000000..7c2035d7e8 --- /dev/null +++ b/packages/freetype/freetype-2.3.0/configure.patch @@ -0,0 +1,43 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +Index: freetype-2.3.0/builds/unix/configure.ac +=================================================================== +--- freetype-2.3.0.orig/builds/unix/configure.ac 2007-01-17 12:51:51.000000000 +0100 ++++ freetype-2.3.0/builds/unix/configure.ac 2007-01-19 00:10:00.000000000 +0100 +@@ -159,7 +159,7 @@ + + # don't quote AS_HELP_STRING! + AC_ARG_WITH([zlib], +- AS_HELP_STRING([--without-zlib], ++ AC_HELP_STRING([--without-zlib], + [use internal zlib instead of system-wide])) + if test x$with_zlib != xno && test -z "$LIBZ"; then + AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])]) +@@ -175,7 +175,7 @@ + + # don't quote AS_HELP_STRING! + AC_ARG_WITH([old-mac-fonts], +- AS_HELP_STRING([--with-old-mac-fonts], ++ AC_HELP_STRING([--with-old-mac-fonts], + [allow Mac resource-based fonts to be used])) + if test x$with_old_mac_fonts = xyes; then + orig_LDFLAGS="${LDFLAGS}" +Index: freetype-2.3.0/builds/unix/unix-cc.in +=================================================================== +--- freetype-2.3.0.orig/builds/unix/unix-cc.in 2006-10-15 10:57:22.000000000 +0200 ++++ freetype-2.3.0/builds/unix/unix-cc.in 2007-01-19 00:10:53.000000000 +0100 +@@ -14,8 +14,10 @@ + + CC := @CC@ + COMPILER_SEP := $(SEP) ++SHELL := @SHELL@ ++top_builddir := $(BUILD_DIR) + +-LIBTOOL ?= $(BUILD_DIR)/libtool ++LIBTOOL := @LIBTOOL@ + + + # The object file extension (for standard and static libraries). This can be diff --git a/packages/freetype/freetype-2.3.0/no-hardcode.patch b/packages/freetype/freetype-2.3.0/no-hardcode.patch new file mode 100644 index 0000000000..65289758d5 --- /dev/null +++ b/packages/freetype/freetype-2.3.0/no-hardcode.patch @@ -0,0 +1,11 @@ +--- freetype-2.2.1/builds/unix/freetype-config.in.orig 2006-07-10 10:51:47.000000000 +0100 ++++ freetype-2.2.1/builds/unix/freetype-config.in 2006-07-10 10:52:27.000000000 +0100 +@@ -16,7 +16,7 @@ + libdir=@libdir@ + enable_shared=@enable_shared@ + wl=@wl@ +-hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@' ++hardcode_libdir_flag_spec='' + + usage() + { diff --git a/packages/freetype/freetype_2.3.0.bb b/packages/freetype/freetype_2.3.0.bb new file mode 100644 index 0000000000..3c574486c1 --- /dev/null +++ b/packages/freetype/freetype_2.3.0.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Freetype font rendering library" +SECTION = "libs" +LICENSE = "freetype" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://no-hardcode.patch;patch=1" +S = "${WORKDIR}/freetype-${PV}" + +inherit autotools pkgconfig binconfig + +DEFAULT_PREFERENCE = "-1" + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" + +do_configure() { + cd builds/unix + gnu-configize + aclocal -I . + autoconf + cd ${S} + oe_runconf +} + +do_compile_prepend() { + ${BUILD_CC} -o objs/apinames src/tools/apinames.c +} + +do_stage() { + autotools_stage_includes + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" diff --git a/packages/g15daemon/g15daemon_1.2.6a.bb b/packages/g15daemon/g15daemon_1.2.6a.bb index 872d61d848..0522b27a28 100644 --- a/packages/g15daemon/g15daemon_1.2.6a.bb +++ b/packages/g15daemon/g15daemon_1.2.6a.bb @@ -10,10 +10,16 @@ SECTION = "console/utils" PRIORITY = "optional" DEPENDS = "libdaemon libg15" RDEPENDS = "libg15" +RRECOMMENDS = "kernel-module-uinput" +PR="r2" SRC_URI = "${SOURCEFORGE_MIRROR}/g15daemon/g15daemon-${PV}.tar.bz2" inherit autotools -EXTRA_OECONF = "--disable-build-docs" +EXTRA_OECONF = "--with-gnu-ld" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gizmod/.mtn2git_empty b/packages/gizmod/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gizmod/.mtn2git_empty diff --git a/packages/gizmod/files/.mtn2git_empty b/packages/gizmod/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gizmod/files/.mtn2git_empty diff --git a/packages/gizmod/files/disable-bmp.patch b/packages/gizmod/files/disable-bmp.patch new file mode 100644 index 0000000000..89dfad3446 --- /dev/null +++ b/packages/gizmod/files/disable-bmp.patch @@ -0,0 +1,105 @@ +Index: gizmod-2.3/configure.ac +=================================================================== +--- gizmod-2.3.orig/configure.ac ++++ gizmod-2.3/configure.ac +@@ -319,76 +319,6 @@ fi + + ########################################################################### + ## +-## Check whether to build BMP plugin +-## +- +-################## +-## enabled? +-######## +- +-AC_MSG_CHECKING(Whether or not to build BMP plugin) +-AC_ARG_ENABLE(bmp, +- [ --enable-bmp build BMP plugin <default = no>], +- [enable_bmp="$enableval"], enable_bmp=no) +-AC_MSG_RESULT($enable_bmp) +- +-AM_CONDITIONAL(BUILD_EXTERNALPLUGIN_BMP, test x$enable_bmp = xyes) +-AM_CONDITIONAL(BUILD_PLUGIN_BMPCONTROL, test x$enable_bmp = xyes) +- +-################## +-## can we build it if it's enabled? +-######## +- +-if test "$enable_bmp" == "yes"; then +- +-BEEP_CFLAGS="" +-BEEP_LIBS="" +- +-#check stuff +-AM_PATH_GLIB_2_0(2.4.0, , +- AC_MSG_ERROR([GTK+ >= 2.4.0 not installed - required for BMP plugin])) +-AM_PATH_GTK_2_0(2.4.0, , +- AC_MSG_ERROR([GTK+ >= 2.4.0 not installed - required for BMP plugin])) +- +-dnl check for beep +-PKG_CHECK_MODULES(BEEP, [ bmp >= 0.9.7], , +- AC_MSG_ERROR("You need the BEEP development files to build the BEEP plugin!")) +- +-BEEP_PLUGIN_DIR="`$PKG_CONFIG --variable=output_plugin_dir bmp`" +-BEEP_INPUT_PLUGIN_DIR="`$PKG_CONFIG --variable=input_plugin_dir bmp`" +-BEEP_OUTPUT_PLUGIN_DIR="`$PKG_CONFIG --variable=output_plugin_dir bmp`" +-BEEP_GENERAL_PLUGIN_DIR="`$PKG_CONFIG --variable=general_plugin_dir bmp`" +-BEEP_VISUALIZATION_PLUGIN_DIR="`$PKG_CONFIG --variable=visualization_plugin_dir bmp`" +-BEEP_EFFECT_PLUGIN_DIR="`$PKG_CONFIG --variable=effect_plugin_dir bmp`" +-BEEP_DATA_DIR="`$PKG_CONFIG --variable=data_dir bmp`" +- +-AC_SUBST(BEEP_PLUGIN_DIR) +-AC_SUBST(BEEP_INPUT_PLUGIN_DIR) +-AC_SUBST(BEEP_OUTPUT_PLUGIN_DIR) +-AC_SUBST(BEEP_GENERAL_PLUGIN_DIR) +-AC_SUBST(BEEP_VISUALIZATION_PLUGIN_DIR) +-AC_SUBST(BEEP_EFFECT_PLUGIN_DIR) +-AC_SUBST(BEEP_DATA_DIR) +- +-dnl make BEEP_DATA_DIR a variable in config.h +-AH_TEMPLATE(BEEP_DATA_DIR, "Path to bmp-touch.config") +-AC_DEFINE_UNQUOTED(BEEP_DATA_DIR, "$BEEP_DATA_DIR") +- +-CPPFLAGS="$CPPFLAGS $BEEP_CFLAGS" +- +-AC_CHECK_HEADER(bmp/beepctrl.h, [ +- AC_DEFINE(HAVE_BEEPCTRL_H, 1, [Has bmp/beepctrl.h]) +- ], [ +- AC_MSG_ERROR([Cannot find beepctrl.h!]) +- ]) +- +-AC_SUBST(BEEP_CFLAGS) +-AC_SUBST(BEEP_LIBS) +- +-fi +- +-########################################################################### +-## + ## Check whether to build Sound Visualization plugin + ## + +@@ -633,9 +563,7 @@ AC_CONFIG_FILES([ + plugins/soundVisualization/Makefile + plugins/cpuUsage/Makefile + plugins/x11/Makefile +- plugins/bmpControl/Makefile + plugins/externalPlugins/Makefile +- plugins/externalPlugins/bmp/Makefile + plugins/lirc/Makefile + ]) + AC_OUTPUT +Index: gizmod-2.3/plugins/Makefile.am +=================================================================== +--- gizmod-2.3.orig/plugins/Makefile.am ++++ gizmod-2.3/plugins/Makefile.am +@@ -1 +1 @@ +-SUBDIRS=scriptingPlugins powermate alsaMixer xosd generic externalPlugins soundVisualization cpuUsage x11 bmpControl lirc ++SUBDIRS=scriptingPlugins powermate alsaMixer xosd generic externalPlugins soundVisualization cpuUsage x11 lirc +Index: gizmod-2.3/plugins/externalPlugins/Makefile.am +=================================================================== +--- gizmod-2.3.orig/plugins/externalPlugins/Makefile.am ++++ gizmod-2.3/plugins/externalPlugins/Makefile.am +@@ -1 +1 @@ +-SUBDIRS=bmp ++SUBDIRS= diff --git a/packages/gizmod/files/disable-xmms.patch b/packages/gizmod/files/disable-xmms.patch new file mode 100644 index 0000000000..e8aea12b4c --- /dev/null +++ b/packages/gizmod/files/disable-xmms.patch @@ -0,0 +1,113 @@ +Index: gizmod-2.3/configure.ac +=================================================================== +--- gizmod-2.3.orig/configure.ac ++++ gizmod-2.3/configure.ac +@@ -393,60 +393,6 @@ fi + + ########################################################################### + ## +-## Check whether to build XMMS plugin +-## +- +-################## +-## enabled? +-######## +- +-AC_MSG_CHECKING(Whether or not to build XMMS plugin) +-AC_ARG_ENABLE(xmms, +- [ --enable-xmms build XMMS plugin <default = yes>], +- [enable_xmms="$enableval"], enable_xmms=yes) +-AC_MSG_RESULT($enable_xmms) +- +-AM_CONDITIONAL(BUILD_EXTERNALPLUGIN_XMMS, test x$enable_xmms = xyes) +-AM_CONDITIONAL(BUILD_PLUGIN_XMMSCONTROL, test x$enable_xmms = xyes) +- +-################## +-## can we build it if it's enabled? +-######## +- +-if test "$enable_xmms" == "yes"; then +- +-XMMS_CFLAGS="" +-XMMS_LIBS="" +- +-#check stuff +- +-AM_PATH_XMMS(1.2.4, +- XMMS_CFLAGS=`xmms-config --cflags` +- CPPFLAGS="$CPPFLAGS $XMMS_CFLAGS" +- XMMS_LIBS=`xmms-config --libs` +- , +- AC_MSG_ERROR([You must have the XMMS development headers installed to build the XMMS plugin!]) +-) +- +-AC_CHECK_HEADER(xmms/xmmsctrl.h, [ +- AC_DEFINE(HAVE_XMMSCTRL_H, 1, [Has xmms/xmmsctrl.h]) +- ], [ +- AC_MSG_ERROR([Cannot find xmmsctrl.h!]) +- ]) +- +-AC_CHECK_HEADER(xmms/plugin.h, [ +- AC_DEFINE(HAVE_XMMSPLUGIN_H, 1, [Has xmms/xmmsplugin.h]) +- ], [ +- AC_MSG_ERROR([Cannot find xmms/plugin.h!]) +- ]) +- +-AC_SUBST(XMMS_CFLAGS) +-AC_SUBST(XMMS_LIBS) +- +-fi +- +-########################################################################### +-## + ## Check whether to build Sound Visualization plugin + ## + +@@ -691,10 +637,8 @@ AC_CONFIG_FILES([ + plugins/soundVisualization/Makefile + plugins/cpuUsage/Makefile + plugins/x11/Makefile +- plugins/xmmsControl/Makefile + plugins/bmpControl/Makefile + plugins/externalPlugins/Makefile +- plugins/externalPlugins/xmms/Makefile + plugins/externalPlugins/bmp/Makefile + plugins/lirc/Makefile + ]) +@@ -774,22 +718,10 @@ else + echo " BMP Control plugin: Disabled" + fi + +-if test "$enable_xmms" == "yes"; then +- echo " XMMS Control plugin: Enabled" +-else +- echo " XMMS Control plugin: Disabled" +-fi +- + if test "$enable_bmp" == "yes"; then + echo " BMP Visualization plugin: Enabled" + else + echo " BMP Visualization plugin: Disabled" + fi + +-if test "$enable_xmms" == "yes"; then +- echo " XMMS Visualization plugin: Enabled" +-else +- echo " XMMS Visualization plugin: Disabled" +-fi +- + echo +Index: gizmod-2.3/plugins/Makefile.am +=================================================================== +--- gizmod-2.3.orig/plugins/Makefile.am ++++ gizmod-2.3/plugins/Makefile.am +@@ -1 +1 @@ +-SUBDIRS=scriptingPlugins powermate alsaMixer xosd generic externalPlugins soundVisualization cpuUsage x11 xmmsControl bmpControl lirc ++SUBDIRS=scriptingPlugins powermate alsaMixer xosd generic externalPlugins soundVisualization cpuUsage x11 bmpControl lirc +Index: gizmod-2.3/plugins/externalPlugins/Makefile.am +=================================================================== +--- gizmod-2.3.orig/plugins/externalPlugins/Makefile.am ++++ gizmod-2.3/plugins/externalPlugins/Makefile.am +@@ -1 +1 @@ +-SUBDIRS=xmms bmp ++SUBDIRS=bmp diff --git a/packages/gizmod/files/fix-python-configure.patch b/packages/gizmod/files/fix-python-configure.patch new file mode 100644 index 0000000000..9b48c9790f --- /dev/null +++ b/packages/gizmod/files/fix-python-configure.patch @@ -0,0 +1,17 @@ +Index: gizmod-2.3/configure.ac +=================================================================== +--- gizmod-2.3.orig/configure.ac ++++ gizmod-2.3/configure.ac +@@ -162,11 +162,7 @@ CFLAGS="$PYTHON_INC $CFLAGS" + # AC_MSG_ERROR([Cannot find python.h!]) + # ]) + +-AC_CHECK_FILE(${py_prefix}/include/python${py_ver}/Python.h, [ +- AC_DEFINE(HAVE_PYTHON_H, 1, [Has Python.h]) +- ], [ +- AC_MSG_ERROR([Cannot find Python.h!]) +- ]) ++AC_DEFINE(HAVE_PYTHON_H, 1, [Has Python.h]) + + CFLAGS="$OLD_CFLAGS" + diff --git a/packages/gizmod/gizmod_2.3.bb b/packages/gizmod/gizmod_2.3.bb new file mode 100644 index 0000000000..c00293b64c --- /dev/null +++ b/packages/gizmod/gizmod_2.3.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Gizmo Daemon" +HOMEPAGE = "http://gizmod.sourceforge.net" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +SECTION = "console/multimedia" +DEPENDS = "python virtual/libx11 xf86vidmodeproto" +SRC_URI = "${SOURCEFORGE_MIRROR}/gizmod/gizmod-${PV}.tar.bz2 \ + file://disable-xmms.patch;patch=1 \ + file://fix-python-configure.patch;patch=1 \ + file://disable-bmp.patch;patch=1" + +PR = "r0" + +inherit autotools + +EXTRA_OECONF = "--disable-xmms --disable-bmp --disable-xosd" + +#do_configure_prepend() { +# sed -i 's/TARGET_SYS/${TARGET_SYS}/' ${S}/configure.ac +#} + +FILES_${PN} += "${datadir}/gizmo/scripts ${datadir}/gizmo/plugins/*.so ${datadir}/gizmo/plugins/*.so.*" +FILES_${PN}-dev += "${datadir}/gizmo/plugins/*.a ${datadir}/gizmo/plugins/*.la" +FILES_${PN}-dbg += "${datadir}/gizmo/plugins/.debug"
\ No newline at end of file diff --git a/packages/gpe-session-scripts/files/angstrom/.mtn2git_empty b/packages/gpe-session-scripts/files/angstrom/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-session-scripts/files/angstrom/.mtn2git_empty diff --git a/packages/gpe-session-scripts/files/angstrom/matchbox-session b/packages/gpe-session-scripts/files/angstrom/matchbox-session new file mode 100644 index 0000000000..ad2d9b6a78 --- /dev/null +++ b/packages/gpe-session-scripts/files/angstrom/matchbox-session @@ -0,0 +1,9 @@ +#!/bin/sh + +XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` + + matchbox-desktop & + +matchbox-panel --no-flip --orientation south & +exec matchbox-window-manager $@ + diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb index 2cf63737bd..85c6a2575a 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb @@ -11,7 +11,7 @@ DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question SRC_URI += "file://matchbox-session \ file://disable-composite.xsettings" -PR = "r4" +PR = "r5" #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1" diff --git a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb index 8bd4260184..e239f21e04 100644 --- a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb +++ b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb @@ -2,7 +2,6 @@ LICENSE = "GPL" SECTION = "gpe" inherit gpe -DEPENDS = "virtual/libx11 esound-gpe" -RDEPENDS_${PN} = "esd" +DEPENDS = "virtual/libx11 esound" SRC_URI += "file://makefile-breakage.patch;patch=1" diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index a7f0d6d7e6..f0531dc570 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Plugins for GStreamer" SECTION = "multimedia" PRIORITY = "optional" -DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound-gpe" +DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound" PR = "r1" PACKAGES_DYNAMIC = "gst-plugin-*" diff --git a/packages/hal/files/99_hal b/packages/hal/files/99_hal new file mode 100644 index 0000000000..f3d477231e --- /dev/null +++ b/packages/hal/files/99_hal @@ -0,0 +1 @@ +d root root 0700 /var/run/hald none diff --git a/packages/hal/hal_0.5.8.1.bb b/packages/hal/hal_0.5.8.1.bb index 4b2196f875..f608c4018c 100644 --- a/packages/hal/hal_0.5.8.1.bb +++ b/packages/hal/hal_0.5.8.1.bb @@ -3,14 +3,15 @@ HOMEPAGE = "http://freedesktop.org/Software/hal" SECTION = "unknown" LICENSE = "GPL LGPL AFL" -DEPENDS = "dbus-glib expat libusb" +DEPENDS = "dbus-glib udev intltool expat libusb" RDEPENDS += "udev" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -PR = "r1" +PR = "r2" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" +SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ + file://99_hal" S = "${WORKDIR}/hal-${PV}" @@ -24,6 +25,11 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --disable-policy-kit \ " +do_install_append() { + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles +} + do_stage() { autotools_stage_all install -d ${STAGING_LIBDIR} @@ -31,6 +37,30 @@ do_stage() { install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so } +# At the time the postinst runs, dbus might not be setup so only restart if running +pkg_postinst_hal () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + + /etc/init.d/populate-volatile.sh update + + grep haldaemon /etc/group || addgroup haldaemon + grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL + + DBUSPID=`pidof dbus-daemon` + + if [ "x$DBUSPID" != "x" ]; then + /etc/init.d/dbus-1 force-reload + fi +} + +pkg_postrm_hal () { + deluser haldaemon || true + delgroup haldaemon || true +} + #PACKAGES += "hal-device-manager" #FILES_hal-device-manager = " \ diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb index 42b0907b2b..d5d48233a7 100644 --- a/packages/images/xfce-image.bb +++ b/packages/images/xfce-image.bb @@ -2,8 +2,10 @@ export IMAGE_BASENAME = "xfce-image" IMAGE_LINGUAS = "" +XSERVER ?= "xserver-kdrive-fbdev" + X_DEPENDS = "virtual/xserver" -X_RDEPENDS = "xserver-kdrive-fbdev" +X_RDEPENDS = "${XSERVER}" XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base" XFCE_RDEPENDS = "${XFCE_DEPENDS}" diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh index 44db23707e..cb0a940c7d 100755 --- a/packages/initscripts/initscripts-1.0/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/checkroot.sh @@ -141,6 +141,7 @@ else test `uname -m` = s390 && spinner="" # This should go away test "$VERBOSE" != no && echo "Checking root filesystem..." fsck $spinner $force $fix / + RTC=$? # # If there was a failure, drop into single-user mode. # diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 838c479cb1..0648ceea19 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -5,7 +5,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r83" +PR = "r85" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/lcdproc/lcdproc_0.5.1.bb b/packages/lcdproc/lcdproc_0.5.1.bb new file mode 100644 index 0000000000..aa1b26e544 --- /dev/null +++ b/packages/lcdproc/lcdproc_0.5.1.bb @@ -0,0 +1,124 @@ +DESCRIPTION = "LCDproc is a client/Server suite to drive all kinds of LCD (-like) devices. The client \ +shipped with this package can be used to acquire various kinds of system stats." +HOMEPAGE = "http://lcdproc.org" +LICENSE = "GPL" +PRIORITY = "optional" +SECTION = "utils" +PR="r2" + +DEPENDS = "libusb ncurses libg15 g15daemon libg15render" +RRECOMMENDS_lcdproc = "lcdd" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz" + +inherit autotools update-rc.d + +PACKAGES =+ "lcdd lcdvc lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \ + lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \ + lcdd-driver-curses lcdd-driver-text \ + lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \ + lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \ + lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \ + lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \ + lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan lcdd-driver-g15" + +CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" +CONFFILES_lcdproc = "${sysconfdir}/lcdproc.conf" +CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf" + +FILES_lcdd = "${CONFFILES_lcdd} \ + ${sbindir}/LCDd \ + ${sysconfdir}/init.d/lcdd" + +FILES_lcdproc = "${CONFFILES_lcdproc} \ + ${bindir}/lcdproc \ + ${sysconfdir}/init.d/lcdproc" + +FILES_lcdvc = "${CONFFILES_lcdvc} \ + ${sbindir}/lcdvc" + +# Driver packages + +FILES_lcdd-driver-cfontz = "${libdir}/lcdproc/CFontz*.so" +FILES_lcdd-driver-bayrad = "${libdir}/lcdproc/bayrad.so" +FILES_lcdd-driver-hd44780nousb = "${libdir}/lcdproc/hd44780nousb.so" +FILES_lcdd-driver-hd44780 = "${libdir}/lcdproc/hd44780.so" +FILES_lcdd-driver-mtxorb = "${libdir}/lcdproc/MtxOrb.so" +FILES_lcdd-driver-serialvfd = "${libdir}/lcdproc/serialVFD.so" +FILES_lcdd-driver-curses = "${libdir}/lcdproc/curses.so" +FILES_lcdd-driver-text = "${libdir}/lcdproc/text.so" +FILES_lcdd-driver-sed = "${libdir}/lcdproc/sed*.so" +FILES_lcdd-driver-cwlnx = "${libdir}/lcdproc/CwLnx.so" +FILES_lcdd-driver-glk = "${libdir}/lcdproc/glk.so" +FILES_lcdd-driver-icp-a106 = "${libdir}/lcdproc/icp_a106.so" +FILES_lcdd-driver-imon = "${libdir}/lcdproc/imon.so" +FILES_lcdd-driver-joy = "${libdir}/lcdproc/joy.so" +FILES_lcdd-driver-lb216 = "${libdir}/lcdproc/lb216.so" +FILES_lcdd-driver-lcdm001 = "${libdir}/lcdproc/lcdm001.so" +FILES_lcdd-driver-lcterm = "${libdir}/lcdproc/lcterm.so" +FILES_lcdd-driver-ms6931 = "${libdir}/lcdproc/ms6931.so" +FILES_lcdd-driver-mtc-s16209x = "${libdir}/lcdproc/mtc_s16209x.so" +FILES_lcdd-driver-noritakevfd = "${libdir}/lcdproc/NoritakeVFD.so" +FILES_lcdd-driver-pyramid = "${libdir}/lcdproc/pyramid.so" +FILES_lcdd-driver-sli = "${libdir}/lcdproc/sli.so" +FILES_lcdd-driver-stv5730 = "${libdir}/lcdproc/stv5730.so" +FILES_lcdd-driver-t6963 = "${libdir}/lcdproc/t6963.so" +FILES_lcdd-driver-tyan = "${libdir}/lcdproc/tyan.so" +FILES_lcdd-driver-g15 = "${libdir}/lcdproc/g15.so" + + +# Install-all-drivers-hack: + +DEPENDS_lcdd-driver-all = "lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \ + lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \ + lcdd-driver-curses lcdd-driver-text \ + lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \ + lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \ + lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \ + lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \ + lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan lcdd-driver-g15" + +# USB / no USB trickery + +CONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" +CONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" + +INITSCRIPT_PACKAGES = "lcdd lcdproc" +INITSCRIPT_NAME_lcdd = "lcdd" +INITSCRIPT_NAME_lcdproc = "lcdproc" +INITSCRIPT_PARAMS_lcdd = "defaults 70 21" +INITSCRIPT_PARAMS_lcdproc = "defaults 71 20" + +EXTRA_OECONF = "--enable-drivers=all --enable-libusb" + +do_install () { + # binaries + install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd + install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc + install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc + + # init scripts + install -d ${D}${sysconfdir}/init.d + # so far, not fixed :-( and now even uglier :-(( + cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd + chmod 0755 ${D}${sysconfdir}/init.d/lcdd + # prevent lcdproc from starting if no SCREENS are set. + # will be fixed in next upstream release + cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n "$SCREENS" ] || exit 0\n\ncase/' | sed -e s'/--oknodo//' > ${D}${sysconfdir}/init.d/lcdproc + chmod 0755 ${D}${sysconfdir}/init.d/lcdproc + + # configuration files + install -D -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf + install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf + # don't start lcdproc by default + # will be fixed in next upstream release + cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}${sysconfdir}/lcdproc.conf + chmod 0644 ${D}${sysconfdir}/lcdproc.conf + + # driver library files + install -d ${D}${libdir}/lcdproc + for i in server/drivers/*.so; do + install -m 0644 $i ${D}${libdir}/lcdproc/ + done +} + diff --git a/packages/libg15/libg15_1.2.1.bb b/packages/libg15/libg15_1.2.1.bb index 746e5f2e98..930cfe8640 100644 --- a/packages/libg15/libg15_1.2.1.bb +++ b/packages/libg15/libg15_1.2.1.bb @@ -4,16 +4,15 @@ LICENSE = "GPLv2" SECTION = "libs" PRIORITY = "optional" DEPENDS = "libusb" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15-${PV}.tar.bz2" inherit autotools +EXTRA_OECONF = "--with-gnu-ld" + do_stage () { - oe_libinstall -a -so libg15 ${STAGING_LIBDIR} - for i in libg15.h; do - install -m 0644 ${S}/$i ${STAGING_INCDIR}/ - done + autotools_stage_all } diff --git a/packages/libg15render/.mtn2git_empty b/packages/libg15render/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libg15render/.mtn2git_empty diff --git a/packages/libg15render/libg15render_1.2.bb b/packages/libg15render/libg15render_1.2.bb new file mode 100644 index 0000000000..e0e2e0bf2c --- /dev/null +++ b/packages/libg15render/libg15render_1.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "This is a library to render text and shapes into a buffer usable by the Logitech G15 Gaming Keyboard." +HOMEPAGE = "http://g15tools.sourceforge.net" +LICENSE = "GPLv2" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libg15" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15render-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF = "--with-gnu-ld" + +do_stage () { + autotools_stage_all +} + diff --git a/packages/libsoundgen/libsoundgen_0.3.bb b/packages/libsoundgen/libsoundgen_0.3.bb index afcdf8a04c..4348670538 100644 --- a/packages/libsoundgen/libsoundgen_0.3.bb +++ b/packages/libsoundgen/libsoundgen_0.3.bb @@ -1,7 +1,7 @@ SECTION = "x11/libs" inherit gpe LICENSE = "LGPL" -DEPENDS = "esound-gpe" +DEPENDS = "esound" do_stage() { install -d ${STAGING_INCDIR}/gpe diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index 1115b6e961..28d3be1b3d 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -3,7 +3,7 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng" +DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound virtual/libx11 libxext libpng" PROVIDES = "virtual/libxine" PR = "r0" diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 270ac8f6e5..7732eb813e 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -3,7 +3,7 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng" +DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound virtual/libx11 libxext libpng" PROVIDES = "virtual/libxine" PR = "r1" diff --git a/packages/linux/linux-epia-2.6.19.2/.mtn2git_empty b/packages/linux/linux-epia-2.6.19.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-epia-2.6.19.2/.mtn2git_empty diff --git a/packages/linux/linux-epia-2.6.19.2/epia_defconfig b/packages/linux/linux-epia-2.6.19.2/epia_defconfig new file mode 100644 index 0000000000..3cb0893080 --- /dev/null +++ b/packages/linux/linux-epia-2.6.19.2/epia_defconfig @@ -0,0 +1,1868 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.19.2 +# Fri Jan 19 21:02:53 2007 +# +CONFIG_X86_32=y +CONFIG_GENERIC_TIME=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_SEMAPHORE_SLEEPERS=y +CONFIG_X86=y +CONFIG_MMU=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +CONFIG_LBD=y +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# Processor type and features +# +# CONFIG_SMP is not set +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_NUMAQ is not set +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_VISWS is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_ES7000 is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +CONFIG_MCYRIXIII=y +# CONFIG_MVIAC3_2 is not set +# CONFIG_X86_GENERIC is not set +CONFIG_X86_CMPXCHG=y +CONFIG_X86_XADD=y +CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_TSC=y +# CONFIG_HPET_TIMER is not set +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +# CONFIG_X86_UP_APIC is not set +CONFIG_X86_MCE=y +# CONFIG_X86_MCE_NONFATAL is not set +CONFIG_VM86=y +# CONFIG_TOSHIBA is not set +# CONFIG_I8K is not set +# CONFIG_X86_REBOOTFIXUPS is not set +# CONFIG_MICROCODE is not set +# CONFIG_X86_MSR is not set +# CONFIG_X86_CPUID is not set + +# +# Firmware Drivers +# +# CONFIG_EDD is not set +# CONFIG_DELL_RBU is not set +# CONFIG_DCDBAS is not set +CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +# CONFIG_EFI is not set +CONFIG_REGPARM=y +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_KEXEC=y +CONFIG_PHYSICAL_START=0x100000 +CONFIG_COMPAT_VDSO=y + +# +# Power management options (ACPI, APM) +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +CONFIG_SOFTWARE_SUSPEND=y +CONFIG_PM_STD_PARTITION="" + +# +# ACPI (Advanced Configuration and Power Interface) Support +# +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SLEEP_PROC_FS=y +# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_VIDEO=m +# CONFIG_ACPI_HOTKEY is not set +CONFIG_ACPI_FAN=y +# CONFIG_ACPI_DOCK is not set +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_THERMAL=y +# CONFIG_ACPI_ASUS is not set +CONFIG_ACPI_IBM=m +# CONFIG_ACPI_IBM_DOCK is not set +# CONFIG_ACPI_TOSHIBA is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +CONFIG_X86_PM_TIMER=y +# CONFIG_ACPI_CONTAINER is not set +# CONFIG_ACPI_SBS is not set + +# +# APM (Advanced Power Management) BIOS Support +# +# CONFIG_APM is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +# CONFIG_X86_POWERNOW_K6 is not set +# CONFIG_X86_POWERNOW_K7 is not set +# CONFIG_X86_POWERNOW_K8 is not set +# CONFIG_X86_GX_SUSPMOD is not set +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +# CONFIG_X86_SPEEDSTEP_ICH is not set +# CONFIG_X86_SPEEDSTEP_SMI is not set +# CONFIG_X86_P4_CLOCKMOD is not set +# CONFIG_X86_CPUFREQ_NFORCE2 is not set +# CONFIG_X86_LONGRUN is not set +CONFIG_X86_LONGHAUL=y + +# +# shared options +# +# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set +# CONFIG_X86_SPEEDSTEP_LIB is not set + +# +# Bus options (PCI, PCMCIA, EISA, MCA, ISA) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +# CONFIG_PCIEPORTBUS is not set +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +# CONFIG_EISA is not set +# CONFIG_MCA is not set +# CONFIG_SCx200 is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# PCI Hotplug Support +# +# CONFIG_HOTPLUG_PCI is not set + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=m + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +CONFIG_INET_XFRM_TUNNEL=y +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=y +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +CONFIG_IPV6_MIP6=y +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y +CONFIG_INET6_XFRM_MODE_BEET=y +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=y +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set +# CONFIG_IP_NF_CT_PROTO_SCTP is not set +# CONFIG_IP_NF_FTP is not set +# CONFIG_IP_NF_IRC is not set +# CONFIG_IP_NF_NETBIOS_NS is not set +# CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_H323 is not set +# CONFIG_IP_NF_SIP is not set +CONFIG_IP_NF_QUEUE=y + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_IP6_NF_QUEUE is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +# CONFIG_BT_RFCOMM_TTY is not set +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_HIDP is not set + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +# CONFIG_BT_HCIUART is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +# CONFIG_PARPORT_1284 is not set + +# +# Plug and Play support +# +# CONFIG_PNP is not set + +# +# Block devices +# +CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# Misc devices +# +# CONFIG_IBM_ASM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +# CONFIG_BLK_DEV_HD_IDE is not set +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_BLK_DEV_IDECD=y +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +# CONFIG_BLK_DEV_CMD640 is not set +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=y +# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_RZ1000 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +CONFIG_IDEDMA_PCI_AUTO=y +# CONFIG_IDEDMA_ONLYDISK is not set +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_ATIIXP is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_CS5535 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_JMICRON is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_IT821X is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_PDC202XX_OLD is not set +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SIS5513 is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +CONFIG_BLK_DEV_VIA82CXXX=y +# CONFIG_IDE_ARM is not set +# CONFIG_IDE_CHIPSETS is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +CONFIG_IDEDMA_AUTO=y +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_ULTRASTOR is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Old CD-ROM drivers (not SCSI, not IDE) +# +# CONFIG_CD_NO_IDESCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set +# CONFIG_FUSION_SPI is not set +# CONFIG_FUSION_FC is not set +# CONFIG_FUSION_SAS is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_IEEE1394=y + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +# CONFIG_IEEE1394_OUI_DB is not set +CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y +CONFIG_IEEE1394_CONFIG_ROM_IP1394=y +# CONFIG_IEEE1394_EXPORT_FULL_API is not set + +# +# Device Drivers +# +# CONFIG_IEEE1394_PCILYNX is not set +CONFIG_IEEE1394_OHCI1394=y + +# +# Protocol Drivers +# +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_DV1394=m +CONFIG_IEEE1394_RAWIO=m + +# +# I2O device support +# +# CONFIG_I2O is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_LANCE is not set +# CONFIG_NET_VENDOR_SMC is not set +# CONFIG_NET_VENDOR_RACAL is not set + +# +# Tulip family network device support +# +# CONFIG_NET_TULIP is not set +# CONFIG_AT1700 is not set +# CONFIG_DEPCA is not set +# CONFIG_HP100 is not set +# CONFIG_NET_ISA is not set +CONFIG_NET_PCI=y +# CONFIG_PCNET32 is not set +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +# CONFIG_AC3200 is not set +# CONFIG_APRICOT is not set +# CONFIG_B44 is not set +# CONFIG_FORCEDETH is not set +# CONFIG_CS89x0 is not set +# CONFIG_DGRS is not set +# CONFIG_EEPRO100 is not set +# CONFIG_E100 is not set +# CONFIG_FEALNX is not set +# CONFIG_NATSEMI is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_8139CP is not set +# CONFIG_8139TOO is not set +# CONFIG_SIS900 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SUNDANCE is not set +# CONFIG_TLAN is not set +CONFIG_VIA_RHINE=y +# CONFIG_VIA_RHINE_MMIO is not set +# CONFIG_VIA_RHINE_NAPI is not set +# CONFIG_NET_POCKET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_SK98LIN is not set +# CONFIG_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_QLA3XXX is not set + +# +# Ethernet (10000 Mbit) +# +# CONFIG_CHELSIO_T1 is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set +# CONFIG_MYRI10GE is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NET_FC is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Telephony Support +# +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_INPORT is not set +# CONFIG_MOUSE_LOGIBM is not set +# CONFIG_MOUSE_PC110PAD is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_PCSPKR is not set +# CONFIG_INPUT_WISTRON_BTNS is not set +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_CONSOLE is not set +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +# CONFIG_TIPAR is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_SONYPI is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +CONFIG_AGP=y +# CONFIG_AGP_ALI is not set +# CONFIG_AGP_ATI is not set +# CONFIG_AGP_AMD is not set +# CONFIG_AGP_AMD64 is not set +# CONFIG_AGP_INTEL is not set +# CONFIG_AGP_NVIDIA is not set +# CONFIG_AGP_SIS is not set +# CONFIG_AGP_SWORKS is not set +CONFIG_AGP_VIA=y +# CONFIG_AGP_EFFICEON is not set +# CONFIG_DRM is not set +# CONFIG_MWAVE is not set +# CONFIG_PC8736x_GPIO is not set +# CONFIG_NSC_GPIO is not set +# CONFIG_CS5535_GPIO is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_HPET is not set +# CONFIG_HANGCHECK_TIMER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_ELEKTOR is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +# CONFIG_SCx200_ACB is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_STUB is not set +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m +# CONFIG_I2C_VOODOO3 is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +CONFIG_SENSORS_VT1211=m +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_K8TEMP is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_HDAPS is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y + +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_BT848 is not set +# CONFIG_VIDEO_PMS is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_SAA7134 is not set +# CONFIG_VIDEO_MXB is not set +# CONFIG_VIDEO_DPC is not set +# CONFIG_VIDEO_HEXIUM_ORION is not set +# CONFIG_VIDEO_HEXIUM_GEMINI is not set +# CONFIG_VIDEO_CX88 is not set + +# +# V4L USB devices +# +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_USB_VICAM is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set +# CONFIG_USB_ET61X251 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_W9968CF is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set +# CONFIG_USB_ZC0301 is not set +# CONFIG_USB_PWC is not set + +# +# Radio Adapters +# +# CONFIG_RADIO_CADET is not set +# CONFIG_RADIO_RTRACK is not set +# CONFIG_RADIO_RTRACK2 is not set +# CONFIG_RADIO_AZTECH is not set +# CONFIG_RADIO_GEMTEK is not set +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_RADIO_SF16FMI is not set +# CONFIG_RADIO_SF16FMR2 is not set +# CONFIG_RADIO_TERRATEC is not set +# CONFIG_RADIO_TRUST is not set +# CONFIG_RADIO_TYPHOON is not set +# CONFIG_RADIO_ZOLTRIX is not set +# CONFIG_USB_DSBR is not set + +# +# Digital Video Broadcasting Devices +# +CONFIG_DVB=y +CONFIG_DVB_CORE=m +# CONFIG_DVB_CORE_ATTACH is not set + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_DVB_AV7110=m +# CONFIG_DVB_AV7110_OSD is not set +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +# CONFIG_DVB_BUDGET_AV is not set +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +# CONFIG_DVB_USB is not set +# CONFIG_DVB_TTUSB_BUDGET is not set +# CONFIG_DVB_TTUSB_DEC is not set +# CONFIG_DVB_CINERGYT2 is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +# CONFIG_DVB_B2C2_FLEXCOP is not set + +# +# Supported BT878 Adapters +# + +# +# Supported Pluto2 Adapters +# +# CONFIG_DVB_PLUTO2 is not set + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +# CONFIG_DVB_CX24110 is not set +# CONFIG_DVB_CX24123 is not set +CONFIG_DVB_TDA8083=m +# CONFIG_DVB_MT312 is not set +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_TDA10086=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +# CONFIG_DVB_SP887X is not set +# CONFIG_DVB_CX22700 is not set +# CONFIG_DVB_CX22702 is not set +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +# CONFIG_DVB_MT352 is not set +# CONFIG_DVB_ZL10353 is not set +# CONFIG_DVB_DIB3000MB is not set +# CONFIG_DVB_DIB3000MC is not set + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_STV0297=m + +# +# 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 + +# +# Tuners/PLL support +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TDA826X=m +# CONFIG_DVB_TUNER_MT2060 is not set + +# +# Miscellaneous devices +# +CONFIG_DVB_LNBP21=m +# CONFIG_DVB_ISL6421 is not set +# CONFIG_DVB_TUA6100 is not set +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_VIDEOBUF=m +CONFIG_VIDEO_BUF=m +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +# CONFIG_VIDEO_SELECT is not set +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_SEQUENCER=y +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_MPU401_UART=y +CONFIG_SND_AC97_CODEC=y +CONFIG_SND_AC97_BUS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_MTS64 is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ISA devices +# +# CONFIG_SND_ADLIB is not set +# CONFIG_SND_AD1848 is not set +# CONFIG_SND_CMI8330 is not set +# CONFIG_SND_CS4231 is not set +# CONFIG_SND_CS4232 is not set +# CONFIG_SND_CS4236 is not set +# CONFIG_SND_ES1688 is not set +# CONFIG_SND_ES18XX is not set +# CONFIG_SND_GUSCLASSIC is not set +# CONFIG_SND_GUSEXTREME is not set +# CONFIG_SND_GUSMAX is not set +# CONFIG_SND_OPL3SA2 is not set +# CONFIG_SND_OPTI92X_AD1848 is not set +# CONFIG_SND_OPTI92X_CS4231 is not set +# CONFIG_SND_OPTI93X is not set +# CONFIG_SND_MIRO is not set +# CONFIG_SND_SB8 is not set +# CONFIG_SND_SB16 is not set +# CONFIG_SND_SBAWE is not set +# CONFIG_SND_SGALAXY is not set +# CONFIG_SND_SSCAPE is not set +# CONFIG_SND_WAVEFRONT is not set + +# +# PCI devices +# +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS5535AUDIO is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +CONFIG_SND_VIA82XX=y +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_AC97_POWER_SAVE is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_USX2Y is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_SPLIT_ISO is not set +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +CONFIG_USB_UHCI_HCD=y +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set +# CONFIG_USB_USBNET is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# +# CONFIG_EDAC is not set + +# +# Real Time Clock +# +# CONFIG_RTC_CLASS is not set + +# +# DMA Engine support +# +# CONFIG_DMA_ENGINE is not set + +# +# DMA Clients +# + +# +# DMA Devices +# + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_SECURITY is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +# CONFIG_ZISOFS is not set +CONFIG_UDF_FS=y +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +CONFIG_HFSPLUS_FS=m +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_CRAMFS=y +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +# CONFIG_ROOT_NFS is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=m + +# +# Instrumentation Support +# +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +# CONFIG_KPROBES is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_UNUSED_SYMBOLS=y +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_FS is not set +# CONFIG_UNWIND_INFO is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_EARLY_PRINTK=y +CONFIG_DOUBLEFAULT=y + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_PLIST=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_X86_BIOS_REBOOT=y +CONFIG_KTIME_SCALAR=y diff --git a/packages/linux/linux-epia_2.6.19.2.bb b/packages/linux/linux-epia_2.6.19.2.bb new file mode 100644 index 0000000000..a52f512c12 --- /dev/null +++ b/packages/linux/linux-epia_2.6.19.2.bb @@ -0,0 +1,27 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for VIA EPiA" +LICENSE = "GPL" +PR = "r0" + +KERNEL_CCSUFFIX = "-3.3.4" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://epia_defconfig" +S = "${WORKDIR}/linux-${PV}" + +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit kernel + +ARCH = "i386" +KERNEL_IMAGETYPE = "bzImage" + +# Don't want kernel in rootfs +FILES_kernel = "" +ALLOW_EMPTY_kernel = "1" +PACKAGES += "kernel-image" +FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/epia_defconfig ${S}/.config +} diff --git a/packages/linux/linux-ezx/defconfig-a780 b/packages/linux/linux-ezx/defconfig-a780 index beb7a64cc1..1321bf7df6 100644 --- a/packages/linux/linux-ezx/defconfig-a780 +++ b/packages/linux/linux-ezx/defconfig-a780 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.13 -# Thu May 18 19:40:25 2006 +# Sun Jan 21 10:52:04 2007 # CONFIG_ARM=y CONFIG_MMU=y @@ -14,7 +14,6 @@ CONFIG_ARCH_MTD_XIP=y # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # @@ -124,6 +123,8 @@ CONFIG_IWMMXT=y CONFIG_PXA_SPI=y CONFIG_PXA_EZX_PCAP=y CONFIG_PXA_EZX_PCAP_EMU=m +CONFIG_PXA_EZX_PCAP_EMU_USB=y +# CONFIG_PXA_EZX_PCAP_EMU_UART is not set # # Processor Type @@ -155,7 +156,8 @@ CONFIG_XSCALE_PMU=y # # CONFIG_PREEMPT is not set # CONFIG_NO_IDLE_HZ is not set -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -172,7 +174,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=1 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off console=ttyS2,115200n8 console=tty0" +CONFIG_CMDLINE="console=ttyS2,115200n8 console=tty1 noinitrd root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off debug mem=32M@0xA0000000 mem=16M@0xAC000000" # CONFIG_XIP_KERNEL is not set # @@ -192,7 +194,6 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -737,7 +738,6 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set -# CONFIG_LEGACY_PTY_COUNT is not set # # IPMI @@ -765,6 +765,8 @@ CONFIG_SA1100_RTC=y # # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set +CONFIG_TS0710_MUX=y +CONFIG_TS0710_MUX_USB=y # # I2C support @@ -841,9 +843,10 @@ CONFIG_SPI_BITBANG=m # # Motorola EZX devices # -# CONFIG_KEYPAD_A780 is not set +CONFIG_KEYPAD_A780=y # CONFIG_KEYPAD_E680 is not set -# CONFIG_KEYLIGHT_A780 is not set +CONFIG_KEYLIGHT_A780=y +CONFIG_VIBRATOR_A780=y # CONFIG_FMRADIO_E680 is not set # @@ -856,7 +859,6 @@ CONFIG_SPI_BITBANG=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y -# CONFIG_LEDS_E680 is not set CONFIG_LEDS_A780=y CONFIG_LEDS_TRIGGER_TIMER=y @@ -914,9 +916,10 @@ CONFIG_LOGO_LINUX_CLUT224=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y -CONFIG_BACKLIGHT_EZX=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y +# CONFIG_BACKLIGHT_HP680 is not set +CONFIG_BACKLIGHT_EZX=y # # Sound @@ -928,7 +931,7 @@ CONFIG_LCD_DEVICE=y # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB=m +CONFIG_USB=y # CONFIG_USB_DEBUG is not set # @@ -944,7 +947,7 @@ CONFIG_USB=m # USB Host Controller Drivers # # CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_BIG_ENDIAN is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_SL811_HCD is not set diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index 5d13af9f83..6e6f4628dc 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -4,7 +4,7 @@ AUTHOR = "Harald Welte and the OpenEZX Team <openezx-devel@lists.openezx.org>" HOMEPAGE = "http://www.openezx.org" LICENSE = "GPL" DEPENDS += "quilt-native" -EZX = "ezx7" +EZX = "ezx8" PR = "${EZX}-r1" inherit kernel @@ -16,7 +16,9 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" # source and patches # SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ - http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-ezx7.tar.bz2 \ + http://www.openezx.org/download/patches-2.6.16-2.6.16.13-${EZX}.tar.bz2 \ + \ + ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1;status=merged \ \ file://sa1100-rtc-gcc4.diff;patch=1 \ file://pxa-serial-gcc4.diff;patch=1 \ diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6/h3900/defconfig index d678a6c5c3..52b2c8741e 100644 --- a/packages/linux/linux-handhelds-2.6/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.19-hh7 -# Sun Dec 31 02:28:00 2006 +# Linux kernel version: 2.6.19-hh8 +# Mon Jan 22 05:03:33 2007 # CONFIG_ARM=y # CONFIG_GENERIC_TIME is not set @@ -38,7 +38,6 @@ CONFIG_SYSVIPC=y # CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y -# CONFIG_MINIMAL_OOPS is not set CONFIG_IKCONFIG_PROC=y # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" @@ -58,8 +57,6 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_USELIB=y -CONFIG_CORE_DUMP=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_RT_MUTEXES=y @@ -146,7 +143,6 @@ CONFIG_MACH_H3900=y CONFIG_IPAQ_H3900_LCD=y CONFIG_IPAQ_H3900_BACKLIGHT=y CONFIG_IPAQ_H3900_BATTERY=y -# CONFIG_IPAQ_H3900_MMC is not set # CONFIG_MACH_H4000 is not set # CONFIG_MACH_H4700 is not set # CONFIG_MACH_HX2750 is not set @@ -169,14 +165,17 @@ CONFIG_IPAQ_H3900_BATTERY=y # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA25x=y -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader # # CONFIG_LAB is not set +CONFIG_PXA_IPAQ=y + +# +# XScale-based iPAQ +# +CONFIG_IPAQ_HANDHELD=y # # Processor Type @@ -199,16 +198,6 @@ CONFIG_XSCALE_PMU=y CONFIG_KEXEC=y # -# Compaq/iPAQ Platforms -# -CONFIG_PXA_IPAQ=y - -# -# XScale-based iPAQ -# -CONFIG_IPAQ_HANDHELD=y - -# # Compaq/iPAQ Drivers # @@ -515,10 +504,7 @@ CONFIG_INPUT=y # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y @@ -624,7 +610,42 @@ CONFIG_LEGACY_PTY_COUNT=32 # # I2C support # -# CONFIG_I2C is not set +CONFIG_I2C=m +# CONFIG_I2C_CHARDEV is not set + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set # # SPI support @@ -759,7 +780,17 @@ CONFIG_BACKLIGHT_CORGI=y # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +# CONFIG_SND is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set # # USB support @@ -833,8 +864,15 @@ CONFIG_RTC_INTF_DEV=y # # RTC drivers # +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6/h4000/defconfig index 28a78fa880..f17812c9f4 100644 --- a/packages/linux/linux-handhelds-2.6/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h4000/defconfig @@ -1,11 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18-hh0 -# Sat Nov 18 21:26:56 2006 +# Linux kernel version: 2.6.19-hh8 +# Mon Jan 22 05:03:36 2007 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -29,19 +31,21 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y -# CONFIG_MINIMAL_OOPS is not set CONFIG_IKCONFIG_PROC=y # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_EMBEDDED=y -CONFIG_UID16=y CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +# CONFIG_UID16 is not set +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set @@ -53,8 +57,6 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_USELIB=y -CONFIG_CORE_DUMP=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_RT_MUTEXES=y @@ -75,6 +77,7 @@ CONFIG_KMOD=y # # Block layer # +CONFIG_BLOCK=y # CONFIG_BLK_DEV_IO_TRACE is not set # @@ -107,7 +110,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set @@ -128,6 +132,7 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set # CONFIG_ARCH_ESERIES is not set # CONFIG_MACH_A620 is not set # CONFIG_MACH_A716 is not set @@ -136,14 +141,15 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_H2200 is not set # CONFIG_MACH_H3900 is not set CONFIG_MACH_H4000=y -CONFIG_IPAQ_H4000_SERIAL=m +# CONFIG_IPAQ_H4000_SERIAL is not set CONFIG_IPAQ_H4000_UDC=y CONFIG_IPAQ_H4000_LCD=y CONFIG_IPAQ_H4000_BACKLIGHT=y CONFIG_IPAQ_H4000_TS=y -CONFIG_IPAQ_H4000_PCMCIA=y CONFIG_IPAQ_H4000_BUTTONS=y CONFIG_IPAQ_H4000_BATT=y +CONFIG_IPAQ_H4000_LEDS=y +CONFIG_IPAQ_H4000_BT=y CONFIG_IPAQ_H4300_KBD=m # CONFIG_MACH_H4700 is not set # CONFIG_MACH_HX2750 is not set @@ -164,15 +170,20 @@ CONFIG_IPAQ_H4300_KBD=m # CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_T3XSCALE is not set # CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA25x=y -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set +CONFIG_PXA_SSP=y # # Linux As Bootloader # # CONFIG_LAB is not set +CONFIG_PXA_IPAQ=y + +# +# XScale-based iPAQ +# +CONFIG_IPAQ_HANDHELD=y # # Processor Type @@ -183,25 +194,18 @@ CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set CONFIG_XSCALE_PMU=y CONFIG_KEXEC=y # -# Compaq/iPAQ Platforms -# -CONFIG_PXA_IPAQ=y - -# -# XScale-based iPAQ -# -CONFIG_IPAQ_HANDHELD=y - -# # Compaq/iPAQ Drivers # @@ -209,8 +213,6 @@ CONFIG_IPAQ_HANDHELD=y # Compaq/HP iPAQ Drivers # # CONFIG_IPAQ_SLEEVE is not set -# CONFIG_IPAQ_SAMCOP is not set -# CONFIG_IPAQ_HAMCOP is not set # # Bus support @@ -228,7 +230,7 @@ CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # -CONFIG_PCMCIA_PXA2XX=y +# CONFIG_PCMCIA_PXA2XX is not set # # Kernel Features @@ -236,7 +238,8 @@ CONFIG_PCMCIA_PXA2XX=y # CONFIG_PREEMPT is not set CONFIG_NO_IDLE_HZ=y CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -260,20 +263,7 @@ CONFIG_CMDLINE="keepinitrd" # # CPU Frequency scaling # -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_DEBUG=y -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_FREQ_PXA=y -CONFIG_PXA25x_ALTERNATE_FREQS=y +# CONFIG_CPU_FREQ is not set # # Floating point emulation @@ -292,7 +282,6 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -300,6 +289,8 @@ CONFIG_BINFMT_ELF=y CONFIG_PM=y # CONFIG_PM_LEGACY is not set CONFIG_PM_DEBUG=y +# CONFIG_DISABLE_CONSOLE_SUSPEND is not set +CONFIG_PM_SYSFS_DEPRECATED=y CONFIG_APM=y # @@ -316,6 +307,7 @@ CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -335,31 +327,24 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +CONFIG_INET_XFRM_MODE_BEET=y # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" # # IP: Virtual Server Configuration # # CONFIG_IP_VS is not set -CONFIG_IPV6=m -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -# CONFIG_IPV6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set -CONFIG_BRIDGE_NETFILTER=y # # Core Netfilter Configuration @@ -386,16 +371,6 @@ CONFIG_IP_NF_IRC=m # CONFIG_IP_NF_QUEUE is not set # -# IPv6: Netfilter Configuration (EXPERIMENTAL) -# -# CONFIG_IP6_NF_QUEUE is not set - -# -# Bridge: Netfilter Configuration -# -# CONFIG_BRIDGE_NF_EBTABLES is not set - -# # DCCP Configuration (EXPERIMENTAL) # # CONFIG_IP_DCCP is not set @@ -410,10 +385,9 @@ CONFIG_IP_NF_IRC=m # # CONFIG_TIPC is not set # CONFIG_ATM is not set -CONFIG_BRIDGE=m +# CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set -CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -432,72 +406,9 @@ CONFIG_LLC=m # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -CONFIG_IRDA=y - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRCOMM=y -# CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# -# CONFIG_IRDA_CACHE_LAST_LSAP is not set -# CONFIG_IRDA_FAST_RR is not set -CONFIG_IRDA_DEBUG=y - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -# CONFIG_DONGLE is not set - -# -# Old SIR device drivers -# -# CONFIG_IRPORT_SIR is not set - -# -# Old Serial dongle support -# - -# -# FIR device drivers -# -CONFIG_PXA_FICP=y -CONFIG_BT=y -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -# CONFIG_BT_HCIDTL1 is not set -# CONFIG_BT_HCIBT3C is not set -# CONFIG_BT_HCIBLUECARD is not set -# CONFIG_BT_HCIBTUART is not set -# CONFIG_BT_HCIVHCI is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set # CONFIG_IEEE80211 is not set -CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -520,98 +431,7 @@ CONFIG_FW_LOADER=y # # Memory Technology Devices (MTD) # -CONFIG_MTD=y -CONFIG_MTD_DEBUG=y -CONFIG_MTD_DEBUG_VERBOSE=1 -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_CMDLINE_PARTS is not set -# CONFIG_MTD_AFS_PARTS is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_CFI_INTELEXT=m -# CONFIG_MTD_CFI_AMDSTD is not set -# CONFIG_MTD_CFI_STAA is not set -CONFIG_MTD_CFI_UTIL=m -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set -CONFIG_MTD_XIP=y - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set -# CONFIG_MTD_IPAQ is not set -# CONFIG_MTD_SHARP_SL is not set -# CONFIG_MTD_PLATRAM is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set - -# -# NAND Flash Device Drivers -# -CONFIG_MTD_NAND=y -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -# CONFIG_MTD_NAND_ECC_SMC is not set -# CONFIG_MTD_NAND_H1900 is not set -CONFIG_MTD_NAND_IDS=y -CONFIG_MTD_NAND_DISKONCHIP=y -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -# CONFIG_MTD_NAND_SHARPSL is not set -# CONFIG_MTD_NAND_NANDSIM is not set - -# -# OneNAND Flash Device Drivers -# -# CONFIG_MTD_ONENAND is not set +# CONFIG_MTD is not set # # Parallel port support @@ -626,11 +446,10 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 # Block devices # # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=6 +CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_BLK_DEV_INITRD=y @@ -640,35 +459,19 @@ CONFIG_BLK_DEV_INITRD=y # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=m -CONFIG_BLK_DEV_IDE=m - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=m -# CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECS=m -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -# CONFIG_IDE_GENERIC is not set -# CONFIG_IDE_ARM is not set -# CONFIG_BLK_DEV_IDEDMA is not set -# CONFIG_IDEDMA_AUTO is not set -# CONFIG_BLK_DEV_HD is not set +# CONFIG_IDE is not set # # SCSI device support # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set # # Multi-device support (RAID and LVM) @@ -691,81 +494,7 @@ CONFIG_BLK_DEV_IDECS=m # # Network device support # -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set - -# -# PHY device support -# - -# -# Ethernet (10 or 100Mbit) -# -# CONFIG_NET_ETHERNET is not set - -# -# Ethernet (1000 Mbit) -# - -# -# Ethernet (10000 Mbit) -# - -# -# Token Ring devices -# - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -# CONFIG_NET_WIRELESS_RTNETLINK is not set - -# -# Obsolete Wireless cards support (pre-802.11) -# -# CONFIG_STRIP is not set -# CONFIG_PCMCIA_WAVELAN is not set -# CONFIG_PCMCIA_NETWAVE is not set - -# -# Wireless 802.11 Frequency Hopping cards support -# -# CONFIG_PCMCIA_RAYCS is not set - -# -# Wireless 802.11b ISA/PCI cards support -# -# CONFIG_HERMES is not set -# CONFIG_ATMEL is not set - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# -# CONFIG_AIRO_CS is not set -# CONFIG_PCMCIA_WL3501 is not set -# CONFIG_HOSTAP is not set -CONFIG_ACX=y -CONFIG_ACX_MEM=y -# CONFIG_ACX_H4000 is not set -CONFIG_NET_WIRELESS=y - -# -# PCMCIA network device support -# -# CONFIG_NET_PCMCIA is not set - -# -# Wan interfaces -# -# CONFIG_WAN is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set -# CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set +# CONFIG_NETDEVICES is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -778,15 +507,14 @@ CONFIG_NET_WIRELESS=y # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_TSDEV=y -CONFIG_INPUT_TSDEV_SCREEN_X=240 -CONFIG_INPUT_TSDEV_SCREEN_Y=320 +# CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set @@ -799,9 +527,14 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set CONFIG_GPIO_KEYS=y CONFIG_KEYBOARD_ASIC3=y -# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_NAVPOINT is not set +# CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set @@ -839,10 +572,42 @@ CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=32 # +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_SA1100_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# # I2C support # -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y +CONFIG_I2C=m +# CONFIG_I2C_CHARDEV is not set # # I2C Algorithms @@ -854,8 +619,7 @@ CONFIG_I2C_CHARDEV=y # # I2C Hardware Bus support # -# CONFIG_I2C_ELV is not set -CONFIG_I2C_PXA=y +CONFIG_I2C_PXA=m # CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set @@ -872,6 +636,7 @@ CONFIG_I2C_PXA=y # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCA9535 is not set # CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set @@ -879,112 +644,31 @@ CONFIG_I2C_PXA=y # CONFIG_I2C_DEBUG_CHIP is not set # -# L3 serial bus support -# -# CONFIG_L3 is not set - -# -# Mice -# -# CONFIG_BUSMOUSE is not set - -# -# IPMI -# -# CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# -# CONFIG_WATCHDOG is not set -CONFIG_HW_RANDOM=y -# CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=y -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# - -# -# PCMCIA character devices -# -# CONFIG_SYNCLINK_CS is not set -# CONFIG_CARDMAN_4000 is not set -# CONFIG_CARDMAN_4040 is not set -# CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set - -# # SPI support # -CONFIG_SPI=y -CONFIG_SPI_DEBUG=y -CONFIG_SPI_MASTER=y +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set # -# SPI Master Controller Drivers +# Dallas's 1-wire bus # -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_PXA2XX is not set +# CONFIG_W1 is not set # -# SPI Protocol Masters +# Hardware Monitoring support # +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set # -# Dallas's 1-wire bus +# Hardware Monitoring - Battery # +# CONFIG_BATTERY_MONITOR is not set # -# Hardware Monitoring support +# L3 serial bus support # -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ABITUGURU is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM70 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47M192 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83791D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_L3 is not set # # SoC drivers @@ -993,38 +677,45 @@ CONFIG_HWMON=y # CONFIG_SOC_T7L66XB is not set # CONFIG_SOC_TC6387XB is not set # CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y +# CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_TSC2101 is not set +# CONFIG_SOC_TSC2200 is not set # # Misc devices # -CONFIG_BATTERY_MONITOR=y # # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +CONFIG_ADC_ADS7846_SSP=y +# CONFIG_TIFM_CORE is not set # # LED devices # -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y # # LED drivers # +CONFIG_LEDS_ASIC3=y # # LED Triggers # +# CONFIG_LEDS_TRIGGERS is not set # # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices @@ -1034,7 +725,7 @@ CONFIG_VIDEO_V4L2=y # # Graphics support # -CONFIG_FIRMWARE_EDID=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -1042,13 +733,14 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set -CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_IMAGEON is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y -CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_PXA_PARAMETERS is not set # CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set # # Console display driver support @@ -1088,21 +780,19 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_DYNAMIC_MINORS is not set -# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y -CONFIG_SND_VERBOSE_PRINTK=y -CONFIG_SND_DEBUG=y -CONFIG_SND_DEBUG_DETECT=y -# CONFIG_SND_PCM_XRUN_DEBUG is not set +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set # # Generic devices @@ -1115,9 +805,8 @@ CONFIG_SND_DEBUG_DETECT=y # # ALSA ARM devices # -CONFIG_SND_H4000=y -# CONFIG_SND_HTCSABLE is not set -CONFIG_SND_PXA2xx_I2SOUND=y +CONFIG_SND_H4000=m +CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_PXA2XX_AC97 is not set # @@ -1125,7 +814,12 @@ CONFIG_SND_PXA2xx_I2SOUND=y # # CONFIG_SND_VXPOCKET is not set # CONFIG_SND_PDAUDIOCF is not set -CONFIG_SND_UDA1380=y + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set +CONFIG_SND_UDA1380=m # # Open Sound System @@ -1148,7 +842,7 @@ CONFIG_USB_ARCH_HAS_HCD=y # USB Gadget Support # CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DEBUG_FILES=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set CONFIG_USB_GADGET_PXA2XX=y @@ -1158,16 +852,18 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ETH=y -# CONFIG_USB_ETH_RNDIS is not set +CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # @@ -1177,6 +873,7 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y # CONFIG_MMC_PXA is not set +# CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set CONFIG_MMC_ASIC3=y @@ -1185,7 +882,35 @@ CONFIG_MMC_ASIC3=y # Real Time Clock # CONFIG_RTC_LIB=y -# CONFIG_RTC_CLASS is not set +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_DEBUG=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set # # File systems @@ -1194,10 +919,12 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set @@ -1229,8 +956,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set @@ -1245,16 +974,6 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=1 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -1344,11 +1063,12 @@ CONFIG_NLS_UTF8=y # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_KERNEL=y -CONFIG_LOG_BUF_SHIFT=15 +CONFIG_LOG_BUF_SHIFT=16 CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set @@ -1364,9 +1084,10 @@ CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_FS is not set CONFIG_DEBUG_VM=y +# CONFIG_DEBUG_LIST is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set CONFIG_FORCED_INLINING=y +# CONFIG_HEADERS_CHECK is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_DEBUG_USER=y # CONFIG_DEBUG_WAITQ is not set @@ -1383,6 +1104,9 @@ CONFIG_DEBUG_ERRORS=y # Cryptographic options # CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set @@ -1392,6 +1116,8 @@ CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_CBC is not set CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set @@ -1421,6 +1147,4 @@ CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -CONFIG_REED_SOLOMON=y -CONFIG_REED_SOLOMON_DEC16=y CONFIG_PLIST=y diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb index b34d4630a0..ec5844bfb5 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.0.bb index 1ab29c0d57..6d47f9418f 100644 --- a/packages/musicpd/mpc_0.12.0.bb +++ b/packages/musicpd/mpc_0.12.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" SECTION = "console/multimedia" PR = "r0" -SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz" +SRC_URI = "http://www.musicpd.org/uploads/files/mpc-${PV}.tar.bz2" EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \ --with-iconv-includes=${STAGING_INCDIR}" diff --git a/packages/mythfront/mythfront-config.bb b/packages/mythfront/mythfront-config.bb index 2cb7362ae8..b53393e202 100644 --- a/packages/mythfront/mythfront-config.bb +++ b/packages/mythfront/mythfront-config.bb @@ -1,8 +1,7 @@ -PV = "1.8" +PV = "1.9" PR = "r0" -DEPENDS = "xfonts-xorg" -RDEPENDS_${PN} = "xfonts-xorg" +RDEPENDS_${PN} = "font-misc-misc" LICENSE = "MIT" SRC_URI = "file://tftp.sh file://xorg.conf" diff --git a/packages/mythtv/mythtv-0.20/.mtn2git_empty b/packages/mythtv/mythtv-0.20/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mythtv/mythtv-0.20/.mtn2git_empty diff --git a/packages/mythtv/mythtv-0.20/configure.patch b/packages/mythtv/mythtv-0.20/configure.patch new file mode 100644 index 0000000000..03281eb7e5 --- /dev/null +++ b/packages/mythtv/mythtv-0.20/configure.patch @@ -0,0 +1,90 @@ +--- mythtv-0.20/configure 2006-08-28 17:18:08.000000000 +0100 ++++ mythtv-0.20/configure 2007-01-16 14:42:18.000000000 +0000 +@@ -1225,49 +1225,50 @@ + + has_library() + { +- if test -f /etc/ld.so.conf ; then +- LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` ++ lib=`echo $1 | sed 's/^lib//'` ++ tmpfile=/tmp/conftest.$$ ++ rm -f $tmpfile $tmpfile.c ++ cat >$tmpfile.c <<EOF ++int main() { return 0; } ++EOF ++ echo "cc=$cc $LDFLAGS" ++ echo -n "checking for lib$lib... " ++ if $cc $LDFLAGS -o $tmpfile $tmpfile.c -l$lib; then ++ echo "yes" ++ result=0 + else +- LIBPATHS='' ++ echo "no" ++ result=1 + fi +- LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " +- # Mac OS X has a different variable for this: +- LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " +- +- # recurse down just one level, should be enough in most cases +- if test -f /etc/ld.so.conf ; then +- INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` +- SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` +- for x in $SRCH ; do +- LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` +- LIBPATHS="$LIBPATHS $LP_APPEND" +- done +- fi +- +- LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " +- +- HAS_IT="no" +- for LIBPATH in $LIBPATHS ; do +- if test x`ls $LIBPATH/$1* 2> /dev/null | head -n 1` != x"" ; then +- HAS_IT="yes" +- fi +- done +- expr $HAS_IT : "yes" > /dev/null ++ rm -f $tmpfile $tmpfile.c ++ return $result + } + + has_header() + { +- HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include" +- INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` +- HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` " +- +- HAS_IT="no" +- for HPATH in $HPATHS ; do +- if test x`ls $HPATH/$1* 2> /dev/null | head -n 1` != x"" ; then +- HAS_IT="yes" +- fi +- done +- expr $HAS_IT : "yes" > /dev/null ++ header=$1 ++ tmpfile=/tmp/conftest.$$ ++ rm -f $tmpfile.o $tmpfile.c ++ case $header in ++ X11/*) extra_incs="#include <X11/Xlib.h>" ;; ++ *) extra_incs="" ;; ++ esac ++ cat >$tmpfile.c <<EOF ++$extra_incs ++#include <$header> ++int main() { return 0; } ++EOF ++ echo "cc=$cc $CPPFLAGS $CFLAGS" ++ echo -n "checking for <$header>... " ++ if $cc $CPPFLAGS $CFLAGS -c -o $tmpfile.o $tmpfile.c; then ++ echo "yes" ++ result=0 ++ else ++ echo "no" ++ result=1 ++ fi ++ rm -f $tmpfile.o $tmpfile.c ++ return $result + } + + CCONFIG="$CCONFIG $compile_type" diff --git a/packages/mythtv/mythtv-0.20/libmyth-libdir.patch b/packages/mythtv/mythtv-0.20/libmyth-libdir.patch new file mode 100644 index 0000000000..0ecfddcb53 --- /dev/null +++ b/packages/mythtv/mythtv-0.20/libmyth-libdir.patch @@ -0,0 +1,11 @@ +--- mythtv-0.20/libs/libmyth/libmyth.pro 2006-08-20 07:45:34.000000000 +0100 ++++ mythtv-0.20/libs/libmyth/libmyth.pro 2007-01-16 14:54:59.000000000 +0000 +@@ -33,6 +33,8 @@ + SOURCES += DisplayResScreen.cpp util-x11.cpp qmdcodec.cpp + SOURCES += virtualkeyboard.cpp mythobservable.cpp mythsocket.cpp + ++DEFINES += LIBDIR=\"$${LIBDIR}\" ++ + INCLUDEPATH += ../libmythsamplerate ../libmythsoundtouch ../.. ../ + DEPENDPATH += ../libmythsamplerate ../libmythsoundtouch ../ ../libmythui + diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb new file mode 100644 index 0000000000..ab9060de94 --- /dev/null +++ b/packages/mythtv/mythtv_0.20.bb @@ -0,0 +1,97 @@ +DESCRIPTION = "A full featured personal video recorder system." +HOMEPAGE = "http://www.mythtv.org" +LICENSE = "GPL" +SECTION = "x11/multimedia" +DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc qt-x11-free openchrome" +PR = "r0" + +SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://libmyth-libdir.patch;patch=1" + +# Seen on the mythtv web page: +# http://www.mythtv.org/mc/fix-mythweb-in-0.20.diff;patch=1 + +inherit qmake qt3x11 + +# there is a -march=586 somewhere in the source tree +COMPATIBLE_HOST = 'i.86.*-linux' + +QMAKE_PROFILES = "mythtv.pro" + +mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia" +PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" + +FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode" +FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf" +RDEPENDS_mythtv-frontend = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats" +FILES_mythtv-bin = "${bindir}" +FILES_mythtv-filters = "${libdir}/mythtv/filters" +FILES_mythtv-data = "${datadir}" +RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" +ALLOW_EMPTY_${PN} = "1" + +PACKAGES_DYNAMIC = "mythtv-theme-*" + +python __anonymous () { + import bb + + mythlibs = bb.data.getVar('mythlibs', d).split() + pv = bb.data.expand(bb.data.getVar("PV", d), d) + + for m in mythlibs: + bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d) + bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d) + + packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split()) + + bb.data.setVar("PACKAGES", packages, d) +} + +def mythtv_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "x86" + elif arch == "x86_64": + arch = "x86" + elif arch == "arm": + arch = "armv4l" + return arch + +MYTHTV_ARCH := "${@mythtv_arch(d)}" + +do_configure_prepend() { +# it's not autotools anyway, so we call ./configure directly + find . -name "Makefile"|xargs rm -f + ./configure --prefix=/usr \ + --mandir=/usr/man \ + --cpu=${MYTHTV_ARCH} \ + --enable-mmx \ + --disable-altivec \ + --enable-v4l \ + --enable-audio-oss \ + --enable-proc-opt \ + --enable-xvmc \ + --enable-xvmc-pro \ + --enable-dvb \ + --dvb-path=${STAGING_INCDIR} + + sed 's!PREFIX =.*!PREFIX = ${prefix}!;/INCLUDEPATH += $${PREFIX}\/include/d' < settings.pro > settings.pro.new + mv settings.pro.new settings.pro +} + +do_install() { + oe_runmake INSTALL_ROOT=${D} install +} + +python populate_packages_prepend () { + new_packages = [] + + def the_hook(file, pkg, pattern, format, basename): + new_packages.append(pkg) + + do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True) + + bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d) +} diff --git a/packages/nbd/files/cross-compile.patch b/packages/nbd/files/cross-compile.patch index 654a3d7a48..1d0a135bb9 100644 --- a/packages/nbd/files/cross-compile.patch +++ b/packages/nbd/files/cross-compile.patch @@ -3,11 +3,11 @@ Cross Compile fixes: let us define those. -Index: nbd-2.8.4/configure.ac +Index: nbd-2.8.7/configure.ac =================================================================== ---- nbd-2.8.4.orig/configure.ac 2006-02-26 15:52:03.000000000 +0100 -+++ nbd-2.8.4/configure.ac 2006-05-25 21:35:26.000000000 +0200 -@@ -68,7 +68,8 @@ +--- nbd-2.8.7.orig/configure.ac 2006-10-17 19:42:11.000000000 +0200 ++++ nbd-2.8.7/configure.ac 2007-01-19 14:19:09.000000000 +0100 +@@ -68,15 +68,16 @@ man8_MANS=nbd-client.8 AC_MSG_RESULT(yes) ;; @@ -17,21 +17,20 @@ Index: nbd-2.8.4/configure.ac esac AC_MSG_CHECKING(where to find a working nbd.h) dnl We need to check for NBD_CMD_DISC, but that's part of an enum, it is not -@@ -82,8 +83,8 @@ - [int foo=NBD_CMD_DISC], - [AC_DEFINE(NBD_H_LOCAL, 1, Set to 1 if a (kernel 2.6) nbd.h can be found in the current directory) - NBD_H='"nbd.h"'], -- AC_TRY_COMPILE([#define u32 int + dnl #define'd. Therefore, we check for something which is differently #define'd + dnl in the old or new versions, even if we don't really care about that. + dnl This might break at some time, but it should work for now, so... +-AC_TRY_COMPILE([#define u32 int -#define u64 int -+ AC_TRY_COMPILE([#define __u32 int ++AC_TRY_COMPILE([#define __u32 int +#define __u64 int - #include <linux/nbd.h> - ], - [int foo=NBD_CMD_DISC], -Index: nbd-2.8.4/cliserv.h + #define __be32 int + #define __be64 int + #include "nbd.h" +Index: nbd-2.8.7/cliserv.h =================================================================== ---- nbd-2.8.4.orig/cliserv.h 2006-01-06 18:02:03.000000000 +0100 -+++ nbd-2.8.4/cliserv.h 2006-05-25 21:41:25.000000000 +0200 +--- nbd-2.8.7.orig/cliserv.h 2006-10-17 19:29:12.000000000 +0200 ++++ nbd-2.8.7/cliserv.h 2007-01-19 14:17:15.000000000 +0100 @@ -17,20 +17,26 @@ #if SIZEOF_UNSIGNED_SHORT_INT==4 diff --git a/packages/nbd/nbd_2.8.4.bb b/packages/nbd/nbd_2.8.7.bb index 103c2053c7..2241fea71e 100644 --- a/packages/nbd/nbd_2.8.4.bb +++ b/packages/nbd/nbd_2.8.7.bb @@ -4,16 +4,18 @@ HOMEPAGE = "http://nbd.sourceforge.net" DEPENDS = "glib-2.0" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2;md5sum=1b5a0866d025b98d1c24fe19a4f628c3 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2;md5sum=bc7995b4961385269abc645575bcaf4d \ file://cross-compile.patch;patch=1 " inherit autotools -PACKAGES = "nbd-client nbd-server" +PACKAGES = "nbd-client nbd-server nbd-client-dbg nbd-server-dbg" PACKAGES += "nbd-client-doc nbd-server-doc" FILES_nbd-client = "/usr/sbin/nbd-client" FILES_nbd-server = "/usr/bin/nbd-server" +FILES_nbd-client-dbg = "/usr/sbin/.debug/nbd-client" +FILES_nbd-server-dbg = "/usr/bin/.debug/nbd-server" FILES_nbd-client-doc = "/usr/share/man/man8/*" FILES_nbd-server-doc = "/usr/share/man/man1/*" diff --git a/packages/openchrome/openchrome_svn.bb b/packages/openchrome/openchrome_svn.bb index d5de8afce9..d680ebfbbb 100644 --- a/packages/openchrome/openchrome_svn.bb +++ b/packages/openchrome/openchrome_svn.bb @@ -11,7 +11,7 @@ FILES_libviaXvMCPro-dev = "${libdir}/libviaXvMCPro.so ${libdir}/libviaXvMCPro.la FILES_libviaXvMC-dbg = "${libdir}/.debug/libviaXvMC.so.*" FILES_libviaXvMCPro-dbg = "${libdir}/.debug/libviaXvMCPro.so.*" -DEPENDS = "xserver-xorg" +DEPENDS = "xserver-xorg libxvmc" inherit autotools xorg-module diff --git a/packages/portmap/portmap-5-25/.mtn2git_empty b/packages/portmap/portmap-5-25/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/portmap/portmap-5-25/.mtn2git_empty diff --git a/packages/portmap/portmap-5-24/make.patch b/packages/portmap/portmap-5-25/make.patch index 7726846b7c..7726846b7c 100644 --- a/packages/portmap/portmap-5-24/make.patch +++ b/packages/portmap/portmap-5-25/make.patch diff --git a/packages/portmap/portmap_5-24.bb b/packages/portmap/portmap_5-25.bb index 064679e7f0..064679e7f0 100644 --- a/packages/portmap/portmap_5-24.bb +++ b/packages/portmap/portmap_5-25.bb diff --git a/packages/prism3-support/files/hostap-fw-load b/packages/prism3-support/files/hostap-fw-load index 707030c6a7..d0a002bbbb 100644 --- a/packages/prism3-support/files/hostap-fw-load +++ b/packages/prism3-support/files/hostap-fw-load @@ -1,7 +1,7 @@ #!/bin/sh # dont handle non-wireless interfaces -if [ -n `cat /proc/net/wireless|grep $IFACE` ]; then +if [ -n "`cat /proc/net/wireless|grep $IFACE`" ]; then exit 0 fi @@ -23,4 +23,4 @@ fi # lets hope that run-parts obeys the order :D -exit 0
\ No newline at end of file +exit 0 diff --git a/packages/prism3-support/prism3-support_1.0.0.bb b/packages/prism3-support/prism3-support_1.0.0.bb index b3c00e422f..88623a4305 100644 --- a/packages/prism3-support/prism3-support_1.0.0.bb +++ b/packages/prism3-support/prism3-support_1.0.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "prism3-firmware hostap-utils" RDEPENDS = "prism3-firmware hostap-utils" PACKAGE_ARCH = "all" -PR = "r3" +PR = "r4" SRC_URI = "file://hostap-fw-load" diff --git a/packages/pulseaudio/pulseaudio_0.9.2.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb index abfc42957f..68c6889540 100644 --- a/packages/pulseaudio/pulseaudio_0.9.2.bb +++ b/packages/pulseaudio/pulseaudio_0.9.5.bb @@ -3,24 +3,44 @@ HOMEPAGE = "http://www.pulseaudio.org" AUTHOR = "Lennart Poettering" SECTION = "libs/multimedia" LICENSE = "LGPL" -DEPENDS = "liboil libsamplerate0 libsndfile1 libtool" + +DEPENDS = "liboil avahi libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "alsa-lib" -PR = "r1" + +PROVIDES = "esound" +RPROVIDES = "esound" + +PR = "r2" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz" inherit autotools -EXTRA_OECONF = "--disable-lynx --without-x --without-glib --without-jack --with-alsa --with-oss" +EXTRA_OECONF = "\ + --disable-lynx \ + --without-x \ + --without-glib \ + --without-jack \ + --with-alsa \ + --with-oss \ + " PARALLEL_MAKE = "" LEAD_SONAME = "libpulse.so" + PACKAGES =+ "${PN}-conf ${PN}-bin" PACKAGES_DYNAMIC = "pulseaudio-module-* pulseaudio-lib-*" + FILES_${PN}-conf = "${sysconfdir}" -FILES_${PN}-bin = "${bindir}" +FILES_${PN}-bin = "${bindir}/*" + +CONFFILES_${PN}-conf = "\ + ${sysconfdir}/pulse/default.pa \ + ${sysconfdir}/pulse/daemon.conf \ + ${sysconfdir}/pulse/client.conf \ + " python populate_packages_prepend() { #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d) diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc new file mode 100644 index 0000000000..b15dc270ee --- /dev/null +++ b/packages/qt/qt-x11-free-common.inc @@ -0,0 +1,86 @@ +DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "GPL QPL" +HOMEPAGE = "http://www.trolltech.com" + +S = "${WORKDIR}/qt-x11-free-${PV}" + +inherit qmake-base qt3x11 + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3" +ARCH_i686 = "x86" +EXTRA_OEMAKE = "-e" + +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"' + +do_configure() { + echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql + # force regenerate + rm -f src/qtmain.pro + cat Makefile >makefile + find . -name "Makefile"|xargs rm -f + (cd src && qmake -spec ${QMAKESPEC} ) + (cd plugins/src && qmake -spec ${QMAKESPEC} ) + (cd tools && qmake -spec ${QMAKESPEC} ) + (cd tools/qvfb && qmake -spec ${QMAKESPEC} ) +} + +do_compile() { + unset CFLAGS + unset CXXFLAGS + oe_runmake -C src ${EXTRA_ENV} + oe_runmake -C plugins/src ${EXTRA_ENV} + oe_runmake -C tools ${EXTRA_ENV} + oe_runmake -C tools/qvfb ${EXTRA_ENV} +} + +do_stage() { + install -d ${STAGING_QT_DIR}/bin + ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc + ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic + ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake + install -d ${STAGING_QT_DIR}/lib + oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib + install -d ${STAGING_QT_DIR}/include/private + for f in include/*.h + do + install -m 0644 $f ${STAGING_QT_DIR}/include/ + done + for f in include/private/*.h + do + install -m 0644 $f ${STAGING_QT_DIR}/include/private + done + for f in lib/*.prl + do + install -m 0644 $f ${STAGING_QT_DIR}/lib + done +} + +do_install() { + install -d ${D}${libdir}/ + oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ + install -d ${D}${bindir}/ + install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} + install -d ${D}${prefix}/plugins/ + cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ +} + +PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ + qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" +FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats" +FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers" +FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer" +FILES_qt-x11-designer = "${bindir}/designer" +FILES_qt-x11-assistant = "${bindir}/assistant" +FILES_qt-x11-qvfb = "${bindir}/qvfb" +FILES_qt-x11-qtconfig = "${bindir}/qtconfig" diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb index 51228b4d30..d5df55cbb4 100644 --- a/packages/qt/qt-x11-free_3.3.6.bb +++ b/packages/qt/qt-x11-free_3.3.6.bb @@ -1,8 +1,3 @@ -DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework" -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -HOMEPAGE = "http://www.trolltech.com" DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa" PROVIDES = "qt3x11" PR = "r1" @@ -11,83 +6,5 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://no-examples.patch;patch=1 \ file://gcc4_1-HACK.patch;patch=1" -S = "${WORKDIR}/qt-x11-free-${PV}" -inherit qmake-base qt3x11 - -export QTDIR = "${S}" -STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3" -ARCH_i686 = "x86" -EXTRA_OEMAKE = "-e" - -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose" - -EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"' - -do_configure() { - echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql - # force regenerate - rm -f src/qtmain.pro - cat Makefile >makefile - find . -name "Makefile"|xargs rm -f - (cd src && qmake -spec ${QMAKESPEC} ) - (cd plugins/src && qmake -spec ${QMAKESPEC} ) - (cd tools && qmake -spec ${QMAKESPEC} ) - (cd tools/qvfb && qmake -spec ${QMAKESPEC} ) -} - -do_compile() { - unset CFLAGS - unset CXXFLAGS - oe_runmake -C src ${EXTRA_ENV} - oe_runmake -C plugins/src ${EXTRA_ENV} - oe_runmake -C tools ${EXTRA_ENV} - oe_runmake -C tools/qvfb ${EXTRA_ENV} -} - -do_stage() { - install -d ${STAGING_QT_DIR}/bin - ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc - ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic - ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake - install -d ${STAGING_QT_DIR}/lib - oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib - install -d ${STAGING_QT_DIR}/include/private - for f in include/*.h - do - install -m 0644 $f ${STAGING_QT_DIR}/include/ - done - for f in include/private/*.h - do - install -m 0644 $f ${STAGING_QT_DIR}/include/private - done - for f in lib/*.prl - do - install -m 0644 $f ${STAGING_QT_DIR}/lib - done -} - -do_install() { - install -d ${D}${libdir}/ - oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ - install -d ${D}${bindir}/ - install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} - install -d ${D}${prefix}/plugins/ - cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ -} - -PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ - qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" -FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats" -FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers" -FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer" -FILES_qt-x11-designer = "${bindir}/designer" -FILES_qt-x11-assistant = "${bindir}/assistant" -FILES_qt-x11-qvfb = "${bindir}/qvfb" -FILES_qt-x11-qtconfig = "${bindir}/qtconfig" +require qt-x11-free-common.inc diff --git a/packages/qt/qt-x11-free_3.3.7.bb b/packages/qt/qt-x11-free_3.3.7.bb new file mode 100644 index 0000000000..3c8533e608 --- /dev/null +++ b/packages/qt/qt-x11-free_3.3.7.bb @@ -0,0 +1,10 @@ +DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa" +PROVIDES = "qt3x11" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://no-examples.patch;patch=1 \ + file://gcc4_1-HACK.patch;patch=1" + +require qt-x11-free-common.inc diff --git a/packages/quilt/quilt-native.inc b/packages/quilt/quilt-native.inc index b7ddd8bce8..5861b2229c 100644 --- a/packages/quilt/quilt-native.inc +++ b/packages/quilt/quilt-native.inc @@ -1,7 +1,7 @@ require quilt_${PV}.inc SRC_URI_append_build-darwin = "? file://non-gnu.patch;patch=1 " -RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native" +RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/quilt-${PV}" INHIBIT_AUTOTOOLS_DEPS = "1" diff --git a/packages/quilt/quilt.inc b/packages/quilt/quilt.inc index b1d19daf45..ee90455fca 100644 --- a/packages/quilt/quilt.inc +++ b/packages/quilt/quilt.inc @@ -2,6 +2,7 @@ DESCRIPTION = "Tool to work with series of patches." HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/" SECTION = "devel" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz " diff --git a/packages/quilt/quilt_0.39.bb b/packages/quilt/quilt_0.39.bb index 9a08b19abd..5d8ae086c2 100644 --- a/packages/quilt/quilt_0.39.bb +++ b/packages/quilt/quilt_0.39.bb @@ -1,4 +1,4 @@ -RDEPENDS_${PN} += "patch diffstat bzip2" +RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" require quilt_${PV}.inc diff --git a/packages/quilt/quilt_0.45.bb b/packages/quilt/quilt_0.45.bb index cf96cc9bc9..d809c83518 100644 --- a/packages/quilt/quilt_0.45.bb +++ b/packages/quilt/quilt_0.45.bb @@ -1,4 +1,4 @@ -RDEPENDS_${PN} += "patch diffstat bzip2" +RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" require quilt_${PV}.inc diff --git a/packages/ruby/files/.mtn2git_empty b/packages/ruby/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ruby/files/.mtn2git_empty diff --git a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch b/packages/ruby/files/disable_wide_getaddrinfo_check.patch index 82137896b9..82137896b9 100644 --- a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch +++ b/packages/ruby/files/disable_wide_getaddrinfo_check.patch diff --git a/packages/ruby/ruby-1.8.5/extmk_run.patch b/packages/ruby/files/extmk_run.patch index 57926f51b0..57926f51b0 100644 --- a/packages/ruby/ruby-1.8.5/extmk_run.patch +++ b/packages/ruby/files/extmk_run.patch diff --git a/packages/ruby/ruby-native_1.8.5.bb b/packages/ruby/ruby-native_1.8.5.bb index d5ccae8262..e4d2a3361e 100644 --- a/packages/ruby/ruby-native_1.8.5.bb +++ b/packages/ruby/ruby-native_1.8.5.bb @@ -1,3 +1,2 @@ -include ruby_${PV}.bb +require ruby.inc inherit native -DEPENDS = "" diff --git a/packages/ruby/ruby.inc b/packages/ruby/ruby.inc new file mode 100644 index 0000000000..9fe8333f6f --- /dev/null +++ b/packages/ruby/ruby.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "Ruby is an interpreted scripting language \ +for quick and easy object-oriented programming." +SECTION = "devel/ruby" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \ + file://extmk_run.patch;patch=1 \ + file://disable_wide_getaddrinfo_check.patch;patch=1" + +S = "${WORKDIR}/ruby-${PV}" + +inherit autotools + +# This snippet lets compiled extensions which rely on external libraries, +# such as zlib, compile properly. If we don't do this, then when extmk.rb +# runs, it uses the native libraries instead of the target libraries, and so +# none of the linking operations succeed -- which makes extconf.rb think +# that the libraries aren't available and hence that the extension can't be +# built. + +do_configure_prepend() { + sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk + rm -rf ${S}/ruby/ +} diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb index 972d56e14c..d06e9e0943 100644 --- a/packages/ruby/ruby_1.8.5.bb +++ b/packages/ruby/ruby_1.8.5.bb @@ -1,25 +1,2 @@ -DESCRIPTION = "Ruby is an interpreted scripting language \ -for quick and easy object-oriented programming." -SECTION = "devel/ruby" +require ruby.inc DEPENDS = "ruby-native zlib openssl" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz \ - file://extmk_run.patch;patch=1 \ - file://disable_wide_getaddrinfo_check.patch;patch=1" - -S = "${WORKDIR}/ruby-${PV}" - -inherit autotools - -# This snippet lets compiled extensions which rely on external libraries, -# such as zlib, compile properly. If we don't do this, then when extmk.rb -# runs, it uses the native libraries instead of the target libraries, and so -# none of the linking operations succeed -- which makes extconf.rb think -# that the libraries aren't available and hence that the extension can't be -# built. - -do_configure_prepend() { - sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk -} diff --git a/packages/soundtracker/soundtracker-gtk2_0.6.7.bb b/packages/soundtracker/soundtracker-gtk2_0.6.7.bb index a71abda875..8070b89270 100644 --- a/packages/soundtracker/soundtracker-gtk2_0.6.7.bb +++ b/packages/soundtracker/soundtracker-gtk2_0.6.7.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Music composition program in the style of AMIGA Impulse Tracker" -DEPENDS = "gtk+ libgnomeui audiofile esound-gpe alsa-lib" +DEPENDS = "gtk+ libgnomeui audiofile esound alsa-lib" LICENSE = "GPL" SECTION = "x11/multimedia" PR = "r1" diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb index edd78558c3..2dc8da8bc1 100644 --- a/packages/starling/starling_0.1.bb +++ b/packages/starling/starling_0.1.bb @@ -6,7 +6,7 @@ PR = "r1" inherit gpe autotools DESCRIPTION = "Starling audio player for GPE" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound-gpe" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound" RDEPENDS = "esd \ gst-plugins \ gst-plugin-audio \ diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index d7e4d20076..7fa7c11322 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -108,7 +108,7 @@ RDEPENDS_task-sdk-x11-ext := "\ RDEPENDS_task-sdk-gpe := "\ libcontactsdb-dev \ - esound-gpe-dev \ + esound-dev \ libeventdb-dev \ libgpepimc-dev \ libgpevtype-dev \ diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb index 71aec2a8b0..bd6841f025 100644 --- a/packages/tasks/task-xfce-base.bb +++ b/packages/tasks/task-xfce-base.bb @@ -3,12 +3,13 @@ # Released under the MIT license (see packages/COPYING) DESCRIPTION = "All packages required for an base XFCE installation" +LICENSE = "MIT" ALLOW_EMPTY = "1" PACKAGES = "${PN}" -PR = "r1" +PR = "r2" RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \ - xfce-utils-mcs-plugins xfce4-panel-mcs-plugins \ + xfce4-panel-mcs-plugins \ xfdesktop-mcs-plugins" -LICENSE = "MIT" +RRECOMMENDS = "xfce-utils-mcs-plugins" diff --git a/packages/vincent/.mtn2git_empty b/packages/vincent/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/vincent/.mtn2git_empty diff --git a/packages/vincent/vincent_svn.bb b/packages/vincent/vincent_svn.bb new file mode 100644 index 0000000000..87e111875a --- /dev/null +++ b/packages/vincent/vincent_svn.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Vincent OpenGL-ES library " +HOMEPAGE = "http://sourceforge.net/projects/ogl-es/" +LICENSE = "BSD" + +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://svn.sourceforge.net/svnroot/ogl-es/branches;module=linux_nokia_770;proto=https" + +S = "${WORKDIR}/linux_nokia_770/ogles/projects/linux-x11" + +TOP = "${WORKDIR}/linux_nokia_770/ogles/" + +inherit autotools pkgconfig + +# PACKAGES = ${PN} + +do_stage() { + install -d ${STAGING_INCDIR}/GLES + + install -m 0644 ${TOP}/include/ug.h ${STAGING_INCDIR} + install -m 0644 ${TOP}/include/GLES/* ${STAGING_INCDIR}/GLES/ + + oe_libinstall -so libvincent ${STAGING_LIBDIR} +} diff --git a/packages/vino/vino_2.16.0.bb b/packages/vino/vino_2.16.0.bb index a7639a248d..b2d1a5fb08 100644 --- a/packages/vino/vino_2.16.0.bb +++ b/packages/vino/vino_2.16.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Vino is an integrated VNC server for GNOME." LICENSE = "GPLv2" -DEPENDS = "libgnomeui libglade gnome-keyring esound-gpe dbus-glib libxml2 gnutls gnome-vfs" +DEPENDS = "libgnomeui libglade gnome-keyring esound dbus-glib libxml2 gnutls gnome-vfs" inherit gnome gconf diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager.inc b/packages/xfce-mcs-manager/xfce-mcs-manager.inc index d913910d69..c50bf0ca64 100644 --- a/packages/xfce-mcs-manager/xfce-mcs-manager.inc +++ b/packages/xfce-mcs-manager/xfce-mcs-manager.inc @@ -5,6 +5,7 @@ DESCRIPTION="XFCE4 Settings manager." DEPENDS="libxfcegui4 libxfce4mcs" SECTION = "x11" +PR = "r1" inherit xfce @@ -20,5 +21,5 @@ do_stage() { do_stage_append () { install -d ${PKG_CONFIG_PATH} - install -m 0644 ${S}/xfce-mcs-manager/xfce-mcs-manager.pc ${PKG_CONFIG_PATH}/xfce-mcs-manager.pc + sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_PATH}/xfce-mcs-manager.pc } diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce-utils/xfce-utils.inc index 3de7625940..0b191194d7 100644 --- a/packages/xfce-utils/xfce-utils.inc +++ b/packages/xfce-utils/xfce-utils.inc @@ -6,21 +6,24 @@ DESCRIPTION="XFCE4 Utilities" DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" inherit xfce -FILES_${PN} += " /usr/share/xfce4/AUTHORS \ - /usr/share/xfce4/BSD \ - /usr/share/xfce4/COPYING \ - /usr/share/xfce4/GPL \ - /usr/share/xfce4/INFO \ - /usr/share/xfce4/LGPL \ - /usr/share/xfce4/AUTHORS.html \ - /usr/share/xfce4/BSD.html \ - /usr/share/xfce4/COPYING.html \ - /usr/share/xfce4/GPL.html \ - /usr/share/xfce4/INFO.html \ - /usr/share/xfce4/LGPL.html" +FILES_${PN} += " \ + ${bindir}/* \ + ${datadir}/dbus-1/* \ + ${datadir}/xfce4/AUTHORS \ + ${datadir}/xfce4/BSD \ + ${datadir}/xfce4/COPYING \ + ${datadir}/xfce4/GPL \ + ${datadir}/xfce4/INFO \ + ${datadir}/xfce4/LGPL \ + ${datadir}/xfce4/AUTHORS.html \ + ${datadir}/xfce4/BSD.html \ + ${datadir}/xfce4/COPYING.html \ + ${datadir}/xfce4/GPL.html \ + ${datadir}/xfce4/INFO.html \ + ${datadir}/xfce4/LGPL.html" -PACKAGES += "${PN}-mcs-plugins" -FILES_${PN}-mcs-plugins = "/usr/lib/xfce4/mcs-plugins/" +PACKAGES =+ "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/" # NOTE: This package takes a --with-browser for the default browser # NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce-utils/xfce-utils_4.3.99.2.bb b/packages/xfce-utils/xfce-utils_4.3.99.2.bb index 57909f2c2d..472ba68a14 100644 --- a/packages/xfce-utils/xfce-utils_4.3.99.2.bb +++ b/packages/xfce-utils/xfce-utils_4.3.99.2.bb @@ -2,5 +2,5 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -PR = "r1" +PR = "r2" require ${PN}.inc diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfdesktop/xfdesktop.inc index 380832d7c3..e3e64ef355 100644 --- a/packages/xfdesktop/xfdesktop.inc +++ b/packages/xfdesktop/xfdesktop.inc @@ -4,7 +4,7 @@ DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" -DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" inherit xfce PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" @@ -12,5 +12,3 @@ PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*" FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so" - - diff --git a/packages/xfprint/xfprint_4.3.99.2.bb b/packages/xfprint/xfprint_4.3.99.2.bb new file mode 100644 index 0000000000..7e349ce881 --- /dev/null +++ b/packages/xfprint/xfprint_4.3.99.2.bb @@ -0,0 +1,9 @@ +# xfprint OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="XFCE4 Print Manager" +SECTION = "x11/base" + +DEPENDS="libxfcegui4" +inherit xfce diff --git a/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb b/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb new file mode 100644 index 0000000000..9f67ad2ed9 --- /dev/null +++ b/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb @@ -0,0 +1,5 @@ +# xfwm4-themes OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc diff --git a/packages/xfwm4/xfwm4_4.3.99.2.bb b/packages/xfwm4/xfwm4_4.3.99.2.bb new file mode 100644 index 0000000000..e1feff01f1 --- /dev/null +++ b/packages/xfwm4/xfwm4_4.3.99.2.bb @@ -0,0 +1,5 @@ +# xfwm4 OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 2b174d3d7f..0a91cfed12 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -11,7 +11,7 @@ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ -libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ +libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext virtual/libx11 \ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native" RDEPENDS="rgb" @@ -27,13 +27,17 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-builddocs" -PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils" +PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xnest ${PN}-dmx" -FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" +FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print ${bindir}/Xprt" FILES_${PN}-xvfb = "${bindir}/Xvfb" +FILES_${PN}-xnest = "${bindir}/Xnest" +FILES_${PN}-dmx = "${bindir}/Xdmx ${bindir}/dmx* ${bindir}/xdmxconfig ${bindir}/xdmx ${bindir}/vdltodmx" FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/modules ${libdir}/xorg/modules /etc/X11 " +FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so /etc/X11" FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" +FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug ${libdir}/xorg/modules/*/.debug" +FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" do_stage() { autotools_stage_all diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb index 2a7ba03431..06270e4316 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb @@ -1,5 +1,7 @@ require xorg-xserver-common.inc +PR = "r1" + #DESCRIPTION = "" #DEPENDS += " " diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb index 3db5c640c7..acf1f2abb0 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb @@ -2,6 +2,8 @@ require xorg-xserver-common.inc SRC_URI += "file://drmfix.patch;patch=1" +PR = "r1" + EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " #DESCRIPTION = "" |