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/base-files/Makefile                            | 17 ++++++++++++++---
 package/base-files/src/usr/share/udhcpc/default.script |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'package/base-files')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 560158226..421f355c4 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		17
+PKG_RELEASE:=		20
 PKG_SECTION:=		base
 PKG_DESCR:=		basic filesystem structure and scripts
 
@@ -65,13 +65,24 @@ endif
 	ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab
 	rm -rf $(IDIR_BASE_FILES)/var
 	ln -sf tmp $(IDIR_BASE_FILES)/var
-	test -z $(ADK_PASSWORD) || \
+	test -z $(ADK_RUNTIME_HOSTNAME) || \
+	    echo $(ADK_RUNTIME_HOSTNAME) > \
+	    $(IDIR_BASE_FILES)/etc/hostname
+	test -z $(ADK_RUNTIME_PASSWORD) || \
 	    $(SED) 's,\*NP\*,'"$$(${STAGING_TOOLS}/bin/mkcrypt \
-	    ${ADK_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow
+	    ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow
 	git log -1|head -1|sed -e 's#commit ##' \
 		> $(IDIR_BASE_FILES)/etc/adkversion
 ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
 	gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz
 endif
 
+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/base-files/src/usr/share/udhcpc/default.script b/package/base-files/src/usr/share/udhcpc/default.script
index 02e4a7a3c..68c603496 100755
--- a/package/base-files/src/usr/share/udhcpc/default.script
+++ b/package/base-files/src/usr/share/udhcpc/default.script
@@ -4,7 +4,7 @@ if [[ -z $1 ]]; then
 	exit 1
 fi
 
-RESOLV_CONF=/tmp/resolv.conf
+RESOLV_CONF=/etc/resolv.conf
 
 case $1 in
 (deconfig)
-- 
cgit v1.2.3