X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Fbase-files%2FMakefile;h=577d320b2bb896aa4a9b842803c189b2251ecb68;hb=73704a5703a66809b9e280791824a1a5147244e9;hp=5af1414d4e37f483484f4ffb23ceeb3dd2b94b0d;hpb=105a602ecf14e4afe29f88e062496135bce41dc7;p=oweals%2Fopenwrt.git diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 5af1414d4e..577d320b2b 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -13,17 +13,18 @@ PKG_NAME:=base-files PKG_RELEASE:=8 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) +PKG_FILE_DEPEND:=$(PLATFORM_DIR) 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} + UCLIBC_EXTRA_VERSION:=${shell cat $(STAGING_DIR)/uclibc_extra_version 2>/dev/null} LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null} else UCLIBC_VERSION:= @@ -40,34 +41,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) -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 -endef - -define -xscale-2.6/conffiles -/etc/config/network + $(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 @@ -83,68 +61,62 @@ 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 - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=@!NATIVE_TOOLCHAIN - TITLE:=POSIX thread library - URL:=http://uclibc.org/ - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) +define Package/libgcc + $(call Package/gcc/Default) + TITLE:=GCC support library endef -define Package/uclibc +define Package/libssp + $(call Package/gcc/Default) + TITLE:=GCC support library +endef + +define Package/uclibc/Default SECTION:=libs CATEGORY:=Base system DEPENDS:=@!NATIVE_TOOLCHAIN - TITLE:=C library embedded systems URL:=http://uclibc.org/ VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -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) -I src -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 Build/Prepare + mkdir -p $(PKG_BUILD_DIR) endef - -define Package/base-files$(TARGET)/install-ar7 - mkdir -p $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin +define Build/Compile/Default endef -define Package/base-files$(TARGET)/install-brcm - rm -f $(1)/etc/config/network - mkdir -p $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin +define Build/Compile + $(call Build/Compile/Default) endef define Package/base-files$(TARGET)/install - $(CP) ./default/* $(1)/ - if [ -d $(BOARD) ]; then \ - $(CP) $(BOARD)/* $(1)/; \ + $(CP) ./files/* $(1)/ + if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \ + $(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \ fi - if [ -d $(BOARD)-$(KERNEL) ]; then \ - $(CP) $(BOARD)-$(KERNEL)/* $(1)/; \ + 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 @@ -163,29 +135,58 @@ define Package/base-files$(TARGET)/install rm -f $(1)/var ln -sf /tmp $(1)/var mkdir -p $(1)/etc -$(call Package/base-files$(TARGET)/install-$(BOARD),$(1)) + 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 -m0755 -d $(1)/lib + $(INSTALL_DIR) $(1)/lib $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/ endef +ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4) + define Package/libssp/install + $(INSTALL_DIR) $(1)/lib + $(CP) $(STAGING_DIR)/lib/libssp.so.* $(1)/lib/ + endef +endif + define Package/libpthread/install - install -m0755 -d $(1)/lib + $(INSTALL_DIR) $(1)/lib $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/ $(CP) $(STAGING_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/; \ done endef +define Package/ldd/install + $(INSTALL_DIR) $(1)/bin/ + $(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/utils/ldd $(1)/bin/ +endef + +define Package/ldconfig/install + $(INSTALL_DIR) $(1)/bin/ + $(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/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,libpthread)) $(eval $(call BuildPackage,uclibc))