From 52ee190f6bbbf0bf0c3d354f0370c409aed14506 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 7 Jul 2010 02:16:43 +0200
Subject: more runtime fixes, update of some packages.

- update busybox, dnsmasq, ppp and libusb
- add timezone and hostname configuration for target via menu
- fix resolv.conf creation for dhcp client
- fix usb for alix boards
- enable lsusb and lspci by default
---
 package/busybox/Makefile                    | 20 ++++++++++----------
 package/busybox/config/util-linux/Config.in |  6 ++++--
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'package/busybox')

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 367bb2cae..fb326feeb 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.16.1
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		319486ec65078d07fde26eb620fecde7
+PKG_VERSION:=		1.16.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2ba980f720a5bdce4ec05423519acc35
 PKG_DESCR:=		Core utilities for embedded Linux systems
 PKG_SECTION:=		base
 PKG_URL:=		http://www.busybox.net/
@@ -30,12 +30,6 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-bbrebuild:
-	@if [ -f ${TOPDIR}/.bbrebuild ];then \
-		rm ${WRKBUILD}/.build_done; \
-		rm ${TOPDIR}/.bbrebuild; \
-	fi
-
 ${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
 	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
 		${TOPDIR}/.busyboxcfg
@@ -84,6 +78,12 @@ udhcpd-install:
 	${INSTALL_DIR} ${IDIR_UDHCPD}/etc/
 	${INSTALL_DATA} ./files/udhcpd.conf ${IDIR_UDHCPD}/etc/
 
-fake: bbrebuild
+rebuild:
+	@if [ -f ${TOPDIR}/.rebuild.${PKG_NAME} ];then \
+		rm ${WRKBUILD}/.build_done; \
+		rm ${TOPDIR}/.rebuild.${PKG_NAME}; \
+	fi
+
+fake: rebuild
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index d4be6854b..d24a02843 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -351,7 +351,8 @@ config BUSYBOX_LOSETUP
 
 config BUSYBOX_LSPCI
 	bool "lspci"
-	default n
+	default y
+	depends on !ADK_PACKAGE_PCIUTILS
 	help
 	  lspci is a utility for displaying information about PCI buses in the
 	  system and devices connected to them.
@@ -360,7 +361,8 @@ config BUSYBOX_LSPCI
 
 config BUSYBOX_LSUSB
 	bool "lsusb"
-	default n
+	default y
+	depends on !ADK_PACKAGE_LSUSB
 	help
 	  lsusb is a utility for displaying information about USB buses in the
 	  system and devices connected to them.
-- 
cgit v1.2.3