X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e9437d222f86a8960af081199fbef41312c7770b..93f14ce27eb1b0feeca985a90952c5fd0f005471:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index daa15d0a7..d6e62b5ae 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:= 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 @@ -87,28 +86,28 @@ define Package/libgcc SECTION:=libs CATEGORY:=Libraries DEFAULT:=y + DEPENDS:=@!NATIVE_TOOLCHAIN TITLE:=GCC support library VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) DESCRIPTION:=$(TITLE) - FORCEREBUILD:=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 - FORCEREBUILD:=n 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 - FORCEREBUILD:=n endef define Build/Prepare @@ -134,6 +133,7 @@ define Package/base-files$(TARGET)/install-ar7 $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin endef define Package/base-files$(TARGET)/install-brcm + rm -f $(1)/etc/config/network mkdir -p $(1)/sbin $(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin endef @@ -157,7 +157,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