From feba5e162d128081ed60b3711a1ebe77c341df0c Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Wed, 2 May 2007 02:54:57 +0000
Subject: [PATCH] 	* updated busybox (1.4.2 -> 1.5.0) 	* added option
 to busybox to keep SUSv2 (SDECFG_PKG_BUSYBOX_SUSv2) compatibility 	*
 improved busybox config to take NLS and DEBUG values from build's $config

git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20958 10447126-35f2-4685-b0cf-6dd780d3921f
---
 base/busybox/busybox.conf | 18 +++++++++++++++++-
 base/busybox/busybox.desc |  4 ++--
 base/busybox/config.in    |  8 +++++---
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/base/busybox/busybox.conf b/base/busybox/busybox.conf
index 35b788a3d..083cf3b0b 100644
--- a/base/busybox/busybox.conf
+++ b/base/busybox/busybox.conf
@@ -46,7 +46,7 @@ default_config() {
 	fi
 
 	if [ "$SDECFG_PKG_BUSYBOX_ET" = 1 ] ; then
-		echo "X CONFIG_PREFIX \"${SDECFG_PKG_BUSYBOX_ET_DIR#/}\""
+		echo "X CONFIG_PREFIX \"$root${SDECFG_PKG_BUSYBOX_ET_DIR#/}\""
 	elif [ "$SDECFG_PKG_BUSYBOX_SYMLINKS" = 0 ] ; then
 		echo "X CONFIG_INSTALL_APPLET_DONT"
 		echo "O CONFIG_INSTALL_APPLET_SYMLINKS"
@@ -54,6 +54,22 @@ default_config() {
 	else
 		echo "X CONFIG_PREFIX \"${root:-/}\""
 	fi
+
+	if [ "$SDECFG_DISABLE_NLS" = 1 ]; then
+		echo "O CONFIG_LOCALE_SUPPORT"
+	fi
+
+	if [ "$SDECFG_DEBUG" = 0 ]; then
+		echo "O CONFIG_DEBUG"
+	else
+		echo "X CONFIG_DEBUG"
+	fi
+
+	if [ "$SDECFG_PKG_BUSYBOX_SUSv2" != 1 ]; then
+		echo "O CONFIG_INCLUDE_SUSv2"
+	else
+		echo "X CONFIG_INCLUDE_SUSv2"
+	fi
 }
 
 # add custom/target configuration from $targetdir
diff --git a/base/busybox/busybox.desc b/base/busybox/busybox.desc
index 8f6488197..8a536e73b 100644
--- a/base/busybox/busybox.desc
+++ b/base/busybox/busybox.desc
@@ -30,7 +30,7 @@
 
 [L] GPL
 [S] Stable
-[V] 1.4.2
+[V] 1.5.0
 [P] X -1---5---9 102.000
 
-[D] 2832227525 busybox-1.4.2.tar.bz2 http://busybox.net/downloads/
+[D] 3167898930 busybox-1.5.0.tar.bz2 http://busybox.net/downloads/
diff --git a/base/busybox/config.in b/base/busybox/config.in
index c400b93ae..7dc70d451 100644
--- a/base/busybox/config.in
+++ b/base/busybox/config.in
@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../busybox/config.in
+# Filename: package/.../busybox/config.in
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 # 
@@ -11,7 +12,7 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 if pkgcheck busybox X
 then
@@ -25,6 +26,7 @@ then
 			block_end
 		fi
 		bool 'Create Busybox symlinks' SDECFG_PKG_BUSYBOX_SYMLINKS 0
+		bool 'Enable SUSv2 backward compatibility' SDECFG_PKG_BUSYBOX_SUSv2 0
 	menu_end
 fi