File I forgot

[openwrt.git] / package / base-files / Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index daa15d0..dce07fe 100644 (file)
--- 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)
 
 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>
 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
   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
 endef
 
 define -ar7-2.4/conffiles


@@ -87,28 +86,28 @@ define Package/libgcc
   SECTION:=libs
   CATEGORY:=Libraries
   DEFAULT:=y
   SECTION:=libs
   CATEGORY:=Libraries
   DEFAULT:=y

+  DEPENDS:=@!NATIVE_TOOLCHAIN

   TITLE:=GCC support library
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
   DESCRIPTION:=$(TITLE)
   TITLE:=GCC support library
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
   DESCRIPTION:=$(TITLE)

-  FORCEREBUILD:=n

 endef
 
 define Package/libpthread
   $(call Package/base-files$(TARGET))
   DEFAULT:=n
 endef
 
 define Package/libpthread
   $(call Package/base-files$(TARGET))
   DEFAULT:=n

+  DEPENDS:=@!NATIVE_TOOLCHAIN

   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=POSIX thread library
   DESCRIPTION:=POSIX thread library
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   TITLE:=POSIX thread library
   DESCRIPTION:=POSIX thread library

-  FORCEREBUILD:=n

 endef
 
 
 define Package/uclibc
   $(call Package/base-files$(TARGET))
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
 endef
 
 
 define Package/uclibc
   $(call Package/base-files$(TARGET))
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)

+  DEPENDS:=@!NATIVE_TOOLCHAIN

   TITLE:=C library
   DESCRIPTION:=C library for embedded systems
   TITLE:=C library
   DESCRIPTION:=C library for embedded systems

-  FORCEREBUILD:=n

 endef
 
 define Build/Prepare
 endef
 
 define Build/Prepare


@@ -157,7 +156,6 @@ define Package/base-files$(TARGET)/install
        mkdir -p $(1)/usr/bin
        mkdir -p $(1)/sys
        mkdir -p $(1)/www
        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
        ln -sf /proc/mounts $(1)/etc/mtab
        rm -f $(1)/var
        ln -sf /tmp $(1)/var