From da98447705d59973842f81f8c1684aeb9e0f82ac Mon Sep 17 00:00:00 2001
From: Tobias Hintze <th@rocklinux.org>
Date: Wed, 13 Dec 2006 21:48:30 +0000
Subject: [PATCH] Tobias Hintze: 	* change default ISO size from 680MB
 to 4700MB 	* make removal of :doc packages in crystal optional 	  (and
 not the default behaviour)

[2006120700564014611] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8101 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 scripts/Create-ISO       | 6 +++---
 target/crystal/build.sh  | 9 +++++++--
 target/crystal/config.in | 3 +++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/scripts/Create-ISO b/scripts/Create-ISO
index add47c711..32bfe328c 100755
--- a/scripts/Create-ISO
+++ b/scripts/Create-ISO
@@ -30,7 +30,7 @@ if [ $# -eq 0 ] ; then
 	echo " Targets have to be built using ./scripts/Build-Target before you can create"
 	echo " ISO images from them."
 	echo
-	echo "	-size  <MB>	limit the size of images to <MB> MB; default is 680"
+	echo "	-size  <MB>	limit the size of images to <MB> MB; default is 4700"
 	echo "	-source		include package sources from download/mirror on the images"
 	echo "	-nodist		also include download/nodist sources (Check licenses!)"
 	echo "	-mkdebug	create a small debug script for every image"
@@ -45,8 +45,8 @@ if [ $# -eq 0 ] ; then
 	exit 1
 fi
 
-# default disk-size is 680 MB
-dsize=$(( 680 * 1024 ))
+# default disk-size is 4700 MB
+dsize=$(( 4700 * 1024 ))
 src=0; mkdebug=0; implantisomd5=1; nodist=0
 
 while true ; do
diff --git a/target/crystal/build.sh b/target/crystal/build.sh
index 6b60cef48..b0416b19d 100644
--- a/target/crystal/build.sh
+++ b/target/crystal/build.sh
@@ -13,8 +13,13 @@ mkdir -p build/${ROCKCFG_ID}/ROCK/pkgs_sel
 (cd build/${ROCKCFG_ID}/ROCK/pkgs/;
 	ls | xargs ln --target-directory="../pkgs_sel";)
 
-# :doc packages are nice but in most cases never used
-(cd build/${ROCKCFG_ID}/ROCK/pkgs_sel/; rm -f *:doc{-*,}.gem;)
+if [ "$ROCKCFG_TARGET_CRYSTAL_REMOVEDOCS" = 1 ]; then
+	# :doc packages are nice but in most cases never used
+	(
+		cd build/${ROCKCFG_ID}/ROCK/pkgs_sel/
+		rm -f *:doc{-*,}.gem
+	)
+fi
 
 # remove packages which haven't been built in stages 0-8
 if [ "$ROCKCFG_TARGET_CRYSTAL_BUILDADDONS" = 1 ]; then
diff --git a/target/crystal/config.in b/target/crystal/config.in
index c49073459..93da16e81 100644
--- a/target/crystal/config.in
+++ b/target/crystal/config.in
@@ -23,6 +23,9 @@
 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
+
 if [ $ROCKCFG_TARGET_CRYSTAL_BUILDADDONS = 1 ]
 then
 	pkgfilter sed \