X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/02cdebbb91a33d8e24da1c94a9d93ac39be168a7..cc3cf69f41c1e939c02ec9602b7caaee9fb9cf49:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b0fd72c76..1277de452 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,65 +10,38 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=8 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/base-files +PKG_RELEASE:=12 -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} -LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version} + TARGET:=-$(BOARD) + ifneq ($(wildcard $(PLATFORM_DIR)/base-files-$(PROFILE) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)),) + TARGET:=$(TARGET)-$(PROFILE) + endif + LIBGCC_VERSION:=$(GCC_VERSION) else -UCLIBC_VERSION:= -LIBGCC_VERSION:= + UCLIBC_VERSION:= + LIBGCC_VERSION:= endif CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files) define Package/base-files$(TARGET) -SECTION:=base -CATEGORY:=Base system -DEFAULT:=y -TITLE:=OpenWrt system scripts -DESCRIPTION:=Base filesystem for OpenWrt -VERSION:=$(PKG_RELEASE) -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 + SECTION:=base + CATEGORY:=Base system + 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 -xscale-2.6/conffiles -/etc/config/network -endef - - define Package/base-files$(TARGET)/conffiles /etc/banner /etc/hosts @@ -82,61 +55,100 @@ define Package/base-files$(TARGET)/conffiles $(call $(TARGET)/conffiles) endef +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 + URL:=http://gcc.gnu.org/ + VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) +endef + define Package/libgcc -SECTION:=libs -CATEGORY:=Libraries -DEFAULT:=y -TITLE:=GCC support library -VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) -DESCRIPTION:=$(TITLE) +$(call Package/gcc/Default) + TITLE:=GCC support library + DEPENDS:=@!TARGET_avr32 @!NATIVE_TOOLCHAIN endef -define Package/uclibc -$(call Package/base-files$(TARGET)) -VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) -TITLE:=C library -DESCRIPTION:=C library for embedded systems +define Package/libssp +$(call Package/gcc/Default) + TITLE:=GCC support library endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) +define Package/libstdcpp +$(call Package/gcc/Default) + NAME:=libstdc++ + TITLE:=GNU Standard C++ Library v3 + DEPENDS:=@!NATIVE_TOOLCHAIN&&@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 Build/Compile/ar7 - $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c +define Package/libpthread +$(call Package/uclibc/Default) + TITLE:=POSIX thread library endef -define Build/Compile/brcm - $(TARGET_CC) -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c +define Package/uclibc +$(call Package/uclibc/Default) + TITLE:=C library embedded systems endef -define Build/Compile -$(call Build/Compile/$(BOARD)) +define Package/ldd +$(call Package/uclibc/Default) + TITLE:=LDD trace utility endef +define Package/ldconfig +$(call Package/uclibc/Default) + 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 Package/base-files$(TARGET)/install-brcm - mkdir -p $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin + +define Build/Compile/Default +endef + +define Build/Compile + $(call Build/Compile/Default) endef define Package/base-files$(TARGET)/install -$(call Package/base-files$(TARGET)/install-$(BOARD),$(1)) - $(CP) ./default/* $(1)/ - if [ -d $(BOARD)-$(KERNEL) ]; then \ - $(CP) $(BOARD)-$(KERNEL)/* $(1)/; \ + $(CP) ./files/* $(1)/ + if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \ + $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \ fi - $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner - $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf + if [ -d $(PLATFORM_DIR)/base-files/. ]; then \ + $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \ + fi + if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \ + $(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(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 \ + ) + $(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)/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 @@ -144,26 +156,71 @@ $(call Package/base-files$(TARGET)/install-$(BOARD),$(1)) mkdir -p $(1)/usr/bin mkdir -p $(1)/sys mkdir -p $(1)/www - ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf + mkdir -p $(1)/root ln -sf /proc/mounts $(1)/etc/mtab rm -f $(1)/var ln -sf /tmp $(1)/var mkdir -p $(1)/etc + ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf + $(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_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib/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/libssp.so.* $(1)/lib/ + endef +endif + +define Package/libstdcpp/install + $(INSTALL_DIR) $(1)/lib + $(CP) $(TOOLCHAIN_DIR)/lib/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 - mkdir -p $(1)/lib + $(INSTALL_DIR) $(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/; \ + $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \ + $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \ done endef -define Package/libgcc/install - mkdir -p $(1)/lib - $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/ +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))