X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1ebe6d34880d1e26b37fe4f794b5039a8245e750..35542adfe391a97f617cb7f228264d1db7fbb74e:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 5cbef91e3..0d3d3040b 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -19,7 +19,6 @@ REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ) ifeq ($(REV),) REV:=0 endif - include $(INCLUDE_DIR)/package.mk ifneq ($(DUMP),1) @@ -43,7 +42,7 @@ define Package/base-files$(TARGET) VERSION:=$(PKG_RELEASE)-$(REV) $(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.0.0,LAN Network Mask) + $(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 @@ -70,6 +69,16 @@ define Package/libgcc 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 @@ -101,8 +110,13 @@ endef define Package/base-files$(TARGET)/install $(CP) ./files/* $(1)/ - if [ -d $(PLATFORM_DIR)/base-files/. ]; then \ - $(CP) $(PLATFORM_DIR)/base-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 @@ -136,6 +150,13 @@ define Package/libgcc/install $(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_DIR) $(1)/lib $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/ @@ -156,7 +177,7 @@ endif $(eval $(call BuildPackage,base-files$(TARGET))) $(eval $(call BuildPackage,libgcc)) +$(eval $(call BuildPackage,libssp)) $(eval $(call BuildPackage,libpthread)) $(eval $(call BuildPackage,uclibc)) -