From f1661e53c0e08c799c9566af3493c74f66accf4c Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Thu, 15 Dec 2005 10:43:15 +0000 Subject: [PATCH] Stefan Fiedler: scripts/config.func: use config.help.$swpid instead of config.help target/crystal: change label of ROCKCFG_TARGET_CRYSTAL_BUILDADDONS option and add a help text for it. Index: scripts/config.func =================================================================== [2005111523035723446] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6717 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/config.func | 6 +++--- target/crystal/config.hlp | 31 +++++++++++++++++++++++++++++++ target/crystal/config.in | 2 +- 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 target/crystal/config.hlp diff --git a/scripts/config.func b/scripts/config.func index e35d1c231..337929f3a 100644 --- a/scripts/config.func +++ b/scripts/config.func @@ -182,7 +182,7 @@ comment() { echo "COMMENT_$commentnr '$spacer$1'" >> config.dialog.$swpid # Hi, esden here, very ill stuff here I save the help - # strings here to a temporary file named config.help + # strings here to a temporary file named config.help.$swpid # this sed tr sandwitch formats the string so that # \n are masked and the Help strings are not killed some way if [ "$2" != "" ] ; then @@ -519,7 +519,7 @@ menu_end() { set_help() { bprof set_help start (echo -ne "$1 '$1:\n\n$2'" | sed 's,$,\\n,' | - tr -d '\n' | sed 's,\\n$,,'; echo ) >> config.help + tr -d '\n' | sed 's,\\n$,,'; echo ) >> config.help.$swpid bprof set_help stop } @@ -580,7 +580,7 @@ $item_name:\\ }" scripts/config*.hlp package/*/*/subconfig-*.hlp package/*/*/config*.hlp target/*/config*.hlp misc/*/config*.hlp misc/*/*/config*.hlp 2>/dev/null ) # Get help strings out of the temporary file. - tmp_text=$(grep "^$item_name" config.help | cut -f2- -d' ' | sed -e "s,^',," -e "s,'$,," ) + tmp_text=$(grep "^$item_name" config.help.$swpid | cut -f2- -d' ' | sed -e "s,^',," -e "s,'$,," ) # Let us see what we have ... if [ "$hlp_text" -a "$tmp_text" ] ; then diff --git a/target/crystal/config.hlp b/target/crystal/config.hlp new file mode 100644 index 000000000..061a4baea --- /dev/null +++ b/target/crystal/config.hlp @@ -0,0 +1,31 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/target/crystal/config.hlp +# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +ROCKCFG_TARGET_CRYSTAL_BUILDADDONS + Set this option to allow the inclusion of additional packages in your + Crystal target, e.g. using custom package selection. + + If unset, only packages flagged as CORE will be built for this target. + + If set, non-CORE packages will be listed to build in stage 9, after all + CORE packages have been created. In this case ROCKCFG_DO_REBUILD_STAGE + should also be set to actually perform stage 9 builds. diff --git a/target/crystal/config.in b/target/crystal/config.in index f89e57c23..d0bec53a0 100644 --- a/target/crystal/config.in +++ b/target/crystal/config.in @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -bool 'Also build the add-on packages for network install' \ +bool 'Also build add-on (non-CORE) packages' \ ROCKCFG_TARGET_CRYSTAL_BUILDADDONS 0 if [ $ROCKCFG_TARGET_CRYSTAL_BUILDADDONS = 1 ]