Rework the way EXPERIMENTAL architecture are marked as such, the same way kernels are handeld.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Sep 29 20:51:16 2008 +0000 (2008-09-29)
changeset 8914d770d1f65a0
parent 890 6227df6bbb79
child 892 187d34a9adf4
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(-)
arch/ia64/config.in
arch/ia64/experimental
arch/sh/config.in
arch/sh/experimental
kconfig/kconfig.mk
     1.1 --- a/arch/ia64/config.in	Mon Sep 29 20:19:45 2008 +0000
     1.2 +++ b/arch/ia64/config.in	Mon Sep 29 20:51:16 2008 +0000
     1.3 @@ -1,4 +1,5 @@
     1.4  # ia64 specific config options
     1.5 +# EXPERIMENTAL
     1.6  
     1.7  config ARCH_ia64
     1.8      select ARCH_SUPPORTS_BOTH_ENDIAN
     2.1 --- a/arch/sh/config.in	Mon Sep 29 20:19:45 2008 +0000
     2.2 +++ b/arch/sh/config.in	Mon Sep 29 20:51:16 2008 +0000
     2.3 @@ -1,4 +1,5 @@
     2.4  # Super-H specific configuration file
     2.5 +# EXPERIMENTAL
     2.6  
     2.7  config ARCH_sh
     2.8      select ARCH_SUPPORTS_BOTH_ENDIAN
     3.1 --- a/kconfig/kconfig.mk	Mon Sep 29 20:19:45 2008 +0000
     3.2 +++ b/kconfig/kconfig.mk	Mon Sep 29 20:51:16 2008 +0000
     3.3 @@ -39,32 +39,32 @@
     3.4  $(GEN_CONFIG_FILES): $(CT_TOP_DIR)/config.gen           \
     3.5                       $(CT_LIB_DIR)/kconfig/kconfig.mk
     3.6  
     3.7 -$(CT_TOP_DIR)/config.gen:
     3.8 +$(CT_TOP_DIR)/config.gen: $(KCONFIG_TOP)
     3.9  	@mkdir -p $(CT_TOP_DIR)/config.gen
    3.10  
    3.11  $(CT_TOP_DIR)/config.gen/arch.in: $(ARCH_CONFIG_FILES)
    3.12  	@echo '  IN   config.gen/arch.in'
    3.13 -	@(echo "# Architectures menu";                                              \
    3.14 -	  echo "# Generated file, do not edit!!!";                                  \
    3.15 -	  echo "";                                                                  \
    3.16 -	  for arch in $(ARCHS); do                                                  \
    3.17 -	    _arch=$$(echo "$${arch}" |sed -r -s -e 's/[-.+]/_/g;');                 \
    3.18 -	    echo "config ARCH_$${_arch}";                                           \
    3.19 -	    echo "    bool";                                                        \
    3.20 -	    printf "    prompt \"$${arch}";                                         \
    3.21 -	    if [ -f $(CT_LIB_DIR)/arch/$${arch}/experimental ]; then                \
    3.22 -	      echo " (EXPERIMENTAL)\"";                                             \
    3.23 -	      echo "    depends on EXPERIMENTAL";                                   \
    3.24 -	    else                                                                    \
    3.25 -	      echo "\"";                                                            \
    3.26 -	    fi;                                                                     \
    3.27 -	    echo "if ARCH_$${_arch}";                                               \
    3.28 -	    echo "config ARCH";                                                     \
    3.29 -	    echo "    default \"$${arch}\" if ARCH_$${_arch}";                      \
    3.30 -	    echo "source config/arch/$${arch}/config.in";                           \
    3.31 -	    echo "endif";                                                           \
    3.32 -	    echo "";                                                                \
    3.33 -	  done;                                                                     \
    3.34 +	@(echo "# Architectures menu";                                                              \
    3.35 +	  echo "# Generated file, do not edit!!!";                                                  \
    3.36 +	  echo "";                                                                                  \
    3.37 +	  for arch in $(ARCHS); do                                                                  \
    3.38 +	    _arch=$$(echo "$${arch}" |sed -r -s -e 's/[-.+]/_/g;');                                 \
    3.39 +	    echo "config ARCH_$${_arch}";                                                           \
    3.40 +	    echo "    bool";                                                                        \
    3.41 +	    printf "    prompt \"$${arch}";                                                         \
    3.42 +	    if grep -E '^# +EXPERIMENTAL$$' config/arch/$${arch}/config.in >/dev/null 2>&1; then    \
    3.43 +	      echo " (EXPERIMENTAL)\"";                                                             \
    3.44 +	      echo "    depends on EXPERIMENTAL";                                                   \
    3.45 +	    else                                                                                    \
    3.46 +	      echo "\"";                                                                            \
    3.47 +	    fi;                                                                                     \
    3.48 +	    echo "if ARCH_$${_arch}";                                                               \
    3.49 +	    echo "config ARCH";                                                                     \
    3.50 +	    echo "    default \"$${arch}\" if ARCH_$${_arch}";                                      \
    3.51 +	    echo "source config/arch/$${arch}/config.in";                                           \
    3.52 +	    echo "endif";                                                                           \
    3.53 +	    echo "";                                                                                \
    3.54 +	  done;                                                                                     \
    3.55  	 ) >$@
    3.56  
    3.57  $(CT_TOP_DIR)/config.gen/kernel.in: $(KERN_CONFIG_FILES)