# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1222721476 0
# Node ID 4d770d1f65a0895e4564f5dace0604862e24b878
# Parent  6227df6bbb79dc7e57bd4aa722989628dce77163
Rework the way EXPERIMENTAL architecture are marked as such, the same way kernels are handeld.
Fix marking EXPERIMENTAL kernel when using --prefix.

 /trunk/kconfig/kconfig.mk  |   44    22    22     0 ++++++++++++++++++++++----------------------
 /trunk/arch/ia64/config.in |    1     1     0     0 +
 /trunk/arch/sh/config.in   |    1     1     0     0 +
 3 files changed, 24 insertions(+), 22 deletions(-)

diff -r 6227df6bbb79 -r 4d770d1f65a0 arch/ia64/config.in
--- a/arch/ia64/config.in	Mon Sep 29 20:19:45 2008 +0000
+++ b/arch/ia64/config.in	Mon Sep 29 20:51:16 2008 +0000
@@ -1,4 +1,5 @@
 # ia64 specific config options
+# EXPERIMENTAL
 
 config ARCH_ia64
     select ARCH_SUPPORTS_BOTH_ENDIAN
diff -r 6227df6bbb79 -r 4d770d1f65a0 arch/sh/config.in
--- a/arch/sh/config.in	Mon Sep 29 20:19:45 2008 +0000
+++ b/arch/sh/config.in	Mon Sep 29 20:51:16 2008 +0000
@@ -1,4 +1,5 @@
 # Super-H specific configuration file
+# EXPERIMENTAL
 
 config ARCH_sh
     select ARCH_SUPPORTS_BOTH_ENDIAN
diff -r 6227df6bbb79 -r 4d770d1f65a0 kconfig/kconfig.mk
--- a/kconfig/kconfig.mk	Mon Sep 29 20:19:45 2008 +0000
+++ b/kconfig/kconfig.mk	Mon Sep 29 20:51:16 2008 +0000
@@ -39,32 +39,32 @@
 $(GEN_CONFIG_FILES): $(CT_TOP_DIR)/config.gen           \
                      $(CT_LIB_DIR)/kconfig/kconfig.mk
 
-$(CT_TOP_DIR)/config.gen:
+$(CT_TOP_DIR)/config.gen: $(KCONFIG_TOP)
 	@mkdir -p $(CT_TOP_DIR)/config.gen
 
 $(CT_TOP_DIR)/config.gen/arch.in: $(ARCH_CONFIG_FILES)
 	@echo '  IN   config.gen/arch.in'
-	@(echo "# Architectures menu";                                              \
-	  echo "# Generated file, do not edit!!!";                                  \
-	  echo "";                                                                  \
-	  for arch in $(ARCHS); do                                                  \
-	    _arch=$$(echo "$${arch}" |sed -r -s -e 's/[-.+]/_/g;');                 \
-	    echo "config ARCH_$${_arch}";                                           \
-	    echo "    bool";                                                        \
-	    printf "    prompt \"$${arch}";                                         \
-	    if [ -f $(CT_LIB_DIR)/arch/$${arch}/experimental ]; then                \
-	      echo " (EXPERIMENTAL)\"";                                             \
-	      echo "    depends on EXPERIMENTAL";                                   \
-	    else                                                                    \
-	      echo "\"";                                                            \
-	    fi;                                                                     \
-	    echo "if ARCH_$${_arch}";                                               \
-	    echo "config ARCH";                                                     \
-	    echo "    default \"$${arch}\" if ARCH_$${_arch}";                      \
-	    echo "source config/arch/$${arch}/config.in";                           \
-	    echo "endif";                                                           \
-	    echo "";                                                                \
-	  done;                                                                     \
+	@(echo "# Architectures menu";                                                              \
+	  echo "# Generated file, do not edit!!!";                                                  \
+	  echo "";                                                                                  \
+	  for arch in $(ARCHS); do                                                                  \
+	    _arch=$$(echo "$${arch}" |sed -r -s -e 's/[-.+]/_/g;');                                 \
+	    echo "config ARCH_$${_arch}";                                                           \
+	    echo "    bool";                                                                        \
+	    printf "    prompt \"$${arch}";                                                         \
+	    if grep -E '^# +EXPERIMENTAL$$' config/arch/$${arch}/config.in >/dev/null 2>&1; then    \
+	      echo " (EXPERIMENTAL)\"";                                                             \
+	      echo "    depends on EXPERIMENTAL";                                                   \
+	    else                                                                                    \
+	      echo "\"";                                                                            \
+	    fi;                                                                                     \
+	    echo "if ARCH_$${_arch}";                                                               \
+	    echo "config ARCH";                                                                     \
+	    echo "    default \"$${arch}\" if ARCH_$${_arch}";                                      \
+	    echo "source config/arch/$${arch}/config.in";                                           \
+	    echo "endif";                                                                           \
+	    echo "";                                                                                \
+	  done;                                                                                     \
 	 ) >$@
 
 $(CT_TOP_DIR)/config.gen/kernel.in: $(KERN_CONFIG_FILES)