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
---
 mk/build.mk | 10 +++++++++-
 mk/image.mk | 31 -------------------------------
 2 files changed, 9 insertions(+), 32 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index 8791ebf1d..a4559afef 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -64,8 +64,16 @@ noconfig_targets:=	menuconfig \
 
 POSTCONFIG=		-@ \
 	if [ -f .config.old ];then \
+		rebuild=0; \
 		if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
-			touch .bbrebuild; \
+			touch .rebuild.busybox;\
+			rebuild=1;\
+		fi; \
+		if [ "$$(grep ^ADK_RUNTIME_PASSWORD .config|md5sum)" != "$$(grep ^ADK_RUNTIME_PASSWORD .config.old|md5sum)" ];then \
+			touch .rebuild.base-files;\
+			rebuild=1;\
+		fi; \
+		if [ $$rebuild -eq 1 ];then \
 			cp .config .config.old; \
 		fi; \
 	fi
diff --git a/mk/image.mk b/mk/image.mk
index 4713d621d..668de8c26 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -13,37 +13,6 @@ image-prepare-post:
 	rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \
 	    dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \
 	    chmod 600 ${TARGET_DIR}/etc/.rnd
-	@cd ${TARGET_DIR}; ls=; ln=; li=; x=1; md5sum $$(find . -type f) | \
-	    sed -e "s/*//" | \
-	    while read sum name; do \
-		inode=$$(ls -i "$$name"); \
-		echo "$$sum $${inode%% *} $$name"; \
-	    done | sort | while read sum inode name; do \
-		if [[ $$sum = $$ls ]]; then \
-			[[ $$li = $$inode ]] && continue; \
-			case $$x in \
-			1)	echo 'WARNING: duplicate files found' \
-				    'in filesystem! Please fix them.' >&2; \
-				echo -n "> $$ln "; \
-				;; \
-			2)	echo -n "> $$ln "; \
-				;; \
-			3)	echo -n ' '; \
-				;; \
-			esac; \
-			echo -n "$$name"; \
-			x=3; \
-		else \
-			case $$x in \
-			3)	echo; \
-				x=2; \
-				;; \
-			esac; \
-		fi; \
-		ls=$$sum; \
-		ln=$$name; \
-		li=$$inode; \
-	done
 	chmod 4511 ${TARGET_DIR}/bin/busybox
 	chmod 1777 ${TARGET_DIR}/tmp
 	@if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \
-- 
cgit v1.2.3