X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9dfc3e092d28d1f60741e9af70ea79496b749930..2d32ced1744d54bae589cb1500e1453cfa84a8ca:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7fbeb6f33..15920d52b 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,18 +1,17 @@ # -# Copyright (C) 2007 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:=13 +PKG_RELEASE:=31 -PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ +PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ include $(INCLUDE_DIR)/package.mk @@ -22,14 +21,18 @@ ifneq ($(DUMP),1) TARGET:=$(TARGET)-$(PROFILE) endif LIBGCC_VERSION:=$(GCC_VERSION) + ifeq ($(ARCH),x86_64) + LIB_SUFFIX:=64 + endif + ifneq ($(findstring mips64,$(ARCH)),) + LIB_SUFFIX:=64 + endif else - UCLIBC_VERSION:= + LIBC_VERSION:= LIBGCC_VERSION:= endif -CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files) - -define Package/base-files$(TARGET) +define Package/base-files SECTION:=base CATEGORY:=Base system TITLE:=Base filesystem for OpenWrt @@ -42,7 +45,7 @@ define Package/base-files$(TARGET) $(call Config,network.lan.dns,ip,,LAN DNS server) endef -define Package/base-files$(TARGET)/conffiles +define Package/base-files/conffiles /etc/banner /etc/hosts /etc/inittab @@ -50,12 +53,11 @@ define Package/base-files$(TARGET)/conffiles /etc/passwd /etc/profile /etc/shells -/etc/ipkg.conf /etc/sysctl.conf $(call $(TARGET)/conffiles) endef -define Package/base-files$(TARGET)/description +define Package/base-files/description This package contains a base filesystem and system scripts for OpenWrt. endef @@ -70,11 +72,12 @@ endef define Package/libgcc $(call Package/gcc/Default) TITLE:=GCC support library - DEPENDS:=@!TARGET_avr32 @!NATIVE_TOOLCHAIN + DEPENDS+=@!(TARGET_avr32||TARGET_coldfire) endef define Package/libssp $(call Package/gcc/Default) + DEPENDS+=@SSP_SUPPORT TITLE:=GCC support library endef @@ -82,37 +85,48 @@ define Package/libstdcpp $(call Package/gcc/Default) NAME:=libstdc++ TITLE:=GNU Standard C++ Library v3 - DEPENDS:=@!NATIVE_TOOLCHAIN&&@INSTALL_LIBSTDCPP + DEPENDS+=@INSTALL_LIBSTDCPP endef -define Package/uclibc/Default +define Package/libc/Default SECTION:=libs CATEGORY:=Base system DEPENDS:=@!NATIVE_TOOLCHAIN - URL:=http://uclibc.org/ - VERSION:=$(UCLIBC_VERSION)$(UCLIBC_PATCHVER)-$(PKG_RELEASE) + VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE) + URL:=$(LIBC_URL) +endef + +define Package/libc +$(call Package/libc/Default) + TITLE:=C library endef define Package/libpthread -$(call Package/uclibc/Default) +$(call Package/libc/Default) TITLE:=POSIX thread library + DEPENDS:= +librt endef -define Package/uclibc -$(call Package/uclibc/Default) - TITLE:=C library embedded systems +define Package/librt +$(call Package/libc/Default) + TITLE:=POSIX.1b RealTime extension library endef define Package/ldd -$(call Package/uclibc/Default) +$(call Package/libc/Default) + SECTION:=utils + CATEGORY:=Utilities TITLE:=LDD trace utility endef define Package/ldconfig -$(call Package/uclibc/Default) +$(call Package/libc/Default) + SECTION:=utils + CATEGORY:=Utilities TITLE:=Shared library path configuration endef + define Build/Prepare mkdir -p $(PKG_BUILD_DIR) endef @@ -124,7 +138,7 @@ define Build/Compile $(call Build/Compile/Default) endef -define Package/base-files$(TARGET)/install +define Package/base-files/install $(CP) ./files/* $(1)/ if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \ $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \ @@ -135,24 +149,39 @@ define Package/base-files$(TARGET)/install if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \ $(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(1)/; \ fi + if [ -d $(PLATFORM_DIR)/$(PROFILE)/base-files/. ]; then \ + $(CP) $(PLATFORM_DIR)/$(PROFILE)/base-files/* $(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; \ + if [ -d $(PLATFORM_SUBDIR)/$(PROFILE)/base-files/. ]; then \ + $(CP) $(PLATFORM_SUBDIR)/$(PROFILE)/base-files/* $(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 - $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf + mkdir -p $(1)/CONTROL mkdir -p $(1)/dev mkdir -p $(1)/etc/crontabs + mkdir -p $(1)/etc/rc.d mkdir -p $(1)/jffs mkdir -p $(1)/lib/firmware + $(if $(LIB_SUFFIX),-ln -s lib $(1)/lib$(LIB_SUFFIX)) mkdir -p $(1)/mnt mkdir -p $(1)/proc mkdir -p $(1)/tmp mkdir -p $(1)/usr/lib + $(if $(LIB_SUFFIX),-ln -s lib $(1)/usr/lib$(LIB_SUFFIX)) mkdir -p $(1)/usr/bin mkdir -p $(1)/sys mkdir -p $(1)/www @@ -161,11 +190,11 @@ define Package/base-files$(TARGET)/install rm -f $(1)/var ln -sf /tmp $(1)/var mkdir -p $(1)/etc - ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf + 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 || \ + grep "$$$${conffile##$(1)}" $(1)/CONTROL/conffiles || \ echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \ fi \ done @@ -173,54 +202,87 @@ endef define Package/libgcc/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/ endef -ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4) - define Package/libssp/install +define Package/libssp/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/ - endef -endif + $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/ +endef 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/libstdc++.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_SO_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_SO_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_SO_VERSION).so $(1)/lib/; \ + done +endef + +define Package/libc/install +$(call Package/$(LIBC)/install,$1) +endef + +define Package/libc/install_lib + $(CP) $(filter-out %/libdl_pic.a,$(wildcard $(TOOLCHAIN_DIR)/usr/lib/lib*.a)) $(1)/lib/ + $(if $(wildcard $(TOOLCHAIN_DIR)/usr/lib/libc_so.a),$(CP) $(TOOLCHAIN_DIR)/usr/lib/libc_so.a $(1)/lib/libc_pic.a) + $(CP) $(TOOLCHAIN_DIR)/usr/lib/gcc/*/*/libgcc.a $(1)/lib/libgcc_s_pic.a endef define Package/libpthread/install $(INSTALL_DIR) $(1)/lib $(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/ - $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(UCLIBC_VERSION).so $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so $(1)/lib/ endef -define Package/uclibc/install +define Package/librt/install $(INSTALL_DIR) $(1)/lib - for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \ - $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \ - $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \ - done + $(CP) $(TOOLCHAIN_DIR)/lib/librt.so.* $(1)/lib/ + $(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so $(1)/lib/ endef define Package/ldd/install - $(INSTALL_DIR) $(1)/bin/ - $(CP) $(TOOLCHAIN_DIR)/target-utils/ldd $(1)/bin/ + $(INSTALL_DIR) $(1)/usr/bin/ + $(CP) $(TOOLCHAIN_DIR)/usr/bin/ldd $(1)/usr/bin/ endef define Package/ldconfig/install - $(INSTALL_DIR) $(1)/bin/ - $(CP) $(TOOLCHAIN_DIR)/target-utils/ldconfig $(1)/bin/ + $(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,base-files)) +$(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))