fix CAC_ADDR/UNCAC_ADDR macros

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c5dd05e..9b8478d 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,9 +10,8 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files

-PKG_RELEASE:=9
+PKG_RELEASE:=10

 
 

-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)

 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )


@@ -35,8 +34,6 @@ define Package/base-files$(TARGET)
   SECTION:=base
   CATEGORY:=Base system
   TITLE:=Base filesystem for OpenWrt
   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)
   $(call Config,network.lan.proto,string,static,LAN Protocol)
   URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)-$(REV)
   $(call Config,network.lan.proto,string,static,LAN Protocol)


@@ -59,6 +56,10 @@ define Package/base-files$(TARGET)/conffiles
 $(call $(TARGET)/conffiles)
 endef
 
 $(call $(TARGET)/conffiles)
 endef
 

+define Package/base-files$(TARGET)/description
+ This package contains a base filesystem and system scripts for OpenWrt.
+endef
+

 define Package/gcc/Default
   SECTION:=libs
   CATEGORY:=Base system
 define Package/gcc/Default
   SECTION:=libs
   CATEGORY:=Base system


@@ -68,18 +69,18 @@ define Package/gcc/Default
 endef
 
 define Package/libgcc
 endef
 
 define Package/libgcc

-  $(call Package/gcc/Default)
+$(call Package/gcc/Default)

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

-  DEPENDS:=@!LINUX_2_6_AVR32||@!NATIVE_TOOLCHAIN
+  DEPENDS:=@!TARGET_avr32 @!NATIVE_TOOLCHAIN

 endef
 
 define Package/libssp
 endef
 
 define Package/libssp

-  $(call Package/gcc/Default)
+$(call Package/gcc/Default)

   TITLE:=GCC support library
 endef
 
 define Package/libstdcpp
   TITLE:=GCC support library
 endef
 
 define Package/libstdcpp

-  $(call Package/gcc/Default)
+$(call Package/gcc/Default)

   NAME:=libstdc++
   TITLE:=GNU Standard C++ Library v3
   DEPENDS:=@!NATIVE_TOOLCHAIN&&@INSTALL_LIBSTDCPP
   NAME:=libstdc++
   TITLE:=GNU Standard C++ Library v3
   DEPENDS:=@!NATIVE_TOOLCHAIN&&@INSTALL_LIBSTDCPP


@@ -94,12 +95,12 @@ define Package/uclibc/Default
 endef
 
 define Package/libpthread
 endef
 
 define Package/libpthread

-  $(call Package/uclibc/Default)
+$(call Package/uclibc/Default)

   TITLE:=POSIX thread library
 endef
 
 define Package/uclibc
   TITLE:=POSIX thread library
 endef
 
 define Package/uclibc

-  $(call Package/uclibc/Default)
+$(call Package/uclibc/Default)

   TITLE:=C library embedded systems
 endef
 
   TITLE:=C library embedded systems
 endef
 


@@ -122,6 +123,11 @@ define Package/base-files$(TARGET)/install
        if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
                $(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \
        fi
        if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
                $(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \
        fi

+       $(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
+               if [ -d $(PLATFORM_SUBDIR)/base-files/default/. ]; then \
+                       $(CP) $(PLATFORM_SUBDIR)/base-files/default/* $(1)/; \
+               fi \
+       )

        if [ "$(PROFILE)" != "Default" ]; then \
                if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \
                        $(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \
        if [ "$(PROFILE)" != "Default" ]; then \
                if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \
                        $(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \