airlink generation fix, thanks st9_

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9f6da3b..0d3d304 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -13,12 +13,12 @@ PKG_NAME:=base-files
 PKG_RELEASE:=8
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
+PKG_FILE_DEPEND:=$(PLATFORM_DIR)
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
 ifeq ($(REV),)
   REV:=0
 endif
-
 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
@@ -35,40 +35,16 @@ CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 define Package/base-files$(TARGET)
   SECTION:=base
   CATEGORY:=Base system
-  DEFAULT:=y
   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
-/etc/config/network
-endef
-
-define -aruba-2.6/conffiles
-/etc/config/network
-endef
-
-define -au1000-2.6/conffiles
-/etc/config/network
-endef
-
-define -rb532-2.6/conffiles
-/etc/config/network
-endef
-
-define -sibyte-2.6/conffiles
-/etc/config/network
-endef
-
-define -x86-2.6/conffiles
-/etc/config/network
-endef
-
-define -xscale-2.6/conffiles
-/etc/config/network
+  $(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)
+  $(call Config,network.lan.gateway,ip,,LAN Gateway)
+  $(call Config,network.lan.dns,ip,,LAN DNS server)
 endef
 
 define Package/base-files$(TARGET)/conffiles
@@ -87,13 +63,22 @@ endef
 define Package/libgcc
   SECTION:=libs
   CATEGORY:=Base system
-  DEFAULT:=y
   DEPENDS:=@!NATIVE_TOOLCHAIN
   TITLE:=GCC support library
   URL:=http://gcc.gnu.org/
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
 endef
 
+define Package/libssp
+  SECTION:=libs
+  CATEGORY:=Base system
+  DEPENDS:=@!NATIVE_TOOLCHAIN
+  DEFAULT:=m
+  TITLE:=GCC support library
+  URL:=http://gcc.gnu.org/
+  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+endef
+
 define Package/libpthread
   SECTION:=libs
   CATEGORY:=Libraries
@@ -106,7 +91,6 @@ endef
 define Package/uclibc
   SECTION:=libs
   CATEGORY:=Base system
-  DEFAULT:=y
   DEPENDS:=@!NATIVE_TOOLCHAIN
   TITLE:=C library embedded systems
   URL:=http://uclibc.org/
@@ -117,34 +101,22 @@ 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
-       $(TARGET_CC) -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c
+define Build/Compile/Default
 endef
 
 define Build/Compile
-  $(call Build/Compile/$(BOARD))
-endef
-
-
-define Package/base-files$(TARGET)/install-ar7
-       mkdir -p $(1)/sbin
-       $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin
-endef
-
-define Package/base-files$(TARGET)/install-brcm
-       rm -f $(1)/etc/config/network
-       mkdir -p $(1)/sbin
-       $(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin
+       $(call Build/Compile/Default)
 endef
 
 define Package/base-files$(TARGET)/install
-       $(CP) ./default/* $(1)/
-       if [ -d $(BOARD)-$(KERNEL) ]; then \
-               $(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
+       $(CP) ./files/* $(1)/
+       if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
+               $(CP) $(PLATFORM_DIR)/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)/; \
+               fi; \
        fi
        $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
        $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf
@@ -163,29 +135,49 @@ define Package/base-files$(TARGET)/install
        rm -f $(1)/var
        ln -sf /tmp $(1)/var
        mkdir -p $(1)/etc
-$(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
+       ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf
+       $(call Package/base-files/install-target,$(1))
+       for conffile in $(1)/etc/config/*; do \
+               if [ -f "$$$$conffile" ]; then \
+                       grep "$$$$conffile" $(1)/CONTROL/conffiles || \
+                               echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \
+               fi \
+       done
 endef
 
 define Package/libgcc/install
-       install -m0755 -d $(1)/lib
+       $(INSTALL_DIR) $(1)/lib
        $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
 endef
 
+ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
+  define Package/libssp/install
+       $(INSTALL_DIR) $(1)/lib
+       $(CP) $(STAGING_DIR)/lib/libssp.so.* $(1)/lib/
+  endef
+endif
+
 define Package/libpthread/install
-       install -m0755 -d $(1)/lib
+       $(INSTALL_DIR) $(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
-       install -m0755 -d $(1)/lib
+       $(INSTALL_DIR) $(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
 
+ifneq ($(DUMP),1)
+  -include $(PLATFORM_DIR)/base-files.mk
+endif
+
 $(eval $(call BuildPackage,base-files$(TARGET)))
 $(eval $(call BuildPackage,libgcc))
+$(eval $(call BuildPackage,libssp))
 $(eval $(call BuildPackage,libpthread))
 $(eval $(call BuildPackage,uclibc))
+