X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fbase-files%2FMakefile;h=b80fee3ff700776be5e109c2edd9f9ec042d24d9;hp=62859294367a19b86f3e52ad9d726651e83a9266;hb=0d9271c86644b1ef1a70e8d30b0fe287f801ba41;hpb=f134c8e1d6385368996ffdfa54fd84b6e4abf2ee diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 6285929436..b80fee3ff7 100644 --- 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,21 +10,18 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=8 - -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) +PKG_RELEASE:=13 -REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ) -ifeq ($(REV),) - REV:=0 -endif +PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ include $(INCLUDE_DIR)/package.mk ifneq ($(DUMP),1) - TARGET:=-$(BOARD)-$(KERNEL) - UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null} - LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null} + TARGET:=-$(BOARD) + ifneq ($(wildcard $(PLATFORM_DIR)/base-files-$(PROFILE) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)),) + TARGET:=$(TARGET)-$(PROFILE) + endif + LIBGCC_VERSION:=$(GCC_VERSION) else UCLIBC_VERSION:= LIBGCC_VERSION:= @@ -36,10 +33,13 @@ define Package/base-files$(TARGET) 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) + 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) + $(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 +55,62 @@ define Package/base-files$(TARGET)/conffiles $(call $(TARGET)/conffiles) endef -define Package/libgcc +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 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 + DEPENDS:=@!TARGET_avr32 @!NATIVE_TOOLCHAIN +endef + +define Package/libssp +$(call Package/gcc/Default) + TITLE:=GCC support library +endef + +define Package/libstdcpp +$(call Package/gcc/Default) + NAME:=libstdc++ + TITLE:=GNU Standard C++ Library v3 + DEPENDS:=@!NATIVE_TOOLCHAIN&&@INSTALL_LIBSTDCPP +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) + VERSION:=$(UCLIBC_VERSION)$(UCLIBC_PATCHVER)-$(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 Package/ldd +$(call Package/uclibc/Default) + TITLE:=LDD trace utility +endef + +define Package/ldconfig +$(call Package/uclibc/Default) + TITLE:=Shared library path configuration endef define Build/Prepare @@ -95,15 +126,29 @@ endef define Package/base-files$(TARGET)/install $(CP) ./files/* $(1)/ + if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \ + $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \ + fi if [ -d $(PLATFORM_DIR)/base-files/. ]; then \ $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \ fi - $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner - $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf + 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/. ]; then \ + $(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \ + fi; \ + if [ -d $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/. ]; then \ + $(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \ + fi \ + ) + $(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 - mkdir -p $(1)/lib + mkdir -p $(1)/lib/firmware mkdir -p $(1)/mnt mkdir -p $(1)/proc mkdir -p $(1)/tmp @@ -111,10 +156,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 /tmp/fstab $(1)/etc/ $(call Package/base-files/install-target,$(1)) for conffile in $(1)/etc/config/*; do \ if [ -f "$$$$conffile" ]; then \ @@ -125,29 +172,55 @@ define Package/base-files$(TARGET)/install endef define Package/libgcc/install - install -m0755 -d $(1)/lib - $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/ + $(INSTALL_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib/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/ + endef +endif + +define Package/libstdcpp/install + $(INSTALL_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/ endef define Package/libpthread/install - install -m0755 -d $(1)/lib - $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/ - $(CP) $(STAGING_DIR)/lib/libpthread-$(UCLIBC_VERSION).so $(1)/lib/ + $(INSTALL_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_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/; \ + $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \ + $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \ done endef +define Package/ldd/install + $(INSTALL_DIR) $(1)/bin/ + $(CP) $(TOOLCHAIN_DIR)/target-utils/ldd $(1)/bin/ +endef + +define Package/ldconfig/install + $(INSTALL_DIR) $(1)/bin/ + $(CP) $(TOOLCHAIN_DIR)/target-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,libstdcpp)) $(eval $(call BuildPackage,libpthread)) $(eval $(call BuildPackage,uclibc)) +$(eval $(call BuildPackage,ldd)) +$(eval $(call BuildPackage,ldconfig))