Clifford Wolf:

Documentation/Developers/PKG-DESC-FORMAT

@@ -160,3 +160,10 @@ file.
     This would run the whole build cycle with mypkg-version1.tar.bz2 and 
     mypkg-gfx-version2.tbz2 but not with mypkg-data-version3.tar.bz2.
 
+--
+
+[CD] [CHECKDEPS]
+
+  This flag is used to tell Check-Deps-2 and copy-cache.sh how to handle split
+  packages.
+

misc/tools-source/copy-cache.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# find package -type f -name '*.cache' | while read fn
+# do [ -f $1/${fn%.cache}.desc ] && cp -v $fn $1/$fn; done
+# cd $1; ./scripts/Create-DepDB > scripts/dep_db.txt
+
+if [ ! -d "$1" ]; then
+	echo "Usage: $0 <targetdir>"
+	exit 1
+fi
+
+find package -type f -name '*.cache' | \
+cut -f2,3 -d/ | sort -u | tr / ' ' | \
+while read rep pkg; do
+	confdir="$1/package/$rep/$pkg"
+	cachedir="package/$rep/$pkg"
+	descfile="$confdir/$pkg.desc"
+	[ -f "$descfile" ] || continue
+
+	if egrep '^\[(CD|CHECKDEPS)\] <COPY> ' -q $descfile
+	then
+		eval "$( egrep '^\[(CD|CHECKDEPS)\] <COPY> ' $descfile | sed 's,.*>,,' )"
+	else
+		rm -rf $confdir/*.cache
+		cp $cachedir/$pkg.cache $confdir/
+	fi
+done
+

package/base/automake/automake.desc

@@ -54,3 +54,5 @@
 [D] 619690407 automake-1.8.5.tar.bz2 ftp://ftp.gnu.org/pub/gnu/automake/
 #endif
 
+[CD] <COPY> cp $cachedir/automake18.cache $confdir/$pkg.cache
+

package/base/bash/bash.desc

@@ -59,3 +59,5 @@
 [D] 2834434668 bash-doc-3.0.tar.gz ftp://ftp.gnu.org/pub/gnu/bash/
 #endif
 
+[CD] <COPY> cp $cachedir/bash2.cache $confdir/$pkg.cache
+

package/base/bdb/bdb.desc

@@ -74,3 +74,5 @@
 [D] 4159179082 db-4.2.52.tar.gz http://www.sleepycat.com/update/snapshot/
 #endif
 
+[CD] <COPY> for x in $cachedir/*.cache; do cp $x $confdir/$pkg.cache; done
+

package/base/gcc/gcc.desc

@@ -69,3 +69,5 @@
 [D] 870641564 protector-3.4-2.tar.gz http://www.research.ibm.com/trl/projects/security/ssp/gcc3_4/
 #endif
 
+[CD] <COPY> for x in $cachedir/*.cache; do cp $x $confdir/$pkg.cache; done
+

package/base/glibc/glibc.desc

@@ -56,3 +56,5 @@
 [D] 3614008728 glibc-hppa-patches-2004-05-01.tar.gz http://parisc-linux.org/~carlos/glibc-work/
 #endif
 
+[CD] <COPY> cp $cachedir/glibc2[23].cache $confdir/$pkg.cache
+

package/base/linux/linux.desc

@@ -54,3 +54,5 @@
 [D] 2989845998 patch-2.6.7-pa15.gz http://cvs.parisc-linux.org/download/linux-2.6/
 #endif
 
+[CD] <COPY> for x in $cachedir/linux2[46].cache; do cp $x $confdir/$pkg.cache; done
+

package/import/cpan/cpan.desc

@@ -38,5 +38,8 @@
 
 [D] X 02packages.details.txt.gz http://www.cpan.org/modules/
 
+[CD] <COPY> rm $confdir/*.cache
+[CD] <COPY> cp $cachedir/*.cache $confdir/
+
 #include package/import/cpan/hosted_cpan.desc
 

package/jsaw/flexlm/flexlm.desc

@@ -48,3 +48,6 @@
 [D] X lmgrd-x86.Z !ftp://ftp.globes.com/flexlm/unix/v9.2.1/i86_r6/lmgrd.Z NODIST
 [D] X lmutil-x86.Z !ftp://ftp.globes.com/flexlm/unix/v9.2.1/i86_r6/lmutil.Z NODIST
 #endif
+
+[CD] <COPY> true
+

target/reference/build.sh

@@ -57,12 +57,7 @@ EOT
 
 echo_header "Reference build finished."
 
-cat <<- EOT > build/${ROCKCFG_ID}/ROCK/result/copy-cache.sh
-	#!/bin/sh
-	find package -type f -name '*.cache' | while read fn
-	do [ -f \$1/\${fn%.cache}.desc ] && cp -v \$fn \$1/\$fn; done
-	cd \$1; ./scripts/Create-DepDB > scripts/dep_db.txt
-EOT
+cp misc/tools-source/copy-cache.sh build/${ROCKCFG_ID}/ROCK/result/copy-cache.sh
 chmod +x build/${ROCKCFG_ID}/ROCK/result/copy-cache.sh
 
 echo_status "Results are stored in the directory"