diff --git a/packages/devel/libnih-host/build b/packages/devel/libnih-host/build new file mode 100755 index 0000000000..af8fb87325 --- /dev/null +++ b/packages/devel/libnih-host/build @@ -0,0 +1,22 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain +$SCRIPTS/build dbus-host +$SCRIPTS/unpack libnih + +setup_toolchain host + +cd $BUILD/libnih* + +mkdir -p objdir-host +cd objdir-host + +../configure --enable-static \ + --disable-shared + +make + +mkdir -p $ROOT/$TOOLCHAIN/bin + cp -f nih-dbus-tool/nih-dbus-tool $ROOT/$TOOLCHAIN/bin diff --git a/packages/devel/libnih/build b/packages/devel/libnih/build new file mode 100755 index 0000000000..2dcebc5bde --- /dev/null +++ b/packages/devel/libnih/build @@ -0,0 +1,26 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain +$SCRIPTS/build dbus +$SCRIPTS/build libnih-host + +export NIH_DBUS_TOOL="$ROOT/$TOOLCHAIN/bin/nih-dbus-tool" + +cd $BUILD/$1* + +mkdir -p objdir-target +cd objdir-target + +../configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --enable-static \ + --disable-shared \ + --disable-nls \ + --enable-threading + +make + +$MAKEINSTALL diff --git a/packages/devel/libnih/url b/packages/devel/libnih/url new file mode 100644 index 0000000000..00e18dd843 --- /dev/null +++ b/packages/devel/libnih/url @@ -0,0 +1 @@ +http://upstart.ubuntu.com/download/libnih/1.0/libnih-1.0.2.tar.gz diff --git a/packages/image/install b/packages/image/install index 12d0bece25..ef78007ecd 100755 --- a/packages/image/install +++ b/packages/image/install @@ -56,6 +56,9 @@ case "$2" in $SCRIPTS/install busybox $SCRIPTS/install util-linux-ng + $SCRIPTS/install pm-utils + $SCRIPTS/install ureadahead + echo "OpenELEC" > $INSTALL/etc/distribution echo "$PROJECT.$TARGET_ARCH" > $INSTALL/etc/arch echo "$OPENELEC_VERSION" > $INSTALL/etc/version diff --git a/packages/linux/patches/0001-trace-add-trace-events-for-open-exec-an.diff b/packages/linux/patches/0001-trace-add-trace-events-for-open-exec-an.diff new file mode 100644 index 0000000000..11961d0f50 --- /dev/null +++ b/packages/linux/patches/0001-trace-add-trace-events-for-open-exec-an.diff @@ -0,0 +1,155 @@ +From ee9c0b591bf16ca11bb354bc68dae75a903f3a64 Mon Sep 17 00:00:00 2001 +From: Scott James Remnant +Date: Tue, 27 Oct 2009 10:05:32 +0000 +Subject: [PATCH] trace: add trace events for open(), exec() and uselib() + +This patch uses TRACE_EVENT to add tracepoints for the open(), +exec() and uselib() syscalls so that ureadahead can cheaply trace +the boot sequence to determine what to read to speed up the next. + +It's not upstream because it will need to be rebased onto the syscall +trace events whenever that gets merged, and is a stop-gap. + +Signed-off-by: Scott James Remnant +--- + fs/exec.c | 8 +++++ + fs/open.c | 4 ++ + include/trace/events/fs.h | 71 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 83 insertions(+), 0 deletions(-) + create mode 100644 include/trace/events/fs.h + +diff --git a/fs/exec.c b/fs/exec.c +index 172ceb6..c936999 100644 +--- a/fs/exec.c ++++ b/fs/exec.c +@@ -56,6 +56,8 @@ + #include + #include + ++#include ++ + #include + #include + #include +@@ -130,6 +132,10 @@ SYSCALL_DEFINE1(uselib, const char __user *, library) + + fsnotify_open(file->f_path.dentry); + ++ tmp = getname(library); ++ trace_uselib(tmp); ++ putname(library); ++ + error = -ENOEXEC; + if(file->f_op) { + struct linux_binfmt * fmt; +@@ -665,6 +671,8 @@ struct file *open_exec(const char *name) + + fsnotify_open(file->f_path.dentry); + ++ trace_open_exec(name); ++ + err = deny_write_access(file); + if (err) + goto exit; +diff --git a/fs/open.c b/fs/open.c +index 04b9aad..41c87f3 100644 +--- a/fs/open.c ++++ b/fs/open.c +@@ -31,6 +31,9 @@ + #include + #include + ++#define CREATE_TRACE_POINTS ++#include ++ + int vfs_statfs(struct dentry *dentry, struct kstatfs *buf) + { + int retval = -ENODEV; +@@ -1041,6 +1044,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode) + } else { + fsnotify_open(f->f_path.dentry); + fd_install(fd, f); ++ trace_do_sys_open(tmp, flags, mode); + } + } + putname(tmp); +diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h +new file mode 100644 +index 0000000..e967c55 +--- /dev/null ++++ b/include/trace/events/fs.h +@@ -0,0 +1,71 @@ ++#undef TRACE_SYSTEM ++#define TRACE_SYSTEM fs ++ ++#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ) ++#define _TRACE_FS_H ++ ++#include ++#include ++ ++TRACE_EVENT(do_sys_open, ++ ++ TP_PROTO(char *filename, int flags, int mode), ++ ++ TP_ARGS(filename, flags, mode), ++ ++ TP_STRUCT__entry( ++ __string( filename, filename ) ++ __field( int, flags ) ++ __field( int, mode ) ++ ), ++ ++ TP_fast_assign( ++ __assign_str(filename, filename); ++ __entry->flags = flags; ++ __entry->mode = mode; ++ ), ++ ++ TP_printk("\"%s\" %x %o", ++ __get_str(filename), __entry->flags, __entry->mode) ++); ++ ++TRACE_EVENT(uselib, ++ ++ TP_PROTO(char *filename), ++ ++ TP_ARGS(filename), ++ ++ TP_STRUCT__entry( ++ __string( filename, filename ) ++ ), ++ ++ TP_fast_assign( ++ __assign_str(filename, filename); ++ ), ++ ++ TP_printk("\"%s\"", ++ __get_str(filename)) ++); ++ ++TRACE_EVENT(open_exec, ++ ++ TP_PROTO(char *filename), ++ ++ TP_ARGS(filename), ++ ++ TP_STRUCT__entry( ++ __string( filename, filename ) ++ ), ++ ++ TP_fast_assign( ++ __assign_str(filename, filename); ++ ), ++ ++ TP_printk("\"%s\"", ++ __get_str(filename)) ++); ++ ++#endif /* _TRACE_FS_H */ ++ ++/* This part must be outside protection */ ++#include +-- +1.6.3.3 + diff --git a/packages/linux/unpack b/packages/linux/unpack index ace32d60d4..2e9ad1774e 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -27,57 +27,4 @@ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$PKG_D # copy some extra firmware to linux tree cp -R $PKG_DIR/firmware/* $LINUX/firmware - if [ "$DEVTOOLS" = yes ]; then - echo "CONFIG_DEBUG_KERNEL=y" >> $LINUX/.config # needed for bootchart - echo "CONFIG_SCHEDSTATS=y" >> $LINUX/.config # needed for bootchart - echo "CONFIG_SCHED_DEBUG=y" >> $LINUX/.config # needed for bootchart - echo "# CONFIG_DEBUG_PERF_USE_VMALLOC is not set" >> $LINUX/.config - echo "# CONFIG_PCI_DEBUG is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_DRIVER is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_DEVRES is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_SHIRQ is not set" >> $LINUX/.config - echo "# CONFIG_DETECT_SOFTLOCKUP is not set" >> $LINUX/.config - echo "# CONFIG_DETECT_HUNG_TASK is not set" >> $LINUX/.config - echo "# CONFIG_TIMER_STATS is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_OBJECTS is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_KMEMLEAK is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_RT_MUTEXES is not set" >> $LINUX/.config - echo "# CONFIG_RT_MUTEX_TESTER is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_SPINLOCK is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_MUTEXES is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_LOCK_ALLOC is not set" >> $LINUX/.config - echo "# CONFIG_PROVE_LOCKING is not set" >> $LINUX/.config - echo "# CONFIG_LOCK_STAT is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_SPINLOCK_SLEEP is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_KOBJECT is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_HIGHMEM is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_INFO is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_VM is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_VIRTUAL is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_WRITECOUNT is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_LIST is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_SG is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_NOTIFIERS is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_CREDENTIALS is not set" >> $LINUX/.config - echo "# CONFIG_BOOT_PRINTK_DELAY is not set" >> $LINUX/.config - echo "# CONFIG_RCU_TORTURE_TEST is not set" >> $LINUX/.config - echo "# CONFIG_BACKTRACE_SELF_TEST is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set" >> $LINUX/.config - echo "# CONFIG_FAULT_INJECTION is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_PAGEALLOC is not set" >> $LINUX/.config - echo "# CONFIG_KGDB is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_STACKOVERFLOW is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_STACK_USAGE is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_PER_CPU_MAPS is not set" >> $LINUX/.config - echo "# CONFIG_X86_PTDUMP is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_RODATA is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_NX_TEST is not set" >> $LINUX/.config - echo "# CONFIG_CPA_DEBUG is not set" >> $LINUX/.config - echo "# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set" >> $LINUX/.config - echo "# CONFIG_MAXSMP is not set" >> $LINUX/.config - echo "# CONFIG_IOMMU_DEBUG is not set" >> $LINUX/.config - fi - make -C $LINUX oldconfig diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url index 6cbaee5ac4..c4a759a223 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/url +++ b/packages/mediacenter/xbmc-theme-Confluence/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-Confluence-29605.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-29759.tar.bz2 diff --git a/packages/mediacenter/xbmc-theme-PM3-HD/install b/packages/mediacenter/xbmc-theme-PM3-HD/install old mode 100644 new mode 100755 diff --git a/packages/mediacenter/xbmc-theme-PM3-HD/url b/packages/mediacenter/xbmc-theme-PM3-HD/url index 1c5183dbb3..00fb3566c4 100644 --- a/packages/mediacenter/xbmc-theme-PM3-HD/url +++ b/packages/mediacenter/xbmc-theme-PM3-HD/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29605.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29759.tar.bz2 diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index 22bbae5fe0..5ecda158c7 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -17,6 +17,7 @@ $SCRIPTS/install libssh $SCRIPTS/install dbus $SCRIPTS/install hal $SCRIPTS/install udisks +$SCRIPTS/install upower $SCRIPTS/install ConsoleKit $SCRIPTS/install libXt diff --git a/packages/mediacenter/xbmc/patches/001-xbmc-fix_libcurl.so_detection.diff b/packages/mediacenter/xbmc/patches/001-xbmc-fix_libcurl.so_detection.diff deleted file mode 100644 index 57772d9445..0000000000 --- a/packages/mediacenter/xbmc/patches/001-xbmc-fix_libcurl.so_detection.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-29428/configure.in xbmc-29428.patch/configure.in ---- xbmc-29428/configure.in 2010-04-22 00:56:44.000000000 +0200 -+++ xbmc-29428.patch/configure.in 2010-04-22 19:06:31.906738563 +0200 -@@ -478,7 +478,7 @@ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) -- if [ -z "$LIBCURL_BASENAME" ]; then -+ if [[ -z "$LIBCURL_BASENAME" ]]; then - echo "Unable to determine basename of libcurl library" - fi - diff --git a/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff b/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff index e6d31030d5..7ea8b5abbd 100644 --- a/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff +++ b/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff @@ -1,6 +1,6 @@ -diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in ---- xbmc-28910/configure.in 2010-03-28 18:55:35.040753605 +0200 -+++ xbmc-28910.patch/configure.in 2010-03-28 18:58:11.605628523 +0200 +diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in +--- xbmc-29740/configure.in 2010-05-03 03:25:29.000000000 +0200 ++++ xbmc-29740.patch/configure.in 2010-05-03 04:05:13.412131036 +0200 @@ -23,6 +23,8 @@ xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. ==" goom_enabled="== GOOM enabled. ==" @@ -10,7 +10,7 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" pulse_disabled="== PulseAudio support manually disabled. ==" faac_not_found="== Could not find libfaac. FAAC support disabled. ==" -@@ -152,6 +154,12 @@ +@@ -168,6 +170,12 @@ [use_goom=$enableval], [use_goom=no]) @@ -23,7 +23,7 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in AC_PATH_PROG(CCACHE,ccache,none) AC_ARG_ENABLE([ccache], [AS_HELP_STRING([--enable-ccache], -@@ -531,6 +539,15 @@ +@@ -579,6 +587,15 @@ fi fi @@ -37,9 +37,9 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in +fi + ### External libraries checks - if test "$use_external_libraries" = "yes"; then - AC_MSG_NOTICE($external_libraries_enabled) -@@ -862,6 +879,12 @@ + # External FFmpeg + if test "$use_external_ffmpeg" = "yes"; then +@@ -943,6 +960,12 @@ final_message="$final_message\n GOOM:\t\tNo" fi @@ -52,15 +52,15 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in if test "$use_pcre" = "yes"; then final_message="$final_message\n PCRE Support:\tYes" else -@@ -1106,6 +1129,7 @@ +@@ -1181,6 +1204,7 @@ AC_SUBST(SDL_DEFINES) AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_GOOM) +AC_SUBST(BUILD_XBMCPROJECTM) - AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_LIBA52) -@@ -1451,7 +1475,7 @@ + AC_SUBST(USE_EXTERNAL_LIBDTS) +@@ -1535,7 +1559,7 @@ -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" . set +x fi @@ -69,10 +69,10 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ if test "$host_vendor" != "apple" ; then -diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in ---- xbmc-28910/Makefile.in 2010-03-28 17:12:32.000000000 +0200 -+++ xbmc-28910.patch/Makefile.in 2010-03-28 18:58:11.636752616 +0200 -@@ -105,8 +105,10 @@ +diff -Naur xbmc-29740/Makefile.in xbmc-29740.patch/Makefile.in +--- xbmc-29740/Makefile.in 2010-05-03 03:25:29.000000000 +0200 ++++ xbmc-29740.patch/Makefile.in 2010-05-03 04:04:11.589130864 +0200 +@@ -106,8 +106,10 @@ VIS_DIRS=\ xbmc/visualizations/OpenGLSpectrum \ @@ -85,7 +85,7 @@ diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in ifeq ($(findstring osx,$(ARCH)), osx) VIS_DIRS+=xbmc/visualizations/iTunes endif -@@ -303,7 +305,9 @@ +@@ -306,7 +308,9 @@ visualizations: exports $(MAKE) -C xbmc/visualizations/OpenGLSpectrum $(MAKE) -C xbmc/visualizations/WaveForm diff --git a/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff b/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff index caa0a141ee..612ee758bd 100644 --- a/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff +++ b/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff @@ -1,6 +1,6 @@ -diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in ---- xbmc-28910/configure.in 2010-03-28 19:01:27.995753591 +0200 -+++ xbmc-28910.patch/configure.in 2010-03-28 19:02:17.307753519 +0200 +diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in +--- xbmc-29740/configure.in 2010-05-03 04:06:14.609255790 +0200 ++++ xbmc-29740.patch/configure.in 2010-05-03 04:07:44.163129774 +0200 @@ -25,6 +25,8 @@ goom_disabled="== GOOM disabled. ==" xbmcprojectm_enabled="== XBMCProjectM enabled. ==" @@ -10,7 +10,7 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" pulse_disabled="== PulseAudio support manually disabled. ==" faac_not_found="== Could not find libfaac. FAAC support disabled. ==" -@@ -160,6 +162,12 @@ +@@ -176,6 +178,12 @@ [use_xbmcprojectm=$enableval], [use_xbmcprojectm=yes]) @@ -23,7 +23,7 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in AC_PATH_PROG(CCACHE,ccache,none) AC_ARG_ENABLE([ccache], [AS_HELP_STRING([--enable-ccache], -@@ -548,6 +556,15 @@ +@@ -596,6 +604,15 @@ BUILD_XBMCPROJECTM=1 fi @@ -37,9 +37,9 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in +fi + ### External libraries checks - if test "$use_external_libraries" = "yes"; then - AC_MSG_NOTICE($external_libraries_enabled) -@@ -885,6 +902,12 @@ + # External FFmpeg + if test "$use_external_ffmpeg" = "yes"; then +@@ -966,6 +983,12 @@ final_message="$final_message\n XBMCProjectM:\tNo" fi @@ -52,15 +52,15 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in if test "$use_pcre" = "yes"; then final_message="$final_message\n PCRE Support:\tYes" else -@@ -1130,6 +1153,7 @@ +@@ -1205,6 +1228,7 @@ AC_SUBST(BUILD_DVDCSS) AC_SUBST(BUILD_GOOM) AC_SUBST(BUILD_XBMCPROJECTM) +AC_SUBST(BUILD_RSXS) - AC_SUBST(USE_EXTERNAL_LIBRARIES) AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(USE_EXTERNAL_LIBA52) -@@ -1529,7 +1553,7 @@ + AC_SUBST(USE_EXTERNAL_LIBDTS) +@@ -1613,7 +1637,7 @@ --disable-lattice \ --disable-skyrocket fi @@ -69,10 +69,10 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ if test "$host_vendor" = "apple" ; then -diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in ---- xbmc-28910/Makefile.in 2010-03-28 19:01:27.997753604 +0200 -+++ xbmc-28910.patch/Makefile.in 2010-03-28 19:02:17.308751221 +0200 -@@ -100,8 +100,10 @@ +diff -Naur xbmc-29740/Makefile.in xbmc-29740.patch/Makefile.in +--- xbmc-29740/Makefile.in 2010-05-03 04:06:14.610256210 +0200 ++++ xbmc-29740.patch/Makefile.in 2010-05-03 04:07:08.523256011 +0200 +@@ -101,8 +101,10 @@ lib/xbmc-dll-symbols \ lib/jsoncpp/jsoncpp/src/lib_json @@ -85,7 +85,7 @@ diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in VIS_DIRS=\ xbmc/visualizations/OpenGLSpectrum \ -@@ -317,7 +319,9 @@ +@@ -320,7 +322,9 @@ endif endif screensavers: exports diff --git a/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff b/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff index 182c72f5ed..fed04421e0 100644 --- a/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff +++ b/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff @@ -1,84 +1,12 @@ -diff -Naur xbmc-29428/configure.in xbmc-29428.patch/configure.in ---- xbmc-29428/configure.in 2010-04-22 00:56:44.000000000 +0200 -+++ xbmc-29428.patch/configure.in 2010-04-22 02:22:21.771774020 +0200 -@@ -474,7 +474,7 @@ - # check for library basenames - if test "$host_vendor" != "apple"; then - # libcurl -- LIBCURL_BASENAME=$(gcc $CFLAGS -print-file-name=libcurl.so | \ -+ LIBCURL_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libcurl.so | \ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) -@@ -483,7 +483,7 @@ - fi - - # libFLAC -- LIBFLAC_BASENAME=$(gcc $CFLAGS -print-file-name=libFLAC.so | \ -+ LIBFLAC_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libFLAC.so | \ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) -@@ -492,7 +492,7 @@ - fi - - # libvorbisfile -- LIBVORBISFILE_BASENAME=$(gcc $CFLAGS -print-file-name=libvorbisfile.so | \ -+ LIBVORBISFILE_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libvorbisfile.so | \ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) -@@ -501,7 +501,7 @@ - fi - - # libmodplug -- LIBMODPLUG_BASENAME=$(gcc $CFLAGS -print-file-name=libmodplug.so | \ -+ LIBMODPLUG_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libmodplug.so | \ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) -@@ -510,7 +510,7 @@ - fi - - # libfaad -- LIBFAAD_BASENAME=$(gcc $CFLAGS -print-file-name=libfaad.so | \ -+ LIBFAAD_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libfaad.so | \ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) -@@ -519,7 +519,7 @@ - fi - - # libmad -- LIBMAD_BASENAME=$(gcc $CFLAGS -print-file-name=libmad.so | \ -+ LIBMAD_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libmad.so | \ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) -@@ -528,7 +528,7 @@ - fi - - # libogg -- LIBOGG_BASENAME=$(gcc $CFLAGS -print-file-name=libogg.so | \ -+ LIBOGG_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libogg.so | \ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) -@@ -537,7 +537,7 @@ - fi - - # libvorbisenc -- LIBVORBISENC_BASENAME=$(gcc $CFLAGS -print-file-name=libvorbisenc.so | \ -+ LIBVORBISENC_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libvorbisenc.so | \ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) -@@ -546,7 +546,7 @@ - fi - - # libvorbis -- LIBVORBIS_BASENAME=$(gcc $CFLAGS -print-file-name=libvorbis.so | \ -+ LIBVORBIS_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libvorbis.so | \ - while read output; do objdump -p $output | \ - grep SONAME | \ - awk 'BEGIN { FS = " " } ; { print $2 }'; done) +diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in +--- xbmc-29740/configure.in 2010-05-03 04:08:41.115131030 +0200 ++++ xbmc-29740.patch/configure.in 2010-05-03 04:12:20.116129219 +0200 +@@ -499,7 +499,7 @@ + AC_DEFUN([XB_FIND_SONAME], + [ + AC_MSG_CHECKING([for lib$2 soname]) +- $1_SONAME=$( gcc -print-file-name=lib$2.so | \ ++ $1_SONAME=$( $CC -print-file-name=lib$2.so | \ + while read output; do objdump -p $output | \ + grep "SONAME" | \ + sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) diff --git a/packages/mediacenter/xbmc/patches/403-xbmc-add_DESTDIR_support_to_make_install-0.1.diff b/packages/mediacenter/xbmc/patches/403-xbmc-add_DESTDIR_support_to_make_install-0.1.diff index aecb77d0bd..509472b745 100644 --- a/packages/mediacenter/xbmc/patches/403-xbmc-add_DESTDIR_support_to_make_install-0.1.diff +++ b/packages/mediacenter/xbmc/patches/403-xbmc-add_DESTDIR_support_to_make_install-0.1.diff @@ -1,7 +1,7 @@ -diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in ---- xbmc-28910/Makefile.in 2010-03-28 19:09:49.356628842 +0200 -+++ xbmc-28910.patch/Makefile.in 2010-03-28 19:28:17.265753408 +0200 -@@ -495,7 +495,7 @@ +diff -Naur xbmc-29740/Makefile.in xbmc-29740.patch/Makefile.in +--- xbmc-29740/Makefile.in 2010-05-03 04:08:41.116131093 +0200 ++++ xbmc-29740.patch/Makefile.in 2010-05-03 04:16:42.386130163 +0200 +@@ -497,7 +497,7 @@ $(MAKE) -C tools/TexturePacker/ install-bin: xbmc.bin # developement convenience target @@ -10,7 +10,7 @@ diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in ifeq ($(findstring osx,$(ARCH)), osx) # TODO: add osx install -@@ -503,55 +503,55 @@ +@@ -505,53 +505,53 @@ install: install-binaries install-arch install-datas install-web install-binaries: install-scripts @@ -25,8 +25,8 @@ diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in install-arch: @# Arch dependent files -- @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" -+ @find system screensavers visualisations -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" +- @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" ++ @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" install-scripts: - @install -D tools/Linux/xbmc.sh $(prefix)/bin/xbmc @@ -49,9 +49,6 @@ diff -Naur xbmc-28910/Makefile.in xbmc-28910.patch/Makefile.in @# Arch independent files - @find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" + @find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" - @# Skins -- @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r" -+ @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(DESTDIR)/$(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r" @# Icons and links - @mkdir -p $(prefix)/share/applications $(prefix)/share/pixmaps - @cp -a tools/Linux/xbmc.png $(prefix)/share/pixmaps/ diff --git a/packages/mediacenter/xbmc/patches/404-xbmc-add_udisks_and_upower_support-0.1.diff b/packages/mediacenter/xbmc/patches/404-xbmc-add_udisks_and_upower_support-0.1.diff deleted file mode 100644 index b13b23d56d..0000000000 --- a/packages/mediacenter/xbmc/patches/404-xbmc-add_udisks_and_upower_support-0.1.diff +++ /dev/null @@ -1,734 +0,0 @@ -diff -Naur xbmc-29490/xbmc/linux/ConsoleUPowerSyscall.cpp xbmc-29490.patch/xbmc/linux/ConsoleUPowerSyscall.cpp ---- xbmc-29490/xbmc/linux/ConsoleUPowerSyscall.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-29490.patch/xbmc/linux/ConsoleUPowerSyscall.cpp 2010-04-25 23:12:52.124485047 +0200 -@@ -0,0 +1,143 @@ -+/* -+ * Copyright (C) 2005-2009 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" -+#include "ConsoleUPowerSyscall.h" -+#include "utils/log.h" -+ -+#ifdef HAS_DBUS -+#include "Application.h" -+#include "LocalizeStrings.h" -+#include "DBusUtil.h" -+ -+CConsoleUPowerSyscall::CConsoleUPowerSyscall() -+{ -+ m_CanPowerdown = ConsoleKitMethodCall("CanStop"); -+ -+ // If "the name org.freedesktop.UPower was not provided by any .service files", -+ // GetVariant() would return NULL, and asBoolean() would crash. -+ CVariant canSuspend = CDBusUtil::GetVariant("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "can_suspend"); -+ -+ if ( !canSuspend.isNull() ) -+ m_CanSuspend = canSuspend.asBoolean(); -+ else -+ m_CanSuspend = false; -+ -+ CVariant canHibernate = CDBusUtil::GetVariant("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "can_hibernate"); -+ -+ if ( !canHibernate.isNull() ) -+ m_CanHibernate = canHibernate.asBoolean(); -+ else -+ m_CanHibernate = false; -+ -+ m_CanReboot = ConsoleKitMethodCall("CanRestart"); -+} -+ -+bool CConsoleUPowerSyscall::Powerdown() -+{ -+ CDBusMessage message("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", "Stop"); -+ return message.SendSystem() != NULL; -+} -+ -+bool CConsoleUPowerSyscall::Suspend() -+{ -+ CDBusMessage message("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Suspend"); -+ return message.SendSystem() != NULL; -+} -+ -+bool CConsoleUPowerSyscall::Hibernate() -+{ -+ CDBusMessage message("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Hibernate"); -+ return message.SendSystem() != NULL; -+} -+ -+bool CConsoleUPowerSyscall::Reboot() -+{ -+ CDBusMessage message("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", "Restart"); -+ return message.SendSystem() != NULL; -+} -+ -+bool CConsoleUPowerSyscall::CanPowerdown() -+{ -+ return m_CanPowerdown; -+} -+bool CConsoleUPowerSyscall::CanSuspend() -+{ -+ return m_CanSuspend; -+} -+bool CConsoleUPowerSyscall::CanHibernate() -+{ -+ return m_CanHibernate; -+} -+bool CConsoleUPowerSyscall::CanReboot() -+{ -+ return m_CanReboot; -+} -+ -+bool CConsoleUPowerSyscall::HasDeviceConsoleKit() -+{ -+ bool hasConsoleKitManager = false; -+ CDBusMessage consoleKitMessage("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", "CanStop"); -+ -+ DBusError error; -+ dbus_error_init (&error); -+ DBusConnection *con = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ -+ consoleKitMessage.Send(con, &error); -+ -+ if (!dbus_error_is_set(&error)) -+ hasConsoleKitManager = true; -+ else -+ CLog::Log(LOGDEBUG, "ConsoleKit.Manager: %s - %s", error.name, error.message); -+ -+ dbus_error_free (&error); -+ -+ bool hasUPower = false; -+ CDBusMessage deviceKitMessage("org.freedesktop.UDisks", "/org/freedesktop/UDisks", "org.freedesktop.UDisks", "EnumerateDevices"); -+ -+ deviceKitMessage.Send(con, &error); -+ -+ if (!dbus_error_is_set(&error)) -+ hasUPower = true; -+ else -+ CLog::Log(LOGDEBUG, "UPower: %s - %s", error.name, error.message); -+ -+ dbus_error_free (&error); -+ dbus_connection_unref(con); -+ -+ return hasUPower && hasConsoleKitManager; -+} -+ -+bool CConsoleUPowerSyscall::ConsoleKitMethodCall(const char *method) -+{ -+ CDBusMessage message("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", method); -+ DBusMessage *reply = message.SendSystem(); -+ if (reply) -+ { -+ dbus_bool_t boolean = FALSE; -+ -+ if (dbus_message_get_args (reply, NULL, DBUS_TYPE_BOOLEAN, &boolean, DBUS_TYPE_INVALID)) -+ return boolean; -+ } -+ -+ return false; -+} -+#endif -diff -Naur xbmc-29490/xbmc/linux/ConsoleUPowerSyscall.h xbmc-29490.patch/xbmc/linux/ConsoleUPowerSyscall.h ---- xbmc-29490/xbmc/linux/ConsoleUPowerSyscall.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-29490.patch/xbmc/linux/ConsoleUPowerSyscall.h 2010-04-25 23:12:52.125484748 +0200 -@@ -0,0 +1,50 @@ -+/* -+ * Copyright (C) 2005-2009 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 -+ * -+ */ -+ -+#ifdef HAS_DBUS -+#include "IPowerSyscall.h" -+ -+class CConsoleUPowerSyscall : public IPowerSyscall -+{ -+public: -+ CConsoleUPowerSyscall(); -+ virtual ~CConsoleUPowerSyscall() { } -+ -+ virtual bool Powerdown(); -+ virtual bool Suspend(); -+ virtual bool Hibernate(); -+ virtual bool Reboot(); -+ -+ virtual bool CanPowerdown(); -+ virtual bool CanSuspend(); -+ virtual bool CanHibernate(); -+ virtual bool CanReboot(); -+ -+ static bool HasDeviceConsoleKit(); -+private: -+ static bool ConsoleKitMethodCall(const char *method); -+ -+ bool m_CanPowerdown; -+ bool m_CanSuspend; -+ bool m_CanHibernate; -+ bool m_CanReboot; -+}; -+#endif -diff -Naur xbmc-29490/xbmc/linux/LinuxStorageProvider.h xbmc-29490.patch/xbmc/linux/LinuxStorageProvider.h ---- xbmc-29490/xbmc/linux/LinuxStorageProvider.h 2010-04-24 22:43:12.000000000 +0200 -+++ xbmc-29490.patch/xbmc/linux/LinuxStorageProvider.h 2010-04-25 23:12:52.126484868 +0200 -@@ -22,6 +22,7 @@ - #include "IStorageProvider.h" - #include "HALProvider.h" - #include "DeviceKitDisksProvider.h" -+#include "UDisksProvider.h" - #include "PosixMountProvider.h" - - class CLinuxStorageProvider : public IStorageProvider -@@ -32,7 +33,9 @@ - m_instance = NULL; - - #ifdef HAS_DBUS -- if (CDeviceKitDisksProvider::HasDeviceKitDisks()) -+ if (CUDisksProvider::HasUDisks() ) { -+ m_instance = new CUDisksProvider(); -+ } else if (CDeviceKitDisksProvider::HasDeviceKitDisks()) - m_instance = new CDeviceKitDisksProvider(); - #endif - #ifdef HAS_HAL -diff -Naur xbmc-29490/xbmc/linux/Makefile.in xbmc-29490.patch/xbmc/linux/Makefile.in ---- xbmc-29490/xbmc/linux/Makefile.in 2010-04-24 22:43:12.000000000 +0200 -+++ xbmc-29490.patch/xbmc/linux/Makefile.in 2010-04-25 23:12:52.127484639 +0200 -@@ -7,7 +7,7 @@ - - CXXFLAGS+=-fPIC #-DHAS_SDL - --SRCS=ConvUtils.cpp XEventUtils.cpp XFileUtils.cpp XHandle.cpp XSyncUtils.cpp XTimeUtils.cpp XMemUtils.cpp XThreadUtils.cpp NetworkLinux.cpp LinuxResourceCounter.cpp LinuxTimezone.cpp XRandR.cpp XCriticalSection.cpp XLCDproc.cpp HALManager.cpp HALPowerSyscall.cpp ConsoleDeviceKitPowerSyscall.cpp DBusUtil.cpp DBusMessage.cpp ZeroconfAvahi.cpp ZeroconfBrowserAvahi.cpp HALProvider.cpp PosixMountProvider.cpp DeviceKitDisksProvider.cpp -+SRCS=ConvUtils.cpp XEventUtils.cpp XFileUtils.cpp XHandle.cpp XSyncUtils.cpp XTimeUtils.cpp XMemUtils.cpp XThreadUtils.cpp NetworkLinux.cpp LinuxResourceCounter.cpp LinuxTimezone.cpp XRandR.cpp XCriticalSection.cpp XLCDproc.cpp HALManager.cpp HALPowerSyscall.cpp ConsoleDeviceKitPowerSyscall.cpp DBusUtil.cpp DBusMessage.cpp ZeroconfAvahi.cpp ZeroconfBrowserAvahi.cpp HALProvider.cpp PosixMountProvider.cpp DeviceKitDisksProvider.cpp UDisksProvider.cpp ConsoleUPowerSyscall.cpp - - LIB=linux.a - -diff -Naur xbmc-29490/xbmc/linux/UDisksProvider.cpp xbmc-29490.patch/xbmc/linux/UDisksProvider.cpp ---- xbmc-29490/xbmc/linux/UDisksProvider.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-29490.patch/xbmc/linux/UDisksProvider.cpp 2010-04-25 23:12:52.129484321 +0200 -@@ -0,0 +1,385 @@ -+/* -+ * Copyright (C) 2005-2009 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 "UDisksProvider.h" -+#ifdef HAS_DBUS -+#include "Util.h" -+#include "AdvancedSettings.h" -+#include "LocalizeStrings.h" -+#include "log.h" -+ -+CUDiskDevice::CUDiskDevice(const char *DeviceKitUDI) -+{ -+ m_DeviceKitUDI = DeviceKitUDI; -+ m_UDI = ""; -+ m_MountPath = ""; -+ m_FileSystem = ""; -+ m_isMounted = false; -+ m_isMountedByUs = false; -+ m_isRemovable = false; -+ m_isPartition = false; -+ m_isFileSystem = false; -+ m_isSystemInternal = false; -+ m_PartitionSizeGiB = 0.0f; -+ Update(); -+} -+ -+void CUDiskDevice::Update() -+{ -+ CStdString str = CDBusUtil::GetVariant("org.freedesktop.UDisks", m_DeviceKitUDI.c_str(), "org.freedesktop.UDisks.Device", "IdUsage").asString(); -+ m_isFileSystem = str.Equals("filesystem"); -+ if (m_isFileSystem) -+ { -+ CVariant properties = CDBusUtil::GetAll("org.freedesktop.UDisks", m_DeviceKitUDI.c_str(), "org.freedesktop.UDisks.Device"); -+ -+ m_UDI = properties["IdUuid"].asString(); -+ m_Label = properties["IdLabel"].asString(); -+ m_FileSystem = properties["IdType"].asString(); -+ if (properties["DeviceMountPaths"].size() > 0) -+ m_MountPath = properties["DeviceMountPaths"][0].asString(); -+ m_isMounted = properties["DeviceIsMounted"].asBoolean(); -+ -+ m_PartitionSizeGiB = properties["PartitionSize"].asUnsignedInteger() / 1024.0 / 1024.0 / 1024.0; -+ m_isPartition = properties["DeviceIsPartition"].asBoolean(); -+ m_isSystemInternal = properties["DeviceIsSystemInternal"].asBoolean(); -+ if (m_isPartition) -+ { -+ CVariant isRemovable = CDBusUtil::GetVariant("org.freedesktop.UDisks", properties["PartitionSlave"].asString(), "org.freedesktop.UDisks.Device", "DeviceIsRemovable"); -+ -+ if ( !isRemovable.isNull() ) -+ m_isRemovable = isRemovable.asBoolean(); -+ else -+ m_isRemovable = false; -+ } -+ else -+ m_isRemovable = properties["DeviceIsRemovable"].asBoolean(); -+ } -+} -+ -+bool CUDiskDevice::Mount() -+{ -+ if (!m_isMounted && !m_isSystemInternal && m_isFileSystem) -+ { -+ CLog::Log(LOGDEBUG, "UDisks: Mounting %s", m_DeviceKitUDI.c_str()); -+ CDBusMessage message("org.freedesktop.UDisks", m_DeviceKitUDI.c_str(), "org.freedesktop.UDisks.Device", "FilesystemMount"); -+ message.AppendArgument(""); -+ const char *array[] = {}; -+ message.AppendArgument(array, 0); -+ -+ DBusMessage *reply = message.SendSystem(); -+ if (reply) -+ { -+ char *mountPoint; -+ if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &mountPoint, DBUS_TYPE_INVALID)) -+ { -+ m_MountPath = mountPoint; -+ CLog::Log(LOGDEBUG, "UDisks: Sucessfully mounted %s on %s", m_DeviceKitUDI.c_str(), mountPoint); -+ m_isMountedByUs = m_isMounted = true; -+ } -+ } -+ -+ return m_isMounted; -+ } -+ else -+ CLog::Log(LOGDEBUG, "UDisks: Is not able to mount %s", toString().c_str()); -+ -+ return false; -+} -+ -+bool CUDiskDevice::UnMount() -+{ -+ if (m_isMounted && !m_isSystemInternal && m_isFileSystem) -+ { -+ CDBusMessage message("org.freedesktop.UDisks", m_DeviceKitUDI.c_str(), "org.freedesktop.UDisks.Device", "FilesystemUnmount"); -+ -+ const char *array[1]; -+ message.AppendArgument(array, 0); -+ -+ DBusMessage *reply = message.SendSystem(); -+ if (reply) -+ m_isMountedByUs = m_isMounted = false; -+ -+ return !m_isMounted; -+ } -+ else -+ CLog::Log(LOGDEBUG, "UDisks: Is not able to unmount %s", toString().c_str()); -+ -+ return false; -+} -+ -+CMediaSource CUDiskDevice::ToMediaShare() -+{ -+ CMediaSource source; -+ source.strPath = m_MountPath; -+ if (m_Label.empty()) -+ source.strName.Format("%.1f GB %s", m_PartitionSizeGiB, g_localizeStrings.Get(155).c_str()); -+ else -+ source.strName = m_Label; -+ source.m_iDriveType = !m_isSystemInternal ? CMediaSource::SOURCE_TYPE_REMOVABLE : CMediaSource::SOURCE_TYPE_LOCAL; -+ source.m_ignore = true; -+ return source; -+} -+ -+bool CUDiskDevice::IsApproved() -+{ -+ return (m_isFileSystem && m_isMounted && m_UDI.length() > 0 && (m_FileSystem.length() > 0 && !m_FileSystem.Equals("swap")) && !m_MountPath.Equals("/")); -+} -+ -+#define BOOL2SZ(b) ((b) ? "true" : "false") -+ -+CStdString CUDiskDevice::toString() -+{ -+ CStdString str; -+ str.Format("DeviceUDI %s: IsFileSystem %s HasFileSystem %s " -+ "IsSystemInternal %s IsMounted %s IsRemovable %s IsPartition %s", -+ m_DeviceKitUDI.c_str(), BOOL2SZ(m_isFileSystem), m_FileSystem, -+ BOOL2SZ(m_isSystemInternal), BOOL2SZ(m_isMounted), -+ BOOL2SZ(m_isRemovable), BOOL2SZ(m_isPartition)); -+ -+ return str; -+} -+ -+CUDisksProvider::CUDisksProvider() -+{ -+ dbus_error_init (&m_error); -+ m_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &m_error); -+ -+ dbus_bus_add_match(m_connection, "type='signal',interface='org.freedesktop.UDisks'", &m_error); -+ dbus_connection_flush(m_connection); -+ if (dbus_error_is_set(&m_error)) -+ { -+ CLog::Log(LOGERROR, "UDisks: Failed to attach to signal %s", m_error.message); -+ dbus_connection_unref(m_connection); -+ m_connection = NULL; -+ } -+} -+ -+CUDisksProvider::~CUDisksProvider() -+{ -+ DeviceMap::iterator itr; -+ -+ for (itr = m_AvailableDevices.begin(); itr != m_AvailableDevices.end(); ++itr) -+ delete m_AvailableDevices[itr->first]; -+ -+ m_AvailableDevices.clear(); -+ -+ if (m_connection) -+ { -+ dbus_connection_unref(m_connection); -+ m_connection = NULL; -+ } -+ -+ dbus_error_free (&m_error); -+} -+ -+void CUDisksProvider::Initialize() -+{ -+ CLog::Log(LOGDEBUG, "Selected UDisks as storage provider"); -+ m_DaemonVersion = atoi(CDBusUtil::GetVariant("org.freedesktop.UDisks", "/org/freedesktop/UDisks", "org.freedesktop.UDisks", "DaemonVersion").asString()); -+ CLog::Log(LOGDEBUG, "UDisks: DaemonVersion %i", m_DaemonVersion); -+ -+ CLog::Log(LOGDEBUG, "UDisks: Querying available devices"); -+ std::vector devices = EnumerateDisks(); -+ for (unsigned int i = 0; i < devices.size(); i++) -+ DeviceAdded(devices[i].c_str(), NULL); -+} -+ -+bool CUDisksProvider::Eject(CStdString mountpath) -+{ -+ DeviceMap::iterator itr; -+ CStdString path(mountpath); -+ CUtil::RemoveSlashAtEnd(path); -+ -+ for (itr = m_AvailableDevices.begin(); itr != m_AvailableDevices.end(); ++itr) -+ { -+ CUDiskDevice *device = itr->second; -+ if (device->m_MountPath.Equals(path)) -+ return device->UnMount(); -+ } -+ -+ return false; -+} -+ -+std::vector CUDisksProvider::GetDiskUsage() -+{ -+ std::vector devices; -+ DeviceMap::iterator itr; -+ -+ for(itr = m_AvailableDevices.begin(); itr != m_AvailableDevices.end(); ++itr) -+ { -+ CUDiskDevice *device = itr->second; -+ if (device->IsApproved()) -+ { -+ CStdString str; -+ str.Format("%s %.1f GiB", device->m_MountPath.c_str(), device->m_PartitionSizeGiB); -+ devices.push_back(str); -+ } -+ } -+ -+ return devices; -+} -+ -+bool CUDisksProvider::PumpDriveChangeEvents(IStorageEventsCallback *callback) -+{ -+ bool result = false; -+ if (m_connection) -+ { -+ dbus_connection_read_write(m_connection, 0); -+ DBusMessage *msg = dbus_connection_pop_message(m_connection); -+ -+ if (msg) -+ { -+ char *object; -+ if (dbus_message_get_args (msg, NULL, DBUS_TYPE_OBJECT_PATH, &object, DBUS_TYPE_INVALID)) -+ { -+ result = true; -+ if (dbus_message_is_signal(msg, "org.freedesktop.UDisks", "DeviceAdded")) -+ DeviceAdded(object, callback); -+ else if (dbus_message_is_signal(msg, "org.freedesktop.UDisks", "DeviceRemoved")) -+ DeviceRemoved(object, callback); -+ else if (dbus_message_is_signal(msg, "org.freedesktop.UDisks", "DeviceChanged")) -+ DeviceChanged(object, callback); -+ } -+ dbus_message_unref(msg); -+ } -+ } -+ return result; -+} -+ -+bool CUDisksProvider::HasUDisks() -+{ -+ bool hasUDisks = false; -+ CDBusMessage message("org.freedesktop.UDisks", "/org/freedesktop/UDisks", "org.freedesktop.UDisks", "EnumerateDevices"); -+ -+ DBusError error; -+ dbus_error_init (&error); -+ DBusConnection *con = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ -+ message.Send(con, &error); -+ -+ if (!dbus_error_is_set(&error)) -+ hasUDisks = true; -+ else -+ CLog::Log(LOGDEBUG, "UDisks: %s - %s", error.name, error.message); -+ -+ dbus_error_free (&error); -+ dbus_connection_unref(con); -+ -+ return hasUDisks; -+} -+ -+void CUDisksProvider::DeviceAdded(const char *object, IStorageEventsCallback *callback) -+{ -+ CLog::Log(LOGDEBUG, "UDisks: DeviceAdded (%s)", object); -+ -+ if (m_AvailableDevices[object]) -+ { -+ CLog::Log(LOGWARNING, "UDisks: Inconsistency found! DeviceAdded on an indexed disk"); -+ delete m_AvailableDevices[object]; -+ } -+ -+ CUDiskDevice *device = NULL; -+ device = new CUDiskDevice(object); -+ m_AvailableDevices[object] = device; -+ -+ if (g_advancedSettings.m_handleMounting) -+ device->Mount(); -+ -+ CLog::Log(LOGDEBUG, "UDisks: DeviceAdded - %s", device->toString().c_str()); -+ if (device->m_isMounted && device->IsApproved()) -+ { -+ CLog::Log(LOGNOTICE, "UDisks: Added %s", device->m_MountPath.c_str()); -+ if (callback) -+ callback->OnStorageAdded(device->m_Label, device->m_MountPath); -+ } -+} -+ -+void CUDisksProvider::DeviceRemoved(const char *object, IStorageEventsCallback *callback) -+{ -+ CLog::Log(LOGDEBUG, "UDisks: DeviceRemoved (%s)", object); -+ -+ CUDiskDevice *device = m_AvailableDevices[object]; -+ if (device) -+ { -+ if (device->m_isMounted && callback) -+ callback->OnStorageUnsafelyRemoved(device->m_Label); -+ -+ delete m_AvailableDevices[object]; -+ m_AvailableDevices.erase(object); -+ } -+} -+ -+void CUDisksProvider::DeviceChanged(const char *object, IStorageEventsCallback *callback) -+{ -+ CLog::Log(LOGDEBUG, "UDisks: DeviceChanged (%s)", object); -+ -+ CUDiskDevice *device = m_AvailableDevices[object]; -+ if (device == NULL) -+ { -+ CLog::Log(LOGWARNING, "UDisks: Inconsistency found! DeviceChanged on an unindexed disk"); -+ DeviceAdded(object, callback); -+ } -+ else -+ { -+ bool mounted = device->m_isMounted; -+ device->Update(); -+ if (!mounted && device->m_isMounted && callback) -+ callback->OnStorageAdded(device->m_MountPath, device->m_Label); -+ else if (mounted && !device->m_isMounted && callback) -+ callback->OnStorageSafelyRemoved(device->m_Label); -+ -+ CLog::Log(LOGDEBUG, "UDisks: DeviceChanged - %s", device->toString().c_str()); -+ } -+} -+ -+std::vector CUDisksProvider::EnumerateDisks() -+{ -+ std::vector devices; -+ CDBusMessage message("org.freedesktop.UDisks", "/org/freedesktop/UDisks", "org.freedesktop.UDisks", "EnumerateDevices"); -+ DBusMessage *reply = message.SendSystem(); -+ if (reply) -+ { -+ char** disks = NULL; -+ int length = 0; -+ -+ if (dbus_message_get_args (reply, NULL, DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &disks, &length, DBUS_TYPE_INVALID)) -+ { -+ for (int i = 0; i < length; i++) -+ devices.push_back(disks[i]); -+ -+ dbus_free_string_array(disks); -+ } -+ } -+ -+ return devices; -+} -+ -+void CUDisksProvider::GetDisks(VECSOURCES& devices, bool EnumerateRemovable) -+{ -+ DeviceMap::iterator itr; -+ -+ for (itr = m_AvailableDevices.begin(); itr != m_AvailableDevices.end(); ++itr) -+ { -+ CUDiskDevice *device = itr->second; -+ if (device && device->IsApproved() && device->m_isSystemInternal != EnumerateRemovable) -+ devices.push_back(device->ToMediaShare()); -+ } -+} -+#endif -diff -Naur xbmc-29490/xbmc/linux/UDisksProvider.h xbmc-29490.patch/xbmc/linux/UDisksProvider.h ---- xbmc-29490/xbmc/linux/UDisksProvider.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-29490.patch/xbmc/linux/UDisksProvider.h 2010-04-25 23:12:52.130485628 +0200 -@@ -0,0 +1,86 @@ -+#pragma once -+/* -+ * Copyright (C) 2005-2009 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 "IStorageProvider.h" -+#ifdef HAS_DBUS -+#include "DBusUtil.h" -+ -+class CUDiskDevice -+{ -+public: -+ CUDiskDevice(const char *DeviceKitUDI); -+ ~CUDiskDevice() { } -+ -+ void Update(); -+ -+ bool Mount(); -+ bool UnMount(); -+ -+ bool IsApproved(); -+ -+ CStdString toString(); -+ -+ CMediaSource ToMediaShare(); -+ -+ CStdString m_UDI, m_DeviceKitUDI, m_MountPath, m_FileSystem, m_Label; -+ bool m_isMounted, m_isMountedByUs, m_isRemovable, m_isPartition, m_isFileSystem, m_isSystemInternal; -+ float m_PartitionSizeGiB; -+}; -+ -+class CUDisksProvider : public IStorageProvider -+{ -+public: -+ CUDisksProvider(); -+ virtual ~CUDisksProvider(); -+ -+ virtual void Initialize(); -+ virtual void Stop() { } -+ -+ virtual void GetLocalDrives(VECSOURCES &localDrives) { GetDisks(localDrives, false); } -+ virtual void GetRemovableDrives(VECSOURCES &removableDrives) { GetDisks(removableDrives, true); } -+ -+ virtual bool Eject(CStdString mountpath); -+ -+ virtual std::vector GetDiskUsage(); -+ -+ virtual bool PumpDriveChangeEvents(IStorageEventsCallback *callback); -+ -+ static bool HasUDisks(); -+private: -+ typedef std::map DeviceMap; -+ typedef std::pair DevicePair; -+ -+ void DeviceAdded(const char *object, IStorageEventsCallback *callback); -+ void DeviceRemoved(const char *object, IStorageEventsCallback *callback); -+ void DeviceChanged(const char *object, IStorageEventsCallback *callback); -+ -+ std::vector EnumerateDisks(); -+ -+ void GetDisks(VECSOURCES& devices, bool EnumerateRemovable); -+ -+ int m_DaemonVersion; -+ -+ DeviceMap m_AvailableDevices; -+ -+ DBusConnection *m_connection; -+ DBusError m_error; -+}; -+#endif -diff -Naur xbmc-29490/xbmc/PowerManager.cpp xbmc-29490.patch/xbmc/PowerManager.cpp ---- xbmc-29490/xbmc/PowerManager.cpp 2010-04-24 22:43:14.000000000 +0200 -+++ xbmc-29490.patch/xbmc/PowerManager.cpp 2010-04-25 23:12:52.132484681 +0200 -@@ -35,6 +35,7 @@ - #ifdef __APPLE__ - #include "osx/CocoaPowerSyscall.h" - #elif defined(_LINUX) && defined(HAS_DBUS) -+#include "linux/ConsoleUPowerSyscall.h" - #include "linux/ConsoleDeviceKitPowerSyscall.h" - #ifdef HAS_HAL - #include "linux/HALPowerSyscall.h" -@@ -74,6 +75,8 @@ - #elif defined(_LINUX) && defined(HAS_DBUS) - if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit()) - m_instance = new CConsoleDeviceKitPowerSyscall(); -+ else if (CConsoleUPowerSyscall::HasDeviceConsoleKit()) -+ m_instance = new CConsoleUPowerSyscall(); - #ifdef HAS_HAL - else - m_instance = new CHALPowerSyscall(); diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index a97051b150..306975395f 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-29605.tar.bz2 +http://sources.openelec.tv/svn/xbmc-29759.tar.bz2 diff --git a/packages/sysutils/LVM2/url b/packages/sysutils/LVM2/url index 5d60e08e67..20f12b2c86 100644 --- a/packages/sysutils/LVM2/url +++ b/packages/sysutils/LVM2/url @@ -1 +1 @@ -ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.63.tgz +ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.64.tgz diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index e19516e704..e4b7c98d9d 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.16.1 -# Mon Apr 12 16:04:50 2010 +# Sun May 2 15:07:06 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -186,7 +186,7 @@ CONFIG_FEATURE_ENV_LONG_OPTIONS=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set -# CONFIG_ID is not set +CONFIG_ID=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y # CONFIG_LENGTH is not set @@ -367,10 +367,10 @@ CONFIG_FEATURE_FIND_PATH=y # CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set CONFIG_FEATURE_FIND_LINKS=y -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y +# CONFIG_GREP is not set +# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set CONFIG_XARGS=y CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y @@ -684,7 +684,7 @@ CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_HW=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y # CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set +CONFIG_IFPLUGD=y CONFIG_IFUPDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" CONFIG_FEATURE_IFUPDOWN_IP=y diff --git a/packages/sysutils/busybox/init.d/05_mount_filesystem b/packages/sysutils/busybox/init.d/05_mount_filesystem index 6435ec78ac..9a7641e436 100755 --- a/packages/sysutils/busybox/init.d/05_mount_filesystem +++ b/packages/sysutils/busybox/init.d/05_mount_filesystem @@ -6,3 +6,4 @@ progress "mounting needed filesystems" $IONICE mount -n -t ramfs none /var + $IONICE mount -n -t debugfs none /sys/kernel/debug diff --git a/packages/sysutils/busybox/init.d/06_make_directorys b/packages/sysutils/busybox/init.d/06_make_directorys index 8f4690580d..785d3a2ce5 100755 --- a/packages/sysutils/busybox/init.d/06_make_directorys +++ b/packages/sysutils/busybox/init.d/06_make_directorys @@ -21,4 +21,9 @@ progress "make variable directory structure" # others: $IONICE mkdir -p /var/lib/polkit-1 \ - /var/lib/udisks + /var/lib/udisks \ + /var/lib/upower + +# ureadahead: + $IONICE mkdir -p /storage/.cache/ureadahead + ln -sf /storage/.cache/ureadahead /var/lib/ureadahead diff --git a/packages/sysutils/busybox/init.d/07_userconfig b/packages/sysutils/busybox/init.d/08_userconfig similarity index 100% rename from packages/sysutils/busybox/init.d/07_userconfig rename to packages/sysutils/busybox/init.d/08_userconfig diff --git a/packages/sysutils/busybox/init.d/08_network b/packages/sysutils/busybox/init.d/09_network similarity index 100% rename from packages/sysutils/busybox/init.d/08_network rename to packages/sysutils/busybox/init.d/09_network diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 3fdc1919e3..c625bf2074 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -55,3 +55,6 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`" mkdir -p $INSTALL/etc/network cp $PKG_DIR/config/interfaces $INSTALL/etc/network + +# we need an full-featured grep for pm-utils, so we install this :-( + $SCRIPTS/install grep diff --git a/packages/sysutils/e2fsprogs/build b/packages/sysutils/e2fsprogs/build new file mode 100755 index 0000000000..b590895a7d --- /dev/null +++ b/packages/sysutils/e2fsprogs/build @@ -0,0 +1,24 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain + +cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --enable-shared \ + --disable-static \ + --disable-libuuid \ + --disable-libblkid \ + --disable-debugfs \ + --disable-imager \ + --disable-resizer \ + --disable-uuidd \ + +make -C lib/et +make -C lib/ext2fs + +$MAKEINSTALL -C lib/et +$MAKEINSTALL -C lib/ext2fs diff --git a/packages/sysutils/e2fsprogs/install b/packages/sysutils/e2fsprogs/install new file mode 100755 index 0000000000..5c6656c51c --- /dev/null +++ b/packages/sysutils/e2fsprogs/install @@ -0,0 +1,17 @@ +#!/bin/sh + +. config/options + +mkdir -p $INSTALL/bin + cp $PKG_BUILD/mount/.libs/mount $INSTALL/bin + cp $PKG_BUILD/mount/.libs/umount $INSTALL/bin + +mkdir -p $INSTALL/sbin + cp $PKG_BUILD/fdisk/sfdisk $INSTALL/sbin + cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/sbin + +mkdir -p $INSTALL/usr/lib + cp -PR $PKG_BUILD/shlibs/blkid/src/.libs/libblkid.so* $INSTALL/usr/lib + rm -rf $INSTALL/usr/lib/libblkid.so*T + cp -PR $PKG_BUILD/shlibs/uuid/src/.libs/libuuid.so* $INSTALL/usr/lib + rm -rf $INSTALL/usr/lib/libuuid.so*T diff --git a/packages/sysutils/e2fsprogs/url b/packages/sysutils/e2fsprogs/url new file mode 100644 index 0000000000..775aa96da0 --- /dev/null +++ b/packages/sysutils/e2fsprogs/url @@ -0,0 +1 @@ +http://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.11.tar.gz \ No newline at end of file diff --git a/packages/sysutils/grep/build b/packages/sysutils/grep/build new file mode 100755 index 0000000000..05c6f139e4 --- /dev/null +++ b/packages/sysutils/grep/build @@ -0,0 +1,14 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain + +cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --enable-shared \ + --disable-static \ + +make \ No newline at end of file diff --git a/packages/sysutils/grep/install b/packages/sysutils/grep/install new file mode 100755 index 0000000000..fda81c3a2a --- /dev/null +++ b/packages/sysutils/grep/install @@ -0,0 +1,6 @@ +#!/bin/sh + +. config/options + +mkdir -p $INSTALL/usr/bin + cp -P $PKG_BUILD/src/grep $INSTALL/usr/bin diff --git a/packages/sysutils/grep/patches/10-grep_fix-0.1.diff b/packages/sysutils/grep/patches/10-grep_fix-0.1.diff new file mode 100644 index 0000000000..3e60903ddd --- /dev/null +++ b/packages/sysutils/grep/patches/10-grep_fix-0.1.diff @@ -0,0 +1,42 @@ +Hi Nelson, + +Thanks for the report. +I debated whether to add an entry to NEWS, but opted not to, +since it is unlikely that anyone will see the result of this fix. + +Here's the patch: + +From 651d212abe771d2a32db746895ae28dd434527b6 Mon Sep 17 00:00:00 2001 +From: Jim Meyering redhat.com> +Date: Wed, 7 Apr 2010 13:36:02 +0200 +Subject: [PATCH] grep: make kwset's obstack use xmalloc, not malloc + +This insidious bug could make grep fail to diagnose a failed malloc, +and then proceed to dereference the resulting NULL pointer. +Note that this bug was unlikely ever to cause real trouble; without +the fix, grep would segfault upon OOM, now it exits with a diagnostic. +* src/kwset.c (malloc) [GREP]: Define without the "(s)" macro +parameter, so that unadorned uses of malloc are also mapped to xmalloc. +One such use is in the expansion of obstack_init. +Report and patch by Nelson H. F. Beebe, in +http://thread.gmane.org/gmane.comp.gnu.grep.bugs/2995 +--- + src/kwset.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/kwset.c b/src/kwset.c +index 050562e..995be79 100644 +--- a/src/kwset.c ++++ b/src/kwset.c +@@ -40,7 +40,7 @@ + #ifdef GREP + # include "xalloc.h" + # undef malloc +-# define malloc(s) xmalloc(s) ++# define malloc xmalloc + #endif + + #define NCHAR (UCHAR_MAX + 1) +-- +1.7.1.rc0.212.gbd88f + diff --git a/packages/sysutils/grep/url b/packages/sysutils/grep/url new file mode 100644 index 0000000000..37b71ebbd5 --- /dev/null +++ b/packages/sysutils/grep/url @@ -0,0 +1 @@ +ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/grep/grep-2.6.3.tar.gz \ No newline at end of file diff --git a/packages/sysutils/lcdproc/init.d/33_lcdproc b/packages/sysutils/lcdproc/init.d/33_lcdproc index a64dcfcb81..8d3480afc8 100755 --- a/packages/sysutils/lcdproc/init.d/33_lcdproc +++ b/packages/sysutils/lcdproc/init.d/33_lcdproc @@ -2,12 +2,16 @@ # # runlevels: openelec, textmode -[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf +( + [ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf || exit 0 -if [ ! "$LCD_DRIVER" = "none" -a -z "$LCD_DRIVER" ]; then + if [ ! "$LCD_DRIVER" = none ]; then - progress "Starting LCD daemon" + progress "Starting LCD daemon with driver: $LCD_DRIVER" - LCDd -c /etc/LCDd.conf -d $LCD_DRIVER > /dev/null 2>&1 + usleep 10000000 # sleep 10sec. to for irserver loading -fi \ No newline at end of file + LCDd -c /etc/LCDd.conf -d $LCD_DRIVER > /dev/null 2>&1 + + fi +)& \ No newline at end of file diff --git a/packages/sysutils/pm-utils/build b/packages/sysutils/pm-utils/build new file mode 100755 index 0000000000..1733fbe5bd --- /dev/null +++ b/packages/sysutils/pm-utils/build @@ -0,0 +1,15 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain + +cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + +make diff --git a/packages/sysutils/pm-utils/install b/packages/sysutils/pm-utils/install new file mode 100755 index 0000000000..c5b626e3ab --- /dev/null +++ b/packages/sysutils/pm-utils/install @@ -0,0 +1,47 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/install grep + +mkdir -p $INSTALL/etc/pm/config.d +mkdir -p $INSTALL/etc/pm/power.d +mkdir -p $INSTALL/etc/pm/sleep.d + +mkdir -p $INSTALL/usr/bin + for file in import-fdi-quirkdb on_ac_power pm-is-supported; do + cp -P $PKG_BUILD/src/$file $INSTALL/usr/bin + done + +mkdir -p $INSTALL/usr/lib/pm-utils/bin + for file in pm-action pm-pmu pm-reset-swap service; do + cp -P $PKG_BUILD/src/$file $INSTALL/usr/lib/pm-utils/bin + done + +mkdir -p $INSTALL/usr/lib/pm-utils/ + for file in defaults functions pm-functions; do + cp -P $PKG_BUILD/pm/$file $INSTALL/usr/lib/pm-utils + done + +mkdir -p $INSTALL/usr/lib/pm-utils/module.d + for file in kernel tuxonice uswsusp; do + cp -P $PKG_BUILD/pm/module.d/$file $INSTALL/usr/lib/pm-utils/module.d + done + +mkdir -p $INSTALL/usr/lib/pm-utils/power.d + for file in sched-powersave; do + cp -P $PKG_BUILD/pm/power.d/$file $INSTALL/usr/lib/pm-utils/power.d + chmod +x $INSTALL/usr/lib/pm-utils/power.d/$file + done + +mkdir -p $INSTALL/usr/lib/pm-utils/sleep.d + for file in 00logging 00powersave 01grub 49bluetooth 55NetworkManager 75modules 90clock 94cpufreq 95led 98video-quirk-db-handler 99video; do + cp -P $PKG_BUILD/pm/sleep.d/$file $INSTALL/usr/lib/pm-utils/sleep.d + chmod +x $INSTALL/usr/lib/pm-utils/sleep.d/$file + done + +mkdir -p $INSTALL/usr/sbin + cp -P $PKG_BUILD/src/pm-powersave $INSTALL/usr/sbin + for file in pm-hibernate pm-suspend pm-suspend-hybrid; do + ln -sf /usr/lib/pm-utils/bin/pm-action $INSTALL/usr/sbin/$file + done diff --git a/packages/sysutils/pm-utils/url b/packages/sysutils/pm-utils/url new file mode 100644 index 0000000000..74e83fcab0 --- /dev/null +++ b/packages/sysutils/pm-utils/url @@ -0,0 +1 @@ +http://sources.openelec.tv/svn/pm-utils-20100428.tar.bz2 \ No newline at end of file diff --git a/packages/sysutils/remote/irserver/init.d/30_irserver b/packages/sysutils/remote/irserver/init.d/30_irserver index cc77fcf556..245dceac81 100755 --- a/packages/sysutils/remote/irserver/init.d/30_irserver +++ b/packages/sysutils/remote/irserver/init.d/30_irserver @@ -9,17 +9,13 @@ if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then progress "Starting IRtrans daemon" - IRTRANS_DEV="/dev/irtrans0" - IRSERVER_LOG="/var/log/irserver.log" - IRSERVER_PID="/var/run/irserver.pid" - [ ! "$REMOTE_BACKEND" = "irtrans" ] && \ IRSERVER_ARG="$IRSERVER_ARG -no_lirc" # dont run in lirc mode [ "$DEBUG" = "yes" ] && \ IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode - irserver -logfile $IRSERVER_LOG -pidfile $IRSERVER_PID \ - -daemon $IRTRANS_DEV $IRSERVER_ARG > /dev/null 2>&1 + irserver -logfile /var/log/irserver.log -pidfile /var/run/irserver.pid \ + $IRSERVER_ARG -daemon /dev/irtrans0 > /dev/null 2>&1 fi \ No newline at end of file diff --git a/packages/sysutils/upower/build b/packages/sysutils/upower/build new file mode 100755 index 0000000000..e3ed681c1d --- /dev/null +++ b/packages/sysutils/upower/build @@ -0,0 +1,31 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain +$SCRIPTS/build udev +$SCRIPTS/build glib +$SCRIPTS/build dbus +$SCRIPTS/build dbus-glib +$SCRIPTS/build polkit + +cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --libexecdir=/usr/lib/upower \ + --localstatedir=/var \ + --disable-static \ + --enable-shared \ + --with-backend=linux \ + --disable-man-pages \ + --disable-gtk-doc \ + --enable-gtk-doc-html \ + --enable-gtk-doc-pdf \ + --disable-nls \ + +make + +$MAKEINSTALL diff --git a/packages/sysutils/upower/install b/packages/sysutils/upower/install new file mode 100755 index 0000000000..0d4fad0654 --- /dev/null +++ b/packages/sysutils/upower/install @@ -0,0 +1,35 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/install udev +$SCRIPTS/install glib +$SCRIPTS/install dbus +$SCRIPTS/install dbus-glib +$SCRIPTS/install polkit + +mkdir -p $INSTALL/etc/dbus-1/system.d + cp -P $PKG_BUILD/src/org.freedesktop.UPower.conf $INSTALL/etc/dbus-1/system.d + +mkdir -p $INSTALL/usr/bin + cp -P $PKG_BUILD/tools/.libs/upower $INSTALL/usr/bin + +mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/devkit-power-gobject/.libs/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/libupower-glib/.libs/*.so* $INSTALL/usr/lib + +mkdir -p $INSTALL/usr/lib/upower + cp -P $PKG_BUILD/src/.libs/upowerd $INSTALL/usr/lib/upower + +mkdir -p $INSTALL/usr/share/dbus-1/interfaces + cp -P $PKG_BUILD/src/org.freedesktop.UPower.Device.xml $INSTALL/usr/share/dbus-1/interfaces + cp -P $PKG_BUILD/src/org.freedesktop.UPower.QoS.xml $INSTALL/usr/share/dbus-1/interfaces + cp -P $PKG_BUILD/src/org.freedesktop.UPower.Wakeups.xml $INSTALL/usr/share/dbus-1/interfaces + cp -P $PKG_BUILD/src/org.freedesktop.UPower.xml $INSTALL/usr/share/dbus-1/interfaces + +mkdir -p $INSTALL/usr/share/dbus-1/system-services + cp -P $PKG_BUILD/src/org.freedesktop.UPower.service $INSTALL/usr/share/dbus-1/system-services + +mkdir -p $INSTALL/usr/share/polkit-1/actions + cp -P $PKG_BUILD/policy/org.freedesktop.upower.policy $INSTALL/usr/share/polkit-1/actions + cp -P $PKG_BUILD/policy/org.freedesktop.upower.qos.policy $INSTALL/usr/share/polkit-1/actions diff --git a/packages/sysutils/upower/url b/packages/sysutils/upower/url new file mode 100644 index 0000000000..fe8dcb77e1 --- /dev/null +++ b/packages/sysutils/upower/url @@ -0,0 +1 @@ +http://upower.freedesktop.org/releases/upower-0.9.2.tar.bz2 \ No newline at end of file diff --git a/packages/sysutils/ureadahead/build b/packages/sysutils/ureadahead/build new file mode 100755 index 0000000000..0ae6baad9e --- /dev/null +++ b/packages/sysutils/ureadahead/build @@ -0,0 +1,20 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain +$SCRIPTS/build libnih +$SCRIPTS/build e2fsprogs + +cd $PKG_BUILD +EXT2FS_LIBS="-lext2fs -lcom_err" \ +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --disable-static \ + --enable-shared \ + +make diff --git a/packages/sysutils/ureadahead/init.d/07_ureadahead b/packages/sysutils/ureadahead/init.d/07_ureadahead new file mode 100755 index 0000000000..9915d174b0 --- /dev/null +++ b/packages/sysutils/ureadahead/init.d/07_ureadahead @@ -0,0 +1,10 @@ +# start the ureadahead daemon +# +# runlevels: openelec, textmode + +( + progress "Starting ureadahead" + + ureadahead --daemon --timeout=30 > /dev/null 2>&1 + +)& \ No newline at end of file diff --git a/packages/sysutils/ureadahead/install b/packages/sysutils/ureadahead/install new file mode 100755 index 0000000000..7ab7a30d7c --- /dev/null +++ b/packages/sysutils/ureadahead/install @@ -0,0 +1,6 @@ +#!/bin/sh + +. config/options + +mkdir -p $INSTALL/usr/sbin + cp -P $PKG_BUILD/src/ureadahead $INSTALL/usr/sbin diff --git a/packages/sysutils/ureadahead/url b/packages/sysutils/ureadahead/url new file mode 100644 index 0000000000..400d2e3709 --- /dev/null +++ b/packages/sysutils/ureadahead/url @@ -0,0 +1 @@ +http://sources.openelec.tv/svn/ureadahead-111.tar.bz2 \ No newline at end of file diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index cf1932b77a..ab12dee30b 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33.2 +# Linux kernel version: 2.6.33.3 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -123,7 +123,9 @@ CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -143,7 +145,9 @@ CONFIG_HAVE_PERF_EVENTS=y # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y +CONFIG_EVENT_PROFILE=y # CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set @@ -152,7 +156,9 @@ CONFIG_PCI_QUIRKS=y CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -166,6 +172,7 @@ CONFIG_HAVE_USER_RETURN_NOTIFIER=y # # GCOV-based kernel profiling # +# CONFIG_GCOV_KERNEL is not set # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y @@ -221,7 +228,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_MUTEX_SPIN_ON_OWNER=y -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y # # Processor type and features @@ -376,16 +383,20 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # CONFIG_PM=y # CONFIG_PM_DEBUG is not set -# CONFIG_SUSPEND is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_PM_RUNTIME=y CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set # CONFIG_ACPI_POWER_METER is not set CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_PROC_EVENT=y -# CONFIG_ACPI_AC is not set -# CONFIG_ACPI_BATTERY is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BUTTON=y CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y @@ -399,8 +410,9 @@ CONFIG_ACPI_BLACKLIST_YEAR=2000 CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y -# CONFIG_ACPI_SBS is not set +CONFIG_ACPI_SBS=y # CONFIG_SFI is not set +# CONFIG_APM is not set # # CPU Frequency scaling @@ -468,6 +480,7 @@ CONFIG_PCIEAER=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_STUB is not set CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set @@ -555,6 +568,7 @@ CONFIG_SCTP_HMAC_SHA1=y # Network testing # # CONFIG_NET_PKTGEN is not set +# CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set @@ -587,6 +601,7 @@ CONFIG_CFG80211=m # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set # CONFIG_WIRELESS_OLD_REGULATORY is not set CONFIG_CFG80211_WEXT=y CONFIG_WIRELESS_EXT_SYSFS=y @@ -600,6 +615,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set CONFIG_RFKILL=m @@ -622,6 +638,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set @@ -864,6 +882,7 @@ CONFIG_ATH5K=m CONFIG_ATH9K_HW=m CONFIG_ATH9K_COMMON=m CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUGFS is not set # CONFIG_AR9170_USB is not set # CONFIG_B43 is not set # CONFIG_B43LEGACY is not set @@ -1827,7 +1846,9 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set @@ -1989,17 +2010,54 @@ CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_DETECT_HUNG_TASK is not set +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y -# CONFIG_FRAME_POINTER is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -2007,17 +2065,52 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y -# CONFIG_FTRACE is not set +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SYSPROF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_FTRACE_SYSCALLS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_POWER_TRACER is not set +# CONFIG_KSYM_TRACER is not set +CONFIG_STACK_TRACER=y +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_DYNAMIC_FTRACE=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set # CONFIG_EARLY_PRINTK is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_DEBUG_NX_TEST is not set # CONFIG_4KSTACKS is not set CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set @@ -2031,7 +2124,10 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IO_DELAY_NONE is not set CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # # Security options @@ -2147,7 +2243,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_HW is not set CONFIG_HAVE_KVM=y # CONFIG_VIRTUALIZATION is not set -# CONFIG_BINARY_PRINTF is not set +CONFIG_BINARY_PRINTF=y # # Library routines diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 3cbc4f2752..f80bab3937 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33.2 +# Linux kernel version: 2.6.33.3 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -24,8 +24,8 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_TIME_VSYSCALL=y @@ -123,7 +123,9 @@ CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -143,7 +145,9 @@ CONFIG_HAVE_PERF_EVENTS=y # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y +CONFIG_EVENT_PROFILE=y # CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set @@ -152,7 +156,9 @@ CONFIG_PCI_QUIRKS=y CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -166,6 +172,7 @@ CONFIG_HAVE_USER_RETURN_NOTIFIER=y # # GCOV-based kernel profiling # +# CONFIG_GCOV_KERNEL is not set # CONFIG_SLOW_WORK is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_RT_MUTEXES=y @@ -220,7 +227,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_MUTEX_SPIN_ON_OWNER=y -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y # # Processor type and features @@ -266,6 +273,7 @@ CONFIG_X86_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y @@ -287,6 +295,7 @@ CONFIG_GART_IOMMU=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y # CONFIG_IOMMU_API is not set +# CONFIG_MAXSMP is not set CONFIG_NR_CPUS=4 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y @@ -360,16 +369,20 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # CONFIG_PM=y # CONFIG_PM_DEBUG is not set -# CONFIG_SUSPEND is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_PM_RUNTIME=y CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set # CONFIG_ACPI_POWER_METER is not set CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_PROC_EVENT=y -# CONFIG_ACPI_AC is not set -# CONFIG_ACPI_BATTERY is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BUTTON=y CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y @@ -383,7 +396,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y -# CONFIG_ACPI_SBS is not set +CONFIG_ACPI_SBS=y # CONFIG_SFI is not set # @@ -442,6 +455,7 @@ CONFIG_PCIEAER=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_STUB is not set CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set @@ -526,6 +540,7 @@ CONFIG_SCTP_HMAC_SHA1=y # Network testing # # CONFIG_NET_PKTGEN is not set +# CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set @@ -558,6 +573,7 @@ CONFIG_CFG80211=m # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set # CONFIG_WIRELESS_OLD_REGULATORY is not set CONFIG_CFG80211_WEXT=y CONFIG_WIRELESS_EXT_SYSFS=y @@ -571,6 +587,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set CONFIG_RFKILL=m @@ -593,6 +610,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set @@ -833,6 +852,7 @@ CONFIG_ATH5K=m CONFIG_ATH9K_HW=m CONFIG_ATH9K_COMMON=m CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUGFS is not set # CONFIG_AR9170_USB is not set # CONFIG_B43 is not set # CONFIG_B43LEGACY is not set @@ -1781,7 +1801,9 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set @@ -1943,17 +1965,53 @@ CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_DETECT_HUNG_TASK is not set +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y -# CONFIG_FRAME_POINTER is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -1961,17 +2019,54 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y -# CONFIG_FTRACE is not set +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SYSPROF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_FTRACE_SYSCALLS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_POWER_TRACER is not set +# CONFIG_KSYM_TRACER is not set +CONFIG_STACK_TRACER=y +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_DYNAMIC_FTRACE=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set # CONFIG_EARLY_PRINTK is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_DEBUG_NX_TEST is not set +# CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_IO_DELAY_TYPE_0X80=0 @@ -1983,7 +2078,10 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IO_DELAY_NONE is not set CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # # Security options @@ -2093,6 +2191,7 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_DEFLATE is not set CONFIG_CRYPTO_ZLIB=y CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_LZF=y # # Random Number Generation @@ -2101,7 +2200,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_HW is not set CONFIG_HAVE_KVM=y # CONFIG_VIRTUALIZATION is not set -# CONFIG_BINARY_PRINTF is not set +CONFIG_BINARY_PRINTF=y # # Library routines @@ -2117,7 +2216,6 @@ CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set CONFIG_LIBCRC32C=y -CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y diff --git a/projects/generic/linux/linux.i386.conf b/projects/generic/linux/linux.i386.conf index abcdb5d6cb..700f9125a2 100644 --- a/projects/generic/linux/linux.i386.conf +++ b/projects/generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33.2 +# Linux kernel version: 2.6.33.3 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -123,7 +123,9 @@ CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -143,7 +145,9 @@ CONFIG_HAVE_PERF_EVENTS=y # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y +CONFIG_EVENT_PROFILE=y # CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set @@ -152,7 +156,9 @@ CONFIG_PCI_QUIRKS=y CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -166,6 +172,7 @@ CONFIG_HAVE_USER_RETURN_NOTIFIER=y # # GCOV-based kernel profiling # +# CONFIG_GCOV_KERNEL is not set # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y @@ -221,7 +228,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_MUTEX_SPIN_ON_OWNER=y -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y # # Processor type and features @@ -377,16 +384,20 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # CONFIG_PM=y # CONFIG_PM_DEBUG is not set -# CONFIG_SUSPEND is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_PM_RUNTIME=y CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set # CONFIG_ACPI_POWER_METER is not set CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_PROC_EVENT=y -# CONFIG_ACPI_AC is not set -# CONFIG_ACPI_BATTERY is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=y CONFIG_ACPI_FAN=y @@ -401,8 +412,9 @@ CONFIG_ACPI_BLACKLIST_YEAR=2000 CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y -# CONFIG_ACPI_SBS is not set +CONFIG_ACPI_SBS=y # CONFIG_SFI is not set +# CONFIG_APM is not set # # CPU Frequency scaling @@ -470,6 +482,7 @@ CONFIG_PCIEAER=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_STUB is not set CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set @@ -557,6 +570,7 @@ CONFIG_SCTP_HMAC_SHA1=y # Network testing # # CONFIG_NET_PKTGEN is not set +# CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set @@ -592,6 +606,7 @@ CONFIG_CFG80211=m # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set # CONFIG_WIRELESS_OLD_REGULATORY is not set CONFIG_CFG80211_WEXT=y CONFIG_WIRELESS_EXT_SYSFS=y @@ -608,6 +623,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set CONFIG_RFKILL=m @@ -631,6 +647,8 @@ CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE=" radeon/R600_rlc.bin radeon/R700_rlc.bin" CONFIG_EXTRA_FIRMWARE_DIR="firmware" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set @@ -892,6 +910,7 @@ CONFIG_R8169=m # CONFIG_SIS190 is not set # CONFIG_SKGE is not set CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m @@ -924,12 +943,14 @@ CONFIG_ATH5K=m CONFIG_ATH9K_HW=m CONFIG_ATH9K_COMMON=m CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUGFS is not set CONFIG_AR9170_USB=m CONFIG_AR9170_LEDS=y CONFIG_B43=m CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y # CONFIG_B43_SDIO is not set +CONFIG_B43_PIO=y CONFIG_B43_PHY_LP=y CONFIG_B43_LEDS=y CONFIG_B43_HWRNG=y @@ -958,6 +979,7 @@ CONFIG_LIBIPW=m CONFIG_IWLWIFI=m CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y # CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set CONFIG_IWLAGN=m CONFIG_IWL4965=y CONFIG_IWL5000=y @@ -1373,6 +1395,7 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_SSB=m CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_PCIHOST=y CONFIG_SSB_B43_PCI_BRIDGE=y @@ -2062,7 +2085,9 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set @@ -2224,17 +2249,54 @@ CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_DETECT_HUNG_TASK is not set +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y -# CONFIG_FRAME_POINTER is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -2242,17 +2304,52 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y -# CONFIG_FTRACE is not set +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SYSPROF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_FTRACE_SYSCALLS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_POWER_TRACER is not set +# CONFIG_KSYM_TRACER is not set +CONFIG_STACK_TRACER=y +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_DYNAMIC_FTRACE=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set # CONFIG_EARLY_PRINTK is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_DEBUG_NX_TEST is not set # CONFIG_4KSTACKS is not set CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set @@ -2266,7 +2363,10 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IO_DELAY_NONE is not set CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # # Security options @@ -2382,7 +2482,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_HW is not set CONFIG_HAVE_KVM=y # CONFIG_VIRTUALIZATION is not set -# CONFIG_BINARY_PRINTF is not set +CONFIG_BINARY_PRINTF=y # # Library routines diff --git a/projects/intel/linux/linux.i386.conf b/projects/intel/linux/linux.i386.conf index 6473ae01ce..cfb468d977 100644 --- a/projects/intel/linux/linux.i386.conf +++ b/projects/intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33.2 +# Linux kernel version: 2.6.33.3 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -123,7 +123,9 @@ CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -143,7 +145,9 @@ CONFIG_HAVE_PERF_EVENTS=y # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y +CONFIG_EVENT_PROFILE=y # CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set @@ -152,7 +156,9 @@ CONFIG_PCI_QUIRKS=y CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -166,6 +172,7 @@ CONFIG_HAVE_USER_RETURN_NOTIFIER=y # # GCOV-based kernel profiling # +# CONFIG_GCOV_KERNEL is not set # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y @@ -221,7 +228,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_MUTEX_SPIN_ON_OWNER=y -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y # # Processor type and features @@ -377,16 +384,20 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # CONFIG_PM=y # CONFIG_PM_DEBUG is not set -# CONFIG_SUSPEND is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_PM_RUNTIME=y CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set # CONFIG_ACPI_POWER_METER is not set CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_PROC_EVENT=y -# CONFIG_ACPI_AC is not set -# CONFIG_ACPI_BATTERY is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=y CONFIG_ACPI_FAN=y @@ -401,8 +412,9 @@ CONFIG_ACPI_BLACKLIST_YEAR=2000 CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y -# CONFIG_ACPI_SBS is not set +CONFIG_ACPI_SBS=y # CONFIG_SFI is not set +# CONFIG_APM is not set # # CPU Frequency scaling @@ -470,6 +482,7 @@ CONFIG_PCIEAER=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_STUB is not set CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set @@ -557,6 +570,7 @@ CONFIG_SCTP_HMAC_SHA1=y # Network testing # # CONFIG_NET_PKTGEN is not set +# CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set @@ -588,6 +602,7 @@ CONFIG_CFG80211=m # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set # CONFIG_WIRELESS_OLD_REGULATORY is not set CONFIG_CFG80211_WEXT=y CONFIG_WIRELESS_EXT_SYSFS=y @@ -601,6 +616,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set CONFIG_RFKILL=m @@ -623,6 +639,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set @@ -850,6 +868,7 @@ CONFIG_WLAN=y CONFIG_IWLWIFI=m CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y # CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set CONFIG_IWLAGN=m CONFIG_IWL4965=y CONFIG_IWL5000=y @@ -2009,7 +2028,9 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set @@ -2171,17 +2192,54 @@ CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_DETECT_HUNG_TASK is not set +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y -# CONFIG_FRAME_POINTER is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -2189,17 +2247,52 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y -# CONFIG_FTRACE is not set +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SYSPROF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_FTRACE_SYSCALLS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_POWER_TRACER is not set +# CONFIG_KSYM_TRACER is not set +CONFIG_STACK_TRACER=y +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_DYNAMIC_FTRACE=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set # CONFIG_EARLY_PRINTK is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_DEBUG_NX_TEST is not set # CONFIG_4KSTACKS is not set CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set @@ -2213,7 +2306,10 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IO_DELAY_NONE is not set CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # # Security options @@ -2329,7 +2425,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_HW is not set CONFIG_HAVE_KVM=y # CONFIG_VIRTUALIZATION is not set -# CONFIG_BINARY_PRINTF is not set +CONFIG_BINARY_PRINTF=y # # Library routines diff --git a/projects/intel/linux/linux.x86_64.conf b/projects/intel/linux/linux.x86_64.conf index e5b0f9c048..da6ec3e2cf 100644 --- a/projects/intel/linux/linux.x86_64.conf +++ b/projects/intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33.2 +# Linux kernel version: 2.6.33.3 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -24,8 +24,8 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_TIME_VSYSCALL=y @@ -123,7 +123,9 @@ CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -143,7 +145,9 @@ CONFIG_HAVE_PERF_EVENTS=y # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y +CONFIG_EVENT_PROFILE=y # CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set @@ -152,7 +156,9 @@ CONFIG_PCI_QUIRKS=y CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -166,6 +172,7 @@ CONFIG_HAVE_USER_RETURN_NOTIFIER=y # # GCOV-based kernel profiling # +# CONFIG_GCOV_KERNEL is not set # CONFIG_SLOW_WORK is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_RT_MUTEXES=y @@ -220,7 +227,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_MUTEX_SPIN_ON_OWNER=y -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y # # Processor type and features @@ -266,6 +273,7 @@ CONFIG_X86_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y @@ -289,6 +297,7 @@ CONFIG_GART_IOMMU=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y # CONFIG_IOMMU_API is not set +# CONFIG_MAXSMP is not set CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y @@ -362,16 +371,20 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # CONFIG_PM=y # CONFIG_PM_DEBUG is not set -# CONFIG_SUSPEND is not set -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_PM_RUNTIME=y CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set # CONFIG_ACPI_POWER_METER is not set CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_PROC_EVENT=y -# CONFIG_ACPI_AC is not set -# CONFIG_ACPI_BATTERY is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=y CONFIG_ACPI_FAN=y @@ -386,7 +399,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y -# CONFIG_ACPI_SBS is not set +CONFIG_ACPI_SBS=y # CONFIG_SFI is not set # @@ -445,6 +458,7 @@ CONFIG_PCIEAER=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_STUB is not set CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set @@ -529,6 +543,7 @@ CONFIG_SCTP_HMAC_SHA1=y # Network testing # # CONFIG_NET_PKTGEN is not set +# CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set @@ -560,6 +575,7 @@ CONFIG_CFG80211=m # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set # CONFIG_WIRELESS_OLD_REGULATORY is not set CONFIG_CFG80211_WEXT=y CONFIG_WIRELESS_EXT_SYSFS=y @@ -573,6 +589,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set CONFIG_RFKILL=m @@ -595,6 +612,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set @@ -820,6 +839,7 @@ CONFIG_WLAN=y CONFIG_IWLWIFI=m CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y # CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set CONFIG_IWLAGN=m CONFIG_IWL4965=y CONFIG_IWL5000=y @@ -1966,7 +1986,9 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set @@ -2128,17 +2150,53 @@ CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_DETECT_HUNG_TASK is not set +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y -# CONFIG_FRAME_POINTER is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -2146,17 +2204,54 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y -# CONFIG_FTRACE is not set +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SYSPROF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_FTRACE_SYSCALLS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_POWER_TRACER is not set +# CONFIG_KSYM_TRACER is not set +CONFIG_STACK_TRACER=y +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_DYNAMIC_FTRACE=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set # CONFIG_EARLY_PRINTK is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_DEBUG_RODATA is not set +# CONFIG_DEBUG_NX_TEST is not set +# CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_IO_DELAY_TYPE_0X80=0 @@ -2168,7 +2263,10 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IO_DELAY_NONE is not set CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # # Security options @@ -2278,6 +2376,7 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_DEFLATE is not set CONFIG_CRYPTO_ZLIB=y CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_LZF=y # # Random Number Generation @@ -2286,7 +2385,7 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_HW is not set CONFIG_HAVE_KVM=y # CONFIG_VIRTUALIZATION is not set -# CONFIG_BINARY_PRINTF is not set +CONFIG_BINARY_PRINTF=y # # Library routines @@ -2302,7 +2401,6 @@ CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set CONFIG_LIBCRC32C=y -CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_xbmc index e22781a15e..43dae07746 100755 --- a/tools/mkpkg/mkpkg_xbmc +++ b/tools/mkpkg/mkpkg_xbmc @@ -19,6 +19,7 @@ echo "cleaning sources..." echo "seperating theme..." rm -rf xbmc-theme-Confluence-$SVN_REV mv xbmc-$SVN_REV/addons/skin.confluence xbmc-theme-Confluence-$SVN_REV + rm -rf xbmc-theme-PM3-HD-$SVN_REV mv xbmc-$SVN_REV/addons/skin.pm3-hd xbmc-theme-PM3-HD-$SVN_REV echo "cleaning sources..." diff --git a/tools/mkpkg/mkpkg_xbmc-pvr b/tools/mkpkg/mkpkg_xbmc-pvr index 9a143245ad..f09a387f46 100755 --- a/tools/mkpkg/mkpkg_xbmc-pvr +++ b/tools/mkpkg/mkpkg_xbmc-pvr @@ -18,13 +18,14 @@ echo "cleaning sources..." echo "seperating theme..." rm -rf xbmc-pvr-theme-Confluence-$SVN_REV - mv xbmc-pvr-$SVN_REV/skin/Confluence xbmc-pvr-theme-Confluence-$SVN_REV + mv xbmc-pvr-$SVN_REV/addons/skin.confluence xbmc-pvr-theme-Confluence-$SVN_REV + rm -rf xbmc-pvr-theme-PM3-HD-$SVN_REV + mv xbmc-pvr-$SVN_REV/addons/skin.pm3-hd xbmc-pvr-theme-PM3-HD-$SVN_REV echo "cleaning sources..." - rm -rf xbmc-pvr-$SVN_REV/visualizations/XBMCProjectM/win32 + rm -rf xbmc-pvr-$SVN_REV/visualisations rm -rf xbmc-pvr-$SVN_REV/lib/libSDL-* rm -rf xbmc-pvr-$SVN_REV/lib/libcurl-* - rm -rf xbmc-pvr-$SVN_REV/skin rm -rf xbmc-pvr-$SVN_REV/project for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \ @@ -40,7 +41,9 @@ echo "cleaning sources..." echo "packing sources..." tar cvjf xbmc-pvr-$SVN_REV.tar.bz2 xbmc-pvr-$SVN_REV tar cvjf xbmc-pvr-theme-Confluence-$SVN_REV.tar.bz2 xbmc-pvr-theme-Confluence-$SVN_REV + tar cvjf xbmc-pvr-theme-PM3-HD-$SVN_REV.tar.bz2 xbmc-pvr-theme-PM3-HD-$SVN_REV echo "remove temporary sourcedir..." rm -rf xbmc-pvr-$SVN_REV - rm -rf xbmc-pvr-theme-Confluence-$SVN_REV \ No newline at end of file + rm -rf xbmc-pvr-theme-Confluence-$SVN_REV + rm -rf xbmc-pvr-theme-PM3-HD-$SVN_REV \ No newline at end of file