X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b7bfd6b6ea1bb7a7aa1b20ed240ace289cfcbead..727db54052cb31cafb13a2b39d441045bc716b44:/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 3e83c01d9..bec33c8e0 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -10,18 +10,17 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=12 +PKG_RELEASE:=13 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:= @@ -35,7 +34,7 @@ define Package/base-files$(TARGET) CATEGORY:=Base system TITLE:=Base filesystem 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) @@ -133,12 +132,18 @@ define Package/base-files$(TARGET)/install 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,r$(REV),g' $(1)/etc/banner + $(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 @@ -156,7 +161,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 + ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/ $(call Package/base-files/install-target,$(1)) for conffile in $(1)/etc/config/*; do \ if [ -f "$$$$conffile" ]; then \