Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd

packages/linux/patches/3.10.9/linux-997-disable-rc6-on-sandybridge-gt1.patch

@@ -1,13 +0,0 @@
---- a/drivers/gpu/drm/i915/intel_pm.c	2013-05-30 22:57:09.098080381 +0200
-+++ b/drivers/gpu/drm/i915/intel_pm.c	2013-05-30 23:31:31.644308032 +0200
-@@ -2503,8 +2503,8 @@
- 	if (i915_enable_rc6 >= 0)
- 		return i915_enable_rc6;
- 
--	/* Disable RC6 on Ironlake */
--	if (INTEL_INFO(dev)->gen == 5)
-+	/* Disable RC6 on Ironlake and Sandybridge GT1 */
-+	if (INTEL_INFO(dev)->gen == 5 || IS_SNB_GT1(dev))
- 		return 0;
- 
- 	if (IS_HASWELL(dev)) {

packages/sysutils/kmod/build

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --disable-silent-rules \
-            --disable-static \
-            --enable-shared \
-            --enable-tools \
-            --enable-logging \
-            --disable-debug \
-            --disable-gtk-doc \
-            --disable-gtk-doc-html \
-            --disable-gtk-doc-pdf \
-            --with-gnu-ld \
-            --without-xz \
-            --without-zlib
-
-make
-$MAKEINSTALL

packages/sysutils/kmod/install

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libkmod/.libs/*.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/tools/.libs/kmod $INSTALL/usr/bin
-
-mkdir -p $INSTALL/sbin
-  ln -sf /usr/bin/kmod $INSTALL/sbin/lsmod
-  ln -sf /usr/bin/kmod $INSTALL/sbin/insmod
-  ln -sf /usr/bin/kmod $INSTALL/sbin/rmmod
-  ln -sf /usr/bin/kmod $INSTALL/sbin/modinfo
-  ln -sf /usr/bin/kmod $INSTALL/sbin/modprobe
-
-# add system modprobe.d dir
-  mkdir -p $INSTALL/etc/modprobe.d
-    cp $PKG_DIR/modprobe.d/* $INSTALL/etc/modprobe.d
-
-# add user modprobe.d dir
-  mkdir -p $INSTALL/usr/config/modprobe.d
-

packages/sysutils/kmod/package.mk

@@ -19,18 +19,46 @@
 ################################################################################
 
 PKG_NAME="kmod"
-PKG_VERSION="14"
+PKG_VERSION="15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://git.profusion.mobi/cgit.cgi/kmod.git/"
 PKG_URL="http://ftp.kernel.org/pub/linux/utils/kernel/kmod/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules."
 PKG_LONGDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-tools \
+                           --enable-logging \
+                           --disable-debug \
+                           --disable-gtk-doc \
+                           --disable-gtk-doc-html \
+                           --disable-gtk-doc-pdf \
+                           --disable-manpages \
+                           --with-gnu-ld \
+                           --without-xz \
+                           --without-zlib"
+
+post_makeinstall_target() {
+# make symlinks for compatibility
+  mkdir -p $INSTALL/sbin
+    ln -sf /usr/bin/kmod $INSTALL/sbin/lsmod
+    ln -sf /usr/bin/kmod $INSTALL/sbin/insmod
+    ln -sf /usr/bin/kmod $INSTALL/sbin/rmmod
+    ln -sf /usr/bin/kmod $INSTALL/sbin/modinfo
+    ln -sf /usr/bin/kmod $INSTALL/sbin/modprobe
+
+# add system modprobe.d dir
+  mkdir -p $INSTALL/etc/modprobe.d
+    cp $PKG_DIR/modprobe.d/* $INSTALL/etc/modprobe.d
+
+# add user modprobe.d dir
+  mkdir -p $INSTALL/usr/config/modprobe.d
+}