[x86] grub: Natively build grub only on x86 linux hosts, cross compile everywhere...

[openwrt.git] / package / base-files / Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1ef64ac..bec33c8 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ 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/
 
@@ -18,6 +18,9 @@ include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
   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:=<UCLIBC_VERSION>
@@ -129,9 +132,15 @@ 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,$(REVISION),g' $(1)/etc/banner
@@ -152,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 \