diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index 04f2ab686b..144a50dc4b 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.18.1 -# Tue Dec 28 19:07:18 2010 +# Thu Dec 30 18:40:13 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -158,7 +158,7 @@ CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_LZMA is not set CONFIG_UNXZ=y CONFIG_XZ=y -# CONFIG_UNZIP is not set +CONFIG_UNZIP=y # # Coreutils @@ -239,7 +239,7 @@ CONFIG_NICE=y CONFIG_OD=y CONFIG_PRINTENV=y CONFIG_PRINTF=y -# CONFIG_PWD is not set +CONFIG_PWD=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y # CONFIG_REALPATH is not set @@ -264,11 +264,11 @@ CONFIG_FEATURE_SORT_BIG=y CONFIG_SYNC=y # CONFIG_TAC is not set CONFIG_TAIL=y -# CONFIG_FEATURE_FANCY_TAIL is not set +CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TOUCH=y -# CONFIG_TRUE is not set +CONFIG_TRUE=y # CONFIG_TTY is not set CONFIG_UNAME=y # CONFIG_UNEXPAND is not set @@ -315,7 +315,7 @@ CONFIG_CLEAR=y # CONFIG_LOADFONT is not set CONFIG_LOADKMAP=y # CONFIG_OPENVT is not set -# CONFIG_RESET is not set +CONFIG_RESET=y # CONFIG_RESIZE is not set # CONFIG_FEATURE_RESIZE_PRINT is not set CONFIG_SETCONSOLE=y @@ -334,9 +334,9 @@ CONFIG_DEFAULT_SETFONT_DIR="" # CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS is not set -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y +# 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 @@ -409,9 +409,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities # -CONFIG_BOOTCHARTD=y -CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y -CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" @@ -508,8 +508,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # CONFIG_BLOCKDEV is not set # CONFIG_REV is not set -CONFIG_ACPID=y -CONFIG_FEATURE_ACPID_COMPAT=y +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y @@ -678,7 +678,7 @@ CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_MOUNTPOINT=y # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set -CONFIG_READAHEAD=y +# CONFIG_READAHEAD is not set CONFIG_RFKILL=y # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set @@ -701,9 +701,9 @@ CONFIG_NC=y # CONFIG_NC_SERVER is not set # CONFIG_NC_EXTRA is not set CONFIG_NC_110_COMPAT=y -# CONFIG_FEATURE_IPV6 is not set +CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set -# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set # CONFIG_ARP is not set # CONFIG_ARPING is not set @@ -747,7 +747,7 @@ CONFIG_FEATURE_IFUPDOWN_IP=y CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set CONFIG_FEATURE_IFUPDOWN_IPV4=y -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +CONFIG_FEATURE_IFUPDOWN_IPV6=y # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set # CONFIG_INETD is not set @@ -777,12 +777,12 @@ CONFIG_FEATURE_IP_ROUTE=y # CONFIG_FEATURE_NAMEIF_EXTENDED is not set CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set -# CONFIG_FEATURE_NETSTAT_PRG is not set +CONFIG_FEATURE_NETSTAT_PRG=y # CONFIG_NSLOOKUP is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set CONFIG_PING=y -# CONFIG_PING6 is not set +CONFIG_PING6=y CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y @@ -801,9 +801,9 @@ CONFIG_ROUTE=y # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set # CONFIG_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set @@ -882,7 +882,7 @@ CONFIG_FEATURE_TOP_DECIMALS=y CONFIG_FEATURE_TOP_SMP_PROCESS=y CONFIG_FEATURE_TOPMEM=y CONFIG_FEATURE_SHOW_THREADS=y -# CONFIG_UPTIME is not set +CONFIG_UPTIME=y # CONFIG_WATCH is not set # diff --git a/packages/sysutils/busybox/init.d/23_acpid b/packages/sysutils/busybox/init.d/23_wakeup similarity index 88% rename from packages/sysutils/busybox/init.d/23_acpid rename to packages/sysutils/busybox/init.d/23_wakeup index 612ba39a50..4b432e5a43 100755 --- a/packages/sysutils/busybox/init.d/23_acpid +++ b/packages/sysutils/busybox/init.d/23_wakeup @@ -20,17 +20,13 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -# start the ACPI daemon subsystem +# setup wakup devices # -# runlevels: openelec, installer, textmode +# runlevels: openelec . /etc/profile ( - progress "Starting ACPI daemon" - - acpid /dev/input/event* 2>&1 > /dev/null - if [ -f /proc/acpi/wakeup ]; then progress "enable WakeUp devices" diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 70570f9142..e17026eefb 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -24,10 +24,6 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`" mkdir -p $INSTALL/etc cp $PKG_DIR/config/profile $INSTALL/etc - # acpid specific - mkdir -p $INSTALL/etc/acpi/PWRF - cp $PKG_DIR/scripts/acpi_powerbtn $INSTALL/etc/acpi/PWRF/00000080 - # /etc/fstab is needed by... touch $INSTALL/etc/fstab diff --git a/packages/sysutils/busybox/scripts/acpi_pwrbtn b/packages/sysutils/busybox/scripts/acpi_pwrbtn deleted file mode 100755 index d2b6c38a00..0000000000 --- a/packages/sysutils/busybox/scripts/acpi_pwrbtn +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.openelec.tv -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -# shudown normally - /bin/sync - /sbin/poweroff - -