Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 17 years ago
parent
commit
8e610e2697
2 changed files with 24 additions and 24 deletions
  1. +1
    -1
      package/base/bash/postconfig.in
  2. +23
    -23
      scripts/config.in

+ 1
- 1
package/base/bash/postconfig.in

@ -1,5 +1,5 @@
# We rely on bash so heavily that it makes no sense to disable default bash, imho.
# Enable default bash and build non-default bash in stages 5 and 9.
pkgfilter sed -e "/ bash=[^ ]* / { h ; s,^\(.\) [^ ]\{9\}\(.\) ,\1 -----5---\2 , } ; \
pkgfilter sed -e "/ bash=[^ ]* / { h ; s,^\(.\) [^ ]\{9\}\(.\) ,\1 -X---5---\2 , } ; \
/ bash=$ROCKCFG_PKG_BASH_DEFAULT / { x ; s,^. ,X , }"

+ 23
- 23
scripts/config.in

@ -263,6 +263,29 @@ fi
include "$swpdir/config.in.tmp"
expert_end
[ "$ROCKCFG_CROSSBUILD" = 1 ] && ROCKCFG_ID="$ROCKCFG_ID-cross"
[ "$ROCKCFG_PSEUDONATIVE" = 1 ] && ROCKCFG_ID="$ROCKCFG_ID-pseudonative"
ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_TARGET"
[ $ROCKCFG_EXPERT == 1 ] && ROCKCFG_ID="$ROCKCFG_ID-expert"
[ "$ROCKCFG_IDCKSUM" = 1 ] && \
ROCKCFG_ID="`echo $ROCKCFG_ID | cksum | cut -f1 -d' '`"
const ROCKCFG_SHORTID "$ROCKCFG_ID"
ROCKCFG_ID="$config-$ROCKCFG_ID"
const ROCKCFG_ID "$ROCKCFG_ID"
if [ ! -e "$swpdir/postconfig.in.tmp" ] ; then
{
ls misc/*/postconfig{,-*}.in 2>/dev/null \
| LC_ALL=C sort -k3,3 -t"/"
ls package/*/*/postconfig.in
} | xargs grep -h -v "^#" 2> /dev/null > "$swpdir/postconfig.in.tmp"
fi
include "$swpdir/postconfig.in.tmp"
include architecture/$ROCKCFG_ARCH/postconfig.in
include target/$ROCKCFG_TARGET/postconfig.in
filterscript=""
if [ "$ROCKCFG_CROSSBUILD" = 1 ] ; then
var_append filterscript ' ' 's,^\(. ..\)[^ ]*,\1--------, ;'
@ -292,26 +315,3 @@ fi
var_append filterscript ' ' '/^[XO] --* / d ;'
pkgfilter sed -e "$filterscript"
[ "$ROCKCFG_CROSSBUILD" = 1 ] && ROCKCFG_ID="$ROCKCFG_ID-cross"
[ "$ROCKCFG_PSEUDONATIVE" = 1 ] && ROCKCFG_ID="$ROCKCFG_ID-pseudonative"
ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_TARGET"
[ $ROCKCFG_EXPERT == 1 ] && ROCKCFG_ID="$ROCKCFG_ID-expert"
[ "$ROCKCFG_IDCKSUM" = 1 ] && \
ROCKCFG_ID="`echo $ROCKCFG_ID | cksum | cut -f1 -d' '`"
const ROCKCFG_SHORTID "$ROCKCFG_ID"
ROCKCFG_ID="$config-$ROCKCFG_ID"
const ROCKCFG_ID "$ROCKCFG_ID"
if [ ! -e "$swpdir/postconfig.in.tmp" ] ; then
{
ls misc/*/postconfig{,-*}.in 2>/dev/null \
| LC_ALL=C sort -k3,3 -t"/"
ls package/*/*/postconfig.in
} | xargs grep -h -v "^#" 2> /dev/null > "$swpdir/postconfig.in.tmp"
fi
include "$swpdir/postconfig.in.tmp"
include architecture/$ROCKCFG_ARCH/postconfig.in
include target/$ROCKCFG_TARGET/postconfig.in

Loading…
Cancel
Save