From 3311cbc0a437d2a3954a1845a6fb03bcf6e4938e Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Thu, 5 Jul 2007 06:48:18 +0000 Subject: [PATCH] Stefan Fiedler: target/crystal: rename ROCKCFG_TARGET_CRYSTAL_REMOVEDOCS to ROCKCFG_TARGET_CRYSTAL_INCLUDEDOCS set ROCKCFG_REBUILD_STAGE if building add-ons [2007062713312120246] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8614 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/crystal/build.sh | 2 +- target/crystal/config.in | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target/crystal/build.sh b/target/crystal/build.sh index 6fd041a74..22ace9112 100644 --- a/target/crystal/build.sh +++ b/target/crystal/build.sh @@ -13,7 +13,7 @@ mkdir -p build/${ROCKCFG_ID}/ROCK/pkgs_sel (cd build/${ROCKCFG_ID}/ROCK/pkgs/; ls | xargs ln --target-directory="../pkgs_sel";) -if [ "$ROCKCFG_TARGET_CRYSTAL_REMOVEDOCS" = 1 ]; then +if [ "$ROCKCFG_TARGET_CRYSTAL_INCLUDEDOCS" != 1 ]; then # :doc packages are nice but in most cases never used ( cd build/${ROCKCFG_ID}/ROCK/pkgs_sel/ diff --git a/target/crystal/config.in b/target/crystal/config.in index 93da16e81..9db9a239c 100644 --- a/target/crystal/config.in +++ b/target/crystal/config.in @@ -23,8 +23,8 @@ bool 'Also build add-on (non-CORE) packages' \ ROCKCFG_TARGET_CRYSTAL_BUILDADDONS 0 -bool 'Do NOT include documentation on ISO' \ - ROCKCFG_TARGET_CRYSTAL_REMOVEDOCS 0 +bool 'Include documentation on ISO' \ + ROCKCFG_TARGET_CRYSTAL_INCLUDEDOCS 1 if [ $ROCKCFG_TARGET_CRYSTAL_BUILDADDONS = 1 ] then @@ -32,6 +32,7 @@ then -e '/ xfree86 / d' \ -e '/ CORE / s/^\(. .........\)./\1-/' \ -e '/ CORE / ! s/^\(.\) .........\(.\)/\1 ---------\2/' + ROCKCFGSET_DO_REBUILD_STAGE=1 else pkgfilter sed -e '/ CORE / ! s/^X /O /' ROCKCFGSET_DO_REBUILD_STAGE=0