improve accuracy of the diag detection of the wrt54g3g

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7db0d05..5af1414 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id$
 
 include $(TOPDIR)/rules.mk
 # $Id$
 
 include $(TOPDIR)/rules.mk


@@ -5,30 +11,35 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8

-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/base-files
+
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)

 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)

-REV:=0
+  REV:=0

 endif
 
 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
 endif
 
 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}
+  TARGET:=-$(BOARD)-$(KERNEL)
+  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>

 endif
 
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 
 define Package/base-files$(TARGET)
 endif
 
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 
 define Package/base-files$(TARGET)

-SECTION:=base
-CATEGORY:=Base system
-DEFAULT:=y
-TITLE:=OpenWrt system scripts
-DESCRIPTION:=Base filesystem for OpenWrt
-VERSION:=$(PKG_RELEASE)
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=Base filesystem for OpenWrt
+  DESCRIPTION:=\
+       This package contains a base filesystem and system scripts for OpenWrt.
+  URL:=http://openwrt.org/
+  VERSION:=$(PKG_RELEASE)-$(REV)

 endef
 
 define -ar7-2.4/conffiles
 endef
 
 define -ar7-2.4/conffiles


@@ -59,7 +70,6 @@ define -xscale-2.6/conffiles
 /etc/config/network
 endef
 
 /etc/config/network
 endef
 

-

 define Package/base-files$(TARGET)/conffiles
 /etc/banner
 /etc/hosts
 define Package/base-files$(TARGET)/conffiles
 /etc/banner
 /etc/hosts


@@ -74,36 +84,46 @@ $(call $(TARGET)/conffiles)
 endef
 
 define Package/libgcc
 endef
 
 define Package/libgcc

-SECTION:=libs
-CATEGORY:=Libraries
-DEFAULT:=y
-TITLE:=GCC support library
-VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
-DESCRIPTION:=$(TITLE)
+  SECTION:=libs
+  CATEGORY:=Base system
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  TITLE:=GCC support library
+  URL:=http://gcc.gnu.org/
+  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+endef
+
+define Package/libpthread
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  TITLE:=POSIX thread library
+  URL:=http://uclibc.org/
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)

 endef
 
 define Package/uclibc
 endef
 
 define Package/uclibc

-$(call Package/base-files$(TARGET))
-VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
-TITLE:=C library
-DESCRIPTION:=C library for embedded systems
+  SECTION:=libs
+  CATEGORY:=Base system
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  TITLE:=C library embedded systems
+  URL:=http://uclibc.org/
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)

 endef
 
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
 endef
 
 endef
 
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
 endef
 

-

 define Build/Compile/ar7
        $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c
 endef
 
 define Build/Compile/brcm
 define Build/Compile/ar7
        $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c
 endef
 
 define Build/Compile/brcm

-       $(TARGET_CC) -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c
+       $(TARGET_CC) -I src -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

-$(call Build/Compile/$(BOARD))
+  $(call Build/Compile/$(BOARD))

 endef
 
 
 endef
 
 


@@ -111,14 +131,18 @@ define Package/base-files$(TARGET)/install-ar7
        mkdir -p $(1)/sbin
        $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin
 endef
        mkdir -p $(1)/sbin
        $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin
 endef

+

 define Package/base-files$(TARGET)/install-brcm
 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
 
 define Package/base-files$(TARGET)/install
        mkdir -p $(1)/sbin
        $(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin
 endef
 
 define Package/base-files$(TARGET)/install

-$(call Package/base-files$(TARGET)/install-$(BOARD),$(1))

        $(CP) ./default/* $(1)/
        $(CP) ./default/* $(1)/

+       if [ -d $(BOARD) ]; then \
+               $(CP) $(BOARD)/* $(1)/; \
+       fi

        if [ -d $(BOARD)-$(KERNEL) ]; then \
                $(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
        fi
        if [ -d $(BOARD)-$(KERNEL) ]; then \
                $(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
        fi


@@ -135,26 +159,33 @@ $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
        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
        mkdir -p $(1)/etc
        ln -sf /proc/mounts $(1)/etc/mtab
        rm -f $(1)/var
        ln -sf /tmp $(1)/var
        mkdir -p $(1)/etc

+$(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
+endef
+
+define Package/libgcc/install
+       install -m0755 -d $(1)/lib
+       $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
+endef
+
+define Package/libpthread/install
+       install -m0755 -d $(1)/lib
+       $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/
+       $(CP) $(STAGING_DIR)/lib/libpthread-$(UCLIBC_VERSION).so $(1)/lib/

 endef
 
 define Package/uclibc/install
 endef
 
 define Package/uclibc/install

-       mkdir -p $(1)/lib
+       install -m0755 -d $(1)/lib

        for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
                $(CP) $(STAGING_DIR)/lib/$$$$file.so.* $(1)/lib/; \
                $(CP) $(STAGING_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
        done
 endef
 
        for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
                $(CP) $(STAGING_DIR)/lib/$$$$file.so.* $(1)/lib/; \
                $(CP) $(STAGING_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
        done
 endef
 

-define Package/libgcc/install
-       mkdir -p $(1)/lib
-       $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
-endef
-

 $(eval $(call BuildPackage,base-files$(TARGET)))
 $(eval $(call BuildPackage,libgcc))
 $(eval $(call BuildPackage,base-files$(TARGET)))
 $(eval $(call BuildPackage,libgcc))

+$(eval $(call BuildPackage,libpthread))

 $(eval $(call BuildPackage,uclibc))
 $(eval $(call BuildPackage,uclibc))