svn commit: r186181 - head/tools/tools/nanobsd

[Poul-Henning Kamp]

Author: phk
Date: Tue Dec 16 15:05:52 2008
New Revision: 186181
URL: http://svn.freebsd.org/changeset/base/186181

Log:
  Make it possible to cherry-pick packages out of a directory.

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Tue Dec 16 15:05:35 2008	(r186180)
+++ head/tools/tools/nanobsd/nanobsd.sh	Tue Dec 16 15:05:52 2008	(r186181)
@@ -47,6 +47,7 @@ NANO_TOOLS=tools/tools/nanobsd
 
 # Where cust_pkg() finds packages to install
 NANO_PACKAGE_DIR=${NANO_SRC}/${NANO_TOOLS}/Pkg
+NANO_PACKAGE_LIST="*"
 
 # Object tree directory
 # default is subdir of /usr/obj
@@ -592,7 +593,11 @@ cust_pkg () (
 
 	# Copy packages into chroot
 	mkdir -p ${NANO_WORLDDIR}/Pkg
-	cp ${NANO_PACKAGE_DIR}/* ${NANO_WORLDDIR}/Pkg
+	(
+		cd ${NANO_PACKAGE_DIR}
+		find ${NANO_PACKAGE_LIST} -print |
+		    cpio -dumpv ${NANO_WORLDDIR}/Pkg
+	)
 
 	# Count & report how many we have to install
 	todo=`ls ${NANO_WORLDDIR}/Pkg | wc -l`