X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fbase-files%2FMakefile;h=ff48f5d318b7d8ed21f64f935b0a0a50296289f9;hp=bd77d3438254aa7d545ae4702b1eb1679a673f32;hb=164eb19df80f2ccb66d1c048c9ad2218d0c52f11;hpb=cd10146d2e35f93ee6dce196ebd1430a4b2b9705 diff --git a/package/base-files/Makefile b/package/base-files/Makefile index bd77d34382..ff48f5d318 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2010 OpenWrt.org +# Copyright (C) 2007-2012 OpenWrt.org # Copyright (C) 2010 Vertical Communications # # This is free software, licensed under the GNU General Public License v2. @@ -8,9 +8,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=60 +PKG_RELEASE:=109 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=opkg/host @@ -22,34 +23,26 @@ ifneq ($(DUMP),1) ifneq ($(wildcard $(PLATFORM_DIR)/base-files-$(PROFILE) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)),) TARGET:=$(TARGET)-$(PROFILE) endif - LIBGCC_VERSION:=$(GCC_VERSION) ifneq ($(findstring $(ARCH) , mips64 x86_64 ),) LIB_SUFFIX:=64 endif -else - LIBC_VERSION:= - LIBGCC_VERSION:= endif define Package/base-files SECTION:=base CATEGORY:=Base system + DEPENDS:=+netifd +libc TITLE:=Base filesystem for OpenWrt URL:=http://openwrt.org/ 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/conffiles -/etc/banner /etc/hosts /etc/inittab /etc/group /etc/passwd +/etc/shadow /etc/profile /etc/shells /etc/sysctl.conf @@ -57,6 +50,7 @@ define Package/base-files/conffiles /etc/sysupgrade.conf /etc/config/ /etc/dropbear/ +/etc/crontabs/ $(call $(TARGET)/conffiles) endef @@ -64,243 +58,6 @@ 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 - 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++ - TITLE:=GNU Standard C++ Library v3 - 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 - VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE) -ifneq ($(TARGET_avr32)$(TARGET_coldfire),) - DEPENDS:=+libgcc -endif - URL:=$(LIBC_URL) -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 -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 - CATEGORY:=Utilities - 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 - CATEGORY:=Utilities - 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 @@ -315,7 +72,7 @@ define ImageConfigOptions 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_SUPPRESS_FAILSAFE_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 @@ -323,11 +80,8 @@ define Build/Prepare mkdir -p $(PKG_BUILD_DIR) endef -define Build/Compile/Default -endef - define Build/Compile - $(call Build/Compile/Default) + endef define Package/base-files/install @@ -355,13 +109,12 @@ define Package/base-files/install $(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 + + $(VERSION_SED) \ + $(1)/etc/banner \ + $(1)/etc/openwrt_version \ + $(1)/etc/openwrt_release + mkdir -p $(1)/CONTROL mkdir -p $(1)/dev mkdir -p $(1)/etc/crontabs @@ -383,6 +136,10 @@ 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/ + + chmod 0600 $(1)/etc/shadow + chmod 1777 $(1)/tmp + $(call ImageConfigOptions,$(1)) $(call Package/base-files/install-target,$(1)) for conffile in $(1)/etc/config/*; do \ @@ -393,184 +150,8 @@ define Package/base-files/install done endef -ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) - - define Package/libgcc/install - $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/ - endef - - define Package/libssp/install - $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/ - endef - - define Package/libstdcpp/install - $(INSTALL_DIR) $(1)/usr/lib - $(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) - - define Package/glibc/install - $(INSTALL_DIR) $(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.* \ - $(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 - $(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 libnsl libresolv 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 %/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 - $(INSTALL_DIR) $(1)/lib - $(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 - $(INSTALL_DIR) $(1)/lib - $(CP) \ - $(TOOLCHAIN_DIR)/lib/librt.so.* \ - $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so \ - $(1)/lib/ - endef - - define Package/ldd/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(CP) $(TOOLCHAIN_DIR)/bin/ldd $(1)/usr/bin/ - endef - - define Package/ldconfig/install - $(INSTALL_DIR) $(1)/sbin/ - $(CP) $(TOOLCHAIN_DIR)/sbin/ldconfig $(1)/sbin/ - 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 endif $(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,librt)) -$(eval $(call BuildPackage,ldd)) -$(eval $(call BuildPackage,ldconfig))