Port kmod-gre to the new module layout

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ec3dc88..dce07fe 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,7 +1,13 @@
+# 
+# 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

-include $(TOPDIR)/package/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=base-files
 PKG_RELEASE:=8
 
 PKG_NAME:=base-files
 PKG_RELEASE:=8


@@ -12,23 +18,26 @@ ifeq ($(REV),)
 REV:=0
 endif
 
 REV:=0
 endif
 

-include $(TOPDIR)/package/rules.mk
+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>

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

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


@@ -74,19 +83,31 @@ $(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:=Libraries
+  DEFAULT:=y
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  TITLE:=GCC support library
+  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+  DESCRIPTION:=$(TITLE)

 endef
 
 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
+endef
+
+

 define Package/uclibc
 define Package/uclibc

-$(call Package/base-files$(TARGET))
-VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
-TITLE:=C library
-DESCRIPTION:=C library for embedded systems
+  $(call Package/base-files$(TARGET))
+  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  TITLE:=C library
+  DESCRIPTION:=C library for embedded systems

 endef
 
 define Build/Prepare
 endef
 
 define Build/Prepare


@@ -103,7 +124,7 @@ define Build/Compile/brcm
 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

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

 endef
 
 
 endef
 
 


@@ -117,7 +138,7 @@ define Package/base-files$(TARGET)/install-brcm
 endef
 
 define Package/base-files$(TARGET)/install
 endef
 
 define Package/base-files$(TARGET)/install

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

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


@@ -135,26 +156,32 @@ $(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
 endef
 
        ln -sf /proc/mounts $(1)/etc/mtab
        rm -f $(1)/var
        ln -sf /tmp $(1)/var
        mkdir -p $(1)/etc
 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
 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))