X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/48e7e69b2a42338442f218166ae93db78221ff43..7e450a1c869a5b227e3c91c4e71049059f1193e6:/package/base-files/Makefile?ds=sidebyside diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 376bd5334..30e90453e 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,22 +11,23 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files PKG_RELEASE:=8 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/base-files + +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 + REV:=0 endif - 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)-$(KERNEL) + UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null} + LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null} else -UCLIBC_VERSION:= -LIBGCC_VERSION:= + UCLIBC_VERSION:= + LIBGCC_VERSION:= endif CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files) @@ -34,41 +35,18 @@ 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 + 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) + $(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.0.0,LAN Network Mask) + $(call Config,network.lan.gateway,ip,,LAN Gateway) + $(call Config,network.lan.dns,ip,,LAN DNS server) 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 -endef - - define Package/base-files$(TARGET)/conffiles /etc/banner /etc/hosts @@ -84,61 +62,51 @@ endef define Package/libgcc SECTION:=libs - CATEGORY:=Libraries - DEFAULT:=y + CATEGORY:=Base system + DEPENDS:=@!NATIVE_TOOLCHAIN TITLE:=GCC support library + URL:=http://gcc.gnu.org/ VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) - DESCRIPTION:=$(TITLE) endef define Package/libpthread - $(call Package/base-files$(TARGET)) - DEFAULT:=n - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=@!NATIVE_TOOLCHAIN TITLE:=POSIX thread library - DESCRIPTION:=POSIX thread library + URL:=http://uclibc.org/ + VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) endef - define Package/uclibc - $(call Package/base-files$(TARGET)) + SECTION:=libs + CATEGORY:=Base system + DEPENDS:=@!NATIVE_TOOLCHAIN + TITLE:=C library embedded systems + URL:=http://uclibc.org/ VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) - TITLE:=C library - DESCRIPTION:=C library for embedded systems endef define Build/Prepare mkdir -p $(PKG_BUILD_DIR) endef - -define Build/Compile/ar7 - $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c -endef - -define Build/Compile/brcm - $(TARGET_CC) -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c +define Build/Compile/Default endef define Build/Compile - $(call Build/Compile/$(BOARD)) -endef - - -define Package/base-files$(TARGET)/install-ar7 - mkdir -p $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin -endef -define Package/base-files$(TARGET)/install-brcm - mkdir -p $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin + $(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 $(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 @@ -153,33 +121,46 @@ define Package/base-files$(TARGET)/install mkdir -p $(1)/usr/bin mkdir -p $(1)/sys mkdir -p $(1)/www - ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf 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 -m0755 -d $(1)/lib + $(INSTALL_DIR) $(1)/lib $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/ endef 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 +ifneq ($(DUMP),1) + -include $(PLATFORM_DIR)/base-files.mk +endif + $(eval $(call BuildPackage,base-files$(TARGET))) $(eval $(call BuildPackage,libgcc)) $(eval $(call BuildPackage,libpthread)) $(eval $(call BuildPackage,uclibc)) + +