mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-03-31 14:41:55 -07:00
Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-next
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,12 @@
|
||||
diff -Naur linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c
|
||||
--- linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c 2011-04-27 05:48:50.000000000 +0200
|
||||
+++ linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c 2011-04-29 02:51:28.773622809 +0200
|
||||
@@ -760,7 +760,7 @@
|
||||
static int __init i915_init(void)
|
||||
{
|
||||
if (!intel_agp_enabled) {
|
||||
- DRM_ERROR("drm/i915 can't work without intel_agp module!\n");
|
||||
+ DRM_INFO("drm/i915 can't work without intel_agp module!\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
===================================================================
|
||||
--- linux-2.6.orig/drivers/base/power/main.c
|
||||
+++ linux-2.6/drivers/base/power/main.c
|
||||
@@ -63,6 +63,7 @@ void device_pm_init(struct device *dev)
|
||||
dev->power.wakeup = NULL;
|
||||
spin_lock_init(&dev->power.lock);
|
||||
pm_runtime_init(dev);
|
||||
+ INIT_LIST_HEAD(&dev->power.entry);
|
||||
}
|
||||
|
||||
/**
|
||||
Index: linux-2.6/drivers/base/power/wakeup.c
|
||||
===================================================================
|
||||
--- linux-2.6.orig/drivers/base/power/wakeup.c
|
||||
+++ linux-2.6/drivers/base/power/wakeup.c
|
||||
@@ -258,7 +258,7 @@ void device_set_wakeup_capable(struct de
|
||||
if (!!dev->power.can_wakeup == !!capable)
|
||||
return;
|
||||
|
||||
- if (device_is_registered(dev)) {
|
||||
+ if (device_is_registered(dev) && !list_empty(&dev->power.entry)) {
|
||||
if (capable) {
|
||||
if (wakeup_sysfs_add(dev))
|
||||
return;
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
Please read the FAQ at http://www.tux.org/lkml/
|
||||
|
||||
|
||||
@@ -27,10 +27,4 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile
|
||||
python setup.py install -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
python setup.py build --cross-compile bdist_egg --exclude-source-files
|
||||
|
||||
@@ -22,4 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
cp -PR $PKG_BUILD/.install/* $INSTALL
|
||||
PKG_SRC_DIR=`ls -d $PKG_BUILD`
|
||||
|
||||
PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
|
||||
export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
|
||||
|
||||
$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg
|
||||
|
||||
@@ -27,4 +27,4 @@ PKG_SRC_DIR=`ls -d $PKG_BUILD`
|
||||
PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
|
||||
export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
|
||||
|
||||
$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --prefix=$INSTALL/usr $PKG_SRC_DIR
|
||||
$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="distribute"
|
||||
PKG_VERSION="0.6.14"
|
||||
PKG_VERSION="0.6.15"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://peak.telecommunity.com/DevCenter/setuptools"
|
||||
PKG_SITE="http://pypi.python.org/pypi/distribute"
|
||||
PKG_URL="http://pypi.python.org/packages/source/d/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="Python"
|
||||
PKG_BUILD_DEPENDS="toolchain Python"
|
||||
|
||||
@@ -27,10 +27,4 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile
|
||||
python setup.py install -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
python setup.py build --cross-compile bdist_egg --exclude-source-files
|
||||
|
||||
@@ -22,4 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
cp -PR $PKG_BUILD/.install/* $INSTALL
|
||||
PKG_SRC_DIR=`ls -d $PKG_BUILD`
|
||||
|
||||
PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
|
||||
export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
|
||||
|
||||
$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg
|
||||
|
||||
@@ -27,10 +27,4 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile
|
||||
python setup.py install -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
python setup.py build --cross-compile bdist_egg --exclude-source-files
|
||||
|
||||
@@ -22,4 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
cp -PR $PKG_BUILD/.install/* $INSTALL
|
||||
PKG_SRC_DIR=`ls -d $PKG_BUILD`
|
||||
|
||||
PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
|
||||
export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
|
||||
|
||||
$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg
|
||||
|
||||
@@ -27,10 +27,4 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile
|
||||
python setup.py install -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
python setup.py build --cross-compile bdist_egg --exclude-source-files
|
||||
|
||||
@@ -22,4 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
cp -PR $PKG_BUILD/.install/* $INSTALL
|
||||
PKG_SRC_DIR=`ls -d $PKG_BUILD`
|
||||
|
||||
PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
|
||||
export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
|
||||
|
||||
$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg
|
||||
|
||||
30
packages/python/system/hotqueue/build
Executable file
30
packages/python/system/hotqueue/build
Executable file
@@ -0,0 +1,30 @@
|
||||
#!/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
|
||||
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile bdist_egg --exclude-source-files
|
||||
30
packages/python/system/hotqueue/install
Executable file
30
packages/python/system/hotqueue/install
Executable file
@@ -0,0 +1,30 @@
|
||||
#!/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
|
||||
|
||||
PKG_SRC_DIR=`ls -d $PKG_BUILD`
|
||||
|
||||
PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
|
||||
export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
|
||||
|
||||
$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg
|
||||
36
packages/python/system/hotqueue/meta
Normal file
36
packages/python/system/hotqueue/meta
Normal file
@@ -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="hotqueue"
|
||||
PKG_VERSION="0.2.5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="https://github.com/richardhenry/hotqueue"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="Python distribute redis-py"
|
||||
PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/system"
|
||||
PKG_SHORTDESC="hotqueue a Python library that allows you to use Redis as a message queue within your Python programs"
|
||||
PKG_LONGDESC="HotQueue is a Python library that allows you to use Redis as a message queue within your Python programs."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
30
packages/python/system/pyasn1-modules/build
Executable file
30
packages/python/system/pyasn1-modules/build
Executable file
@@ -0,0 +1,30 @@
|
||||
#!/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
|
||||
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile bdist_egg --exclude-source-files
|
||||
30
packages/python/system/pyasn1-modules/install
Executable file
30
packages/python/system/pyasn1-modules/install
Executable file
@@ -0,0 +1,30 @@
|
||||
#!/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
|
||||
|
||||
PKG_SRC_DIR=`ls -d $PKG_BUILD`
|
||||
|
||||
PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
|
||||
export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
|
||||
|
||||
$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg
|
||||
36
packages/python/system/pyasn1-modules/meta
Normal file
36
packages/python/system/pyasn1-modules/meta
Normal file
@@ -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="pyasn1-modules"
|
||||
PKG_VERSION="0.0.1a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://sourceforge.net/projects/pyasn1/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/pyasn1/pyasn1-modules/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="Python distribute pyasn1"
|
||||
PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/system"
|
||||
PKG_SHORTDESC="pyasn1-modules: a collection of protocols modules written in ASN.1 language."
|
||||
PKG_LONGDESC="pyasn1-modules is a collection of protocols modules written in ASN.1 language."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
30
packages/python/system/pyasn1/build
Executable file
30
packages/python/system/pyasn1/build
Executable file
@@ -0,0 +1,30 @@
|
||||
#!/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
|
||||
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile bdist_egg --exclude-source-files
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user