X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5ad62fbdd3e65c841a917ee5f2d1fc238921078c..8c5dc0c237dc43601a7cbfe6b8c6f2484f526d14:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 14917f683..8d265f07e 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -13,17 +13,18 @@ PKG_NAME:=base-files PKG_RELEASE:=8 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 }' ) ifeq ($(REV),) REV:=0 endif - include $(INCLUDE_DIR)/package.mk ifneq ($(DUMP),1) TARGET:=-$(BOARD)-$(KERNEL) UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null} + UCLIBC_EXTRA_VERSION:=${shell cat $(STAGING_DIR)/uclibc_extra_version 2>/dev/null} LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null} else UCLIBC_VERSION:= @@ -40,6 +41,11 @@ define Package/base-files$(TARGET) 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) + $(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 @@ -55,31 +61,40 @@ define Package/base-files$(TARGET)/conffiles $(call $(TARGET)/conffiles) endef -define Package/libgcc +define Package/gcc/Default SECTION:=libs CATEGORY:=Base system DEPENDS:=@!NATIVE_TOOLCHAIN - TITLE:=GCC support library URL:=http://gcc.gnu.org/ VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) endef -define Package/libpthread +define Package/libgcc + $(call Package/gcc/Default) + TITLE:=GCC support library +endef + +define Package/libssp + $(call Package/gcc/Default) + TITLE:=GCC support library +endef + +define Package/uclibc/Default SECTION:=libs - CATEGORY:=Libraries + CATEGORY:=Base system DEPENDS:=@!NATIVE_TOOLCHAIN - TITLE:=POSIX thread library URL:=http://uclibc.org/ VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) endef +define Package/libpthread + $(call Package/uclibc/Default) + TITLE:=POSIX thread library +endef + define Package/uclibc - SECTION:=libs - CATEGORY:=Base system - DEPENDS:=@!NATIVE_TOOLCHAIN + $(call Package/uclibc/Default) TITLE:=C library embedded systems - URL:=http://uclibc.org/ - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) endef define Build/Prepare @@ -95,15 +110,23 @@ 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 $(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)/; \ + 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 mkdir -p $(1)/dev mkdir -p $(1)/etc/crontabs mkdir -p $(1)/jffs - mkdir -p $(1)/lib + mkdir -p $(1)/lib/firmware mkdir -p $(1)/mnt mkdir -p $(1)/proc mkdir -p $(1)/tmp @@ -130,6 +153,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/ @@ -144,11 +174,22 @@ define Package/uclibc/install done endef +define Package/ldd/install + $(INSTALL_DIR) $(1)/bin/ + $(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/utils/ldd $(1)/bin/ +endef + +define Package/ldconfig/install + $(INSTALL_DIR) $(1)/bin/ + $(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/utils/ldconfig $(1)/bin/ +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))