X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/76c7aa6ffa09cf5e3467b989682e118eab48fda9..cc3cf69f41c1e939c02ec9602b7caaee9fb9cf49:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 987bb5d54..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,18 +10,17 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=9 +PKG_RELEASE:=12 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ -REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ) -ifeq ($(REV),) - REV:=0 -endif include $(INCLUDE_DIR)/package.mk ifneq ($(DUMP),1) - TARGET:=-$(BOARD)-$(KERNEL) + 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:= @@ -34,10 +33,8 @@ define Package/base-files$(TARGET) SECTION:=base CATEGORY:=Base system TITLE:=Base filesystem for OpenWrt - DESCRIPTION:=\ - This package contains a base filesystem and system scripts for OpenWrt. URL:=http://openwrt.org/ - VERSION:=$(PKG_RELEASE)-$(REV) + 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) @@ -58,6 +55,10 @@ 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 @@ -67,18 +68,18 @@ define Package/gcc/Default endef define Package/libgcc - $(call Package/gcc/Default) +$(call Package/gcc/Default) TITLE:=GCC support library - DEPENDS:=@!LINUX_2_6_AVR32||@!NATIVE_TOOLCHAIN + DEPENDS:=@!TARGET_avr32 @!NATIVE_TOOLCHAIN endef define Package/libssp - $(call Package/gcc/Default) +$(call Package/gcc/Default) TITLE:=GCC support library endef define Package/libstdcpp - $(call Package/gcc/Default) +$(call Package/gcc/Default) NAME:=libstdc++ TITLE:=GNU Standard C++ Library v3 DEPENDS:=@!NATIVE_TOOLCHAIN&&@INSTALL_LIBSTDCPP @@ -93,15 +94,25 @@ define Package/uclibc/Default endef define Package/libpthread - $(call Package/uclibc/Default) +$(call Package/uclibc/Default) TITLE:=POSIX thread library endef define Package/uclibc - $(call Package/uclibc/Default) +$(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 +endef + define Build/Prepare mkdir -p $(PKG_BUILD_DIR) endef @@ -118,16 +129,22 @@ define Package/base-files$(TARGET)/install if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \ $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \ fi - if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \ - $(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \ + if [ -d $(PLATFORM_DIR)/base-files/. ]; then \ + $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \ fi - if [ "$(PROFILE)" != "Default" ]; then \ - if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \ - $(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \ - fi; \ + if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \ + $(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(1)/; \ fi - $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner - $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf + $(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 @@ -139,6 +156,7 @@ define Package/base-files$(TARGET)/install mkdir -p $(1)/usr/bin mkdir -p $(1)/sys mkdir -p $(1)/www + mkdir -p $(1)/root ln -sf /proc/mounts $(1)/etc/mtab rm -f $(1)/var ln -sf /tmp $(1)/var @@ -186,12 +204,12 @@ endef define Package/ldd/install $(INSTALL_DIR) $(1)/bin/ - $(CP) $(TOOLCHAIN_DIR)/utils/ldd $(1)/bin/ + $(CP) $(TOOLCHAIN_DIR)/target-utils/ldd $(1)/bin/ endef define Package/ldconfig/install $(INSTALL_DIR) $(1)/bin/ - $(CP) $(TOOLCHAIN_DIR)/utils/ldconfig $(1)/bin/ + $(CP) $(TOOLCHAIN_DIR)/target-utils/ldconfig $(1)/bin/ endef ifneq ($(DUMP),1) @@ -204,3 +222,5 @@ $(eval $(call BuildPackage,libssp)) $(eval $(call BuildPackage,libstdcpp)) $(eval $(call BuildPackage,libpthread)) $(eval $(call BuildPackage,uclibc)) +$(eval $(call BuildPackage,ldd)) +$(eval $(call BuildPackage,ldconfig))