X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fbase-files%2FMakefile;h=7abcd8b2b58d415fa2e30ef9af05888f32949636;hp=2a8ad7050e609997a20c7b18d521486e9de75a6f;hb=0cc78c202013a13896d42e9ed3264a3fe84bd1a3;hpb=50a164a2e09f43608af09ca043ae895289c0e91d diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 2a8ad7050e..ec69e0cb3c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,18 +1,20 @@ # -# Copyright (C) 2007 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. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=13 +PKG_RELEASE:=122 -PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ +PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ +PKG_BUILD_DEPENDS:=opkg/host include $(INCLUDE_DIR)/package.mk @@ -21,113 +23,66 @@ ifneq ($(DUMP),1) 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:= - 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 + 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$(TARGET)/conffiles -/etc/banner +define Package/base-files/conffiles /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/ +/etc/crontabs/ $(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 -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 -endef - -define Package/libssp -$(call Package/gcc/Default) - DEPENDS+=@SSP_SUPPORT - TITLE:=GCC support library -endef - -define Package/libstdcpp -$(call Package/gcc/Default) - NAME:=libstdc++ - TITLE:=GNU Standard C++ Library v3 - DEPENDS+=@INSTALL_LIBSTDCPP -endef - -define Package/uclibc/Default - SECTION:=libs - CATEGORY:=Base system - DEPENDS:=@!NATIVE_TOOLCHAIN - URL:=http://uclibc.org/ - VERSION:=$(UCLIBC_VERSION)$(UCLIBC_PATCHVER)-$(PKG_RELEASE) -endef - -define Package/libpthread -$(call Package/uclibc/Default) - TITLE:=POSIX thread library -endef - -define Package/uclibc -$(call Package/uclibc/Default) - TITLE:=C library embedded systems -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 +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) endef define Build/Compile/Default -endef -define Build/Compile - $(call Build/Compile/Default) endef +Build/Compile = $(Build/Compile/Default) -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)/; \ @@ -138,29 +93,38 @@ 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 + + $(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 - mkdir -p $(1)/jffs + mkdir -p $(1)/etc/rc.d + mkdir -p $(1)/overlay 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 @@ -170,65 +134,22 @@ define Package/base-files$(TARGET)/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 \ if [ -f "$$$$conffile" ]; then \ - grep "$$$$conffile" $(1)/CONTROL/conffiles || \ + grep "$$$${conffile##$(1)}" $(1)/CONTROL/conffiles || \ echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \ fi \ done endef -define Package/libgcc/install - $(INSTALL_DIR) $(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 - $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/ - endef -endif - -define Package/libstdcpp/install - $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/lib/ -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/ -endef - -define Package/uclibc/install - $(INSTALL_DIR) $(1)/lib - for file in ld$(LIB_SUFFIX)-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 -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)) +$(eval $(call BuildPackage,base-files))