4 files changed, 17 insertions, 9 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 82541e6f4..92949ea13 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:=		9
+PKG_RELEASE:=		10
 PKG_DESCR:=		basic filesystem structure and scripts
 PKG_SECTION:=		base
 
@@ -24,8 +24,15 @@ INSTALL_STYLE:=		manual
 do-install:
 	$(CP) ./extra/* $(IDIR_BASE_FILES)
 	$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES)
+ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
+	@-rm $(IDIR_BASE_FILES)/etc/network/interfaces
+endif
+ifeq (${ADK_TARGET_PACKAGE_IPKG},y)
 	$(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	$(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
+else
+	@-rm $(IDIR_BASE_FILES)/etc/ipkg.conf
+endif
 	echo /bin/sh >${IDIR_BASE_FILES}/etc/shells
 	echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells
 ifneq (${ADK_PACKAGE_BASH},)
diff --git a/package/depmaker b/package/depmaker
index da3923554..67dcb498d 100644
--- a/package/depmaker
+++ b/package/depmaker
@@ -34,5 +34,5 @@ for dn in */Makefile; do
 	done
 	print -r -- $x
 done >Depends.mk
-pbar=done
-print -u2 "$pbar"
+#pbar=done
+#print -u2 "$pbar"
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index de7c80e45..5389c388f 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -46,15 +46,18 @@ EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
 
 # compile nothing, eglibc is already build in toolchain directory
 do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
-	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib
+	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \
+		$(IDIR_EGLIBC)/usr/lib
 	# install /etc/localtime from host system (FIXME)
 	${CP} /etc/localtime $(IDIR_EGLIBC)/etc
-	$(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/
+	$(CP) $(STAGING_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/
 	-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
 		$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \
 		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \
 	done
+
+eglibc-dev-install:
 	# install linker script
 	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC)/usr/lib/libc.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libm.so.6 libm.so
@@ -62,8 +65,6 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so
-
-eglibc-dev-install:
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
diff --git a/package/pkgmaker b/package/pkgmaker
index 4a6ed12a0..7b50517f2 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -261,5 +261,5 @@ EOF
 	) 4>Config.in 5>Config.in.lib
 	cd ..
 done
-pbar=done
-print -u2 "$pbar"
+#pbar=done
+#print -u2 "$pbar"