mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-6.0
This commit is contained in:
commit
c676dd1932
@ -20,8 +20,8 @@ PKG_NAME="flac"
|
||||
PKG_VERSION="1.3.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="http://flac.sourceforge.net/"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://xiph.org/flac/"
|
||||
PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain libogg"
|
||||
PKG_PRIORITY="optional"
|
||||
|
@ -17,12 +17,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libcdio"
|
||||
PKG_VERSION="0.92"
|
||||
PKG_VERSION="0.93"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.gnu.org/software/libcdio/"
|
||||
PKG_URL="http://ftp.gnu.org/gnu/libcdio/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_SITE="https://www.gnu.org/software/libcdio/"
|
||||
PKG_URL="https://ftp.gnu.org/gnu/libcdio/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="audio"
|
||||
|
@ -17,11 +17,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libogg"
|
||||
PKG_VERSION="1.3.1"
|
||||
PKG_VERSION="1.3.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://www.xiph.org/ogg/"
|
||||
PKG_SITE="https://www.xiph.org/ogg/"
|
||||
PKG_URL="http://downloads.xiph.org/releases/ogg/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
@ -17,12 +17,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libopenmpt"
|
||||
PKG_VERSION="0.2.4764"
|
||||
PKG_VERSION="0.2.5598"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://lib.openmpt.org/libopenmpt/"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_URL="http://buildbot.openmpt.org/builds/auto/src/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="audio"
|
||||
|
@ -21,8 +21,8 @@ PKG_VERSION="autoconf-3081101"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="PublicDomain"
|
||||
PKG_SITE="http://www.sqlite.org/"
|
||||
PKG_URL="http://sqlite.org/2015/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_SITE="https://www.sqlite.org/"
|
||||
PKG_URL="https://www.sqlite.org/2015/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="database"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="cmake"
|
||||
PKG_VERSION="3.3.1"
|
||||
PKG_VERSION="3.3.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="gettext"
|
||||
PKG_VERSION="0.19.5.1"
|
||||
PKG_VERSION="0.19.6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -169,6 +169,7 @@ makeinstall_init() {
|
||||
cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/lib
|
||||
cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/lib
|
||||
cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/lib
|
||||
cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/lib
|
||||
|
||||
if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
|
||||
ln -sf ld.so $INSTALL/lib/ld-linux.so.3
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libffi"
|
||||
PKG_VERSION="3.1"
|
||||
PKG_VERSION="3.2.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="fc95251"
|
||||
PKG_VERSION="9a21e6a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="giflib"
|
||||
PKG_VERSION="5.0.5"
|
||||
PKG_VERSION="5.1.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libdrm"
|
||||
PKG_VERSION="2.4.64"
|
||||
PKG_VERSION="2.4.65"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="mesa"
|
||||
PKG_VERSION="10.6.5"
|
||||
PKG_VERSION="10.6.8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -40,7 +40,7 @@ case "$LINUX" in
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="4.1.6"
|
||||
PKG_VERSION="4.1.7"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
esac
|
||||
|
50
packages/linux/patches/4.1.7/linux-230-elgato-eyetv-sat-v3.patch
vendored
Normal file
50
packages/linux/patches/4.1.7/linux-230-elgato-eyetv-sat-v3.patch
vendored
Normal file
@ -0,0 +1,50 @@
|
||||
diff --git a/drivers/media/usb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb/az6027.c
|
||||
index 92e47d6..2e71136 100644
|
||||
--- a/drivers/media/usb/dvb-usb/az6027.c
|
||||
+++ b/drivers/media/usb/dvb-usb/az6027.c
|
||||
@@ -1090,6 +1090,7 @@ static struct usb_device_id az6027_usb_table[] = {
|
||||
{ USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V2) },
|
||||
{ USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_SAT) },
|
||||
{ USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_SAT_V2) },
|
||||
+ { USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_SAT_V3) },
|
||||
{ },
|
||||
};
|
||||
|
||||
@@ -1138,7 +1139,7 @@ static struct dvb_usb_device_properties az6027_properties = {
|
||||
|
||||
.i2c_algo = &az6027_i2c_algo,
|
||||
|
||||
- .num_device_descs = 7,
|
||||
+ .num_device_descs = 8,
|
||||
.devices = {
|
||||
{
|
||||
.name = "AZUREWAVE DVB-S/S2 USB2.0 (AZ6027)",
|
||||
@@ -1168,6 +1169,10 @@ static struct dvb_usb_device_properties az6027_properties = {
|
||||
.name = "Elgato EyeTV Sat",
|
||||
.cold_ids = { &az6027_usb_table[6], NULL },
|
||||
.warm_ids = { NULL },
|
||||
+ }, {
|
||||
+ .name = "Elgato EyeTV Sat",
|
||||
+ .cold_ids = { &az6027_usb_table[7], NULL },
|
||||
+ .warm_ids = { NULL },
|
||||
},
|
||||
{ NULL },
|
||||
}
|
||||
|
||||
warning: LF will be replaced by CRLF in az6027.c.
|
||||
The file will have its original line endings in your working directory.
|
||||
diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h
|
||||
index c117fb3..7552f38 100644
|
||||
--- a/drivers/media/dvb-core/dvb-usb-ids.h
|
||||
+++ b/drivers/media/dvb-core/dvb-usb-ids.h
|
||||
@@ -365,6 +365,7 @@
|
||||
#define USB_PID_ELGATO_EYETV_DTT_Dlx 0x0020
|
||||
#define USB_PID_ELGATO_EYETV_SAT 0x002a
|
||||
#define USB_PID_ELGATO_EYETV_SAT_V2 0x0025
|
||||
+#define USB_PID_ELGATO_EYETV_SAT_V3 0x0036
|
||||
#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD 0x5000
|
||||
#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM 0x5001
|
||||
#define USB_PID_FRIIO_WHITE 0x0001
|
||||
|
||||
warning: LF will be replaced by CRLF in dvb-usb-ids.h.
|
||||
The file will have its original line endings in your working directory.
|
@ -21,8 +21,8 @@ PKG_VERSION="2.0.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.libsdl.org/"
|
||||
PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_SITE="https://www.libsdl.org/"
|
||||
PKG_URL="https://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain yasm:host alsa-lib systemd dbus"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
|
@ -20,9 +20,9 @@ PKG_NAME="ffmpeg"
|
||||
PKG_VERSION="2.6.4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="http://ffmpeg.org"
|
||||
PKG_URL="https://www.ffmpeg.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_LICENSE="LGPLv2.1+"
|
||||
PKG_SITE="https://ffmpeg.org"
|
||||
PKG_URL="https://ffmpeg.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis libressl"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libva-intel-driver"
|
||||
PKG_VERSION="1.6.0"
|
||||
PKG_VERSION="1.6.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libva"
|
||||
PKG_VERSION="1.6.0"
|
||||
PKG_VERSION="1.6.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -20,9 +20,9 @@ PKG_NAME="libvdpau"
|
||||
PKG_VERSION="1.1.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://freedesktop.org/wiki/Software/VDPAU"
|
||||
PKG_URL="http://people.freedesktop.org/~aplattner/vdpau/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="https://wiki.freedesktop.org/www/Software/VDPAU/"
|
||||
PKG_URL="https://secure.freedesktop.org/~aplattner/vdpau/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain libX11 dri2proto libXext"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
|
@ -1,49 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
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_TARGET="toolchain Python distutilscross:host pyasn1"
|
||||
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"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
}
|
@ -1,49 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pyasn1"
|
||||
PKG_VERSION="0.0.13b"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://sourceforge.net/projects/pyasn1/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/pyasn1/pyasn1-devel/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain Python distutilscross:host"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/system"
|
||||
PKG_SHORTDESC="pyasn1: ASN.1 types and codecs"
|
||||
PKG_LONGDESC="pyasn1: ASN.1 types and codecs."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
}
|
@ -1,49 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="PyYAML"
|
||||
PKG_VERSION="3.10"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://pyyaml.org/"
|
||||
PKG_URL="http://pyyaml.org/download/pyyaml/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain Python distutilscross:host yaml"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
PKG_SHORTDESC="PyYAML: a next generation YAML parser and emitter for Python."
|
||||
PKG_LONGDESC="PyYAML is the next generation YAML parser and emitter for Python."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
}
|
@ -1,15 +0,0 @@
|
||||
diff -Naur PyYAML-3.10/setup.py PyYAML-3.10.patch/setup.py
|
||||
--- PyYAML-3.10/setup.py 2011-05-30 05:31:04.000000000 +0200
|
||||
+++ PyYAML-3.10.patch/setup.py 2011-07-17 17:49:50.360528344 +0200
|
||||
@@ -62,9 +62,10 @@
|
||||
import sys, os.path
|
||||
|
||||
from distutils import log
|
||||
+from setuptools import setup
|
||||
from distutils.core import setup, Command
|
||||
from distutils.core import Distribution as _Distribution
|
||||
-from distutils.core import Extension as _Extension
|
||||
+from setuptools import Extension as _Extension
|
||||
from distutils.dir_util import mkpath
|
||||
from distutils.command.build_ext import build_ext as _build_ext
|
||||
from distutils.command.bdist_rpm import bdist_rpm as _bdist_rpm
|
@ -1,54 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="TwistedConch"
|
||||
PKG_VERSION="11.0.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="http://twistedmatrix.com/"
|
||||
PKG_URL="http://twistedmatrix.com/Releases/Conch/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain Python distutilscross:host TwistedCore pyasn1 pycrypto"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
PKG_SHORTDESC="TwistedConch: an SSHv2 implementation written in Python"
|
||||
PKG_LONGDESC="TwistedConch is an SSHv2 implementation written in Python. SSH is a protocol designed to allow remote access to shells and commands, but it is generic enough to allow everything from TCP forwarding to generic filesystem access. Since conch is written in Python, it interfaces well with other Python projects, such as Imagination. Conch also includes a implementations of the telnet and vt102 protocols, as well as support for rudimentary line editing behaviors. A new implementation of Twisted's Manhole application is also included, featuring server-side input history and interactive syntax coloring."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
|
||||
# install to toolchain because its needed for other twisted modules
|
||||
python setup.py install --prefix $ROOT/$TOOLCHAIN
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
rm -rf $INSTALL/usr/lib/python*/site-packages/twisted/conch/test
|
||||
}
|
@ -1,56 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="TwistedCore"
|
||||
PKG_VERSION="11.0.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="http://twistedmatrix.com/"
|
||||
PKG_URL="http://twistedmatrix.com/Releases/Core/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain Python distutilscross:host"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
PKG_SHORTDESC="TwistedCore: An event-based networking framework for Internet applications"
|
||||
PKG_LONGDESC="Twisted is an event-based framework for Internet applications. It includes a Web server, an SMTP/POP3 server, a telnet server, an SSH server, an IRC server, a DNS server, a generic client/server pair for remote object access (Perspective Broker), and APIs for creating new protocols. It supports integration with GTK+, GTK+ 2, Qt, Tkinter, wxPython, Mac OS X (PyObjC) and Win32 event loops. It also supports TCP, SSL and TLS, UDP, Unix sockets, multicast, and serial ports. Supported protocols include HTTP, FTP, SMTP, POP3, IMAP, TOC, OSCAR (AIM and ICQ), SSH, DNS, IRC, NNTP, Jabber, SOCKSv4, Telnet, SIP (for VoIP), and XML-RPC and SOAP using external packages. Most protocols are supported as both servers and clients."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
|
||||
# install to toolchain because its needed for other twisted modules
|
||||
python setup.py install --prefix $ROOT/$TOOLCHAIN
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp bin/twistd $INSTALL/usr/bin
|
||||
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
}
|
@ -1,12 +0,0 @@
|
||||
diff -Naur TwistedCore-10.1.0/twisted/python/dist.py TwistedCore-10.1.0.patch/twisted/python/dist.py
|
||||
--- TwistedCore-10.1.0/twisted/python/dist.py 2009-04-14 14:03:09.000000000 +0200
|
||||
+++ TwistedCore-10.1.0.patch/twisted/python/dist.py 2010-10-19 00:46:32.896878949 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
from distutils.command import build_scripts, install_data, build_ext, build_py
|
||||
from distutils.errors import CompileError
|
||||
from distutils import core
|
||||
-from distutils.core import Extension
|
||||
+from setuptools import Extension
|
||||
|
||||
twisted_subprojects = ["conch", "lore", "mail", "names",
|
||||
"news", "pair", "runner", "web", "web2",
|
@ -1,54 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="TwistedNames"
|
||||
PKG_VERSION="11.0.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="http://twistedmatrix.com/"
|
||||
PKG_URL="http://twistedmatrix.com/Releases/Names/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain Python distutilscross:host TwistedCore"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
PKG_SHORTDESC="TwistedNames: Name resolution part of Twisted framework"
|
||||
PKG_LONGDESC="Twisted is an event-based framework for Internet applications. It includes a Web server, an SMTP/POP3 server, a telnet server, an SSH server, an IRC server, a DNS server, a generic client/server pair for remote object access (Perspective Broker), and APIs for creating new protocols. It supports integration with GTK+, GTK+ 2, Qt, Tkinter, wxPython, Mac OS X (PyObjC) and Win32 event loops. It also supports TCP, SSL and TLS, UDP, Unix sockets, multicast, and serial ports. Supported protocols include HTTP, FTP, SMTP, POP3, IMAP, TOC, OSCAR (AIM and ICQ), SSH, DNS, IRC, NNTP, Jabber, SOCKSv4, Telnet, SIP (for VoIP), and XML-RPC and SOAP using external packages. Most protocols are supported as both servers and clients."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
|
||||
# install to toolchain because its needed for other twisted modules
|
||||
python setup.py install --prefix $ROOT/$TOOLCHAIN
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
rm -rf $INSTALL/usr/lib/python*/site-packages/twisted/names/test
|
||||
}
|
@ -1,54 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="TwistedWeb"
|
||||
PKG_VERSION="11.0.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="http://twistedmatrix.com/"
|
||||
PKG_URL="http://twistedmatrix.com/Releases/Web/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain Python distutilscross:host TwistedCore"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
PKG_SHORTDESC="TwistedWeb: An event-based networking framework for Internet applications"
|
||||
PKG_LONGDESC="Twisted is an event-based framework for Internet applications. It includes a Web server, an SMTP/POP3 server, a telnet server, an SSH server, an IRC server, a DNS server, a generic client/server pair for remote object access (Perspective Broker), and APIs for creating new protocols. It supports integration with GTK+, GTK+ 2, Qt, Tkinter, wxPython, Mac OS X (PyObjC) and Win32 event loops. It also supports TCP, SSL and TLS, UDP, Unix sockets, multicast, and serial ports. Supported protocols include HTTP, FTP, SMTP, POP3, IMAP, TOC, OSCAR (AIM and ICQ), SSH, DNS, IRC, NNTP, Jabber, SOCKSv4, Telnet, SIP (for VoIP), and XML-RPC and SOAP using external packages. Most protocols are supported as both servers and clients."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
|
||||
# install to toolchain because its needed for other twisted modules
|
||||
python setup.py install --prefix $ROOT/$TOOLCHAIN
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
rm -rf $INSTALL/usr/lib/python*/site-packages/twisted/web/test
|
||||
}
|
@ -1,54 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="TwistedWords"
|
||||
PKG_VERSION="11.0.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="http://twistedmatrix.com/"
|
||||
PKG_URL="http://twistedmatrix.com/Releases/Words/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain Python distutilscross:host TwistedCore"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
PKG_SHORTDESC="TwistedWords: An event-based networking framework for Internet applications"
|
||||
PKG_LONGDESC="Twisted is an event-based framework for Internet applications. It includes a Web server, an SMTP/POP3 server, a telnet server, an SSH server, an IRC server, a DNS server, a generic client/server pair for remote object access (Perspective Broker), and APIs for creating new protocols. It supports integration with GTK+, GTK+ 2, Qt, Tkinter, wxPython, Mac OS X (PyObjC) and Win32 event loops. It also supports TCP, SSL and TLS, UDP, Unix sockets, multicast, and serial ports. Supported protocols include HTTP, FTP, SMTP, POP3, IMAP, TOC, OSCAR (AIM and ICQ), SSH, DNS, IRC, NNTP, Jabber, SOCKSv4, Telnet, SIP (for VoIP), and XML-RPC and SOAP using external packages. Most protocols are supported as both servers and clients."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
|
||||
# install to toolchain because its needed for other twisted modules
|
||||
python setup.py install --prefix $ROOT/$TOOLCHAIN
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
rm -rf $INSTALL/usr/lib/python*/site-packages/twisted/words/test
|
||||
}
|
@ -1,50 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="wokkel"
|
||||
PKG_VERSION="0.6.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="free"
|
||||
PKG_SITE="http://wokkel.ik.nu/"
|
||||
PKG_URL="http://wokkel.ik.nu/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain Python distutilscross:host TwistedWords"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
PKG_SHORTDESC="wokkel: Wokkel is a Python module for experimenting with future enhancements to TwistedWords"
|
||||
PKG_LONGDESC="Wokkel is collection of enhancements on top of the Twisted networking framework, written in Python. It mostly provides a testing ground for enhancements to the Jabber/XMPP protocol implementation as found in Twisted Words, that are meant to eventually move there."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
rm -rf $INSTALL/usr/lib/python*/site-packages/wokkel/test
|
||||
}
|
@ -1,52 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="zope.interface"
|
||||
PKG_VERSION="3.3.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://zope.org/Products/ZopeInterface/"
|
||||
PKG_URL="http://www.zope.org/Products/ZopeInterface/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain Python distutilscross:host"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
PKG_SHORTDESC="zopeinterface: zope.interface package from Zope 3"
|
||||
PKG_LONGDESC="This is a separate distribution of the zope.interface package used in Zope 3, along with the packages it depends on."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
pre_make_target() {
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
}
|
||||
|
||||
make_target() {
|
||||
python setup.py build --cross-compile
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
python setup.py install --root=$INSTALL --prefix=/usr
|
||||
|
||||
# install to toolchain because its needed for other twisted modules
|
||||
python setup.py install --prefix $ROOT/$TOOLCHAIN
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
|
||||
}
|
@ -20,9 +20,9 @@ PKG_NAME="libgcrypt"
|
||||
PKG_VERSION="1.6.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.gnupg.org/"
|
||||
PKG_URL="ftp://ftp.gnupg.org/gcrypt/libgcrypt/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://www.gnupg.org/"
|
||||
PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain libgpg-error"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="security"
|
||||
|
@ -17,12 +17,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libgpg-error"
|
||||
PKG_VERSION="1.18"
|
||||
PKG_VERSION="1.20"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.gnupg.org/"
|
||||
PKG_URL="ftp://ftp.gnupg.org/gcrypt/libgpg-error/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://www.gnupg.org"
|
||||
PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="security"
|
||||
|
@ -1,50 +0,0 @@
|
||||
From 91da4f5dbbc9d93975ef9753652a4e71719f9f27 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
||||
Date: Mon, 16 Mar 2015 13:26:00 -0400
|
||||
Subject: [LIBGPG-ERROR PATCH] avoid breakage with gcc 5
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* src/Makefile.am: add -P to the C preprocessor when building
|
||||
mkerrcodes.h, to avoid a noisy intermediate pipeline.
|
||||
|
||||
--
|
||||
|
||||
With gcc 5 without this patch, we see many errors like the following:
|
||||
|
||||
gcc -I. -I. -o mkerrcodes ./mkerrcodes.c
|
||||
In file included from ./mkerrcodes.c:26:0:
|
||||
./mkerrcodes.h:9:5: error: expected expression before ‘,’ token
|
||||
{ , "GPG_ERR_E2BIG" },
|
||||
^
|
||||
./mkerrcodes.h:10:5: error: expected expression before ‘,’ token
|
||||
{ , "GPG_ERR_EACCES" },
|
||||
^
|
||||
|
||||
This patch cleans up the generated mkerrcodes.h by making the
|
||||
intermediate stage clean for all the versions of gcc i tested (4.x and
|
||||
5).
|
||||
|
||||
Debian-Bug-Id: 777374
|
||||
Signed-Off-By: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
||||
---
|
||||
src/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 99c2c53..f847a80 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -213,7 +213,7 @@ code-to-errno.h: Makefile mkerrnos.awk errnos.in
|
||||
# It is correct to use $(CPP). We want the host's idea of the error codes.
|
||||
mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
|
||||
$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
|
||||
- $(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
|
||||
+ $(CPP) $(CPPFLAGS) $(extra_cppflags) -P _$@ | grep GPG_ERR_ | \
|
||||
$(AWK) -f $(srcdir)/mkerrcodes.awk >$@
|
||||
-rm _$@
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
@ -1,6 +1,5 @@
|
||||
[Unit]
|
||||
Description=i.MX6 SoC fan monitor service
|
||||
ConditionPathExists=/var/run/system_type_matrix
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/imx6-soc-fan-monitor
|
||||
|
@ -17,11 +17,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="util-linux"
|
||||
PKG_VERSION="2.26.2"
|
||||
PKG_VERSION="2.27"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.26/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.27/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_DEPENDS_INIT="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
@ -32,105 +32,74 @@ PKG_LONGDESC="The util-linux package contains a large variety of low-level syste
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--disable-gtk-doc \
|
||||
--disable-nls \
|
||||
--disable-rpath \
|
||||
--enable-tls \
|
||||
UTILLINUX_CONFIG_DEFAULT="--disable-gtk-doc \
|
||||
--disable-nls \
|
||||
--disable-rpath \
|
||||
--enable-tls \
|
||||
--disable-all-programs \
|
||||
--enable-chsh-only-listed \
|
||||
--enable-libmount-force-mountinfo \
|
||||
--disable-bash-completion \
|
||||
--disable-colors-default \
|
||||
--disable-pylibmount \
|
||||
--disable-pg-bell \
|
||||
--disable-use-tty-group \
|
||||
--disable-makeinstall-chown \
|
||||
--disable-makeinstall-setuid \
|
||||
--with-gnu-ld \
|
||||
--without-selinux \
|
||||
--without-audit \
|
||||
--without-udev \
|
||||
--without-ncurses \
|
||||
--without-readline \
|
||||
--without-slang \
|
||||
--without-termcap \
|
||||
--without-tinfo \
|
||||
--without-utempter \
|
||||
--without-util \
|
||||
--without-libz \
|
||||
--without-user \
|
||||
--without-systemd \
|
||||
--without-smack \
|
||||
--without-python \
|
||||
--without-systemdsystemunitdir"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="$UTILLINUX_CONFIG_DEFAULT \
|
||||
--enable-libuuid \
|
||||
--enable-libblkid \
|
||||
--enable-libmount \
|
||||
--enable-libsmartcols \
|
||||
--disable-mount \
|
||||
--enable-losetup \
|
||||
--enable-fsck \
|
||||
--disable-partx \
|
||||
--enable-uuidd \
|
||||
--disable-mountpoint \
|
||||
--disable-fallocate \
|
||||
--disable-unshare \
|
||||
--disable-nsenter \
|
||||
--disable-setpriv \
|
||||
--disable-eject \
|
||||
--disable-agetty \
|
||||
--disable-cramfs \
|
||||
--disable-bfs \
|
||||
--disable-minix \
|
||||
--disable-fdformat \
|
||||
--disable-hwclock \
|
||||
--disable-wdctl \
|
||||
--disable-switch-root \
|
||||
--disable-pivot-root \
|
||||
--enable-tunelp \
|
||||
--disable-kill \
|
||||
--enable-deprecated-last \
|
||||
--disable-last \
|
||||
--disable-utmpdump \
|
||||
--disable-line \
|
||||
--disable-mesg \
|
||||
--disable-raw \
|
||||
--disable-rename \
|
||||
--disable-reset \
|
||||
--disable-vipw \
|
||||
--disable-newgrp \
|
||||
--disable-chfn-chsh \
|
||||
--enable-chsh-only-listed \
|
||||
--disable-login \
|
||||
--disable-login-chown-vcs \
|
||||
--disable-login-stat-mail \
|
||||
--disable-nologin \
|
||||
--disable-sulogin \
|
||||
--disable-su \
|
||||
--disable-runuser \
|
||||
--disable-ul \
|
||||
--disable-more \
|
||||
--disable-pg \
|
||||
--disable-setterm \
|
||||
--disable-schedutils \
|
||||
--disable-wall \
|
||||
--disable-write \
|
||||
--disable-bash-completion \
|
||||
--disable-pylibmount \
|
||||
--disable-pg-bell \
|
||||
--disable-use-tty-group \
|
||||
--disable-makeinstall-chown \
|
||||
--disable-makeinstall-setuid \
|
||||
--with-gnu-ld \
|
||||
--without-selinux \
|
||||
--without-audit \
|
||||
--without-udev \
|
||||
--without-ncurses \
|
||||
--without-slang \
|
||||
--without-utempter \
|
||||
--without-python \
|
||||
--without-systemdsystemunitdir"
|
||||
--enable-blkid"
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET \
|
||||
--enable-static \
|
||||
--disable-shared"
|
||||
if [ "$SWAP_SUPPORT" = "yes" ]; then
|
||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-swapon"
|
||||
fi
|
||||
|
||||
PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_TARGET \
|
||||
--prefix=/ \
|
||||
PKG_CONFIGURE_OPTS_HOST="--enable-static \
|
||||
--disable-shared \
|
||||
$UTILLINUX_CONFIG_DEFAULT \
|
||||
--enable-uuidgen \
|
||||
--enable-libuuid"
|
||||
|
||||
PKG_CONFIGURE_OPTS_INIT="--prefix=/ \
|
||||
--bindir=/bin \
|
||||
--sbindir=/sbin \
|
||||
--sysconfdir=/etc \
|
||||
--libexecdir=/lib \
|
||||
--localstatedir=/var \
|
||||
--enable-static --disable-shared"
|
||||
$UTILLINUX_CONFIG_DEFAULT \
|
||||
--enable-libblkid \
|
||||
--enable-libmount \
|
||||
--enable-fsck"
|
||||
|
||||
if [ "$INITRAMFS_PARTED_SUPPORT" = "yes" ]; then
|
||||
PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_INIT --enable-mkfs --enable-libuuid"
|
||||
fi
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin
|
||||
rm -rf $INSTALL/usr/sbin
|
||||
rm -rf $INSTALL/usr/share
|
||||
|
||||
mkdir -p $INSTALL/usr/sbin
|
||||
cp .libs/blkid $INSTALL/usr/sbin
|
||||
cp .libs/fsck $INSTALL/usr/sbin
|
||||
cp .libs/losetup $INSTALL/usr/sbin
|
||||
|
||||
if [ "$SWAP_SUPPORT" = "yes" ]; then
|
||||
cp .libs/swapon $INSTALL/usr/sbin
|
||||
cp .libs/swapoff $INSTALL/usr/sbin
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/openelec
|
||||
cp -PR $PKG_DIR/scripts/mount-swap $INSTALL/usr/lib/openelec
|
||||
|
||||
@ -142,24 +111,6 @@ post_makeinstall_target() {
|
||||
fi
|
||||
}
|
||||
|
||||
post_makeinstall_init() {
|
||||
rm -rf $INSTALL/bin
|
||||
rm -rf $INSTALL/sbin
|
||||
|
||||
if [ $INITRAMFS_PARTED_SUPPORT = "yes" ]; then
|
||||
# install libuuid and libblkid here, needed by 'parted'
|
||||
rm -rf $INSTALL/lib/libmount.so*
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp mkfs $INSTALL/sbin
|
||||
else
|
||||
rm -rf $INSTALL/lib
|
||||
fi
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp fsck $INSTALL/sbin
|
||||
}
|
||||
|
||||
post_install () {
|
||||
if [ "$SWAP_SUPPORT" = "yes" ]; then
|
||||
enable_service swap.service
|
||||
|
@ -0,0 +1,57 @@
|
||||
diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
|
||||
--- util-linux-2.27/configure.ac 2015-09-07 09:59:25.000000000 +0200
|
||||
+++ util-linux-2.27.patch/configure.ac 2015-09-12 10:35:53.576532786 +0200
|
||||
@@ -1051,11 +1051,19 @@
|
||||
AM_CONDITIONAL([BUILD_UUIDD], [test "x$build_uuidd" = xyes])
|
||||
|
||||
|
||||
-UL_BUILD_INIT([uuidgen], [check])
|
||||
+AC_ARG_ENABLE([uuidgen],
|
||||
+ AS_HELP_STRING([--disable-uuidgen], [do not build uuidgen]),
|
||||
+ [], [UL_DEFAULT_ENABLE([uuidgen], [check])]
|
||||
+)
|
||||
+UL_BUILD_INIT([uuidgen]])
|
||||
UL_REQUIRES_BUILD([uuidgen], [libuuid])
|
||||
AM_CONDITIONAL([BUILD_UUIDGEN], [test "x$build_uuidgen" = xyes])
|
||||
|
||||
-UL_BUILD_INIT([blkid], [check])
|
||||
+AC_ARG_ENABLE([blkid],
|
||||
+ AS_HELP_STRING([--disable-blkid], [do not build blkid(8)]),
|
||||
+ [], [UL_DEFAULT_ENABLE([blkid], [check])]
|
||||
+)
|
||||
+UL_BUILD_INIT([blkid])
|
||||
UL_REQUIRES_BUILD([blkid], [libblkid])
|
||||
AM_CONDITIONAL([BUILD_BLKID], [test "x$build_blkid" = xyes])
|
||||
|
||||
@@ -1242,21 +1250,26 @@
|
||||
UL_REQUIRES_HAVE([hwclock], [io, linuxdummy], [ioperm iopl function or Linux])
|
||||
AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes])
|
||||
|
||||
-
|
||||
-UL_BUILD_INIT([mkfs], [yes])
|
||||
+AC_ARG_ENABLE([mkfs],
|
||||
+ AS_HELP_STRING([--disable-mkfs], [do not build mkfs(8)]),
|
||||
+ [], [UL_DEFAULT_ENABLE([mkfs], [check])]
|
||||
+)
|
||||
+UL_BUILD_INIT([mkfs])
|
||||
AM_CONDITIONAL([BUILD_MKFS], [test "x$build_mkfs" = xyes])
|
||||
|
||||
UL_BUILD_INIT([isosize], [yes])
|
||||
AM_CONDITIONAL([BUILD_ISOSIZE], [test "x$build_isosize" = xyes])
|
||||
|
||||
-
|
||||
UL_BUILD_INIT([fstrim], [check])
|
||||
UL_REQUIRES_LINUX([fstrim])
|
||||
UL_REQUIRES_BUILD([fstrim], [libmount])
|
||||
AM_CONDITIONAL([BUILD_FSTRIM], [test "x$build_fstrim" = xyes])
|
||||
|
||||
-
|
||||
-UL_BUILD_INIT([swapon], [check])
|
||||
+AC_ARG_ENABLE([swapon],
|
||||
+ AS_HELP_STRING([--disable-swapon], [do not build swapon(8) and swapoff(8)]),
|
||||
+ [], [UL_DEFAULT_ENABLE([swapon], [check])]
|
||||
+)
|
||||
+UL_BUILD_INIT([swapon])
|
||||
UL_REQUIRES_LINUX([swapon])
|
||||
UL_REQUIRES_BUILD([swapon], [libblkid])
|
||||
UL_REQUIRES_BUILD([swapon], [libmount])
|
@ -22,7 +22,7 @@ PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kodi.tv"
|
||||
PKG_URL="http://garr.dl.sourceforge.net/project/jsoncpp/jsoncpp/0.5.0/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_URL="http://sources.openelec.tv/mirror/jsoncpp/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="fc95251"
|
||||
PKG_VERSION="9a21e6a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
@ -47,8 +47,14 @@ if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then
|
||||
fi
|
||||
|
||||
get_graphicdrivers
|
||||
# Drivers
|
||||
|
||||
# Drivers
|
||||
if [ -n "$LIBINPUT" ]; then
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-input-libinput"
|
||||
else
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-input-evdev"
|
||||
for drv in $XORG_DRIVERS; do
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-video-$drv"
|
||||
done
|
||||
fi
|
||||
|
||||
for drv in $XORG_DRIVERS; do
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-video-$drv"
|
||||
done
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libinput"
|
||||
PKG_VERSION="0.21.0"
|
||||
PKG_VERSION="1.0.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,12 +17,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libmicrohttpd"
|
||||
PKG_VERSION="0.9.42"
|
||||
PKG_VERSION="0.9.43"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="http://www.gnu.org/software/libmicrohttpd/"
|
||||
PKG_URL="ftp://ftp.gnu.org/gnu/libmicrohttpd/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_LICENSE="LGPLv2.1"
|
||||
PKG_SITE="https://www.gnu.org/software/libmicrohttpd/"
|
||||
PKG_URL="https://ftp.gnu.org/gnu/libmicrohttpd/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain libgcrypt"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="web"
|
||||
|
@ -1,33 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC 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 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="yaml"
|
||||
PKG_VERSION="0.1.4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://pyyaml.org"
|
||||
PKG_URL="http://pyyaml.org/download/libyaml/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="web"
|
||||
PKG_SHORTDESC="yaml: a next generation YAML parser and emitter."
|
||||
PKG_LONGDESC="yaml is the next generation YAML parser and emitter."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libxcb"
|
||||
PKG_VERSION="1.11"
|
||||
PKG_VERSION="1.11.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -0,0 +1,21 @@
|
||||
[Unit]
|
||||
Description=Debug Shell on /dev/console
|
||||
DefaultDependencies=no
|
||||
ConditionKernelCommandLine=console
|
||||
|
||||
[Service]
|
||||
WorkingDirectory=/storage
|
||||
ExecStart=/bin/sh -c '. /etc/profile; exec /bin/sh'
|
||||
Restart=always
|
||||
RestartSec=0
|
||||
StandardInput=tty
|
||||
TTYPath=/dev/console
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
KillMode=process
|
||||
IgnoreSIGPIPE=no
|
||||
# bash ignores SIGTERM
|
||||
KillSignal=SIGHUP
|
||||
|
||||
[Install]
|
||||
WantedBy=sysinit.target
|
@ -1386,6 +1386,7 @@ CONFIG_BCM_VC_CMA=y
|
||||
CONFIG_BCM2708_VCMEM=y
|
||||
CONFIG_BCM_VCIO=y
|
||||
CONFIG_BCM_VC_SM=y
|
||||
CONFIG_BCM2835_DEVGPIOMEM=m
|
||||
# CONFIG_XILLYBUS is not set
|
||||
|
||||
#
|
||||
@ -2382,6 +2383,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
|
||||
CONFIG_SND_BCM2708_SOC_RPI_DAC=m
|
||||
CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
|
||||
CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
|
||||
CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
|
||||
# CONFIG_SND_DESIGNWARE_I2S is not set
|
||||
|
||||
#
|
||||
@ -2466,7 +2468,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
|
||||
# CONFIG_SND_SOC_WM8903 is not set
|
||||
# CONFIG_SND_SOC_WM8962 is not set
|
||||
# CONFIG_SND_SOC_WM8978 is not set
|
||||
# CONFIG_SND_SOC_TPA6130A2 is not set
|
||||
CONFIG_SND_SOC_TPA6130A2=m
|
||||
# CONFIG_SND_SIMPLE_CARD is not set
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
CONFIG_AC97_BUS=m
|
||||
|
@ -149,3 +149,8 @@
|
||||
# Space separated list is supported,
|
||||
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
|
||||
ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS"
|
||||
|
||||
# set up serial console when building a development image
|
||||
if [ "$DEVEL_VERSION" = "devel" ] ; then
|
||||
EXTRA_CMDLINE="console=ttyAMA0,115200"
|
||||
fi
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,11 +0,0 @@
|
||||
--- a/drivers/spi/spi-bcm2835.c 2015-08-18 01:31:02.424153151 +0100
|
||||
+++ b/drivers/spi/spi-bcm2835.c 2015-08-18 01:30:50.860074902 +0100
|
||||
@@ -592,7 +592,7 @@
|
||||
return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs);
|
||||
}
|
||||
|
||||
-#if 0
|
||||
+#if 1
|
||||
static void bcm2835_spi_handle_err(struct spi_master *master,
|
||||
struct spi_message *msg)
|
||||
{
|
@ -0,0 +1,21 @@
|
||||
[Unit]
|
||||
Description=Debug Shell on /dev/console
|
||||
DefaultDependencies=no
|
||||
ConditionKernelCommandLine=console
|
||||
|
||||
[Service]
|
||||
WorkingDirectory=/storage
|
||||
ExecStart=/bin/sh -c '. /etc/profile; exec /bin/sh'
|
||||
Restart=always
|
||||
RestartSec=0
|
||||
StandardInput=tty
|
||||
TTYPath=/dev/console
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
KillMode=process
|
||||
IgnoreSIGPIPE=no
|
||||
# bash ignores SIGTERM
|
||||
KillSignal=SIGHUP
|
||||
|
||||
[Install]
|
||||
WantedBy=sysinit.target
|
@ -1438,6 +1438,7 @@ CONFIG_BCM_VC_CMA=y
|
||||
CONFIG_BCM2708_VCMEM=y
|
||||
CONFIG_BCM_VCIO=y
|
||||
CONFIG_BCM_VC_SM=y
|
||||
CONFIG_BCM2835_DEVGPIOMEM=m
|
||||
# CONFIG_XILLYBUS is not set
|
||||
|
||||
#
|
||||
@ -2434,6 +2435,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
|
||||
CONFIG_SND_BCM2708_SOC_RPI_DAC=m
|
||||
CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
|
||||
CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
|
||||
CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
|
||||
# CONFIG_SND_DESIGNWARE_I2S is not set
|
||||
|
||||
#
|
||||
@ -2518,7 +2520,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
|
||||
# CONFIG_SND_SOC_WM8903 is not set
|
||||
# CONFIG_SND_SOC_WM8962 is not set
|
||||
# CONFIG_SND_SOC_WM8978 is not set
|
||||
# CONFIG_SND_SOC_TPA6130A2 is not set
|
||||
CONFIG_SND_SOC_TPA6130A2=m
|
||||
# CONFIG_SND_SIMPLE_CARD is not set
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
CONFIG_AC97_BUS=m
|
||||
|
@ -149,3 +149,8 @@
|
||||
# Space separated list is supported,
|
||||
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
|
||||
ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS"
|
||||
|
||||
# set up serial console when building a development image
|
||||
if [ "$DEVEL_VERSION" = "devel" ] ; then
|
||||
EXTRA_CMDLINE="console=ttyAMA0,115200"
|
||||
fi
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,11 +0,0 @@
|
||||
--- a/drivers/spi/spi-bcm2835.c 2015-08-18 01:31:02.424153151 +0100
|
||||
+++ b/drivers/spi/spi-bcm2835.c 2015-08-18 01:30:50.860074902 +0100
|
||||
@@ -592,7 +592,7 @@
|
||||
return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs);
|
||||
}
|
||||
|
||||
-#if 0
|
||||
+#if 1
|
||||
static void bcm2835_spi_handle_err(struct spi_master *master,
|
||||
struct spi_message *msg)
|
||||
{
|
@ -333,6 +333,7 @@ fi
|
||||
UUID_SYSTEM="$(uuidgen)" \
|
||||
UUID_STORAGE="$(uuidgen)" \
|
||||
UBOOT_SYSTEM="$UBOOT_SYSTEM" \
|
||||
EXTRA_CMDLINE="$EXTRA_CMDLINE" \
|
||||
$SCRIPTS/mkimage
|
||||
fi
|
||||
|
||||
|
@ -148,7 +148,7 @@ elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
|
||||
# create bootloader configuration
|
||||
echo "image: creating bootloader configuration..."
|
||||
cat << EOF > "$OE_TMP"/cmdline.txt
|
||||
boot=/dev/mmcblk0p1 disk=/dev/mmcblk0p2 quiet
|
||||
boot=/dev/mmcblk0p1 disk=/dev/mmcblk0p2 quiet $EXTRA_CMDLINE
|
||||
EOF
|
||||
|
||||
# copy files
|
||||
|
Loading…
x
Reference in New Issue
Block a user