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

packages/linux-firmware/misc-firmware/build

@@ -0,0 +1,27 @@
+#!/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
+
+DESTDIR=.install ./install

packages/linux-firmware/misc-firmware/install

@@ -0,0 +1,26 @@
+#!/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
+
+mkdir -p $INSTALL
+  cp -PR $PKG_BUILD/.install/* $INSTALL

packages/linux-firmware/misc-firmware/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="misc-firmware"
+PKG_VERSION="0.0.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="Free-to-use"
+PKG_SITE="https://github.com/OpenELEC/misc-firmware"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="firmware"
+PKG_SHORTDESC="misc-firmware: firmwares for various drivers"
+PKG_LONGDESC="misc-firmware: firmwares for various drivers"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/linux/patches/linux-3.0-rc7-072-silence_acpi-0.1.patch

@@ -0,0 +1,12 @@
+diff -Naur linux-3.0-rc7/arch/x86/pci/acpi.c linux-3.0-rc7.patch/arch/x86/pci/acpi.c
+--- linux-3.0-rc7/arch/x86/pci/acpi.c	2011-07-12 01:51:52.000000000 +0200
++++ linux-3.0-rc7.patch/arch/x86/pci/acpi.c	2011-07-20 07:46:08.959060136 +0200
+@@ -246,7 +246,7 @@
+ 
+ 		conflict = insert_resource_conflict(root, res);
+ 		if (conflict)
+-			dev_err(&info->bridge->dev,
++			dev_info(&info->bridge->dev,
+ 				"address space collision: host bridge window %pR "
+ 				"conflicts with %s %pR\n",
+ 				res, conflict->name, conflict);

projects/ATV/options

@@ -218,9 +218,9 @@
 # "none" for disable LCD support
   LCD_DRIVER="none"
 
-# additional Firmware to use (dvb-firmware, wlan-firmware)
+# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
   FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)

projects/Fusion/options

@@ -218,10 +218,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon,imonlcd,mdm166a"
 
-# additional Firmware to use (dvb-firmware, wlan-firmware)
+# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
-  FIRMWARE="dvb-firmware wlan-firmware"
+# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+  FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"

projects/Generic/options

@@ -218,10 +218,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon,imonlcd,mdm166a"
 
-# additional Firmware to use (dvb-firmware, wlan-firmware)
+# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
-  FIRMWARE="dvb-firmware wlan-firmware"
+# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+  FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"

projects/ION/options

@@ -218,10 +218,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon,imonlcd,mdm166a"
 
-# additional Firmware to use (dvb-firmware, wlan-firmware)
+# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
-  FIRMWARE="dvb-firmware wlan-firmware"
+# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+  FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"

projects/Intel/options

@@ -218,10 +218,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon,imonlcd,mdm166a"
 
-# additional Firmware to use (dvb-firmware, wlan-firmware)
+# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
-  FIRMWARE="dvb-firmware wlan-firmware"
+# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+  FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"

projects/Ultra/options

@@ -215,10 +215,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="imon,imonlcd"
 
-# additional Firmware to use (dvb-firmware, wlan-firmware)
+# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
-  FIRMWARE="dvb-firmware wlan-firmware"
+# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+  FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"