From 38b5017f21611b2e690a4d244ab721c5bac2b2ee Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 10 Nov 2004 13:21:53 +0000
Subject: [PATCH] Clifford Wolf: 	Removed doc packages from crystal 
 Incrased default ISO size to 680 MB

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



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

diff --git a/scripts/Create-ISO b/scripts/Create-ISO
index f9910d282..9b1fd1b5b 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 600"
+	echo "	-size  <MB>	limit the size of images to <MB> MB; default is 680"
 	echo "	-source		include package sources on the images"
 	echo "	-mkdebug	create a small debug script for every image"
 	echo "	-nomd5		don't add md5 checksums to images"
@@ -44,8 +44,8 @@ if [ $# -eq 0 ] ; then
 	exit 1
 fi
 
-# default disk-size is 600 MB
-dsize=$(( 600 * 1024 ))
+# default disk-size is 680 MB
+dsize=$(( 680 * 1024 ))
 src=0; mkdebug=0; implantisomd5=1
 
 while true ; do
diff --git a/scripts/functions b/scripts/functions
index adfbe7c2f..51337471d 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -529,9 +529,6 @@ create_package_db() {
 
 			  echo -e "\004"
 			) >> $3.tmp
-		else
-			echo_error "Binary file for $bfile not present." \
-			           "Skipped in package database."
 		fi
 	done
 	gzip -c $3.tmp > $3 ; rm -f $3.tmp
diff --git a/target/crystal/build.sh b/target/crystal/build.sh
index 7b0370920..d3c853008 100644
--- a/target/crystal/build.sh
+++ b/target/crystal/build.sh
@@ -7,10 +7,18 @@ pkgloop
 
 echo_header "Finishing build."
 
+echo_status "Selecting bin packages ..."
+rm -rf build/${ROCKCFG_ID}/ROCK/pkgs_sel
+mkdir -p build/${ROCKCFG_ID}/ROCK/pkgs_sel
+ln build/${ROCKCFG_ID}/ROCK/pkgs/* build/${ROCKCFG_ID}/ROCK/pkgs_sel/
+
+# :doc packages are nice but in most cases never used
+rm -f build/${ROCKCFG_ID}/ROCK/pkgs_sel/*:doc{-*,}.gem
+
 echo_status "Creating package database ..."
 admdir="build/${ROCKCFG_ID}/var/adm"
-create_package_db $admdir build/${ROCKCFG_ID}/ROCK/pkgs \
-                  build/${ROCKCFG_ID}/ROCK/pkgs/packages.db
+create_package_db $admdir build/${ROCKCFG_ID}/ROCK/pkgs_sel \
+                  build/${ROCKCFG_ID}/ROCK/pkgs_sel/packages.db
 
 echo_status "Creating isofs.txt file .."
 cat << EOT > build/${ROCKCFG_ID}/ROCK/isofs.txt
@@ -21,7 +29,7 @@ DISK1	$admdir/descs/					${ROCKCFG_SHORTID}/info/descs/
 DISK1	$admdir/flists/					${ROCKCFG_SHORTID}/info/flists/
 DISK1	$admdir/md5sums/				${ROCKCFG_SHORTID}/info/md5sums/
 DISK1	$admdir/packages/				${ROCKCFG_SHORTID}/info/packages/
-EVERY	build/${ROCKCFG_ID}/ROCK/pkgs/packages.db	${ROCKCFG_SHORTID}/pkgs/packages.db
-SPLIT	build/${ROCKCFG_ID}/ROCK/pkgs/			${ROCKCFG_SHORTID}/pkgs/
+EVERY	build/${ROCKCFG_ID}/ROCK/pkgs_sel/packages.db	${ROCKCFG_SHORTID}/pkgs/packages.db
+SPLIT	build/${ROCKCFG_ID}/ROCK/pkgs_sel/		${ROCKCFG_SHORTID}/pkgs/
 EOT