Disable smash stacking support by default, but allow to enable it as an experimental...

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 3137101..f4ef55d 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,19 +10,21 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=10
+PKG_RELEASE:=13
 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
-REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-ifeq ($(REV),)
-  REV:=0
-endif
 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
-  TARGET:=-$(BOARD)-$(KERNEL)
+  TARGET:=-$(BOARD)
+  ifneq ($(wildcard $(PLATFORM_DIR)/base-files-$(PROFILE) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)),)
+    TARGET:=$(TARGET)-$(PROFILE)
+  endif
   LIBGCC_VERSION:=$(GCC_VERSION)
+  ifeq ($(ARCH),x86_64)
+    LIB_SUFFIX:=64
+  endif
 else
   UCLIBC_VERSION:=<UCLIBC_VERSION>
   LIBGCC_VERSION:=<LIBGCC_VERSION>
@@ -35,7 +37,7 @@ define Package/base-files$(TARGET)
   CATEGORY:=Base system
   TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
-  VERSION:=$(PKG_RELEASE)-$(REV)
+  VERSION:=$(PKG_RELEASE)-$(REVISION)
   $(call Config,network.lan.proto,string,static,LAN Protocol)
   $(call Config,network.lan.ipaddr,ip,192.168.1.1,LAN IP Address)
   $(call Config,network.lan.netmask,netmask,255.255.255.0,LAN Network Mask)
@@ -76,6 +78,7 @@ endef
 
 define Package/libssp
 $(call Package/gcc/Default)
+  DEPENDS:=@SSP_SUPPORT
   TITLE:=GCC support library
 endef
 
@@ -130,21 +133,22 @@ define Package/base-files$(TARGET)/install
        if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
                $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
        fi
-       if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
-               $(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \
+       if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
+               $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
+       fi
+       if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \
+               $(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(1)/; \
        fi
        $(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
-               if [ -d $(PLATFORM_SUBDIR)/base-files/default/. ]; then \
-                       $(CP) $(PLATFORM_SUBDIR)/base-files/default/* $(1)/; \
+               if [ -d $(PLATFORM_SUBDIR)/base-files/. ]; then \
+                       $(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \
+               fi; \
+               if [ -d $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/. ]; then \
+                       $(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
                fi \
        )
-       if [ "$(PROFILE)" != "Default" ]; then \
-               if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \
-                       $(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \
-               fi; \
-       fi
-       $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
-       $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
+       $(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner
+       $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
        mkdir -p $(1)/dev
        mkdir -p $(1)/etc/crontabs
        mkdir -p $(1)/jffs
@@ -156,11 +160,12 @@ define Package/base-files$(TARGET)/install
        mkdir -p $(1)/usr/bin
        mkdir -p $(1)/sys
        mkdir -p $(1)/www
+       mkdir -p $(1)/root
        ln -sf /proc/mounts $(1)/etc/mtab
        rm -f $(1)/var
        ln -sf /tmp $(1)/var
        mkdir -p $(1)/etc
-       ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf
+       ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/
        $(call Package/base-files/install-target,$(1))
        for conffile in $(1)/etc/config/*; do \
                if [ -f "$$$$conffile" ]; then \
@@ -172,19 +177,19 @@ endef
 
 define Package/libgcc/install
        $(INSTALL_DIR) $(1)/lib
-       $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/
 endef
 
 ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
   define Package/libssp/install
        $(INSTALL_DIR) $(1)/lib
-       $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/
   endef
 endif
 
 define Package/libstdcpp/install
        $(INSTALL_DIR) $(1)/lib
-       $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/lib/
 endef
 
 define Package/libpthread/install
@@ -195,7 +200,7 @@ endef
 
 define Package/uclibc/install
        $(INSTALL_DIR) $(1)/lib
-       for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
+       for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
        done