X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/356535ffd7bc1343ce6bc2fc367f788cc2c1bd24..76c7aa6ffa09cf5e3467b989682e118eab48fda9:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 04a63b749..987bb5d54 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -10,21 +10,19 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=8 +PKG_RELEASE:=9 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) +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) - UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null} - LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null} + LIBGCC_VERSION:=$(GCC_VERSION) else UCLIBC_VERSION:= LIBGCC_VERSION:= @@ -40,6 +38,11 @@ define Package/base-files$(TARGET) This package contains a base filesystem and system scripts for OpenWrt. URL:=http://openwrt.org/ VERSION:=$(PKG_RELEASE)-$(REV) + $(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 @@ -55,31 +58,48 @@ define Package/base-files$(TARGET)/conffiles $(call $(TARGET)/conffiles) endef -define Package/libgcc +define Package/gcc/Default SECTION:=libs CATEGORY:=Base system DEPENDS:=@!NATIVE_TOOLCHAIN - TITLE:=GCC support library URL:=http://gcc.gnu.org/ VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) endef -define Package/libpthread +define Package/libgcc + $(call Package/gcc/Default) + TITLE:=GCC support library + DEPENDS:=@!LINUX_2_6_AVR32||@!NATIVE_TOOLCHAIN +endef + +define Package/libssp + $(call Package/gcc/Default) + TITLE:=GCC support library +endef + +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:=Libraries + CATEGORY:=Base system DEPENDS:=@!NATIVE_TOOLCHAIN - TITLE:=POSIX thread library URL:=http://uclibc.org/ - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) + VERSION:=$(UCLIBC_VERSION)$(UCLIBC_PATCHVER)-$(PKG_RELEASE) +endef + +define Package/libpthread + $(call Package/uclibc/Default) + TITLE:=POSIX thread library endef define Package/uclibc - SECTION:=libs - CATEGORY:=Base system - DEPENDS:=@!NATIVE_TOOLCHAIN + $(call Package/uclibc/Default) TITLE:=C library embedded systems - URL:=http://uclibc.org/ - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) endef define Build/Prepare @@ -94,16 +114,24 @@ define Build/Compile endef define Package/base-files$(TARGET)/install - $(CP) ./default/* $(1)/ - if [ -d $(PLATFORM_DIR)/base-files/. ]; then \ - $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \ + $(CP) ./files/* $(1)/ + 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)/; \ + fi + if [ "$(PROFILE)" != "Default" ]; then \ + if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \ + $(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \ + fi; \ fi $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner - $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf + $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),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 @@ -115,6 +143,7 @@ define Package/base-files$(TARGET)/install 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 \ @@ -125,29 +154,53 @@ define Package/base-files$(TARGET)/install endef define Package/libgcc/install - install -m0755 -d $(1)/lib - $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/ + $(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 -m0755 -d $(1)/lib - $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/ - $(CP) $(STAGING_DIR)/lib/libpthread-$(UCLIBC_VERSION).so $(1)/lib/ + $(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 -m0755 -d $(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/ldd/install + $(INSTALL_DIR) $(1)/bin/ + $(CP) $(TOOLCHAIN_DIR)/utils/ldd $(1)/bin/ +endef + +define Package/ldconfig/install + $(INSTALL_DIR) $(1)/bin/ + $(CP) $(TOOLCHAIN_DIR)/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))