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 8fccf79..5af1414 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,22 +11,23 @@ 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
 else

-UCLIBC_VERSION:=<UCLIBC_VERSION>
-LIBGCC_VERSION:=<LIBGCC_VERSION>
+  UCLIBC_VERSION:=<UCLIBC_VERSION>
+  LIBGCC_VERSION:=<LIBGCC_VERSION>

 endif
 
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 endif
 
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)


@@ -34,9 +35,10 @@ CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 define Package/base-files$(TARGET)
   SECTION:=base
   CATEGORY:=Base system
 define Package/base-files$(TARGET)
   SECTION:=base
   CATEGORY:=Base system

-  DEFAULT:=y
-  TITLE:=OpenWrt system scripts
-  DESCRIPTION:=Base filesystem for OpenWrt
+  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
 
   VERSION:=$(PKG_RELEASE)-$(REV)
 endef
 


@@ -68,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


@@ -84,40 +85,41 @@ endef
 
 define Package/libgcc
   SECTION:=libs
 
 define Package/libgcc
   SECTION:=libs

-  CATEGORY:=Libraries
-  DEFAULT:=y
+  CATEGORY:=Base system
+  DEPENDS:=@!NATIVE_TOOLCHAIN

   TITLE:=GCC support library
   TITLE:=GCC support library

+  URL:=http://gcc.gnu.org/

   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)

-  DESCRIPTION:=$(TITLE)

 endef
 
 define Package/libpthread
 endef
 
 define Package/libpthread

-  $(call Package/base-files$(TARGET))
-  DEFAULT:=n
-  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=@!NATIVE_TOOLCHAIN

   TITLE:=POSIX thread library
   TITLE:=POSIX thread library

-  DESCRIPTION:=POSIX thread library
+  URL:=http://uclibc.org/
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)

 endef
 
 endef
 

-

 define Package/uclibc
 define Package/uclibc

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

   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
   VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)

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

 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


@@ -129,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


@@ -153,11 +159,11 @@ 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
        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
 endef
 
 define Package/libgcc/install