Merged upstream/master

This commit is contained in:
Lionel Widdifield 2011-09-10 09:37:32 -07:00
commit 0efc099688
70 changed files with 1536 additions and 777 deletions

View File

@ -38,6 +38,7 @@ fi
if [ "$LTO_SUPPORT" = yes ];then
GCC_OPTIM="$GCC_OPTIM -flto"
LD_OPTIM="$LD_OPTIM -flto"
fi
if [ "$GOLD_SUPPORT" = yes ];then
@ -57,7 +58,7 @@ fi
TARGET_CPPFLAGS=
TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
TARGET_CXXFLAGS="$TARGET_CFLAGS"
TARGET_LDFLAGS="$TARGET_LDFLAGS $GCC_OPTIM $LD_OPTIM"
TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM"
TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="gdb"
PKG_VERSION="7.3"
PKG_VERSION="7.3.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/gdb/"
PKG_URL="http://ftp.gnu.org/gnu/gdb/$PKG_NAME-${PKG_VERSION}a.tar.bz2"
PKG_URL="http://ftp.gnu.org/gnu/gdb/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="ncurses expat"
PKG_BUILD_DEPENDS="toolchain ncurses expat"
PKG_PRIORITY="optional"

View File

@ -200,6 +200,7 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
mount_part "$boot" "/flash" "ro,noatime"
show_splash
<<<<<<< HEAD
if [ -n "$disk" ]; then
mount_part "$disk" "/storage" "rw,noatime"
@ -239,6 +240,12 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
fi
# unmount all other filesystems
=======
# move /flash to /sysroot
/bin/busybox mount --move /flash /sysroot/flash
# unmount all other filesystems
>>>>>>> upstream/master
/bin/busybox umount /dev
/bin/busybox umount /proc
/bin/busybox umount /sys

View File

@ -23,6 +23,12 @@
#
# runlevels: openelec, textmode
progress "set cpu's to full power"
case $RUNLEVEL in
boot)
progress "set cpu's to full power"
cpupower frequency-set -g performance > /dev/null 2>&1
;;
cpupower frequency-set -g performance
poweroff|reboot)
;;
esac

View File

@ -23,13 +23,19 @@
#
# runlevels: openelec, textmode
(
case $RUNLEVEL in
boot)
(
progress "loading kernel modules"
IFS='
'
'
for module in `cat /etc/modules|grep "^[^#]"`; do
eval "modprobe $module" >/dev/null 2>&1
done
)&
;;
)&
poweroff|reboot)
;;
esac

View File

@ -0,0 +1,44 @@
################################################################################
# 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
################################################################################
#
# setup XBMC addons
#
# runlevels: openelec, textmode
case $RUNLEVEL in
boot)
progress "setup XBMC addons"
# hack: add addons to $PATH
for i in `find /storage/.xbmc/addons/* -name bin -type d`; do
PATH="$PATH:$i"
done
export PATH
# hack: make addon-bins executable
chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
;;
poweroff|reboot)
;;
esac

View File

@ -22,19 +22,21 @@
#
# runlevels: openelec
progress "setup XBMC"
case $RUNLEVEL in
boot)
progress "setup XBMC"
#
# clean temp dir
#
#
# clean temp dir
#
rm -rf $HOME/.xbmc/temp/*
#
# add some default settings
#
#
# add some default settings
#
mkdir -p $HOME/.xbmc/userdata
# use dds fanarts by default
# use dds fanarts by default
if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then
cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
<advancedsettings>
@ -49,9 +51,9 @@ progress "setup XBMC"
EOF
fi
#
# setup directories for XBMC sources
#
#
# setup directories for XBMC sources
#
[ ! -d "$HOME/music" ] && mkdir -p $HOME/music
[ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures
@ -92,9 +94,9 @@ EOF
EOF
fi
#
# common setup guisettings
#
#
# common setup guisettings
#
mkdir -p $HOME/.xbmc/userdata
@ -109,17 +111,17 @@ EOF
</debug>
EOF
#
# include project specific options
#
#
# include project specific options
#
if [ -f /usr/share/xbmc/config/guisettings.xml ]; then
cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml
fi
#
# common setup for amd and nvidia graphic
#
#
# common setup for amd and nvidia graphic
#
# Always sync to vblank
if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
@ -131,3 +133,8 @@ EOF
fi
echo "</settings>" >> $HOME/.xbmc/userdata/guisettings.xml
fi
;;
poweroff|reboot)
;;
esac

View File

@ -22,21 +22,20 @@
#
# runlevels: openelec
LIRCDEV="/var/run/lirc/lircd"
[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
case $RUNLEVEL in
boot)
LIRCDEV="/var/run/lirc/lircd"
[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
progress "starting XBMC"
progress "starting XBMC"
# hack for Boxee Remote
if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
# hack for Boxee Remote
if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
export SDL_MOUSE_RELATIVE=0
fi
fi
# hack: make addon-bins executable
chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
# starting autostart script (will be removed later again, dont use it!!!)
# starting autostart script (will be removed later again, dont use it!!!)
AUTOSTART="/storage/.config/autostart.sh"
if [ -f $AUTOSTART ]; then
echo "!!! AUTOSTART script detected !!!" >> /var/log/messages
@ -46,19 +45,19 @@ fi
sh $AUTOSTART
fi
# starting autoupdate
# starting autoupdate
[ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
# waiting for Xorg to start
# waiting for Xorg to start
wait_for_xorg
# set cpu's to 'on demand'
# set cpu's to 'on demand'
( usleep 15000000
progress "set cpu's to 'on demand'"
cpupower frequency-set -g ondemand
cpupower frequency-set -g ondemand > /dev/null 2>&1
)&
# starting XBMC
# starting XBMC
while true; do
DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1
@ -66,13 +65,13 @@ fi
case "$RET" in
0)
poweroff -f
RUNLEVEL="poweroff"
;;
64)
poweroff -f
RUNLEVEL="poweroff"
;;
66)
reboot
RUNLEVEL="reboot"
;;
255)
echo "Abnormal Exit. Exited with code $RET"
@ -85,3 +84,8 @@ fi
usleep 250000
done
;;
poweroff|reboot)
;;
esac

View File

@ -0,0 +1,448 @@
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/Makefile xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/Makefile
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/Makefile 2011-03-08 02:49:14.000000000 +0100
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/Makefile 2011-09-06 22:59:02.915548511 +0200
@@ -1,8 +1,9 @@
INCLUDES=-I../../../.. -I. -I../../../ -I../../../linux -I../../../../guilib -I../../../utils -I../../../cores -I../../../../lib/jsoncpp/jsoncpp/include
-SRCS=action.cpp controlbutton.cpp controlcheckmark.cpp control.cpp controlfadelabel.cpp controlimage.cpp controllabel.cpp controllist.cpp controlprogress.cpp controlslider.cpp controlspin.cpp controltextbox.cpp dialog.cpp GUIPythonWindow.cpp GUIPythonWindowDialog.cpp GUIPythonWindowXML.cpp GUIPythonWindowXMLDialog.cpp infotagmusic.cpp infotagvideo.cpp keyboard.cpp listitem.cpp player.cpp pyplaylist.cpp PythonPlayer.cpp pyutil.cpp window.cpp winxml.cpp winxmldialog.cpp xbmcguimodule.cpp xbmcmodule.cpp controlgroup.cpp xbmcplugin.cpp controlradiobutton.cpp PythonAddon.cpp xbmcaddonmodule.cpp
+SRCS=action.cpp controlbutton.cpp controlcheckmark.cpp control.cpp controlfadelabel.cpp controlimage.cpp controllabel.cpp controllist.cpp controlprogress.cpp controlslider.cpp controlspin.cpp controltextbox.cpp dialog.cpp GUIPythonWindow.cpp GUIPythonWindowDialog.cpp GUIPythonWindowXML.cpp GUIPythonWindowXMLDialog.cpp infotagmusic.cpp infotagvideo.cpp keyboard.cpp listitem.cpp player.cpp pyplaylist.cpp PythonPlayer.cpp pyutil.cpp window.cpp winxml.cpp winxmldialog.cpp xbmcguimodule.cpp xbmcmodule.cpp controlgroup.cpp xbmcplugin.cpp controlradiobutton.cpp PythonAddon.cpp xbmcaddonmodule.cpp xbmcvfsmodule.cpp
LIB=xbmcmodule.a
include ../../../../Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
+
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2011-03-08 02:49:14.000000000 +0100
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2011-09-06 22:59:02.916548524 +0200
@@ -64,6 +64,7 @@
#include "SectionLoader.h"
#include "Settings.h"
#include "LocalizeStrings.h"
+#include "utils/FileUtils.h"
// include for constants
#include "pyutil.h"
@@ -958,6 +959,35 @@
return Py_BuildValue((char*)"b", exists);
}
+
+ PyDoc_STRVAR(subHashAndFileSize__doc__,
+ "subHashAndFileSize(file)\n"
+ "\n"
+ "file : file to calculate subtitle hash and size for"
+ "\n"
+ "example:\n"
+ " size,hash = xbmcvfs.subHashAndFileSize(file)\n");
+ PyObject* XBMC_subHashAndFileSize(PyObject *self, PyObject *args, PyObject *kwds)
+ {
+ PyObject *f_line;
+ if (!PyArg_ParseTuple(
+ args,
+ (char*)"O",
+ &f_line))
+ {
+ return NULL;
+ }
+ CStdString strSource;
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
+
+ CStdString strSize;
+ CStdString strHash;
+ Py_BEGIN_ALLOW_THREADS
+ CFileUtils::SubtitleFileSizeAndHash(strSource, strSize, strHash);
+ Py_END_ALLOW_THREADS
+
+ return Py_BuildValue((char*)"ss",strSize.c_str(), strHash.c_str());
+ }
// define c functions to be used in python here
PyMethodDef xbmcMethods[] = {
@@ -1005,6 +1035,8 @@
{(char*)"getCleanMovieTitle", (PyCFunction)XBMC_GetCleanMovieTitle, METH_VARARGS|METH_KEYWORDS, getCleanMovieTitle__doc__},
{(char*)"skinHasImage", (PyCFunction)XBMC_SkinHasImage, METH_VARARGS|METH_KEYWORDS, skinHasImage__doc__},
+ {(char*)"subHashAndFileSize", (PyCFunction)XBMC_subHashAndFileSize, METH_VARARGS, subHashAndFileSize__doc__},
+
{NULL, NULL, 0, NULL}
};
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp 2011-09-06 23:43:28.717382455 +0200
@@ -0,0 +1,299 @@
+/*
+ * Copyright (C) 2005-2011 Team XBMC
+ * http://www.xbmc.org
+ *
+ * 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 XBMC; 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
+ *
+ */
+
+#include "system.h"
+#if (defined USE_EXTERNAL_PYTHON)
+#if (defined HAVE_LIBPYTHON2_6)
+#include <python2.6/Python.h>
+#elif (defined HAVE_LIBPYTHON2_5)
+#include <python2.5/Python.h>
+#elif (defined HAVE_LIBPYTHON2_4)
+#include <python2.4/Python.h>
+#else
+#error "Could not determine version of Python to use."
+#endif
+#else
+#include "python/Include/Python.h"
+#endif
+#include "../XBPythonDll.h"
+
+#include "FileSystem/Directory.h"
+#include "FileSystem/File.h"
+#include "pyutil.h"
+
+using namespace std;
+using namespace XFILE;
+using namespace PYXBMC;
+
+#ifndef __GNUC__
+#pragma code_seg("PY_TEXT")
+#pragma data_seg("PY_DATA")
+#pragma bss_seg("PY_BSS")
+#pragma const_seg("PY_RDATA")
+#endif
+
+#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2)
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ namespace xbmcvfs
+ {
+ /*****************************************************************
+ * start of xbmcvfs methods
+ *****************************************************************/
+ typedef struct {
+ PyObject_HEAD
+ CFile* pFile;
+ } File;
+
+ // copy() method
+ PyDoc_STRVAR(copy__doc__,
+ "copy(source, destination) -- copy file to destination, returns true/false.\n"
+ "\n"
+ "source : file to copy.\n"
+ "destination : destination file"
+ "\n"
+ "example:\n"
+ " success = xbmcvfs.copy(source, destination)\n");
+
+ PyObject* vfs_copy(PyObject *self, PyObject *args)
+ {
+ PyObject *f_line;
+ PyObject *d_line;
+ if (!PyArg_ParseTuple(
+ args,
+ (char*)"OO",
+ &f_line,
+ &d_line))
+ {
+ return NULL;
+ }
+ CStdString strSource;
+ CStdString strDestnation;
+ bool bResult = true;
+
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
+ if (!PyXBMCGetUnicodeString(strDestnation, d_line, 1)) return NULL;
+ Py_BEGIN_ALLOW_THREADS
+ bResult = CFile::Cache(strSource, strDestnation);
+ Py_END_ALLOW_THREADS
+
+ return Py_BuildValue((char*)"b", bResult);
+ }
+ PyDoc_STRVAR(delete__doc__,
+ "delete(file)\n"
+ "\n"
+ "file : file to delete"
+ "\n"
+ "example:\n"
+ " xbmcvfs.delete(file)\n");
+
+ // delete a file
+ PyObject* vfs_delete(File *self, PyObject *args, PyObject *kwds)
+ {
+ PyObject *f_line;
+ if (!PyArg_ParseTuple(
+ args,
+ (char*)"O",
+ &f_line))
+ {
+ return NULL;
+ }
+ CStdString strSource;
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
+
+ Py_BEGIN_ALLOW_THREADS
+ self->pFile->Delete(strSource);
+ Py_END_ALLOW_THREADS
+
+ Py_INCREF(Py_None);
+ return Py_None;
+
+ }
+
+ PyDoc_STRVAR(rename__doc__,
+ "rename(file, newFileName)\n"
+ "\n"
+ "file : file to reaname"
+ "newFileName : new filename, including the full path"
+ "\n"
+ "example:\n"
+ " success = xbmcvfs.rename(file,newFileName)\n");
+
+ // rename a file
+ PyObject* vfs_rename(File *self, PyObject *args, PyObject *kwds)
+ {
+ PyObject *f_line;
+ PyObject *d_line;
+ if (!PyArg_ParseTuple(
+ args,
+ (char*)"OO",
+ &f_line,
+ &d_line))
+ {
+ return NULL;
+ }
+ CStdString strSource;
+ CStdString strDestnation;
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
+ if (!PyXBMCGetUnicodeString(strDestnation, d_line, 1)) return NULL;
+
+ bool bResult;
+ Py_BEGIN_ALLOW_THREADS
+ bResult = self->pFile->Rename(strSource,strDestnation);
+ Py_END_ALLOW_THREADS
+
+ return Py_BuildValue((char*)"b", bResult);
+
+ }
+
+ PyDoc_STRVAR(exists__doc__,
+ "exists(path)\n"
+ "\n"
+ "path : file or folder"
+ "\n"
+ "example:\n"
+ " success = xbmcvfs.exists(path)\n");
+
+ // check for a file or folder existance, mimics Pythons os.path.exists()
+ PyObject* vfs_exists(File *self, PyObject *args, PyObject *kwds)
+ {
+ PyObject *f_line;
+ if (!PyArg_ParseTuple(
+ args,
+ (char*)"O",
+ &f_line))
+ {
+ return NULL;
+ }
+ CStdString strSource;
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
+
+ bool bResult;
+
+ Py_BEGIN_ALLOW_THREADS
+ bResult = self->pFile->Exists(strSource, false);
+ Py_END_ALLOW_THREADS
+
+ return Py_BuildValue((char*)"b", bResult);
+ }
+
+ PyDoc_STRVAR(mkdir__doc__,
+ "mkdir(path) -- Create a folder.\n"
+ "\n"
+ "path : folder\n"
+ "\n"
+ "example:\n"
+ " - success = xbmcvfs.mkdir(path)\n");
+ // make a directory
+ PyObject* vfs_mkdir(File *self, PyObject *args, PyObject *kwds)
+ {
+ PyObject *f_line;
+ if (!PyArg_ParseTuple(
+ args,
+ (char*)"O",
+ &f_line))
+ {
+ return NULL;
+ }
+ CStdString strSource;
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
+
+ bool bResult;
+
+ Py_BEGIN_ALLOW_THREADS
+ bResult = CDirectory::Create(strSource);
+ Py_END_ALLOW_THREADS
+
+ return Py_BuildValue((char*)"b", bResult);
+ }
+
+ PyDoc_STRVAR(rmdir__doc__,
+ "rmdir(path) -- Remove a folder.\n"
+ "\n"
+ "path : folder\n"
+ "\n"
+ "example:\n"
+ " - success = xbmcvfs.rmdir(path)\n");
+ // remove a directory
+ PyObject* vfs_rmdir(File *self, PyObject *args, PyObject *kwds)
+ {
+ PyObject *f_line;
+ if (!PyArg_ParseTuple(
+ args,
+ (char*)"O",
+ &f_line))
+ {
+ return NULL;
+ }
+ CStdString strSource;
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
+
+ bool bResult;
+
+ Py_BEGIN_ALLOW_THREADS
+ bResult = CDirectory::Remove(strSource);
+ Py_END_ALLOW_THREADS
+
+ return Py_BuildValue((char*)"b", bResult);
+ }
+
+ // define c functions to be used in python here
+ PyMethodDef xbmcvfsMethods[] = {
+ {(char*)"copy", (PyCFunction)vfs_copy, METH_VARARGS, copy__doc__},
+ {(char*)"delete", (PyCFunction)vfs_delete, METH_VARARGS, delete__doc__},
+ {(char*)"rename", (PyCFunction)vfs_rename, METH_VARARGS, rename__doc__},
+ {(char*)"mkdir", (PyCFunction)vfs_mkdir, METH_VARARGS, mkdir__doc__},
+ {(char*)"rmdir", (PyCFunction)vfs_rmdir, METH_VARARGS, rmdir__doc__},
+ {(char*)"exists", (PyCFunction)vfs_exists, METH_VARARGS, exists__doc__},
+ {NULL, NULL, 0, NULL}
+ };
+
+ /*****************************************************************
+ * end of methods and python objects
+ * initxbmc(void);
+ *****************************************************************/
+
+
+ PyMODINIT_FUNC
+ DeinitVFSModule()
+ {
+ // no need to Py_DECREF our objects (see InitXBMCMVFSModule()) as they were created only
+ // so that they could be added to the module, which steals a reference.
+ }
+
+ PyMODINIT_FUNC
+ InitVFSModule()
+ {
+ // init general xbmc modules
+ PyObject* pXbmcvfsModule;
+ pXbmcvfsModule = Py_InitModule((char*)"xbmcvfs", xbmcvfsMethods);
+ if (pXbmcvfsModule == NULL) return;
+ }
+ }
+
+#ifdef __cplusplus
+}
+#endif
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/XBPython.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/XBPython.cpp
--- xbmc-10.1-Dharma/xbmc/lib/libPython/XBPython.cpp 2011-03-08 02:49:15.000000000 +0100
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/XBPython.cpp 2011-09-06 22:59:02.955549037 +0200
@@ -119,6 +119,8 @@
void InitAddonModule(void);
void InitAddonTypes(void);
void DeinitAddonModule(void);
+ void InitVFSModule(void);
+ void DeinitVFSModule(void);
}
XBPython::XBPython()
@@ -297,7 +299,8 @@
InitPluginModule(); // init xbmcplugin modules
InitGUIModule(); // init xbmcgui modules
InitAddonModule(); // init xbmcaddon modules
-
+ InitVFSModule(); // init xbmcvfs modules
+
// redirecting default output to debug console
if (PyRun_SimpleString(""
"import xbmc\n"
@@ -325,6 +328,7 @@
DeinitPluginModule();
DeinitGUIModule();
DeinitAddonModule();
+ DeinitVFSModule();
}
/**
diff -Naur xbmc-10.1-Dharma/xbmc/utils/FileUtils.cpp xbmc-10.1-Dharma.patch/xbmc/utils/FileUtils.cpp
--- xbmc-10.1-Dharma/xbmc/utils/FileUtils.cpp 2011-03-08 02:49:14.000000000 +0100
+++ xbmc-10.1-Dharma.patch/xbmc/utils/FileUtils.cpp 2011-09-06 22:59:02.977549326 +0200
@@ -72,3 +72,32 @@
}
return false;
}
+
+bool CFileUtils::SubtitleFileSizeAndHash(const CStdString &path, CStdString &strSize, CStdString &strHash)
+{
+ const size_t chksum_block_size = 8192;
+
+ CFile file;
+ size_t i;
+ uint64_t hash = 0;
+ uint64_t buffer1[chksum_block_size*2];
+ uint64_t fileSize ;
+ // In natural language it calculates: size + 64k chksum of the first and last 64k
+ // (even if they overlap because the file is smaller than 128k).
+ file.Open(path, READ_NO_CACHE); //open file
+ file.Read(buffer1, chksum_block_size*sizeof(uint64_t)); //read first 64k
+ file.Seek(-(int64_t)chksum_block_size*sizeof(uint64_t), SEEK_END); //seek to the end of the file
+ file.Read(&buffer1[chksum_block_size], chksum_block_size*sizeof(uint64_t)); //read last 64k
+
+ for (i=0;i<chksum_block_size*2;i++)
+ hash += buffer1[i];
+
+ fileSize = file.GetLength();
+
+ hash += fileSize; //add size
+
+ file.Close(); //close file
+ strHash.Format("%"PRIx64"", hash); //format hash
+ strSize.Format("%d", fileSize); // format size
+ return true;
+}
diff -Naur xbmc-10.1-Dharma/xbmc/utils/FileUtils.h xbmc-10.1-Dharma.patch/xbmc/utils/FileUtils.h
--- xbmc-10.1-Dharma/xbmc/utils/FileUtils.h 2011-03-08 02:49:14.000000000 +0100
+++ xbmc-10.1-Dharma.patch/xbmc/utils/FileUtils.h 2011-09-06 22:59:03.023549930 +0200
@@ -6,4 +6,5 @@
public:
static bool DeleteItem(const CFileItemPtr &item);
static bool RenameFile(const CStdString &strFile);
+ static bool SubtitleFileSizeAndHash(const CStdString &path, CStdString &strSize, CStdString &strHash);
};

View File

@ -0,0 +1,12 @@
diff -Naur xbmc-10.1-Dharma/xbmc/FileSystem/FileSmb.cpp xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileSmb.cpp
--- xbmc-10.1-Dharma/xbmc/FileSystem/FileSmb.cpp 2011-09-05 02:24:35.154994777 +0200
+++ xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileSmb.cpp 2011-09-05 02:22:55.604582159 +0200
@@ -122,6 +122,8 @@
// use the weaker LANMAN password hash in order to be compatible with older servers
fprintf(f, "\tclient lanman auth = yes\n");
fprintf(f, "\tlanman auth = yes\n");
+ fprintf(f, "\tsocket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=65536 SO_SNDBUF=65536\n");
+ fprintf(f, "\tlock directory = %s/.smb/\n", getenv("HOME"));
// set wins server if there's one. name resolve order defaults to 'lmhosts host wins bcast'.
// if no WINS server has been specified the wins method will be ignored.

View File

@ -22,11 +22,19 @@
#
# runlevels: openelec, textmode
(
case $RUNLEVEL in
boot)
(
wait_for_network
progress "Starting Avahi Daemon"
mkdir -p /var/run/avahi-daemon
avahi-daemon -D
)&
)&
;;
poweroff|reboot)
progress "Starting Avahi Daemon"
killall avahi-daemon
;;
esac

View File

@ -22,28 +22,30 @@
#
# runlevels: openelec, installer, textmode
if [ -f /var/config/settings.conf ]; then
case $RUNLEVEL in
boot)
if [ -f /var/config/settings.conf ]; then
. /var/config/settings.conf
# save original interface names (eth0, eth1)
# save original interface names (eth0, eth1)
NET_IFACE_NAME=$NET_IFACE
NET2_IFACE_NAME=$NET2_IFACE
fi
fi
[ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
[ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec"
# setup hostname
# setup hostname
progress "Setup hostname"
echo "$NET_HOSTNAME" > /proc/sys/kernel/hostname
# create /etc/hosts file, useful for gethostbyname(localhost)
# create /etc/hosts file, useful for gethostbyname(localhost)
progress "creating /etc/hosts"
echo -e "127.0.0.1\tlocalhost $NET_HOSTNAME" > /etc/hosts
# add user defined hosts.conf entry's
# add user defined hosts.conf entry's
[ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts
(
(
# setup Networking 1
progress "setup Networking 1"
@ -168,7 +170,7 @@ fi
[ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3"
[ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE
(
(
# wait some time, put eth1 (NET2_IFACE) down and then up
# this is just temporary solution until I figure out how to
# do properly with connman
@ -176,7 +178,7 @@ fi
ifconfig $NET2_IFACE_NAME down
usleep 1000000
ifconfig $NET2_IFACE_NAME up
)&
)&
fi
# END OF NETWORK 2
@ -193,4 +195,9 @@ fi
/usr/sbin/connmand -n > /dev/null 2>&1
usleep 250000
done
)&
)&
;;
poweroff|reboot)
;;
esac

View File

@ -22,9 +22,16 @@
#
# runlevels: openelec, textmode
(
case $RUNLEVEL in
boot)
(
wait_for_network
progress "mounting Network shares"
netmount > /dev/null 2>&1
)&
)&
;;
poweroff|reboot)
;;
esac

View File

@ -26,7 +26,7 @@ export LD="$TARGET_CC"
export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS"
cd $PKG_BUILD
ac_cv_have_space_for_dirent_d_name=yes \
#ac_cv_have_space_for_dirent_d_name=yes \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \

View File

@ -22,7 +22,6 @@
#
# runlevels: openelec, textmode
(
RSA1_KEY="/storage/.cache/ssh/ssh_host_key"
RSA2_KEY="/storage/.cache/ssh/ssh_host_rsa_key"
DSA2_KEY="/storage/.cache/ssh/ssh_host_dsa_key"
@ -30,6 +29,9 @@
KEYGEN="/usr/bin/ssh-keygen"
SSHD="/usr/sbin/sshd"
case $RUNLEVEL in
boot)
(
# Check for the SSH1 RSA key
if [ ! -f $RSA1_KEY ] ; then
progress "SSH: generating SSH1 RSA key"
@ -72,5 +74,11 @@
mkdir -p /var/empty
chmod -R 600 /var/empty
$SSHD
)&
;;
)&
poweroff|reboot)
progress "Stopping SSH Server"
killall sshd
;;
esac

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="openssh"
PKG_VERSION="5.8p2"
PKG_VERSION="5.9p1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -1,53 +0,0 @@
diff -Naur openssh-5.8p1-old/configure.ac openssh-5.8p1-new/configure.ac
--- openssh-5.8p1-old/configure.ac 2011-02-21 17:41:23.000000000 -0800
+++ openssh-5.8p1-new/configure.ac 2011-02-21 17:42:20.000000000 -0800
@@ -41,7 +41,7 @@
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_EGREP
-AC_PATH_PROG(AR, ar)
+AC_PATH_TOOL(AR, ar)
AC_PATH_PROG(CAT, cat)
AC_PATH_PROG(KILL, kill)
AC_PATH_PROGS(PERL, perl5 perl)
@@ -1188,25 +1188,25 @@
AC_CHECK_DECLS(GLOB_NOMATCH, , , [#include <glob.h>])
-AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
-AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+AC_CACHE_CHECK(
+ [whether struct dirent allocates space for d_name],
+ [ac_cv_have_space_for_dirent_d_name],
+ [AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
#include <sys/types.h>
#include <dirent.h>
int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
- ]])],
- [AC_MSG_RESULT(yes)],
- [
- AC_MSG_RESULT(no)
- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1,
- [Define if your struct dirent expects you to
- allocate extra space for d_name])
- ],
- [
- AC_MSG_WARN([cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME])
- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
- ]
+ ]])],
+ [ ac_cv_have_space_for_dirent_d_name="yes" ],
+ [ ac_cv_have_space_for_dirent_d_name="no" ],
+ [ ac_cv_have_space_for_dirent_d_name="no" ]
+ )]
)
+if test "x$ac_cv_have_space_for_dirent_d_name" = "xno" ; then
+ AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1,
+ [Define if your struct dirent expects you to
+ allocate extra space for d_name])
+fi
AC_MSG_CHECKING([for /proc/pid/fd directory])
if test -d "/proc/$$/fd" ; then

View File

@ -1,49 +0,0 @@
diff -Naur openssh-5.8p1-old/channels.c openssh-5.8p1-new/channels.c
--- openssh-5.8p1-old/channels.c 2010-11-30 17:02:35.000000000 -0800
+++ openssh-5.8p1-new/channels.c 2011-02-21 17:41:34.000000000 -0800
@@ -61,6 +61,7 @@
#include <termios.h>
#include <unistd.h>
#include <stdarg.h>
+#include <stddef.h>
#include "openbsd-compat/sys-queue.h"
#include "xmalloc.h"
@@ -3353,6 +3354,8 @@
{
int sock;
struct sockaddr_un addr;
+ int abstract = 0;
+ int addrsize = 0;
sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (sock < 0)
@@ -3360,8 +3363,15 @@
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
strlcpy(addr.sun_path, pathname, sizeof addr.sun_path);
- if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0)
+ addrsize = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path);
+ if (addr.sun_path[0] = '@')
+ abstract = 1;
+ if (abstract)
+ addr.sun_path[0] = '\0';
+ if (connect(sock, (struct sockaddr *)&addr, addrsize) == 0)
return sock;
+ if (abstract)
+ addr.sun_path[0] = '@';
close(sock);
error("connect %.100s: %.100s", addr.sun_path, strerror(errno));
return -1;
diff -Naur openssh-5.8p1-old/defines.h openssh-5.8p1-new/defines.h
--- openssh-5.8p1-old/defines.h 2011-01-17 02:15:31.000000000 -0800
+++ openssh-5.8p1-new/defines.h 2011-02-21 17:41:34.000000000 -0800
@@ -411,7 +411,7 @@
# ifdef __hpux
# define X_UNIX_PATH "/var/spool/sockets/X11/%u"
# else
-# define X_UNIX_PATH "/tmp/.X11-unix/X%u"
+# define X_UNIX_PATH "@/tmp/.X11-unix/X%u"
# endif
#endif /* X_UNIX_PATH */
#define _PATH_UNIX_X X_UNIX_PATH

View File

@ -22,7 +22,12 @@
#
# runlevels: openelec, textmode
(
SMB_USERCONF="/storage/.config/samba.conf"
SMB_DEFCONF="/etc/samba/smb.conf"
case $RUNLEVEL in
boot)
(
if [ -f /var/config/settings.conf ]; then
. /var/config/settings.conf
@ -32,9 +37,6 @@
progress "Starting Samba server"
SMB_USERCONF="/storage/.config/samba.conf"
SMB_DEFCONF="/etc/samba/smb.conf"
if [ -f $SMB_USERCONF ]; then
SMB_ARG="--configfile=$SMB_USERCONF"
else
@ -46,4 +48,12 @@
nmbd --daemon $SMB_ARG > /dev/null 2>&1
fi
fi
)&
)&
;;
poweroff|reboot)
progress "Stopping Samba server"
killall nmbd
killall smbd
;;
esac

View File

@ -22,8 +22,14 @@
#
# runlevels: openelec, textmode
progress "starting ConsoleKit daemon"
case $RUNLEVEL in
boot)
progress "starting ConsoleKit daemon"
install -m 755 -d /var/log/ConsoleKit
install -m 755 -d /var/run/ConsoleKit
;;
poweroff|reboot)
;;
esac

View File

@ -20,4 +20,20 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
reboot
. /etc/profile
progress "Reboot the syste"
RET=0
RUNLEVEL="reboot"
for script in `ls -r1 /etc/init.d/*`; do
if grep -q -e "^# runlevels:.*$MODE" $script; then
. $script
S_RET=$?
test $S_RET -ge $RET && RET=$S_RET
fi
done
sync
reboot

View File

@ -20,4 +20,20 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
poweroff
. /etc/profile
progress "Poweroff the system"
RET=0
RUNLEVEL="poweroff"
for script in `ls -r1 /etc/init.d/*`; do
if grep -q -e "^# runlevels:.*$MODE" $script; then
. $script
S_RET=$?
test $S_RET -ge $RET && RET=$S_RET
fi
done
sync
poweroff -f

View File

@ -23,5 +23,31 @@
#
# runlevels: openelec, installer, textmode
progress "mounting needed filesystems"
case $RUNLEVEL in
boot)
progress "mounting needed filesystems"
mount -n -t devtmpfs none /dev
mkdir -p /dev/pts
mount -n -t devpts -o gid=5,mode=620 none /dev/pts
mkdir -p /dev/shm
mount -n -t tmpfs none /dev/shm
mount -n -t tmpfs none /run
mount -n -t ramfs none /var
mount "$disk" /storage -o rw,noatime > /dev/null 2>&1
;;
poweroff|reboot)
progress "unmounting filesystems"
for i in 1 2 3 4 5 6 7 8 9 10; do
echo "umount /storage"
ERR_ENV=1
umount /storage
[ "$?" -eq "0" ] && ERR_ENV=0 && break
usleep 1000000
done
if [ "$ERR_ENV" -ne "0" ]; then
mount -o remount,ro /storage
umount -l /storage
fi
;;
esac

View File

@ -23,7 +23,9 @@
#
# runlevels: openelec, installer, textmode
progress "make variable directory structure"
case $RUNLEVEL in
boot)
progress "make variable directory structure"
mkdir -p /var/cache \
/var/lock \
/var/media \
@ -47,7 +49,7 @@ progress "make variable directory structure"
touch /var/log/wtmp
chmod 1777 /var/log/wtmp
# others:
# others:
mkdir -p /var/lib/polkit-1
chmod 700 /var/lib/polkit-1
mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d
@ -58,3 +60,10 @@ progress "make variable directory structure"
mkdir -p /var/lib/udisks
mkdir -p /var/lib/upower
;;
poweroff|reboot)
;;
esac

View File

@ -25,7 +25,8 @@
TTY="3"
if [ "$DEBUG" = "yes" ]; then
case $RUNLEVEL in
boot)
echo "###########################################"
echo "## it seems we are running in Debug mode ##"
echo "## starting debugging shell on console $TTY ##"
@ -33,5 +34,9 @@ if [ "$DEBUG" = "yes" ]; then
echo "###########################################"
openvt -w -c $TTY /bin/sh &
;;
poweroff|reboot)
;;
esac
fi

View File

@ -25,9 +25,16 @@
OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
if [ -f "$OPENELEC_SETTINGS" ]; then
case $RUNLEVEL in
boot)
if [ -f "$OPENELEC_SETTINGS" ]; then
progress "creating system settings"
mkdir -p /var/config
cat "$OPENELEC_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/settings.conf
fi
fi
;;
poweroff|reboot)
;;
esac

View File

@ -23,7 +23,9 @@
#
# runlevels: openelec, textmode
if [ -d /usr/config ]; then
case $RUNLEVEL in
boot)
if [ -d /usr/config ]; then
progress "copy userconfig and samples"
cd /usr/config
@ -42,4 +44,9 @@ if [ -d /usr/config ]; then
for sample in `find . -type f -name "*.sample"`; do
cp $sample /storage/.config/$sample
done
fi
fi
;;
poweroff|reboot)
;;
esac

View File

@ -23,10 +23,22 @@
#
# runlevels: openelec, installer, textmode
(
case $RUNLEVEL in
boot)
(
progress "Starting Syslog daemon"
syslogd
progress "Starting Kernellog daemon"
klogd
)&
)&
;;
poweroff|reboot)
progress "Stopping Kernellog daemon"
killall klogd
progress "Stopping Syslog daemon"
killall syslogd
;;
esac

View File

@ -23,5 +23,12 @@
#
# runlevels: openelec, installer, textmode
progress "Setup some CDROM settings"
case $RUNLEVEL in
boot)
progress "Setup some CDROM settings"
sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 &
;;
poweroff|reboot)
;;
esac

View File

@ -24,12 +24,19 @@
TTY="1"
echo "###########################################"
echo "## it seems we are running in Text mode. ##"
echo "## .... starting shell on console $TTY .... ##"
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
echo "###########################################"
case $RUNLEVEL in
boot)
echo "###########################################"
echo "## it seems we are running in Text mode. ##"
echo "## .... starting shell on console $TTY .... ##"
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
echo "###########################################"
while true; do
while true; do
openvt -w -c $TTY /bin/sh
done
done
;;
poweroff|reboot)
;;
esac

View File

@ -19,13 +19,13 @@
################################################################################
PKG_NAME="busybox"
PKG_VERSION="1.19.1"
PKG_VERSION="1.19.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.busybox.net"
PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="grep hdparm speedcontrol pastebinit"
PKG_DEPENDS="kexec-tools grep hdparm speedcontrol pastebinit"
PKG_BUILD_DEPENDS="toolchain busybox-hosttools"
PKG_PRIORITY="required"
PKG_SECTION="system"

View File

@ -1,16 +0,0 @@
diff -Naur busybox-1.19.1/libbb/match_fstype.c busybox-1.19.1.patch/libbb/match_fstype.c
--- busybox-1.19.1/libbb/match_fstype.c 2011-08-28 12:59:56.000000000 +0200
+++ busybox-1.19.1.patch/libbb/match_fstype.c 2011-09-03 02:10:51.480283260 +0200
@@ -10,10 +10,10 @@
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-#ifdef HAVE_MNTENT_H
-
#include "libbb.h"
+#ifdef HAVE_MNTENT_H
+
int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype)
{
int match = 1;

View File

@ -1,31 +0,0 @@
--- busybox-1.19.1/editors/patch.c
+++ busybox-1.19.1-patch/editors/patch.c
@@ -70,8 +70,7 @@ struct double_list {
// Free all the elements of a linked list
// Call freeit() on each element before freeing it.
-static
-void dlist_free(struct double_list *list, void (*freeit)(void *data))
+static void dlist_free(struct double_list *list, void (*freeit)(void *data))
{
while (list) {
void *pop = list;
@@ -83,8 +82,7 @@ void dlist_free(struct double_list *list
}
// Add an entry before "list" element in (circular) doubly linked list
-static
-struct double_list *dlist_add(struct double_list **list, char *data)
+static struct double_list *dlist_add(struct double_list **list, char *data)
{
struct double_list *llist;
struct double_list *line = xmalloc(sizeof(*line));
@@ -232,7 +230,7 @@ static int apply_one_hunk(void)
else matcheof = 0;
if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data);
}
- matcheof = matcheof < TT.context;
+ matcheof = !matcheof || matcheof < TT.context;
if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N');

View File

@ -25,9 +25,4 @@
PATH="/bin:/sbin:/usr/bin:/usr/sbin"
# hack: add addons to $PATH
for i in `find /storage/.xbmc/addons/* -name bin -type d`; do
PATH="$PATH:$i"
done
export PATH

View File

@ -24,14 +24,14 @@
################################################################################
# getting runlevel
RUNLEVEL="openelec"
MODE="openelec"
if test "$TEXTMODE" = yes; then
RUNLEVEL="textmode"
MODE="textmode"
fi
if test "$INSTALLER" = yes; then
RUNLEVEL="installer"
MODE="installer"
fi
export RUNLEVEL
export MODE

View File

@ -26,16 +26,6 @@
echo 0 > /sys/devices/virtual/graphics/fbcon/cursor_blink
mount -n -t devtmpfs none /dev
mkdir -p /dev/pts
mount -n -t devpts -o gid=5,mode=620 none /dev/pts
mkdir -p /dev/shm
mount -n -t tmpfs none /dev/shm
mount -n -t tmpfs none /run
# showing version
lsb_release
@ -46,8 +36,10 @@
progress "Starting Init Scripts"
RET=0
for script in /etc/init.d/*; do
if grep -q -e "^# runlevels:.*$RUNLEVEL" $script; then
RUNLEVEL="boot"
for script in `ls -1 /etc/init.d/*`; do
if grep -q -e "^# runlevels:.*$MODE" $script; then
. $script
S_RET=$?
test $S_RET -ge $RET && RET=$S_RET

View File

@ -23,10 +23,19 @@
#
# runlevels: openelec, textmode
(
case $RUNLEVEL in
boot)
(
progress "Starting D-BUS"
mkdir -p /var/lib/dbus /var/run/dbus
dbus-uuidgen --ensure
dbus-daemon --system
)&
)&
;;
poweroff|reboot)
progress "Stopping D-BUS"
killall dbus-daemon
;;
esac

View File

@ -23,5 +23,14 @@
#
# runlevels: openelec, textmode
progress "Starting Fuse"
case $RUNLEVEL in
boot)
progress "Starting Fuse"
mount -t fusectl fusectl /sys/fs/fuse/connections >/dev/null 2>&1
;;
poweroff|reboot)
progress "Stopping Fuse"
umount /sys/fs/fuse/connections
;;
esac

View File

@ -0,0 +1,41 @@
#!/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
CFLAGS="-O2" # -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2"
LDFLAGS=""
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
--libexecdir=/usr/lib/upower \
--localstatedir=/var \
--without-gamecube \
--with-zlib \
--without-lzma \
--without-xen \
make

View File

@ -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/usr/sbin
cp $PKG_BUILD/build/sbin/kexec $INSTALL/usr/sbin

View 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="kexec-tools"
PKG_VERSION="2.0.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kernel.org/pub/linux/kernel/people/horms/"
PKG_URL="http://horms.net/projects/kexec/kexec-tools/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="zlib"
PKG_BUILD_DEPENDS="toolchain zlib"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="kexec-tools: the user-space portion of kexec"
PKG_LONGDESC="kexec-tools is the user-space portion of kexec, a tool to load another kernel from the currently executing Linux kernel."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

View File

@ -22,7 +22,9 @@
#
# runlevels: openelec, textmode
(
case $RUNLEVEL in
boot)
(
if [ -f /var/config/settings.conf ]; then
. /var/config/settings.conf
@ -46,4 +48,11 @@
LCDd -c $LCD_CONFIG -d $LCD_DRIVER -s true > /dev/null 2>&1
fi
fi
)&
)&
;;
poweroff|reboot)
progress "Stopping LCD daemon"
killall LCDd
;;
esac

View File

@ -22,8 +22,17 @@
#
# runlevels: openelec, textmode
(
case $RUNLEVEL in
boot)
(
progress "starting ATVclient"
mkdir -p /storage/.cache
atvclient -m > /dev/null 2>&1
)&
)&
;;
poweroff|reboot)
progress "stopping ATVclient"
killall atvclient
;;
esac

View File

@ -22,8 +22,17 @@
#
# runlevels: openelec, textmode
(
case $RUNLEVEL in
boot)
(
progress "starting eventlircd"
mkdir -p /var/run/lirc
eventlircd --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP
)&
)&
;;
poweroff|reboot)
progress "starting eventlircd"
killall eventlircd
;;
esac

View File

@ -25,7 +25,9 @@
[ -f /storage/.config/remote.conf ] && . /storage/.config/remote.conf
[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf
if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
case $RUNLEVEL in
boot)
if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
progress "Starting IRtrans daemon"
@ -37,4 +39,11 @@ if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
irserver -logfile /var/log/irserver.log -pidfile /var/run/irserver.pid \
$IRSERVER_ARG -daemon /dev/irtrans0 > /dev/null 2>&1
fi
fi
;;
poweroff|reboot)
progress "Stopping IRtrans daemon"
killall irserver
;;
esac

View File

@ -23,7 +23,16 @@
#
# runlevels: openelec, installer, textmode
progress "starting udev daemon"
case $RUNLEVEL in
boot)
progress "starting udev daemon"
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
mkdir -p /dev/rules.d
udevd --daemon
;;
poweroff|reboot)
progress "stopping udev daemon"
killall udevd
;;
esac

View File

@ -23,7 +23,14 @@
#
# runlevels: openelec, installer, textmode
(
case $RUNLEVEL in
boot)
progress "monitoring udev events"
udevadm monitor -e > /dev/udev.log
)&
udevadm monitor -e > /dev/udev.log &
;;
poweroff|reboot)
progress "Stopping udev monitor"
killall udevadm
;;
esac

View File

@ -23,8 +23,15 @@
#
# runlevels: openelec, installer, textmode
(
case $RUNLEVEL in
boot)
(
progress "request udev events from the kernel"
udevadm trigger --action=add
udevadm settle
)&
)&
;;
poweroff|reboot)
;;
esac

View File

@ -23,7 +23,9 @@
#
# runlevels: openelec, textmode
(
case $RUNLEVEL in
boot)
(
INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
SWAP=`blkid -t TYPE="swap" -o device`
SWAPFILE="$HOME/.cache/swapfile"
@ -48,4 +50,9 @@
sysctl -w vm.swappiness=60 2>&1 > /dev/null
fi
fi
)&
)&
;;
poweroff|reboot)
;;
esac

View File

@ -43,7 +43,7 @@ fi
download () {
case "$DL_METHOD" in
wget)
wget -c $1 -P $TMP_DIR
wget -c $1 -P $TMP_DIR > /dev/null 2>&1
;;
scp)
scp $SCP_ARG "$1" $TMP_DIR

View File

@ -43,7 +43,7 @@ fi
download () {
case "$DL_METHOD" in
wget)
wget -c $1 -P $TMP_DIR
wget -c $1 -P $TMP_DIR > /dev/null 2>&1
;;
scp)
scp $SCP_ARG "$1" $TMP_DIR

View File

@ -22,7 +22,9 @@
#
# runlevels: openelec
(
case $RUNLEVEL in
boot)
(
if [ -f /var/config/settings.conf ]; then
. /var/config/settings.conf
@ -42,4 +44,9 @@
setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
fi
fi
)&
)&
;;
poweroff|reboot)
;;
esac

View File

@ -34,7 +34,7 @@ cd $PKG_BUILD
--enable-dri \
--enable-kms-only \
--disable-xvmc \
--enable-sna \
--disable-sna \
--with-xorg-module-dir=$XORG_PATH_MODULES
make

View File

@ -22,7 +22,9 @@
#
# runlevels: openelec
(
case $RUNLEVEL in
boot)
(
progress "starting Windowmanager"
# waiting for Xorg to start
@ -30,4 +32,9 @@
# starting ratpoison
DISPLAY=:0.0 ratpoison > /dev/null 2>&1
)&
)&
;;
poweroff|reboot)
;;
esac

View File

@ -0,0 +1,34 @@
################################################################################
# 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
################################################################################
#
# mounting needed filesystems
#
# runlevels: openelec, installer, textmode
case $RUNLEVEL in
boot)
# dont do anything here, we start xorg per udev
;;
poweroff|reboot)
progress "stopping Xorg"
killall Xorg
;;
esac

View File

@ -22,7 +22,7 @@
. /etc/profile
if [ "$RUNLEVEL" = openelec ]; then
if [ "$MODE" = openelec ]; then
logger -t Xorg "### starting Xorg with driver ${xorg_driver} ###"

View File

@ -181,7 +181,6 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
@ -363,11 +362,6 @@ CONFIG_X86_CPUID=y
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
# CONFIG_VMSPLIT_3G is not set
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_2G_OPT is not set
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_X86_PAE is not set
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@ -417,7 +411,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
CONFIG_PHYSICAL_ALIGN=0x1000000
@ -465,7 +459,6 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_STAT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set

View File

@ -405,7 +405,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
@ -2128,7 +2128,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=y
CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
# CONFIG_SND_HDA_CODEC_ANALOG is not set
CONFIG_SND_HDA_CODEC_SIGMATEL=y
# CONFIG_SND_HDA_CODEC_VIA is not set
CONFIG_SND_HDA_CODEC_VIA=y
CONFIG_SND_HDA_CODEC_HDMI=y
# CONFIG_SND_HDA_CODEC_CIRRUS is not set
# CONFIG_SND_HDA_CODEC_CONEXANT is not set

View File

@ -369,7 +369,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set

View File

@ -183,7 +183,6 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
@ -360,11 +359,6 @@ CONFIG_X86_CPUID=y
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
# CONFIG_VMSPLIT_3G is not set
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_2G_OPT is not set
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@ -413,7 +407,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
@ -470,7 +464,6 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_STAT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@ -1177,11 +1170,13 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
CONFIG_IPW2100=m
# CONFIG_IPW2100_MONITOR is not set
CONFIG_IPW2100_MONITOR=y
# CONFIG_IPW2100_DEBUG is not set
CONFIG_IPW2200=m
# CONFIG_IPW2200_MONITOR is not set
# CONFIG_IPW2200_QOS is not set
CONFIG_IPW2200_MONITOR=y
CONFIG_IPW2200_RADIOTAP=y
CONFIG_IPW2200_PROMISCUOUS=y
CONFIG_IPW2200_QOS=y
# CONFIG_IPW2200_DEBUG is not set
CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
@ -2272,6 +2267,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
@ -2290,7 +2286,8 @@ CONFIG_SND_PCI=y
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_OXYGEN is not set
CONFIG_SND_OXYGEN_LIB=m
CONFIG_SND_OXYGEN=m
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set

View File

@ -183,7 +183,6 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
@ -360,11 +359,6 @@ CONFIG_X86_CPUID=y
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
# CONFIG_VMSPLIT_3G is not set
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_2G_OPT is not set
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@ -413,7 +407,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
@ -470,7 +464,6 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_STAT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@ -1174,11 +1167,13 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
CONFIG_IPW2100=m
# CONFIG_IPW2100_MONITOR is not set
CONFIG_IPW2100_MONITOR=y
# CONFIG_IPW2100_DEBUG is not set
CONFIG_IPW2200=m
# CONFIG_IPW2200_MONITOR is not set
# CONFIG_IPW2200_QOS is not set
CONFIG_IPW2200_MONITOR=y
CONFIG_IPW2200_RADIOTAP=y
CONFIG_IPW2200_PROMISCUOUS=y
CONFIG_IPW2200_QOS=y
# CONFIG_IPW2200_DEBUG is not set
CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
@ -2270,6 +2265,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
@ -2288,7 +2284,8 @@ CONFIG_SND_PCI=y
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_OXYGEN is not set
CONFIG_SND_OXYGEN_LIB=m
CONFIG_SND_OXYGEN=m
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set

View File

@ -183,7 +183,6 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
@ -355,11 +354,6 @@ CONFIG_X86_CPUID=y
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
# CONFIG_VMSPLIT_3G is not set
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_2G_OPT is not set
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@ -408,7 +402,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
@ -464,7 +458,6 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_STAT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@ -2129,6 +2122,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
# CONFIG_SND_AD1889 is not set
@ -2146,7 +2140,8 @@ CONFIG_SND_PCI=y
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_OXYGEN is not set
CONFIG_SND_OXYGEN_LIB=m
CONFIG_SND_OXYGEN=m
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set

View File

@ -184,7 +184,6 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
@ -373,7 +372,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
@ -427,7 +426,6 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_STAT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@ -2067,6 +2065,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
# CONFIG_SND_AD1889 is not set
@ -2084,7 +2083,8 @@ CONFIG_SND_PCI=y
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_OXYGEN is not set
CONFIG_SND_OXYGEN_LIB=m
CONFIG_SND_OXYGEN=m
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set

View File

@ -183,7 +183,6 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
@ -356,11 +355,6 @@ CONFIG_X86_CPUID=y
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
# CONFIG_VMSPLIT_3G is not set
# CONFIG_VMSPLIT_3G_OPT is not set
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_2G_OPT is not set
# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@ -409,7 +403,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
@ -466,7 +460,6 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_STAT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@ -1135,8 +1128,17 @@ CONFIG_HOSTAP=m
# CONFIG_HOSTAP_FIRMWARE is not set
# CONFIG_HOSTAP_PLX is not set
# CONFIG_HOSTAP_PCI is not set
# CONFIG_IPW2100 is not set
# CONFIG_IPW2200 is not set
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
# CONFIG_IPW2100_DEBUG is not set
CONFIG_IPW2200=m
CONFIG_IPW2200_MONITOR=y
CONFIG_IPW2200_RADIOTAP=y
CONFIG_IPW2200_PROMISCUOUS=y
CONFIG_IPW2200_QOS=y
# CONFIG_IPW2200_DEBUG is not set
CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
CONFIG_IWLAGN=m
#
@ -2179,6 +2181,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
# CONFIG_SND_AD1889 is not set
@ -2196,7 +2199,8 @@ CONFIG_SND_PCI=y
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_OXYGEN is not set
CONFIG_SND_OXYGEN_LIB=m
CONFIG_SND_OXYGEN=m
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set
@ -2234,15 +2238,15 @@ CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CODEC_REALTEK=y
CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
CONFIG_SND_HDA_CODEC_ANALOG=y
# CONFIG_SND_HDA_CODEC_SIGMATEL is not set
CONFIG_SND_HDA_CODEC_SIGMATEL=y
CONFIG_SND_HDA_CODEC_VIA=y
CONFIG_SND_HDA_CODEC_HDMI=y
# CONFIG_SND_HDA_CODEC_CIRRUS is not set
CONFIG_SND_HDA_CODEC_CIRRUS=y
CONFIG_SND_HDA_CODEC_CONEXANT=y
# CONFIG_SND_HDA_CODEC_CA0110 is not set
CONFIG_SND_HDA_CODEC_CA0110=y
CONFIG_SND_HDA_CODEC_CA0132=y
# CONFIG_SND_HDA_CODEC_CMEDIA is not set
# CONFIG_SND_HDA_CODEC_SI3054 is not set
CONFIG_SND_HDA_CODEC_CMEDIA=y
CONFIG_SND_HDA_CODEC_SI3054=y
CONFIG_SND_HDA_GENERIC=y
# CONFIG_SND_HDA_POWER_SAVE is not set
# CONFIG_SND_HDSP is not set

View File

@ -184,7 +184,6 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
@ -375,7 +374,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
@ -430,7 +429,6 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_STAT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@ -1087,8 +1085,17 @@ CONFIG_HOSTAP=m
# CONFIG_HOSTAP_FIRMWARE is not set
# CONFIG_HOSTAP_PLX is not set
# CONFIG_HOSTAP_PCI is not set
# CONFIG_IPW2100 is not set
# CONFIG_IPW2200 is not set
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
# CONFIG_IPW2100_DEBUG is not set
CONFIG_IPW2200=m
CONFIG_IPW2200_MONITOR=y
CONFIG_IPW2200_RADIOTAP=y
CONFIG_IPW2200_PROMISCUOUS=y
CONFIG_IPW2200_QOS=y
# CONFIG_IPW2200_DEBUG is not set
CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
CONFIG_IWLAGN=m
#
@ -2122,6 +2129,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_MPU401_UART=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
# CONFIG_SND_AD1889 is not set
@ -2139,7 +2147,8 @@ CONFIG_SND_PCI=y
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_OXYGEN is not set
CONFIG_SND_OXYGEN_LIB=m
CONFIG_SND_OXYGEN=m
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set
@ -2177,15 +2186,15 @@ CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CODEC_REALTEK=y
CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
CONFIG_SND_HDA_CODEC_ANALOG=y
# CONFIG_SND_HDA_CODEC_SIGMATEL is not set
CONFIG_SND_HDA_CODEC_SIGMATEL=y
CONFIG_SND_HDA_CODEC_VIA=y
CONFIG_SND_HDA_CODEC_HDMI=y
# CONFIG_SND_HDA_CODEC_CIRRUS is not set
CONFIG_SND_HDA_CODEC_CIRRUS=y
CONFIG_SND_HDA_CODEC_CONEXANT=y
# CONFIG_SND_HDA_CODEC_CA0110 is not set
CONFIG_SND_HDA_CODEC_CA0110=y
CONFIG_SND_HDA_CODEC_CA0132=y
# CONFIG_SND_HDA_CODEC_CMEDIA is not set
# CONFIG_SND_HDA_CODEC_SI3054 is not set
CONFIG_SND_HDA_CODEC_CMEDIA=y
CONFIG_SND_HDA_CODEC_SI3054=y
CONFIG_SND_HDA_GENERIC=y
# CONFIG_SND_HDA_POWER_SAVE is not set
# CONFIG_SND_HDSP is not set

View File

@ -184,7 +184,6 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
@ -373,7 +372,7 @@ CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
@ -427,7 +426,6 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_STAT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set