X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fdedeckeh.git;a=blobdiff_plain;f=package%2Fbase-files%2FMakefile;h=440562b877304012a8da6dd188d79d99ecc9a9d5;hp=5af1414d4e37f483484f4ffb23ceeb3dd2b94b0d;hb=34939cad39f516fceca45a9da7771901a1c9342b;hpb=105a602ecf14e4afe29f88e062496135bce41dc7 diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 5af1414d4e..440562b877 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,73 +1,51 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ 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:=18 -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) + ifeq ($(ARCH),x86_64) + LIB_SUFFIX:=64 + endif else - UCLIBC_VERSION:= + LIBC_VERSION:= LIBGCC_VERSION:= endif +ifneq ($(LIBC_VERSION),0.9.28) + LIBC_VERSION:=$(LIBC_VERSION)$(LIBC_PATCHVER) +endif + CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files) 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) -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 + 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 @@ -78,80 +56,122 @@ define Package/base-files$(TARGET)/conffiles /etc/passwd /etc/profile /etc/shells -/etc/ipkg.conf /etc/sysctl.conf $(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 - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=@!NATIVE_TOOLCHAIN - TITLE:=POSIX thread library - URL:=http://uclibc.org/ - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) +define Package/libgcc +$(call Package/gcc/Default) + TITLE:=GCC support library + DEPENDS+=@!TARGET_avr32 +endef + +define Package/libssp +$(call Package/gcc/Default) + DEPENDS+=@SSP_SUPPORT + TITLE:=GCC support library endef -define Package/uclibc +define Package/libstdcpp +$(call Package/gcc/Default) + NAME:=libstdc++ + TITLE:=GNU Standard C++ Library v3 + DEPENDS+=@INSTALL_LIBSTDCPP +endef + +define Package/libc/Default SECTION:=libs CATEGORY:=Base system DEPENDS:=@!NATIVE_TOOLCHAIN - TITLE:=C library embedded systems - URL:=http://uclibc.org/ - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) + VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE) + URL:=$(LIBC_URL) endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) +define Package/libc +$(call Package/libc/Default) + TITLE:=C library endef -define Build/Compile/ar7 - $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c +define Package/libpthread +$(call Package/libc/Default) + TITLE:=POSIX thread library + DEPENDS:= +librt endef -define Build/Compile/brcm - $(TARGET_CC) -I src -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c +define Package/librt +$(call Package/libc/Default) + TITLE:=POSIX.1b RealTime extension library endef -define Build/Compile - $(call Build/Compile/$(BOARD)) +define Package/ldd +$(call Package/libc/Default) + SECTION:=utils + CATEGORY:=Utilities + TITLE:=LDD trace utility +endef + +define Package/ldconfig +$(call Package/libc/Default) + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Shared library path configuration endef -define Package/base-files$(TARGET)/install-ar7 - mkdir -p $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) +endef + +define Build/Compile/Default 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 +define Build/Compile + $(call Build/Compile/Default) endef define Package/base-files$(TARGET)/install - $(CP) ./default/* $(1)/ - if [ -d $(BOARD) ]; then \ - $(CP) $(BOARD)/* $(1)/; \ + $(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 - if [ -d $(BOARD)-$(KERNEL) ]; then \ - $(CP) $(BOARD)-$(KERNEL)/* $(1)/; \ + if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \ + $(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(1)/; \ fi - $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner - $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf + $(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 \ + ) +# Form valid /etc/shadow entries, by copying the user:pw pairs +# from /etc/passwd, and adding on pw change data + $(if $(CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS), \ + cut -d ':' -f 1-2 $(1)/etc/passwd > $(1)/etc/shadow; \ + $(SED) 's/$$$$/:13848:0:99999:7:::/' $(1)/etc/shadow \ + ) + $(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner + mkdir -p $(1)/CONTROL 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 @@ -159,33 +179,98 @@ 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 -$(call Package/base-files$(TARGET)/install-$(BOARD),$(1)) + ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/ + $(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 - $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/ + $(INSTALL_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.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/ +define Package/libssp/install + $(INSTALL_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/ endef -define Package/uclibc/install - install -m0755 -d $(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/; \ +define Package/libstdcpp/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/usr/lib/ +endef + +use_libutil=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil) +use_libnsl=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl) +use_nsswitch=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files) + +define Package/glibc/install + $(INSTALL_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_VERSION).so $(1)/lib/ + for file in libanl libc libcidn libcrypt libdl libm $(use_libnsl) $(use_nsswitch) libresolv $(use_libutil); do \ + $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \ + $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \ done endef +define Package/eglibc/install +$(call Package/glibc/install,$1) +endef + +define Package/uClibc/install + $(INSTALL_DIR) $(1)/lib + for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv libuClibc libutil; do \ + $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \ + $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \ + done +endef + +define Package/libc/install +$(call Package/$(LIBC)/install,$1) +endef + +define Package/libpthread/install + $(INSTALL_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_VERSION).so $(1)/lib/ +endef + +define Package/librt/install + $(INSTALL_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib/librt.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_VERSION).so $(1)/lib/ +endef + +define Package/ldd/install + $(INSTALL_DIR) $(1)/usr/bin/ + $(CP) $(TOOLCHAIN_DIR)/usr/bin/ldd $(1)/usr/bin/ +endef + +define Package/ldconfig/install + $(INSTALL_DIR) $(1)/sbin/ + $(CP) $(TOOLCHAIN_DIR)/sbin/ldconfig $(1)/sbin/ +endef + +ifneq ($(DUMP),1) + -include $(PLATFORM_DIR)/base-files.mk +endif + $(eval $(call BuildPackage,base-files$(TARGET))) +$(eval $(call BuildPackage,libc)) $(eval $(call BuildPackage,libgcc)) +$(eval $(call BuildPackage,libssp)) +$(eval $(call BuildPackage,libstdcpp)) $(eval $(call BuildPackage,libpthread)) -$(eval $(call BuildPackage,uclibc)) +$(eval $(call BuildPackage,librt)) +$(eval $(call BuildPackage,ldd)) +$(eval $(call BuildPackage,ldconfig))