X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e9437d222f86a8960af081199fbef41312c7770b..fba883ac2d3ce08ff94393c2019d9b4b117e318d:/package/base-files/Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index daa15d0a7..e41e1fd79 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -22,8 +22,8 @@ include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
 TARGET:=-$(BOARD)-$(KERNEL)
-UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
-LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
+UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
+LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
 else
 UCLIBC_VERSION:=<UCLIBC_VERSION>
 LIBGCC_VERSION:=<LIBGCC_VERSION>
@@ -37,8 +37,7 @@ define Package/base-files$(TARGET)
   DEFAULT:=y
   TITLE:=OpenWrt system scripts
   DESCRIPTION:=Base filesystem for OpenWrt
-  VERSION:=$(PKG_RELEASE)
-  FORCEREBUILD:=y
+  VERSION:=$(PKG_RELEASE)-$(REV)
 endef
 
 define -ar7-2.4/conffiles
@@ -90,7 +89,6 @@ define Package/libgcc
   TITLE:=GCC support library
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
   DESCRIPTION:=$(TITLE)
-  FORCEREBUILD:=n
 endef
 
 define Package/libpthread
@@ -99,7 +97,6 @@ define Package/libpthread
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=POSIX thread library
   DESCRIPTION:=POSIX thread library
-  FORCEREBUILD:=n
 endef
 
 
@@ -108,7 +105,6 @@ define Package/uclibc
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=C library
   DESCRIPTION:=C library for embedded systems
-  FORCEREBUILD:=n
 endef
 
 define Build/Prepare
@@ -157,7 +153,6 @@ define Package/base-files$(TARGET)/install
 	mkdir -p $(1)/usr/bin
 	mkdir -p $(1)/sys
 	mkdir -p $(1)/www
-	ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf
 	ln -sf /proc/mounts $(1)/etc/mtab
 	rm -f $(1)/var
 	ln -sf /tmp $(1)/var