Merge branch 'openelec-next' of git://github.com/OpenELEC/OpenELEC.tv into openelec-pvr

config/options

@@ -85,9 +85,9 @@ get_graphicdrivers() {
     [ "$drv" = "i965" ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
     [ "$drv" = "r200" ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
     [ "$drv" = "r300" ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
-    [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
+#    [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
     [ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
-    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
+#    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
     [ "$drv" = "omapfb" ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"
 
     if [ "$drv" = "i915" -o "$drv" = "i965" ]; then

packages/debug/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools htop"
+PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools htop mrxvt"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

packages/debug/mrxvt/build

@@ -0,0 +1,66 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+ac_cv_func_setpgrp_void=no \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-minimal \
+            --disable-frills \
+            --enable-keepscrolling \
+            --disable-selectionscrolling \
+            --enable-mousewheel \
+            --disable-mouseslipwheel \
+            --enable-rxvt-scroll \
+            --disable-half-shadow \
+            --enable-lastlog \
+            --enable-sessionmgr \
+            --enable-linespace \
+            --enable-24bits \
+            --enable-256colors \
+            --enable-cursor-blink \
+            --enable-pointer-blank \
+            --disable-text-shadow \
+            --enable-menubar \
+            --disable-transparency \
+            --disable-tinting \
+            --enable-xrender \
+            --disable-xpm \
+            --disable-jpeg \
+            --disable-png \
+            --enable-xft \
+            --enable-ttygid \
+            --enable-backspace-key \
+            --enable-delete-key \
+            --disable-resources \
+            --disable-swapscreen
+
+#            --x-includes=$SYSROOT_PREFIX/usr/include \
+#            --x-libraries=$SYSROOT_PREFIX/usr/lib \
+
+make
+
+$STRIP src/$1

packages/debug/mrxvt/install

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options
+
+mkdir -p $INSTALL/usr/bin
+  cp -P $PKG_DIR/scripts/$1-session $INSTALL/usr/bin
+  cp -P $PKG_BUILD/src/$1 $INSTALL/usr/bin
+

packages/debug/mrxvt/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="mrxvt"
+PKG_VERSION="0.5.4"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://materm.sourceforge.net/"
+PKG_URL="$SOURCEFORGE_SRC/materm/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="libX11 libXrender freetype"
+PKG_BUILD_DEPENDS="toolchain libX11 libXrender freetype"
+PKG_PRIORITY="optional"
+PKG_SECTION="debug"
+PKG_SHORTDESC="mrxvt: Lightweight Xterm replacement"
+PKG_LONGDESC="Mrxvt (previously named as materm) is a lightweight and powerful multi-tabbed X terminal emulator based on the popular rxvt and aterm. It implements many useful features seen in some modern X terminal emulators, like gnome-terminal and konsole, but keep to be lightweight and independent from the GNOME and KDE desktop environment."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/debug/mrxvt/profile.d/terminal.conf

@@ -0,0 +1,10 @@
+################################################################################
+# Core (PATH) environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+TERMINAL="/usr/bin/mrxvt-session"
+
+export TERMINAL

packages/debug/mrxvt/scripts/mrxvt-session

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. /etc/profile
+
+# start Windowmanager by default
+  $WINDOWMANAGER -term mrxvt &
+
+# start terminal
+  mrxvt

packages/graphics/Mesa/build

@@ -33,7 +33,8 @@ get_graphicdrivers
   LDFLAGS=""
 
 MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965"
-MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga --disable-gallium-swrast"
+MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r300 --disable-gallium-r600"
+MESA_CONFIG="$MESA_CONFIG --disable-gallium-svga --disable-gallium-swrast"
 
 for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = i915 ] && \
@@ -45,8 +46,13 @@ for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = radeon ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/disable-gallium-radeon/'`
 
+  [ "$drv" = r300 ] && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/disable-gallium-r300/'`
+
   [ "$drv" = r600 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/disable-gallium-r600/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'`
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx"
 
   [ "$drv" = nouveau ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \

packages/graphics/Mesa/meta

@@ -36,6 +36,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$MESA_MASTER" = "yes" ]; then
-  PKG_VERSION="6067a2a"
+  PKG_VERSION="7.11-git2812b60"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi

packages/linux/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="2.6.39-rc6"
+PKG_VERSION="2.6.39-rc7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/patches/linux-2.6.39-rc6-056_mceusb_add_DELL_receiver-0.1.patch

@@ -1,12 +0,0 @@
-diff -Naur linux-2.6.39-rc5/drivers/media/rc/mceusb.c linux-2.6.39-rc5.patch/drivers/media/rc/mceusb.c
---- linux-2.6.39-rc5/drivers/media/rc/mceusb.c	2011-04-27 05:48:50.000000000 +0200
-+++ linux-2.6.39-rc5.patch/drivers/media/rc/mceusb.c	2011-04-29 18:10:32.361073307 +0200
-@@ -220,6 +220,8 @@
- 	{ USB_DEVICE(VENDOR_PHILIPS, 0x206c) },
- 	/* Philips/Spinel plus IR transceiver for ASUS */
- 	{ USB_DEVICE(VENDOR_PHILIPS, 0x2088) },
-+	/* Philips RC6 Transceiver, Dell branded */
-+	{ USB_DEVICE(VENDOR_PHILIPS, 0x2093) },
- 	/* Realtek MCE IR Receiver and card reader */
- 	{ USB_DEVICE(VENDOR_REALTEK, 0x0161),
- 	  .driver_info = MULTIFUNCTION },

packages/linux/patches/linux-2.6.39-rc7-057_media-ite-cir-make-IR-receive-work-after-resume.patch

@@ -0,0 +1,13 @@
+diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
+index 43908a7..8488e53 100644
+--- a/drivers/media/rc/ite-cir.c
++++ b/drivers/media/rc/ite-cir.c
+@@ -1684,6 +1684,8 @@ static int ite_resume(struct pnp_dev *pdev)
+ 		/* wake up the transmitter */
+ 		wake_up_interruptible(&dev->tx_queue);
+ 	} else {
++		/* reinitialize hardware config registers */
++		dev->params.init_hardware(dev);
+ 		/* enable the receiver */
+ 		dev->params.enable_rx(dev);
+ 	}

packages/x11/lib/libXext/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libXext"
-PKG_VERSION="1.2.0"
+PKG_VERSION="1.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/x11/xserver/xorg-server/build

@@ -102,7 +102,7 @@ cd $PKG_BUILD
             --with-int10=x86emu \
             --disable-ipv6 \
             --with-gnu-ld \
-            --with-sha1=libgcrypt \
+            --with-sha1=libcrypto \
             --with-os-vendor="OpenELEC.tv" \
             --with-module-dir=$XORG_PATH_MODULES \
             --with-xkb-path=$XORG_PATH_XKB \

packages/x11/xserver/xorg-server/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="xorg-server"
-PKG_VERSION="1.10.1"
+PKG_VERSION="1.10.1.901"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libpciaccess freetype libgcrypt libX11 libXfont libdrm Mesa pixman udev"
-PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa libgcrypt freetype pixman fontsproto udev"
+PKG_DEPENDS="libpciaccess freetype libX11 libXfont libdrm Mesa openssl pixman udev"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto udev"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/xserver"
 PKG_SHORTDESC="xorg-server: The Xorg X server"

projects/ATV/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.39-rc6 Kernel Configuration
+# Linux/i386 2.6.39-rc7 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2256,6 +2256,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set

projects/Fusion/options

@@ -0,0 +1,246 @@
+# Name of the Distro to build (full name, without special charcters)
+  DISTRONAME="OpenELEC"
+
+# Welcome Message for e.g. SSH Server (up to 5 Lines)
+  GREATING0="##############################################"
+  GREATING1="# OpenELEC - The living room PC for everyone #"
+  GREATING2="# ...... visit http://www.openelec.tv ...... #"
+  GREATING3="##############################################"
+  GREATING4=""
+
+# Hostname for target system (openelec)
+  HOSTNAME="openelec"
+
+# Root password to integrate in the target system
+  ROOT_PASSWORD="openelec"
+
+# User to integrate in the target system
+  USER_NAME="openelec"
+
+# User group to integrate in the target system
+  USER_GROUP="openelec"
+
+# User password to integrate in the target system
+  USER_PASSWORD="openelec"
+
+# The TARGET_CPU variable controls which processor should be targeted for
+# generated code.
+  case $TARGET_ARCH in
+    i386)
+      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+      #               athlon-fx athlon-mp athlon-xp athlon-4
+      #               athlon-tbird athlon k6-3 k6-2 k6 geode
+      # (Intel CPUs)  atom core2 nocona prescott pentium4[m] pentium3[m]
+      #               pentium-m pentium2 pentiumpro pentium-mmx pentium
+      #               i686 i586 i486 i386
+      # (VIA CPUs)    c3 c3-2
+      #
+      TARGET_CPU="atom"
+      ;;
+
+    x86_64)
+      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+      #               athlon-fx amdfam10 barcelona
+      # (Intel CPUs)  atom core2 nocona
+      #
+      TARGET_CPU="amdfam10"
+      ;;
+
+    arm)
+      # TARGET_CPU:
+      # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+      # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
+      # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
+      # arm720t arm740t strongarm strongarm110 strongarm1100
+      # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
+      # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
+      # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
+      # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
+      # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
+      # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
+      #
+      TARGET_CPU="cortex-a9"
+
+      # TARGET_FPU:
+      # This specifies what floating point hardware (or hardware emulation) is
+      # available on the target. Permissible names are:
+      # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
+      # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
+      # neon-vfpv4.
+      TARGET_FPU="neon"
+      ;;
+  esac
+
+# Build optimizations (size/normal/speed)
+  OPTIMIZATIONS="speed"
+
+# Project CFLAGS
+  PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"
+
+# Bootloader to use (syslinux / u-boot)
+  BOOTLOADER="syslinux"
+
+# Configuration for u-boot
+  UBOOT_CONFIG=""
+
+# Kernel to use. values can be:
+# default:  default mainline kernel
+# ti-omap4: Ti's OMAP4 kernel
+  LINUX="default"
+
+# use linux-next (latest rc) instead latest released version
+  LINUX_NEXT="no"
+
+# Mediacenter to use (xbmc / no)
+  MEDIACENTER="xbmc"
+
+# Skins to install (Confluence)
+  SKINS="Confluence"
+
+# Default Skin (Confluence)
+  SKIN_DEFAULT="Confluence"
+
+# Plugins for XBMC to install (SABnzbd)
+# Space separated list is supported,
+# e.g. XBMC_PLUGINS="SABnzbd"
+  XBMC_PLUGINS=""
+
+# build and install 'ProjectM' Visualization (yes / no)
+  XBMC_VIS_PROJECTM="yes"
+
+# build and install with non-free support
+# (RAR compression support in XBMC) (yes / no)
+  NONFREE_SUPPORT="yes"
+
+# build and install with DVDCSS support
+# (DVD decryption support in XBMC) (yes / no)
+  DVDCSS_SUPPORT="yes"
+
+# build and install Tvheadend TV server (yes / no)
+  TVHEADEND="yes"
+
+# additional drivers to install:
+# bcm_sta:          Broadcom STA WLAN Driver
+# Space separated list is supported,
+# e.g. ADDITIONAL_DRIVERS="bcm_sta"
+  ADDITIONAL_DRIVERS=""
+
+# build with network support (yes / no)
+  NETWORK="yes"
+
+# build with netmount (mounting network drives on boot) support (yes / no)
+  NETMOUNT="yes"
+
+# build and install with XBMC webfrontend (yes / no)
+  WEBSERVER="yes"
+
+# build and install Avahi (Zeroconf) daemon (yes / no)
+  AVAHI_DAEMON="yes"
+
+# build and install Samba Server (yes / no)
+  SAMBA_SERVER="yes"
+
+# build and install SFTP Server (yes / no)
+  SFTP_SERVER="yes"
+
+# build and install some tools for including in release (yes / no)
+# some of this tools are: htop, nano, wgetpaste
+  TOOLS="yes"
+
+# build and install diskmounter service (udisks)
+# this service provide auto mounting support for external drives
+# in the mediacenter also automount internally drives at boottime (yes / no)
+  UDISKS="yes"
+
+# build and install powermanagement support (upower) (yes / no)
+  UPOWER="yes"
+
+# build and install NTFS-3G fuse support (yes / no)
+  NTFS3G="yes"
+
+# build and install hfs filesystem utilities (yes / no)
+  HFSTOOLS="no"
+
+# build and install Apple device mount support (via ifuse) (yes / no)
+  APPLEMOUNT="yes"
+
+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="xorg-server"
+
+# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau,vmware)
+# Space separated list is supported, 
+# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
+  GRAPHIC_DRIVERS="r600"
+
+# use libdrm-master (latest git) instead latest released version
+  LIBDRM_MASTER="no"
+
+# use Mesa-master (latest git) instead latest released version
+  MESA_MASTER="no"
+
+# use linux-next (latest rc) instead latest released version
+  LINUX_NEXT="no"
+
+# Use VDPAU video acceleration (needs nVidia driver and a supported card)
+  VDPAU="no"
+
+# Use VAAPI video acceleration (needs intel i965 driver and a supported card)
+  VAAPI="no"
+
+# Use Broadcom CrystalHD Decoder Card for video acceleration 
+# (needs Kernelsupport for Broadcom Decoder Card and a supported card)
+  CRYSTALHD="no"
+
+# build and install remote support (yes / no)
+  REMOTE_SUPPORT="yes"
+
+# build and install WiiMote support (yes / no)
+  WIIMOTE_SUPPORT="yes"
+
+# build and install PS3 Remote support (yes / no)
+  PS3REMOTE_SUPPORT="yes"
+
+# build and install ATV IR remote support (yes / no)
+  ATVCLIENT_SUPPORT="no"
+
+# LCD driver to Use - Possible drivers are ( Comma seperated:
+# bayrad,CFontz,CFontz633,CFontzPacket,CwLnx,ea65,
+# EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd,
+# IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,lirc,lis,
+# MD8800,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,picolcd,
+# pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli,
+# stv5730,SureElec,t6963,text,tyan,ula200,xosd
+# 'all' compiles all drivers;
+# 'all,!xxx,!yyy' de-selects previously selected drivers
+# "none" for disable LCD support
+  LCD_DRIVER="irtrans,imon,imonlcd"
+
+# additional Firmware to use (dvb-firmware, wlan-firmware)
+# Space separated list is supported,
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+  FIRMWARE="dvb-firmware wlan-firmware"
+
+# build with lm_sensors hardware monitoring support (yes / no)
+  SENSOR_SUPPORT="yes"
+
+# build with automatic update support (yes / no)
+  UPDATE_SUPPORT="yes"
+
+# build with installer (yes / no)
+  INSTALLER_SUPPORT="yes"
+
+# Testpackages for development (yes / no)
+  TESTING="no"
+
+# OEM packages for OEM's (yes / no)
+  OEM_SUPPORT="no"
+
+# Coreboot support (yes / no)
+  COREBOOT="no"
+
+# Addon Server Url
+  ADDON_SERVER_URL="http://addons.openelec.tv"
+
+# set the addon dirs
+  ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
+  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

projects/Generic/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.39-rc6 Kernel Configuration
+# Linux/i386 2.6.39-rc7 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -271,7 +271,7 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
+CONFIG_M686=y
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
@@ -288,7 +288,7 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
-CONFIG_MCORE2=y
+# CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
@@ -296,6 +296,7 @@ CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
+# CONFIG_X86_PPRO_FENCE is not set
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
@@ -334,7 +335,10 @@ 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_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_NOHIGHMEM is not set
@@ -468,7 +472,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_X86_ACPI_CPUFREQ=y
 # CONFIG_X86_POWERNOW_K6 is not set
 # CONFIG_X86_POWERNOW_K7 is not set
-# CONFIG_X86_POWERNOW_K8 is not set
+CONFIG_X86_POWERNOW_K8=y
 # CONFIG_X86_GX_SUSPMOD is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SPEEDSTEP_ICH is not set
@@ -504,6 +508,7 @@ CONFIG_DMAR=y
 CONFIG_DMAR_DEFAULT_ON=y
 CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_PCIEPORTBUS=y
+# CONFIG_HOTPLUG_PCI_PCIE is not set
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -524,7 +529,13 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_OLPC is not set
 CONFIG_AMD_NB=y
 # CONFIG_PCCARD is not set
-# CONFIG_HOTPLUG_PCI is not set
+CONFIG_HOTPLUG_PCI=m
+# CONFIG_HOTPLUG_PCI_FAKE is not set
+# CONFIG_HOTPLUG_PCI_COMPAQ is not set
+# CONFIG_HOTPLUG_PCI_IBM is not set
+# CONFIG_HOTPLUG_PCI_ACPI is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_RAPIDIO is not set
 
 #
@@ -649,7 +660,7 @@ CONFIG_BT_HCIBTUSB=m
 # CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_BT_MRVL is not set
-# CONFIG_BT_ATH3K is not set
+CONFIG_BT_ATH3K=m
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -702,7 +713,7 @@ CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=" radeon/R600_rlc.bin radeon/R700_rlc.bin"
+CONFIG_EXTRA_FIRMWARE="radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin radeon/CAICOS_pfp.bin radeon/CAYMAN_mc.bin radeon/CAYMAN_me.bin radeon/CAYMAN_pfp.bin radeon/CAYMAN_rlc.bin radeon/CEDAR_me.bin radeon/CEDAR_pfp.bin radeon/CEDAR_rlc.bin radeon/CYPRESS_me.bin radeon/CYPRESS_pfp.bin radeon/CYPRESS_rlc.bin radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/R600_rlc.bin radeon/R700_rlc.bin radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin radeon/REDWOOD_rlc.bin radeon/SUMO_rlc.bin radeon/TURKS_mc.bin radeon/TURKS_me.bin radeon/TURKS_pfp.bin"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 # CONFIG_SYS_HYPERVISOR is not set
 CONFIG_ARCH_NO_SYSDEV_OPS=y
@@ -867,7 +878,7 @@ CONFIG_SATA_VIA=y
 CONFIG_PATA_AMD=y
 # CONFIG_PATA_ARASAN_CF is not set
 # CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
+CONFIG_PATA_ATIIXP=y
 # CONFIG_PATA_ATP867X is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
@@ -1204,7 +1215,7 @@ CONFIG_ZD1211RW=m
 CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=y
 # CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
+CONFIG_INPUT_SPARSEKMAP=m
 
 #
 # Userland interfaces
@@ -1385,7 +1396,7 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_I801=y
 CONFIG_I2C_ISCH=y
-# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_PIIX4=y
 CONFIG_I2C_NFORCE2=y
 # CONFIG_I2C_NFORCE2_S4985 is not set
 # CONFIG_I2C_SIS5595 is not set
@@ -1551,7 +1562,58 @@ CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_F71808E_WDT is not set
+CONFIG_SP5100_TCO=m
+# CONFIG_SC520_WDT is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_ITCO_WDT is not set
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+# CONFIG_SC1200_WDT is not set
+# CONFIG_PC87413_WDT is not set
+# CONFIG_NV_TCO is not set
+# CONFIG_60XX_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_SBC7240_WDT is not set
+# CONFIG_CPU5_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83697UG_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -2377,6 +2439,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_INTEL_SS4200 is not set
+# CONFIG_LEDS_DELL_NETBOOKS is not set
 CONFIG_LEDS_TRIGGERS=y
 
 #
@@ -2529,7 +2592,39 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 # Altera FPGA firmware download module
 #
 # CONFIG_ALTERA_STAPL is not set
-# CONFIG_X86_PLATFORM_DEVICES is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_ACER_WMI is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_DELL_WMI is not set
+# CONFIG_DELL_WMI_AIO is not set
+# CONFIG_FUJITSU_LAPTOP is not set
+# CONFIG_TC1100_WMI is not set
+# CONFIG_HP_ACCEL is not set
+# CONFIG_HP_WMI is not set
+# CONFIG_MSI_LAPTOP is not set
+# CONFIG_PANASONIC_LAPTOP is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_INTEL_MENLOW is not set
+# CONFIG_EEEPC_LAPTOP is not set
+CONFIG_ASUS_WMI=m
+# CONFIG_ASUS_NB_WMI is not set
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+# CONFIG_MSI_WMI is not set
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_ACPI_TOSHIBA is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_ACPI_CMPC is not set
+# CONFIG_INTEL_IPS is not set
+# CONFIG_IBM_RTL is not set
+# CONFIG_XO15_EBOOK is not set
+# CONFIG_SAMSUNG_LAPTOP is not set
 
 #
 # Firmware Drivers
@@ -2629,6 +2724,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set

projects/ION/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.39-rc6 Kernel Configuration
+# Linux/i386 2.6.39-rc7 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2493,6 +2493,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set

projects/ION/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 2.6.39-rc6 Kernel Configuration
+# Linux/x86_64 2.6.39-rc7 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -2436,6 +2436,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set

projects/Intel/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.39-rc6 Kernel Configuration
+# Linux/i386 2.6.39-rc7 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2490,6 +2490,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set

projects/Intel/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 2.6.39-rc6 Kernel Configuration
+# Linux/x86_64 2.6.39-rc7 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -2429,6 +2429,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set