From 312f20914074ad9fa86e97919b574c31c463f372 Mon Sep 17 00:00:00 2001 From: Stephan Raue <stephan@mobile.openelec.tv> Date: Sun, 9 Aug 2009 01:13:42 +0200 Subject: [PATCH] undo last chance --- packages/debug/test/build | 7 - packages/debug/test/install | 8 - packages/debug/test/sources/Makefile | 14 - packages/debug/test/sources/test.c | 6 - packages/devel/dbus/url | 2 +- .../devel/gdb/patches/10_uclibc-conf.diff | 87 +- packages/devel/gdb/url | 2 +- packages/graphics/Mesa-master/install | 2 +- packages/graphics/Mesa/install | 2 +- packages/multimedia/gst-plugins-good/build | 2 +- .../moovida/scripts/xinitrc.d/99_elisa | 4 +- .../sysutils/busybox/config/busybox-test.conf | 884 ------------------ packages/sysutils/busybox/install | 1 - .../sysutils/busybox/scripts/init.initramfs | 4 +- packages/sysutils/busybox/scripts/init.system | 6 +- .../devel/uClibc/30_dlsym-verbose-dev.diff | 26 - .../devel/uClibc/config/uClibc.devtools.conf | 2 - .../devel/uClibc/config/uClibc.i386.conf | 5 +- packages/toolchain/devel/uClibc/url | 2 +- packages/virtual/image/install | 5 +- packages/x11/lib/libSM/url | 2 +- packages/x11/lib/libX11/url | 2 +- packages/x11/other/openbox/config/rc.xml | 2 +- packages/x11/other/roxterm/build | 20 - packages/x11/other/roxterm/install | 17 - packages/x11/other/roxterm/url | 1 - packages/x11/other/vte/build | 26 - packages/x11/other/vte/install | 10 - packages/x11/other/vte/url | 1 - packages/x11/proto/inputproto/url | 2 +- packages/x11/proto/xextproto/url | 2 +- ...xkbcomp-output-for-fast-start-up-v5.2.diff | 367 -------- projects/intel/linux/linux.i386.conf | 58 +- 33 files changed, 121 insertions(+), 1460 deletions(-) delete mode 100755 packages/debug/test/build delete mode 100755 packages/debug/test/install delete mode 100644 packages/debug/test/sources/Makefile delete mode 100644 packages/debug/test/sources/test.c delete mode 100644 packages/sysutils/busybox/config/busybox-test.conf delete mode 100644 packages/toolchain/devel/uClibc/30_dlsym-verbose-dev.diff delete mode 100755 packages/x11/other/roxterm/build delete mode 100755 packages/x11/other/roxterm/install delete mode 100644 packages/x11/other/roxterm/url delete mode 100755 packages/x11/other/vte/build delete mode 100755 packages/x11/other/vte/install delete mode 100644 packages/x11/other/vte/url delete mode 100644 packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.2.diff diff --git a/packages/debug/test/build b/packages/debug/test/build deleted file mode 100755 index a06dddbba..000000000 --- a/packages/debug/test/build +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain - -make -C $BUILD/$1 diff --git a/packages/debug/test/install b/packages/debug/test/install deleted file mode 100755 index 776c4f13e..000000000 --- a/packages/debug/test/install +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` - -mkdir -p $INSTALL/usr/bin -cp -f $BUILD/$1/$1 $INSTALL/usr/bin/testprogramm diff --git a/packages/debug/test/sources/Makefile b/packages/debug/test/sources/Makefile deleted file mode 100644 index bc5f8ff90..000000000 --- a/packages/debug/test/sources/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -CC ?= gcc -CFLAGS = -static -Wall -g3 -ggdb3 -Os -LDFLAGS = - -SRCS = test.c -PROG = test - -all: $(PROG) - -$(PROG): $(SRCS) - $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ - -clean: - rm -f $(PROG) diff --git a/packages/debug/test/sources/test.c b/packages/debug/test/sources/test.c deleted file mode 100644 index 0ad7f8c42..000000000 --- a/packages/debug/test/sources/test.c +++ /dev/null @@ -1,6 +0,0 @@ -#include <unistd.h> - -int main(void) { -char *msg = "works\n"; -return write(STDOUT_FILENO, msg, 6) != 6; -} \ No newline at end of file diff --git a/packages/devel/dbus/url b/packages/devel/dbus/url index 036a59917..7d3448053 100644 --- a/packages/devel/dbus/url +++ b/packages/devel/dbus/url @@ -1 +1 @@ -http://dbus.freedesktop.org/releases/dbus/dbus-1.3.0.tar.gz +http://dbus.freedesktop.org/releases/dbus/dbus-1.2.12.tar.gz diff --git a/packages/devel/gdb/patches/10_uclibc-conf.diff b/packages/devel/gdb/patches/10_uclibc-conf.diff index b39354b6e..9d8fd4e69 100644 --- a/packages/devel/gdb/patches/10_uclibc-conf.diff +++ b/packages/devel/gdb/patches/10_uclibc-conf.diff @@ -1,22 +1,70 @@ -diff -Naur gdb-6.8/bfd/configure gdb-6.8a/bfd/configure ---- gdb-6.8/bfd/configure 2008-02-14 16:20:25.000000000 +0100 -+++ gdb-6.8a/bfd/configure 2009-07-19 09:14:08.000000000 +0200 -@@ -5034,6 +5034,11 @@ - lt_cv_deplibs_check_method=pass_all +--- gdb-6.3/bfd/configure.orig Fri Oct 8 16:53:56 2004 ++++ gdb-6.3/bfd/configure Sun Feb 27 18:32:58 2005 +@@ -3583,6 +3583,11 @@ + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; +linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` + ;; ++ + netbsd* | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' +--- gdb-6.3/libtool.m4.orig Wed Jul 21 21:21:41 2004 ++++ gdb-6.3/libtool.m4 Mon Feb 28 00:08:11 2005 +@@ -653,6 +653,11 @@ + fi + ;; + ++linux-uclibc*) ++ lt_cv_deplibs_check_method=pass_all ++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` ++ ;; ++ + newsos6) + [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] + lt_cv_file_magic_cmd=/usr/bin/file +--- gdb-6.3/ltconfig.orig Tue Oct 5 15:34:42 2004 ++++ gdb-6.3/ltconfig Sun Feb 27 18:14:41 2005 +@@ -602,7 +602,7 @@ + + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. + case $host_os in +-linux-gnu*) ;; ++linux-gnu*|linux-uclibc*) ;; + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` + esac + +@@ -1270,6 +1270,24 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++linux-uclibc*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ++ soname_spec='${libname}${release}.so$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ # Note: copied from linux-gnu, and may not be appropriate. ++ hardcode_into_libs=yes ++ # Assume using the uClibc dynamic linker. ++ dynamic_linker="uClibc ld.so" ++ ;; + netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -diff -Naur gdb-6.8/libtool.m4 gdb-6.8a/libtool.m4 ---- gdb-6.8/libtool.m4 2008-02-16 16:26:46.000000000 +0100 -+++ gdb-6.8a/libtool.m4 2009-07-19 09:15:44.000000000 +0200 -@@ -2937,6 +2937,11 @@ + need_lib_prefix=no + need_version=no +--- gdb-6.3/opcodes/configure.orig Fri Sep 17 08:13:38 2004 ++++ gdb-6.3/opcodes/configure Mon Feb 28 00:09:42 2005 +@@ -3595,6 +3595,11 @@ fi ;; @@ -25,21 +73,6 @@ diff -Naur gdb-6.8/libtool.m4 gdb-6.8a/libtool.m4 + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` + ;; + - newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file -diff -Naur gdb-6.8/opcodes/configure gdb-6.8a/opcodes/configure ---- gdb-6.8/opcodes/configure 2008-02-14 13:33:17.000000000 +0100 -+++ gdb-6.8a/opcodes/configure 2009-07-19 09:17:14.000000000 +0200 -@@ -5038,6 +5038,11 @@ - fi - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - newos6*) + newsos6) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' lt_cv_file_magic_cmd=/usr/bin/file diff --git a/packages/devel/gdb/url b/packages/devel/gdb/url index d899dd102..05c793d17 100644 --- a/packages/devel/gdb/url +++ b/packages/devel/gdb/url @@ -1 +1 @@ -http://ftp.gnu.org/gnu/gdb/gdb-6.8.tar.bz2 +http://ftp.gnu.org/gnu/gdb/gdb-6.6.tar.bz2 diff --git a/packages/graphics/Mesa-master/install b/packages/graphics/Mesa-master/install index 4a7550433..444d14170 100755 --- a/packages/graphics/Mesa-master/install +++ b/packages/graphics/Mesa-master/install @@ -19,4 +19,4 @@ mkdir -p $INSTALL/usr/lib/dri cp -PR $PKG_BUILD/lib*/*_dri.so $INSTALL/usr/lib/dri mkdir -p $INSTALL/usr/bin -cp -PR $PKG_BUILD/progs/xdemos/{glxdemo,glxgears,glxinfo} $INSTALL/usr/bin +cp -PR $PKG_BUILD/progs/xdemos/{corender,glsync,glthreads,glxcontexts,glxdemo,glxgears,glxgears_fbconfig,glxgears_pixmap,glxheads,glxinfo,glxpbdemo,glxpixmap,glxsnoop,glxswapcontrol,manywin,offset,overlay,pbdemo,pbinfo,sharedtex,sharedtex_mt,texture_from_pixmap,wincopy,xfont,xrotfontdemo} $INSTALL/usr/bin diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index a63f82a79..53c9955f7 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -17,4 +17,4 @@ mkdir -p $INSTALL/usr/lib/dri cp -PR $PKG_BUILD/lib*/*_dri.so $INSTALL/usr/lib/dri mkdir -p $INSTALL/usr/bin -cp -PR $PKG_BUILD/progs/xdemos/{glxdemo,glxgears,glxinfo,glxpbdemo} $INSTALL/usr/bin +cp -PR $PKG_BUILD/progs/xdemos/{corender,glsync,glthreads,glxcontexts,glxdemo,glxgears,glxgears_fbconfig,glxgears_pixmap,glxheads,glxinfo,glxpbdemo,glxpixmap,glxsnoop,glxswapcontrol,manywin,offset,overlay,pbdemo,pbinfo,sharedtex,sharedtex_mt,texture_from_pixmap,wincopy,xfont,xrotfontdemo} $INSTALL/usr/bin diff --git a/packages/multimedia/gst-plugins-good/build b/packages/multimedia/gst-plugins-good/build index 5956dacbd..b47ef0911 100755 --- a/packages/multimedia/gst-plugins-good/build +++ b/packages/multimedia/gst-plugins-good/build @@ -85,7 +85,7 @@ cd $PKG_BUILD --disable-sunaudio \ --disable-osx_audio \ --disable-osx_video \ - --disable-gst_v4l2 \ + --enable-gst_v4l2 \ --disable-x \ --disable-xshm \ --disable-xvideo \ diff --git a/packages/python/multimedia/moovida/scripts/xinitrc.d/99_elisa b/packages/python/multimedia/moovida/scripts/xinitrc.d/99_elisa index c24dc28ad..d225050d4 100644 --- a/packages/python/multimedia/moovida/scripts/xinitrc.d/99_elisa +++ b/packages/python/multimedia/moovida/scripts/xinitrc.d/99_elisa @@ -20,12 +20,12 @@ fi # args="${args} GST_DEBUG=GST_ELEMENT_FACTORY:3" if /usr/bin/test "${ELISA_FULLSCREEN}" = "yes" ; then - args="${args} -f -t" + args="${args} -f" fi if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then /usr/bin/elisa ${args} 2> $ELISA_LOGFILE - /usr/bin/roxterm + /usr/bin/mrxvt else /usr/bin/elisa ${args} > /dev/null 2>&1 fi diff --git a/packages/sysutils/busybox/config/busybox-test.conf b/packages/sysutils/busybox/config/busybox-test.conf deleted file mode 100644 index 47b161ed9..000000000 --- a/packages/sysutils/busybox/config/busybox-test.conf +++ /dev/null @@ -1,884 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.15.0.svn -# Wed Aug 5 17:53:34 2009 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_DESKTOP is not set -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_COMPRESS_USAGE is not set -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_ASSUME_UNICODE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -# CONFIG_LONG_OPTS is not set -# CONFIG_FEATURE_DEVPTS is not set -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_PIDFILE is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -CONFIG_FEATURE_PREFER_APPLETS=y -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -# CONFIG_FEATURE_SYSLOG is not set -# CONFIG_FEATURE_HAVE_RPC is not set - -# -# Build Options -# -CONFIG_STATIC=y -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" - -# -# Debugging Options -# -CONFIG_DEBUG=y -CONFIG_DEBUG_PESSIMIZE=y -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -# CONFIG_INCLUDE_SUSv2 is not set - -# -# Installation Options -# -CONFIG_INSTALL_NO_USR=y -# CONFIG_INSTALL_APPLET_SYMLINKS is not set -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -CONFIG_INSTALL_APPLET_DONT=y -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install-test" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=1 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -# CONFIG_FEATURE_NON_POSIX_CP is not set -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -# CONFIG_IOCTL_HEX2STR_ERROR is not set -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -# CONFIG_GUNZIP is not set -# CONFIG_GZIP is not set -# CONFIG_LZOP is not set -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_UNZIP is not set - -# -# Coreutils -# -# CONFIG_BASENAME is not set -# CONFIG_CAL is not set -CONFIG_CAT=y -# CONFIG_CATV is not set -# CONFIG_CHGRP is not set -# CONFIG_CHMOD is not set -# CONFIG_CHOWN is not set -# CONFIG_CHROOT is not set -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -# CONFIG_CP is not set -# CONFIG_CUT is not set -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_DD is not set -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -# CONFIG_DF is not set -# CONFIG_FEATURE_DF_FANCY is not set -# CONFIG_DIRNAME is not set -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -# CONFIG_DU is not set -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -# CONFIG_ECHO is not set -# CONFIG_FEATURE_FANCY_ECHO is not set -# CONFIG_ENV is not set -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -# CONFIG_EXPR is not set -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -# CONFIG_FALSE is not set -# CONFIG_FOLD is not set -# CONFIG_FSYNC is not set -# CONFIG_HEAD is not set -# CONFIG_FEATURE_FANCY_HEAD is not set -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set -# CONFIG_LN is not set -# CONFIG_LOGNAME is not set -# CONFIG_LS is not set -# CONFIG_FEATURE_LS_FILETYPES is not set -# CONFIG_FEATURE_LS_FOLLOWLINKS is not set -# CONFIG_FEATURE_LS_RECURSIVE is not set -# CONFIG_FEATURE_LS_SORTFILES is not set -# CONFIG_FEATURE_LS_TIMESTAMPS is not set -# CONFIG_FEATURE_LS_USERNAME is not set -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set -CONFIG_MKDIR=y -# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set -# CONFIG_MKFIFO is not set -# CONFIG_MKNOD is not set -CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set -# CONFIG_PWD is not set -# CONFIG_READLINK is not set -# CONFIG_FEATURE_READLINK_FOLLOW is not set -# CONFIG_REALPATH is not set -CONFIG_RM=y -# CONFIG_RMDIR is not set -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -# CONFIG_SHA256SUM is not set -# CONFIG_SHA512SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -# CONFIG_FEATURE_FLOAT_SLEEP is not set -# CONFIG_SORT is not set -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set -CONFIG_SYNC=y -# CONFIG_TAC is not set -# CONFIG_TAIL is not set -# CONFIG_FEATURE_FANCY_TAIL is not set -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set -# CONFIG_TOUCH is not set -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_TRUE is not set -# CONFIG_TTY is not set -# CONFIG_UNAME is not set -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -# CONFIG_UNIQ is not set -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -# CONFIG_WC is not set -# CONFIG_FEATURE_WC_LARGE is not set -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -# CONFIG_YES is not set - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set -# CONFIG_FEATURE_AUTOWIDTH is not set -# CONFIG_FEATURE_HUMAN_READABLE is not set -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_KBD_MODE is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETFONT is not set -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set - -# -# Debian Utilities -# -# CONFIG_MKTEMP is not set -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_AWK is not set -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_BINARY is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_FEATURE_DIFF_MINIMAL is not set -# CONFIG_ED is not set -# CONFIG_PATCH is not set -CONFIG_SED=y -# CONFIG_VI is not set -CONFIG_FEATURE_VI_MAX_LEN=0 -# CONFIG_FEATURE_VI_8BIT is not set -# CONFIG_FEATURE_VI_COLON is not set -# CONFIG_FEATURE_VI_YANKMARK is not set -# CONFIG_FEATURE_VI_SEARCH is not set -# CONFIG_FEATURE_VI_USE_SIGNALS is not set -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -# CONFIG_FEATURE_VI_WIN_RESIZE is not set -# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set -# CONFIG_FEATURE_ALLOW_EXEC is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_MAXDEPTH is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -# CONFIG_FEATURE_FIND_USER is not set -# CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set -# CONFIG_FEATURE_FIND_DEPTH is not set -# CONFIG_FEATURE_FIND_PAREN is not set -# CONFIG_FEATURE_FIND_SIZE is not set -# CONFIG_FEATURE_FIND_PRUNE is not set -# CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set -# CONFIG_FEATURE_FIND_REGEX is not set -# CONFIG_FEATURE_FIND_CONTEXT is not set -# 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 is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set -# CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=0 -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set - -# -# Linux Module Utilities -# -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -# CONFIG_INSMOD is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_DEPMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" - -# -# Linux System Utilities -# -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKID is not set -# CONFIG_DMESG is not set -# CONFIG_FEATURE_DMESG_PRETTY is not set -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_VFAT is not set -# CONFIG_GETOPT is not set -# CONFIG_FEATURE_GETOPT_LONG is not set -# CONFIG_HEXDUMP is not set -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -# CONFIG_LOSETUP is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -# CONFIG_MKSWAP is not set -# CONFIG_FEATURE_MKSWAP_UUID is not set -# CONFIG_MORE is not set -# CONFIG_FEATURE_USE_TERMIOS is not set -# CONFIG_VOLUMEID is not set -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -# CONFIG_FEATURE_MOUNT_HELPERS is not set -# CONFIG_FEATURE_MOUNT_LABEL is not set -# CONFIG_FEATURE_MOUNT_NFS is not set -# CONFIG_FEATURE_MOUNT_CIFS is not set -CONFIG_FEATURE_MOUNT_FLAGS=y -# CONFIG_FEATURE_MOUNT_FSTAB is not set -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -# CONFIG_SWAPONOFF is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_IONICE is not set -# CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set -# CONFIG_FEATURE_LAST_FANCY is not set -# CONFIG_LESS is not set -CONFIG_FEATURE_LESS_MAXLINES=0 -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETSID is not set -# CONFIG_STRINGS is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_FEATURE_UNIX_LOCAL is not set -# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_IFCONFIG is not set -# CONFIG_FEATURE_IFCONFIG_STATUS is not set -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -# CONFIG_FEATURE_IFCONFIG_HW is not set -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -# CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NC is not set -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set -# CONFIG_NETSTAT is not set -# CONFIG_FEATURE_NETSTAT_WIDE is not set -# CONFIG_FEATURE_NETSTAT_PRG is not set -# CONFIG_NSLOOKUP is not set -# CONFIG_PING is not set -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING is not set -# CONFIG_PSCAN is not set -# CONFIG_ROUTE is not set -# CONFIG_SLATTACH is not set -# CONFIG_TELNET is not set -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_TFTP is not set -# CONFIG_TFTPD is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_DHCPRELAY is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_APP_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -# CONFIG_VCONFIG is not set -# CONFIG_WGET is not set -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set -# CONFIG_ZCIP is not set -# CONFIG_TCPSVD is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDPSVD is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -CONFIG_FEATURE_MIME_CHARSET="" -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set - -# -# Process Utilities -# -# CONFIG_FREE is not set -# CONFIG_FUSER is not set -# CONFIG_KILL is not set -# CONFIG_KILLALL is not set -# CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set -# CONFIG_PGREP is not set -# CONFIG_PIDOF is not set -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -# CONFIG_PKILL is not set -# CONFIG_PS is not set -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -# CONFIG_UPTIME is not set -# CONFIG_WATCH is not set - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -# CONFIG_ASH_JOB_CONTROL is not set -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set -# CONFIG_ASH_ALIAS is not set -# CONFIG_ASH_GETOPTS is not set -CONFIG_ASH_BUILTIN_ECHO=y -# CONFIG_ASH_BUILTIN_PRINTF is not set -CONFIG_ASH_BUILTIN_TEST=y -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set -CONFIG_SH_MATH_SUPPORT=y -# CONFIG_SH_MATH_SUPPORT_64 is not set -CONFIG_FEATURE_SH_EXTRA_QUIET=y -CONFIG_FEATURE_SH_STANDALONE=y -# CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_CTTYHACK is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -# CONFIG_LOGGER is not set diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index c42c7ec22..c9160e9c8 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -14,7 +14,6 @@ fi if [ "$2" = system ]; then cp -PR $PKG_BUILD/_install-$2/* $INSTALL - mkdir -p $INSTALL/bin ln -sf /bin/sh $INSTALL/bin/bash diff --git a/packages/sysutils/busybox/scripts/init.initramfs b/packages/sysutils/busybox/scripts/init.initramfs index c2a6856f3..aeef786b9 100755 --- a/packages/sysutils/busybox/scripts/init.initramfs +++ b/packages/sysutils/busybox/scripts/init.initramfs @@ -9,8 +9,8 @@ # /bin/busybox mdev -s /bin/busybox mount -o ro,noatime $BOOT /flash -# /bin/busybox mount -o rw,noatime $DISK /storage - /bin/busybox mount -t ramfs none /storage + /bin/busybox mount -o rw,noatime $DISK /storage +# /bin/busybox mount -t ramfs none /storage if [ -f "/storage/.update/openelec.kernel" ]; then echo "updating Kernel..." diff --git a/packages/sysutils/busybox/scripts/init.system b/packages/sysutils/busybox/scripts/init.system index 03ceec9a0..f56a1b906 100755 --- a/packages/sysutils/busybox/scripts/init.system +++ b/packages/sysutils/busybox/scripts/init.system @@ -10,12 +10,8 @@ mount -t ramfs none /dev # mount -t ramfs none /etc mount -t ramfs none /var - mount -t ramfs none /media - touch /media/.hal-mtab mknod /dev/null c 1 3 -# mknod /dev/fb0 c 29 0 -# mknod /dev/tty1 c 4 1 -# mknod /dev/console c 5 1 + mknod /dev/fb0 c 29 0 # parse command line arguments BOOT=`cat /proc/cmdline | sed 's/.*boot=// ; s/ .*//'` diff --git a/packages/toolchain/devel/uClibc/30_dlsym-verbose-dev.diff b/packages/toolchain/devel/uClibc/30_dlsym-verbose-dev.diff deleted file mode 100644 index efe545147..000000000 --- a/packages/toolchain/devel/uClibc/30_dlsym-verbose-dev.diff +++ /dev/null @@ -1,26 +0,0 @@ -* When DEBUG=yes in config/options, allows creation of the file -/dlsym.log which contains all the symbols from libraries that -are accessed via dlopen()/dlsym()/dlclose() procedure (and so -the symbols are not directly accessible from the resulting binary). - -Intended use is to create a file which can be sort|uniq'd into an -alphabetically-ordered list, so that libstrip can be used on those -libraries that are used by programs that use dlsym(), without -stripping out required symbols. - ---- uClibc/ldso/libdl/libdl.c 2007-02-05 03:01:12.000000000 +0900 -+++ uClibc/ldso/libdl/libdl.c 2007-02-05 03:05:10.000000000 +0900 -@@ -406,6 +406,13 @@ - #else - const char *name2 = name; - #endif -+#ifdef _DLSYM_TRACE_NAME -+ FILE *log = fopen("/dlsym.log", "a"); -+ -+ fprintf(log, "%s\n", name); -+ fflush(log); -+ fclose(log); -+#endif - handle = (struct dyn_elf *) vhandle; - - /* First of all verify that we have a real handle diff --git a/packages/toolchain/devel/uClibc/config/uClibc.devtools.conf b/packages/toolchain/devel/uClibc/config/uClibc.devtools.conf index c5345f9d9..f2adccd05 100644 --- a/packages/toolchain/devel/uClibc/config/uClibc.devtools.conf +++ b/packages/toolchain/devel/uClibc/config/uClibc.devtools.conf @@ -1,3 +1 @@ UCLIBC_MALLOC_DEBUGGING=y -SUPPORT_LD_DEBUG_EARLY=y -SUPPORT_LD_DEBUG=y \ No newline at end of file diff --git a/packages/toolchain/devel/uClibc/config/uClibc.i386.conf b/packages/toolchain/devel/uClibc/config/uClibc.i386.conf index e12fbcfd2..6730cfab0 100644 --- a/packages/toolchain/devel/uClibc/config/uClibc.i386.conf +++ b/packages/toolchain/devel/uClibc/config/uClibc.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Version: 0.9.30-git +# Version: 0.9.30-svn # # TARGET_alpha is not set # TARGET_arm is not set @@ -104,8 +104,7 @@ UCLIBC_SUSV3_LEGACY=y # UCLIBC_SUSV4_LEGACY is not set # UCLIBC_HAS_STUBS is not set UCLIBC_HAS_SHADOW=y -UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y -UCLIBC_HAS___PROGNAME=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set UCLIBC_HAS_PTY=y # ASSUME_DEVPTS is not set # UNIX98PTY_ONLY is not set diff --git a/packages/toolchain/devel/uClibc/url b/packages/toolchain/devel/uClibc/url index 31c2bc994..cff410965 100644 --- a/packages/toolchain/devel/uClibc/url +++ b/packages/toolchain/devel/uClibc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/uClibc-20090807.tar.bz2 +http://sources.openelec.tv/svn/uClibc-20090803.tar.bz2 \ No newline at end of file diff --git a/packages/virtual/image/install b/packages/virtual/image/install index ad2f1dee2..c6e766a8a 100755 --- a/packages/virtual/image/install +++ b/packages/virtual/image/install @@ -21,7 +21,6 @@ case "$2" in mkdir -p $INSTALL/lib mkdir -p $INSTALL/sbin mkdir -p $INSTALL/dev - mkdir -p $INSTALL/media mkdir -p $INSTALL/proc mkdir -p $INSTALL/sys mkdir -p $INSTALL/usr @@ -44,7 +43,6 @@ case "$2" in # Audio Driver... $SCRIPTS/install alsa - $SCRIPTS/install test # Xorg... $SCRIPTS/install Xorg @@ -74,8 +72,7 @@ case "$2" in # Devtools... (not for Release) [ "$DEVTOOLS" = yes ] && $SCRIPTS/install gdb -# [ "$DEVTOOLS" = yes ] && $SCRIPTS/install mrxvt - [ "$DEVTOOLS" = yes ] && $SCRIPTS/install roxterm + [ "$DEVTOOLS" = yes ] && $SCRIPTS/install mrxvt [ "$DEVTOOLS" = yes ] && $SCRIPTS/install pciutils [ "$DEVTOOLS" = yes ] && $SCRIPTS/install driconf diff --git a/packages/x11/lib/libSM/url b/packages/x11/lib/libSM/url index 38c38214a..347b00c68 100644 --- a/packages/x11/lib/libSM/url +++ b/packages/x11/lib/libSM/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/lib/libSM-1.1.1.tar.bz2 +http://xorg.freedesktop.org/archive/individual/lib/libSM-1.1.0.tar.bz2 diff --git a/packages/x11/lib/libX11/url b/packages/x11/lib/libX11/url index c44943922..a48642317 100644 --- a/packages/x11/lib/libX11/url +++ b/packages/x11/lib/libX11/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/lib/libX11-1.2.99.901.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/libX11-20090717.tar.bz2 diff --git a/packages/x11/other/openbox/config/rc.xml b/packages/x11/other/openbox/config/rc.xml index 678fe090e..3035af943 100644 --- a/packages/x11/other/openbox/config/rc.xml +++ b/packages/x11/other/openbox/config/rc.xml @@ -21,7 +21,7 @@ </keybind> <keybind key="C-A-t"> <action name="Execute"> - <execute>roxterm</execute> + <execute>mrxvt</execute> </action> </keybind> <keybind key="C-A-e"> diff --git a/packages/x11/other/roxterm/build b/packages/x11/other/roxterm/build deleted file mode 100755 index 4ce674a9a..000000000 --- a/packages/x11/other/roxterm/build +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain -$SCRIPTS/build libX11 -$SCRIPTS/build vte -$SCRIPTS/build libglade - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - -make - -$STRIP src/$1 diff --git a/packages/x11/other/roxterm/install b/packages/x11/other/roxterm/install deleted file mode 100755 index cbf9b5f31..000000000 --- a/packages/x11/other/roxterm/install +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -. config/options -$SCRIPTS/install libX11 -$SCRIPTS/install vte -$SCRIPTS/install libglade - -mkdir -p $INSTALL/usr/bin -cp $PKG_BUILD/src/$1 $INSTALL/usr/bin -cp $PKG_BUILD/src/$1-config $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/share/$1 -cp -PR $PKG_BUILD/Config $INSTALL/usr/share/$1 -cp -PR $PKG_BUILD/src/$1-config.glade $INSTALL/usr/share/$1 - -mkdir -p $INSTALL/usr/share/icons/hicolor/scalable/apps -cp -PR $PKG_BUILD/.DirIcon $INSTALL/usr/share/icons/hicolor/scalable/apps/$1.svg diff --git a/packages/x11/other/roxterm/url b/packages/x11/other/roxterm/url deleted file mode 100644 index 213fabd7f..000000000 --- a/packages/x11/other/roxterm/url +++ /dev/null @@ -1 +0,0 @@ -http://puzzle.dl.sourceforge.net/project/roxterm/roxterm/1.9.1/roxterm-1.9.1.tar.gz \ No newline at end of file diff --git a/packages/x11/other/vte/build b/packages/x11/other/vte/build deleted file mode 100755 index 18565e9e1..000000000 --- a/packages/x11/other/vte/build +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain -$SCRIPTS/build libX11 -$SCRIPTS/build glib -$SCRIPTS/build pango -$SCRIPTS/build gtk+ - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-static \ - --disable-shared \ - --disable-deprecation \ - --disable-python \ - --disable-gnome-pty-helper \ - --disable-glade \ - --with-default-emulation=xterm \ - -make - -$MAKEINSTALL \ No newline at end of file diff --git a/packages/x11/other/vte/install b/packages/x11/other/vte/install deleted file mode 100755 index 9580a1940..000000000 --- a/packages/x11/other/vte/install +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -. config/options - -#mkdir -p $INSTALL/usr/libexec -#cp $PKG_BUILD/gnome-pty-helper/gnome-pty-helper $INSTALL/usr/libexec - -mkdir -p $INSTALL/usr/share/vte/termcap -cp $PKG_BUILD/termcaps/xterm $INSTALL/usr/share/vte/termcap - diff --git a/packages/x11/other/vte/url b/packages/x11/other/vte/url deleted file mode 100644 index f3f2963f3..000000000 --- a/packages/x11/other/vte/url +++ /dev/null @@ -1 +0,0 @@ -http://ftp.gnome.org/pub/GNOME/sources/vte/0.20/vte-0.20.5.tar.gz \ No newline at end of file diff --git a/packages/x11/proto/inputproto/url b/packages/x11/proto/inputproto/url index 98b408456..e7bc25771 100644 --- a/packages/x11/proto/inputproto/url +++ b/packages/x11/proto/inputproto/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/proto/inputproto-1.9.99.901.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/proto/inputproto-1.9.99.15.tar.bz2 \ No newline at end of file diff --git a/packages/x11/proto/xextproto/url b/packages/x11/proto/xextproto/url index 2ccf494f7..afa754c9e 100644 --- a/packages/x11/proto/xextproto/url +++ b/packages/x11/proto/xextproto/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/proto/xextproto-7.1.0.tar.bz2 \ No newline at end of file +http://xorg.freedesktop.org/archive/individual/proto/xextproto-7.0.99.3.tar.bz2 \ No newline at end of file diff --git a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.2.diff b/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.2.diff deleted file mode 100644 index 360aecfdd..000000000 --- a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.2.diff +++ /dev/null @@ -1,367 +0,0 @@ -diff -Naur xorg-server-20090727/configure xorg-server-20090727.patch/configure ---- xorg-server-20090727/configure 2009-07-27 02:52:50.000000000 +0200 -+++ xorg-server-20090727.patch/configure 2009-08-08 20:52:06.226477656 +0200 -@@ -2185,7 +2185,7 @@ - Comma separated list of font dirs - --with-xkb-path=PATH Path to XKB base dir (default: ${datadir}/X11/xkb) - --with-xkb-output=PATH Path to XKB output dir (default: -- ${datadir}/X11/xkb/compiled) -+ ${localstatedir}/cache/xkb) - --with-default-xkb-rules=RULES - Keyboard ruleset (default: base/evdev) - --with-default-xkb-model=MODEL -@@ -19621,7 +19621,7 @@ - if test "${with_xkb_output+set}" = set; then - withval=$with_xkb_output; XKBOUTPUT="$withval" - else -- XKBOUTPUT="compiled" -+ XKBOUTPUT="${localstatedir}/cache/xkb" - fi - - -@@ -23630,7 +23630,9 @@ - - XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` - if [ x$XKBOUTPUT_FIRSTCHAR != x/ ] ; then -- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" -+ { { $as_echo "$as_me:$LINENO: error: xkb-output must be an absolute path." >&5 -+$as_echo "$as_me: error: xkb-output must be an absolute path." >&2;} -+ { (exit 1); exit 1; }; } - fi - - -diff -Naur xorg-server-20090727/configure.ac xorg-server-20090727.patch/configure.ac ---- xorg-server-20090727/configure.ac 2009-07-26 16:15:37.000000000 +0200 -+++ xorg-server-20090727.patch/configure.ac 2009-08-08 20:28:07.100479376 +0200 -@@ -488,9 +488,9 @@ - AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), - [ XKBPATH="$withval" ], - [ XKBPATH="${datadir}/X11/xkb" ]) --AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]), -+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]), - [ XKBOUTPUT="$withval" ], -- [ XKBOUTPUT="compiled" ]) -+ [ XKBOUTPUT="${localstatedir}/cache/xkb" ]) - AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], - [Keyboard ruleset (default: base/evdev)]), - [ XKB_DFLT_RULES="$withval" ], -@@ -1042,7 +1042,7 @@ - dnl Make sure XKM_OUTPUT_DIR is an absolute path - XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` - if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then -- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" -+ AC_MSG_ERROR([xkb-output must be an absolute path.]) - fi - - dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed -diff -Naur xorg-server-20090727/xkb/ddxLoad.c xorg-server-20090727.patch/xkb/ddxLoad.c ---- xorg-server-20090727/xkb/ddxLoad.c 2009-07-26 16:15:37.000000000 +0200 -+++ xorg-server-20090727.patch/xkb/ddxLoad.c 2009-08-08 20:48:46.504353541 +0200 -@@ -32,6 +32,13 @@ - #include <xkb-config.h> - #endif - -+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ -+# include <sha1.h> -+#else /* Use OpenSSL's libcrypto */ -+# include <stddef.h> /* buggy openssl/sha.h wants size_t */ -+# include <openssl/sha.h> -+#endif -+ - #include <stdio.h> - #include <ctype.h> - #include <X11/X.h> -@@ -45,24 +52,13 @@ - #define XKBSRV_NEED_FILE_FUNCS - #include <xkbsrv.h> - #include <X11/extensions/XI.h> -+#include <errno.h> - #include "xkb.h" - - #if defined(CSRG_BASED) || defined(linux) || defined(__GNU__) - #include <paths.h> - #endif - -- /* -- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is -- * relative to the top-level XKB configuration directory. -- * Making the server write to a subdirectory of that directory -- * requires some work in the general case (install procedure -- * has to create links to /var or somesuch on many machines), -- * so we just compile into /usr/tmp for now. -- */ --#ifndef XKM_OUTPUT_DIR --#define XKM_OUTPUT_DIR "compiled/" --#endif -- - #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\"" - #define ERROR_PREFIX "\"> \"" - #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" -@@ -178,6 +174,45 @@ - } - - static Bool -+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input) -+{ -+ int i; -+ unsigned char sha1[SHA_DIGEST_LENGTH]; -+ -+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ -+ SHA1_CTX ctx; -+ -+ SHA1Init (&ctx); -+ SHA1Update (&ctx, input, strlen(input)); -+ SHA1Final (sha1, &ctx); -+#else /* Use OpenSSL's libcrypto */ -+ SHA_CTX ctx; -+ int success; -+ -+ success = SHA1_Init (&ctx); -+ if (! success) -+ return BadAlloc; -+ -+ success = SHA1_Update (&ctx, input, strlen(input)); -+ if (! success) -+ return BadAlloc; -+ -+ success = SHA1_Final (sha1, &ctx); -+ if (! success) -+ return BadAlloc; -+#endif -+ -+ /* convert sha1 to sha1_asc */ -+ for(i=0; i<SHA_DIGEST_LENGTH; ++i) { -+ sprintf(sha1Asc+i*2, "%02X", sha1[i]); -+ } -+ -+ return Success; -+} -+ -+/* call xkbcomp and compile XKB keymap, return xkm file name in -+ nameRtrn */ -+static Bool - XkbDDXCompileKeymapByNames( XkbDescPtr xkb, - XkbComponentNamesPtr names, - unsigned want, -@@ -186,7 +221,11 @@ - int nameRtrnLen) - { - FILE * out; -- char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX]; -+ char * buf = NULL, xkmfile[PATH_MAX], xkm_output_dir[PATH_MAX]; -+ char * tmpXkmFile = NULL; -+ char * canonicalXkmFileName = NULL; -+ char sha1Asc[SHA_DIGEST_LENGTH*2+1], xkbKeyMapBuf[100*1024]; -+ int ret, result; - - const char *emptystring = ""; - const char *xkbbasedirflag = emptystring; -@@ -197,15 +236,69 @@ - /* WIN32 has no popen. The input must be stored in a file which is - used as input for xkbcomp. xkbcomp does not read from stdin. */ - char tmpname[PATH_MAX]; -- const char *xkmfile = tmpname; -+ const char *xkbfile = tmpname; - #else -- const char *xkmfile = "-"; -+ const char *xkbfile = "-"; -+#endif -+ -+ /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf', -+ of which SHA1 is generated and used as result xkm file name */ -+ memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf)); -+ out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w"); -+ if (NULL == out) { -+ ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n"); -+ return False; -+ } -+ ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need); -+ if (fclose(out) !=0) -+ { -+ ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n"); -+ return False; -+ } -+#ifdef DEBUG -+ if (xkbDebugFlags) { -+ ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n"); -+ fputs(xkbKeyMapBuf, stderr); -+ } - #endif -+ if (!ret) { -+ ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n"); -+ return False; -+ } - -- snprintf(keymap, sizeof(keymap), "server-%s", display); -+ DebugF("[xkb] computing SHA1 of keymap\n"); -+ if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) { -+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc); -+ } -+ else { -+ ErrorF("[xkb] Computing SHA1 of keymap failed, " -+ "using display name instead as xkm file name\n"); -+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", display); -+ } - - OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir)); - -+ /* set nameRtrn, fail if it's too small */ -+ if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) { -+ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n"); -+ return False; -+ } -+ strncpy(nameRtrn, xkmfile, nameRtrnLen); -+ -+ /* if the xkm file already exists, reuse it */ -+ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile); -+ if (access(canonicalXkmFileName, R_OK) == 0) { -+ /* yes, we can reuse the old xkm file */ -+ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName); -+ result = True; -+ goto _ret; -+ } -+ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName); -+ -+ /* continue to call xkbcomp to compile the keymap. to avoid race -+ condition, we compile it to a tmpfile then rename it to -+ xkmfile */ -+ - #ifdef WIN32 - strcpy(tmpname, Win32TempDir()); - strcat(tmpname, "\\xkb_XXXXXX"); -@@ -228,19 +321,30 @@ - } - } - -+ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) { -+ ErrorF("[xkb] Can't generate temp xkm file name"); -+ result = False; -+ goto _ret; -+ } -+ - buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" " -- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"", -+ "-em1 %s -emp %s -eml %s \"%s\"", - xkbbindir, xkbbindirsep, - ( (xkbDebugFlags < 2) ? 1 : - ((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ), -- xkbbasedirflag, xkmfile, -+ xkbbasedirflag, xkbfile, - PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1, -- xkm_output_dir, keymap); -+ tmpXkmFile); - - if (xkbbasedirflag != emptystring) { - xfree(xkbbasedirflag); - } - -+ /* there's a potential race condition between calling tempnam() -+ and invoking xkbcomp to write the result file (potential temp -+ file name conflicts), but since xkbcomp is a standalone -+ program, we have to live with this */ -+ - #ifndef WIN32 - out= Popen(buf,"w"); - #else -@@ -248,31 +352,43 @@ - #endif - - if (out!=NULL) { --#ifdef DEBUG -- if (xkbDebugFlags) { -- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n"); -- XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need); -+ /* write XKBKeyMapBuf to xkbcomp */ -+ if (EOF==fputs(xkbKeyMapBuf, out)) -+ { -+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n"); -+ result = False; -+ goto _ret; - } --#endif -- XkbWriteXKBKeymapForNames(out,names,xkb,want,need); - #ifndef WIN32 - if (Pclose(out)==0) - #else - if (fclose(out)==0 && System(buf) >= 0) - #endif - { -+ /* xkbcomp success */ - if (xkbDebugFlags) - DebugF("[xkb] xkb executes: %s\n",buf); -- if (nameRtrn) { -- strncpy(nameRtrn,keymap,nameRtrnLen); -- nameRtrn[nameRtrnLen-1]= '\0'; -+ -+ /* if canonicalXkmFileName already exists now, we simply -+ overwrite it, this is OK */ -+ ret = rename(tmpXkmFile, canonicalXkmFileName); -+ if (0 != ret) { -+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n", -+ tmpXkmFile, canonicalXkmFileName, -+ strerror(errno)); -+ -+ /* in case of error, don't unlink tmpXkmFile, leave it -+ for debugging */ -+ -+ result = False; -+ goto _ret; - } -- if (buf != NULL) -- xfree (buf); -- return True; -+ -+ result = True; -+ goto _ret; - } - else -- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap); -+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile); - #ifdef WIN32 - /* remove the temporary file */ - unlink(tmpname); -@@ -287,9 +403,17 @@ - } - if (nameRtrn) - nameRtrn[0]= '\0'; -+ result = False; -+ -+_ret: -+ if (tmpXkmFile) -+ free(tmpXkmFile); -+ if (canonicalXkmFileName) -+ xfree(canonicalXkmFileName); - if (buf != NULL) - xfree (buf); -- return False; -+ -+ return result; - } - - static FILE * -@@ -373,7 +497,6 @@ - DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined); - } - fclose(file); -- (void) unlink (fileName); - return (need|want)&(~missing); - } - -diff -Naur xorg-server-20090727/xkb/README.compiled xorg-server-20090727.patch/xkb/README.compiled ---- xorg-server-20090727/xkb/README.compiled 2009-07-26 16:15:37.000000000 +0200 -+++ xorg-server-20090727.patch/xkb/README.compiled 2009-08-08 20:29:17.059354234 +0200 -@@ -4,10 +4,10 @@ - or some other tool might destroy or replace the files in this directory, - so it is not a safe place to store compiled keymaps for long periods of - time. The default keymap for any server is usually stored in: -- X<num>-default.xkm --where <num> is the display number of the server in question, which makes --it possible for several servers *on the same host* to share the same --directory. -+ server-<SHA1>.xkm -+ -+where <SHA1> is the SHA1 hash of keymap source, so that compiled -+keymap of different keymap sources are stored in different files. - - Unless the X server is modified, sharing this directory between servers on - different hosts could cause problems. diff --git a/projects/intel/linux/linux.i386.conf b/projects/intel/linux/linux.i386.conf index bff2b5902..efbf4feb6 100644 --- a/projects/intel/linux/linux.i386.conf +++ b/projects/intel/linux/linux.i386.conf @@ -430,7 +430,7 @@ CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_POWERNOW_K8 is not set # CONFIG_X86_GX_SUSPMOD is not set # CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_ICH=y # CONFIG_X86_SPEEDSTEP_SMI is not set CONFIG_X86_P4_CLOCKMOD=m # CONFIG_X86_CPUFREQ_NFORCE2 is not set @@ -441,7 +441,7 @@ CONFIG_X86_P4_CLOCKMOD=m # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_LIB=y # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y @@ -473,7 +473,7 @@ CONFIG_PCIEASPM=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y -# CONFIG_PCI_STUB is not set +CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_IOV=y CONFIG_ISA_DMA_API=y @@ -748,7 +748,7 @@ CONFIG_NETDEVICES=y CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E1000E=m # CONFIG_IP1000 is not set # CONFIG_IGB is not set @@ -799,11 +799,12 @@ CONFIG_WLAN_80211=y CONFIG_IWLWIFI=m CONFIG_IWLWIFI_LEDS=y CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEBUG=y CONFIG_IWLAGN=m CONFIG_IWL4965=y CONFIG_IWL5000=y -# CONFIG_IWL3945 is not set +CONFIG_IWL3945=m +CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y # CONFIG_HOSTAP is not set # CONFIG_B43 is not set # CONFIG_B43LEGACY is not set @@ -1057,8 +1058,8 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PDA_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_BQ27x00 is not set -# CONFIG_BATTERY_MAX17040 is not set +CONFIG_BATTERY_BQ27x00=m +CONFIG_BATTERY_MAX17040=m CONFIG_HWMON=m # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_ABITUGURU is not set @@ -1289,7 +1290,10 @@ CONFIG_FB_I810_I2C=y # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_ILI9320 is not set +CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_PROGEAR=m @@ -1329,7 +1333,7 @@ CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set -CONFIG_SND_HRTIMER=m +# CONFIG_SND_HRTIMER is not set # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PROCFS is not set @@ -1591,7 +1595,7 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=m # CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_LD is not set -CONFIG_USB_TRANCEVIBRATOR=m +# CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set @@ -1706,7 +1710,26 @@ CONFIG_RTC_INTF_DEV=y # TI VLYNQ # # CONFIG_STAGING is not set -# CONFIG_X86_PLATFORM_DEVICES is not set +CONFIG_X86_PLATFORM_DEVICES=y +# CONFIG_ACER_WMI is not set +# CONFIG_ASUS_LAPTOP is not set +# CONFIG_FUJITSU_LAPTOP is not set +# CONFIG_TC1100_WMI is not set +# CONFIG_MSI_LAPTOP is not set +# CONFIG_PANASONIC_LAPTOP is not set +# CONFIG_COMPAL_LAPTOP is not set +# CONFIG_SONY_LAPTOP is not set +CONFIG_THINKPAD_ACPI=m +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_BAY=y +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +# CONFIG_INTEL_MENLOW is not set +# CONFIG_ACPI_WMI is not set +# CONFIG_ACPI_ASUS is not set +# CONFIG_ACPI_TOSHIBA is not set # # Firmware Drivers @@ -1722,7 +1745,9 @@ CONFIG_DMIID=y # File systems # CONFIG_EXT2_FS=m -# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT2_FS_XATTR=y +# CONFIG_EXT2_FS_POSIX_ACL is not set +# CONFIG_EXT2_FS_SECURITY is not set # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y CONFIG_EXT3_DEFAULTS_TO_ORDERED=y @@ -1925,7 +1950,7 @@ CONFIG_FRAME_WARN=1024 # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y -# CONFIG_FRAME_POINTER is not set +CONFIG_FRAME_POINTER=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y @@ -1947,7 +1972,8 @@ CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set -# CONFIG_EARLY_PRINTK is not set +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_4KSTACKS is not set CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set @@ -1961,7 +1987,7 @@ 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_OPTIMIZE_INLINING is not set +CONFIG_OPTIMIZE_INLINING=y # # Security options