conf/distro/opendreambox-1.4,busybox: revert to busybox 1.01 until problems are fixed

diff --git a/conf/distro/opendreambox-1.4.conf b/conf/distro/opendreambox-1.4.conf
index 85d7f04..a80f9f0 100644 (file)
--- a/conf/distro/opendreambox-1.4.conf
+++ b/conf/distro/opendreambox-1.4.conf
@@ -17,6 +17,7 @@ PREFERRED_VERSION_python-native = "2.4.0"
 PREFERRED_VERSION_swig-native = "1.3.29"
 PREFERRED_VERSION_python = "2.4.3"
 PREFERRED_VERSION_ipkg = "0.99.154"
+PREFERRED_VERSION_busybox = "1.01"
 
 # we need libsigc++-1.2 1.2.5
 PREFERRED_VERSION_libsigc++-1.2 = "1.2.5"

diff --git a/conf/machine/dm600pvr.conf b/conf/machine/dm600pvr.conf
index 036cd64..e268329 100644 (file)
--- a/conf/machine/dm600pvr.conf
+++ b/conf/machine/dm600pvr.conf
@@ -23,6 +23,7 @@ PREFERRED_VERSION_gcc = "3.4.4"
 PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
 PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
 PREFERRED_VERSION_binutils = "2.15.94.0.1"
+PREFERRED_VERSION_busybox = "1.01"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls --without-fp --with-__thread"

diff --git a/packages/busybox/busybox-1.01/opendreambox/defconfig b/packages/busybox/busybox-1.01/opendreambox/defconfig
index 5d24b98..44ecc41 100644 (file)
--- a/packages/busybox/busybox-1.01/opendreambox/defconfig
+++ b/packages/busybox/busybox-1.01/opendreambox/defconfig
@@ -195,6 +195,7 @@ CONFIG_RESET=y
 CONFIG_MKTEMP=y
 # CONFIG_PIPE_PROGRESS is not set
 CONFIG_READLINK=y
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
 CONFIG_RUN_PARTS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_WHICH=y
@@ -251,18 +252,19 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 # Login/Password Management Utilities
 #
 # CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_ADDGROUP is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_DELUSER is not set
-# CONFIG_GETTY is not set
-CONFIG_FEATURE_U_W_TMP=y
+CONFIG_ADDGROUP=y
+CONFIG_DELGROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+# CONFIG_FEATURE_WTMP is not set
 CONFIG_LOGIN=y
 CONFIG_FEATURE_SECURETTY=y
-# CONFIG_PASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
+CONFIG_PASSWD=y
+CONFIG_SU=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
 
 #
 # Common options for adduser, deluser, login, su

diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 44005ac..d0ed5ef 100644 (file)
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
           file://udhcppidfile.patch;patch=1 \