X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ac7068d7d70aedd3867546cda3f2be9add6e5599..9c5c489cfea30a1aeedd001036211cef526c24c1:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 15920d52b..4abbdf7ac 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,5 +1,6 @@ # -# Copyright (C) 2007-2009 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org +# Copyright (C) 2010 Vertical Communications # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,9 +10,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=31 +PKG_RELEASE:=66 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ +PKG_BUILD_DEPENDS:=opkg/host include $(INCLUDE_DIR)/package.mk @@ -21,10 +23,7 @@ ifneq ($(DUMP),1) TARGET:=$(TARGET)-$(PROFILE) endif LIBGCC_VERSION:=$(GCC_VERSION) - ifeq ($(ARCH),x86_64) - LIB_SUFFIX:=64 - endif - ifneq ($(findstring mips64,$(ARCH)),) + ifneq ($(findstring $(ARCH) , mips64 x86_64 ),) LIB_SUFFIX:=64 endif else @@ -46,14 +45,18 @@ define Package/base-files endef define Package/base-files/conffiles -/etc/banner /etc/hosts /etc/inittab /etc/group /etc/passwd +/etc/shadow /etc/profile /etc/shells /etc/sysctl.conf +/etc/rc.local +/etc/sysupgrade.conf +/etc/config/ +/etc/dropbear/ $(call $(TARGET)/conffiles) endef @@ -61,26 +64,69 @@ define Package/base-files/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 URL:=http://gcc.gnu.org/ VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) endef + define Package/libgcc $(call Package/gcc/Default) TITLE:=GCC support library DEPENDS+=@!(TARGET_avr32||TARGET_coldfire) endef +define Package/libgcc/config + menu "Configuration" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc + + config LIBGCC_ROOT_DIR + string + prompt "libgcc shared library base directory" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc + default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN + default "/" if NATIVE_TOOLCHAIN + + config LIBGCC_FILE_SPEC + string + prompt "libgcc shared library files (use wildcards)" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc + default "./lib/libgcc_s.so.*" + + endmenu +endef + + define Package/libssp $(call Package/gcc/Default) DEPENDS+=@SSP_SUPPORT TITLE:=GCC support library endef +define Package/libssp/config + menu "Configuration" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp + + config LIBSPP_ROOT_DIR + string + prompt "libssp shared library base directory" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp + default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN + default "/" if NATIVE_TOOLCHAIN + + config LIBSSP_FILE_SPEC + string + prompt "libssp shared library files (use wildcards)" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp + default "./lib/libssp.so.*" + + endmenu +endef + + define Package/libstdcpp $(call Package/gcc/Default) NAME:=libstdc++ @@ -88,30 +134,118 @@ $(call Package/gcc/Default) DEPENDS+=@INSTALL_LIBSTDCPP endef +define Package/libstdcpp/config + menu "Configuration" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp + + config LIBSTDCPP_ROOT_DIR + string + prompt "libstdcpp shared library base directory" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp + default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN + default "/" if NATIVE_TOOLCHAIN + + config LIBSTDCPP_FILE_SPEC + string + prompt "libstdc++ shared library files (use wildcards)" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp + default "./lib/libstdc++.so.*" + + endmenu +endef + + define Package/libc/Default SECTION:=libs CATEGORY:=Base system - DEPENDS:=@!NATIVE_TOOLCHAIN VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE) +ifneq ($(TARGET_avr32)$(TARGET_coldfire),) + DEPENDS:=+libgcc +endif URL:=$(LIBC_URL) + PKG_FLAGS:=hold essential endef + define Package/libc $(call Package/libc/Default) TITLE:=C library endef +define Package/libc/config + menu "Configuration" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libc + + config LIBC_ROOT_DIR + string + prompt "libc shared library base directory" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libc + default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN + default "/" if NATIVE_TOOLCHAIN + + config LIBC_FILE_SPEC + string + prompt "libc shared library files (use wildcards)" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libc + default "./lib/ld{-*.so,-linux*.so.*} ./lib/lib{anl,c,cidn,crypt,dl,m,nsl,nss_dns,nss_files,resolv,util}{-*.so,.so.*}" + + endmenu +endef + + define Package/libpthread $(call Package/libc/Default) TITLE:=POSIX thread library - DEPENDS:= +librt endef +define Package/libpthread/config + menu "Configuration" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread + + config LIBPTHREAD_ROOT_DIR + string + prompt "libpthread shared library base directory" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread + default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN + default "/" if NATIVE_TOOLCHAIN + + config LIBPTHREAD_FILE_SPEC + string + prompt "libpthread shared library files (use wildcards)" + depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread + default "./lib/libpthread{-*.so,.so.*}" + + endmenu +endef + + define Package/librt $(call Package/libc/Default) TITLE:=POSIX.1b RealTime extension library + DEPENDS:=+libpthread endef +define Package/librt/config + menu "Configuration" + depends EXTERNAL_TOOLCHAIN && PACKAGE_librt + + config LIBRT_ROOT_DIR + string + prompt "librt shared library base directory" + depends EXTERNAL_TOOLCHAIN && PACKAGE_librt + default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN + default "/" if NATIVE_TOOLCHAIN + + config LIBRT_FILE_SPEC + string + prompt "librt shared library files (use wildcards)" + depends EXTERNAL_TOOLCHAIN && PACKAGE_librt + default "./lib/librt{-*.so,.so.*}" + + endmenu +endef + + define Package/ldd $(call Package/libc/Default) SECTION:=utils @@ -119,6 +253,27 @@ $(call Package/libc/Default) TITLE:=LDD trace utility endef +define Package/ldd/config + menu "Configuration" + depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd + + config LDD_ROOT_DIR + string + prompt "ldd trace utility base directory" + depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd + default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN + default "/" if NATIVE_TOOLCHAIN + + config LDD_FILE_SPEC + string + prompt "ldd trace utility file" + depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd + default "./usr/bin/ldd" + + endmenu +endef + + define Package/ldconfig $(call Package/libc/Default) SECTION:=utils @@ -126,6 +281,44 @@ $(call Package/libc/Default) TITLE:=Shared library path configuration endef +define Package/ldconfig/config + menu "Configuration" + depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig + + config LDCONFIG_ROOT_DIR + string + prompt "ldconfig base directory" + depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig + default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN + default "/" if NATIVE_TOOLCHAIN + + config LDCONFIG_FILE_SPEC + string + prompt "ldconfig file" + depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig + default "./sbin/ldconfig" + + endmenu +endef + + +ifneq ($(CONFIG_PREINITOPT),) +define ImageConfigOptions + mkdir -p $(1)/lib/preinit + echo 'pi_suppress_stderr="$(CONFIG_TARGET_PREINIT_SUPPRESS_STDERR)"' >$(1)/lib/preinit/00_preinit.conf + echo 'fs_failsafe_wait_timeout=$(if $(CONFIG_TARGET_PREINIT_TIMEOUT),$(CONFIG_TARGET_PREINIT_TIMEOUT),2)' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_init_path=$(if $(CONFIG_TARGET_INIT_PATH),$(CONFIG_TARGET_INIT_PATH),"/bin:/sbin:/usr/bin:/usr/sbin")' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_init_env=$(if $(CONFIG_TARGET_INIT_ENV),$(CONFIG_TARGET_INIT_ENV),"")' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_init_cmd=$(if $(CONFIG_TARGET_INIT_CMD),$(CONFIG_TARGET_INIT_CMD),"/sbin/init")' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_init_suppress_stderr="$(CONFIG_TARGET_INIT_SUPPRESS_STDERR)"' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_ifname=$(if $(CONFIG_TARGET_PREINIT_IFNAME),$(CONFIG_TARGET_PREINIT_IFNAME),"")' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_ip=$(if $(CONFIG_TARGET_PREINIT_IP),$(CONFIG_TARGET_PREINIT_IP),"192.168.1.1")' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_netmask=$(if $(CONFIG_TARGET_PREINIT_NETMASK),$(CONFIG_TARGET_PREINIT_NETMASK),"255.255.255.0")' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_broadcast=$(if $(CONFIG_TARGET_PREINIT_BROADCAST),$(CONFIG_TARGET_PREINIT_BROADCAST),"192.168.1.255")' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_preinit_net_messages="$(CONFIG_TARGET_PREINIT_SHOW_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_preinit_no_failsafe_netmsg="$(CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf +endef +endif define Build/Prepare mkdir -p $(PKG_BUILD_DIR) @@ -174,7 +367,7 @@ define Package/base-files/install mkdir -p $(1)/dev mkdir -p $(1)/etc/crontabs mkdir -p $(1)/etc/rc.d - mkdir -p $(1)/jffs + mkdir -p $(1)/overlay mkdir -p $(1)/lib/firmware $(if $(LIB_SUFFIX),-ln -s lib $(1)/lib$(LIB_SUFFIX)) mkdir -p $(1)/mnt @@ -191,6 +384,7 @@ define Package/base-files/install ln -sf /tmp $(1)/var mkdir -p $(1)/etc ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/ + $(call ImageConfigOptions,$(1)) $(call Package/base-files/install-target,$(1)) for conffile in $(1)/etc/config/*; do \ if [ -f "$$$$conffile" ]; then \ @@ -200,78 +394,174 @@ define Package/base-files/install done endef -define Package/libgcc/install +ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) + + define Package/libgcc/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/ -endef + $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/ + endef -define Package/libssp/install + define Package/libssp/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/ -endef + $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/ + endef -define Package/libstdcpp/install + define Package/libstdcpp/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/usr/lib/ -endef + $(CP) $(TOOLCHAIN_DIR)/lib/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) + 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 + define Package/glibc/install + $(CP) ./glibc-files/* $(1)/ $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/ - $(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_SO_VERSION).so $(1)/lib/ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/ld*.so.* \ + $(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/; \ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/$$$$file.so.* \ + $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so \ + $(1)/lib/; \ done -endef + endef -define Package/eglibc/install -$(call Package/glibc/install,$1) -endef + define Package/eglibc/install + $(call Package/glibc/install,$1) + endef -define Package/uClibc/install + 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/; \ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/ld*-uClibc.so.* \ + $(TOOLCHAIN_DIR)/lib/ld*-uClibc-$(LIBC_SO_VERSION).so \ + $(1)/lib/ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/libc.so.* \ + $(TOOLCHAIN_DIR)/lib/libuClibc-$(LIBC_SO_VERSION).so \ + $(1)/lib/ + for file in libcrypt libdl libm libutil; do \ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/$$$$file.so.* \ + $(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 + endef + + define Package/libc/install + $(call Package/$(LIBC)/install,$1) + endef + + define Package/libc/install_lib + $(CP) $(filter-out %/libdl_pic.a %/libpthread_pic.a %/libresolv_pic.a,$(wildcard $(TOOLCHAIN_DIR)/lib/lib*.a)) $(1)/lib/ + $(if $(wildcard $(TOOLCHAIN_DIR)/lib/libc_so.a),$(CP) $(TOOLCHAIN_DIR)/lib/libc_so.a $(1)/lib/libc_pic.a) + $(if $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map), \ + $(CP) $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a $(1)/lib/libgcc_s_pic.a; \ + $(CP) $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map $(1)/lib/libgcc_s_pic.map \ + ) + endef -define Package/libpthread/install + define Package/libpthread/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/ - $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so $(1)/lib/ -endef + $(CP) \ + $(TOOLCHAIN_DIR)/lib/libpthread.so.* \ + $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \ + $(1)/lib/ + endef + + define Package/libpthread/install_lib + $(if $(wildcard $(TOOLCHAIN_DIR)/lib/libpthread_so.a),$(CP) $(TOOLCHAIN_DIR)/lib/libpthread_so.a $(1)/lib/libpthread_pic.a) + endef -define Package/librt/install + define Package/librt/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/librt.so.* $(1)/lib/ - $(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so $(1)/lib/ -endef + $(CP) \ + $(TOOLCHAIN_DIR)/lib/librt.so.* \ + $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so \ + $(1)/lib/ + endef -define Package/ldd/install + define Package/ldd/install $(INSTALL_DIR) $(1)/usr/bin/ - $(CP) $(TOOLCHAIN_DIR)/usr/bin/ldd $(1)/usr/bin/ -endef + $(CP) $(TOOLCHAIN_DIR)/bin/ldd $(1)/usr/bin/ + endef -define Package/ldconfig/install + define Package/ldconfig/install $(INSTALL_DIR) $(1)/sbin/ $(CP) $(TOOLCHAIN_DIR)/sbin/ldconfig $(1)/sbin/ -endef + endef + +else + + define Package/libgcc/install + for file in $(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)); do \ + dir=`dirname $$$$file` ; \ + $(INSTALL_DIR) $(1)/$$$$dir ; \ + $(CP) $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + done + endef + + define Package/libssp/install + for file in $(call qstrip,$(CONFIG_LIBSSP_FILE_SPEC)); do \ + dir=`dirname $$$$file` ; \ + $(INSTALL_DIR) $(1)/$$$$dir ; \ + $(CP) $(call qstrip,$(CONFIG_LIBSSP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + done + endef + + define Package/libstdcpp/install + for file in $(call qstrip,$(CONFIG_LIBSTDCPP_FILE_SPEC)); do \ + dir=`dirname $$$$file` ; \ + $(INSTALL_DIR) $(1)/$$$$dir ; \ + $(CP) $(call qstrip,$(CONFIG_LIBSTDCPP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + done + endef + + define Package/libc/install + for file in $(call qstrip,$(CONFIG_LIBC_FILE_SPEC)); do \ + dir=`dirname $$$$file` ; \ + $(INSTALL_DIR) $(1)/$$$$dir ; \ + $(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + done + endef + + define Package/libpthread/install + for file in $(call qstrip,$(CONFIG_LIBPTHREAD_FILE_SPEC)); do \ + dir=`dirname $$$$file` ; \ + $(INSTALL_DIR) $(1)/$$$$dir ; \ + $(CP) $(call qstrip,$(CONFIG_LIBPTHREAD_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + done + endef + + define Package/librt/install + for file in $(call qstrip,$(CONFIG_LIBRT_FILE_SPEC)); do \ + dir=`dirname $$$$file` ; \ + $(INSTALL_DIR) $(1)/$$$$dir ; \ + $(CP) $(call qstrip,$(CONFIG_LIBRT_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + done + endef + + define Package/ldd/install + for file in $(call qstrip,$(CONFIG_LDD_FILE_SPEC)); do \ + dir=`dirname $$$$file` ; \ + $(INSTALL_DIR) $(1)/$$$$dir ; \ + $(CP) $(call qstrip,$(CONFIG_LDD_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + done + endef + + define Package/ldconfig/install + for file in $(call qstrip,$(CONFIG_LDCONFIG_FILE_SPEC)); do \ + dir=`dirname $$$$file` ; \ + $(INSTALL_DIR) $(1)/$$$$dir ; \ + $(CP) $(call qstrip,$(CONFIG_LDCONFIG_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \ + done + endef + +endif ifneq ($(DUMP),1) -include $(PLATFORM_DIR)/base-files.mk