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/uclibc/Makefile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'package/uclibc/Makefile')

diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 787dc4e56..823508ca2 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -6,9 +6,10 @@ include $(TOPDIR)/toolchain/uClibc/Makefile.inc
 
 PKG_DESCR:=		embedded C library
 PKG_SECTION:=		base
-NO_DISTFILES:=		1
 PKG_OPTS:=		noremove
 
+NO_DISTFILES:=		1
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -26,21 +27,25 @@ SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+=	uclibc-dev-install
 do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc
 	# create timezone file
-	echo 'CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00' > $(IDIR_UCLIBC)/etc/TZ
+	test -z $(ADK_RUNTIME_TIMEZONE) || \
+	    grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \
+	    cut -f 2 > $(IDIR_UCLIBC)/etc/TZ
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_UCLIBC)/lib/
 	$(CP) $(STAGING_DIR)/lib/libc.so* $(IDIR_UCLIBC)/lib/
-	$(CP) $(STAGING_DIR)/lib/libuClibc-$(PKG_VERSION).so $(IDIR_UCLIBC)/lib/
-	$(CP) $(STAGING_DIR)/lib/ld*-uClibc-$(PKG_VERSION).so $(IDIR_UCLIBC)/lib/
+	$(CP) $(STAGING_DIR)/lib/libuClibc-$(PKG_VERSION).so \
+		$(IDIR_UCLIBC)/lib/
+	$(CP) $(STAGING_DIR)/lib/ld*-uClibc-$(PKG_VERSION).so \
+		$(IDIR_UCLIBC)/lib/
 	$(CP) $(STAGING_DIR)/lib/ld*-uClibc.so.* $(IDIR_UCLIBC)/lib/
 	-for file in libcrypt libdl libm libnsl libresolv librt libutil; do \
 		$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_UCLIBC)/lib/; \
-		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_UCLIBC)/lib/; \
+		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so \
+			$(IDIR_UCLIBC)/lib/; \
 	done
 
 uclibc-dev-install:
 	${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib
 	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib
-	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
 		headers_install
-- 
cgit v1.2.3