svn commit: r200560 - in stable/8/release/picobsd: bridge build

[Luigi Rizzo]

Author: luigi
Date: Tue Dec 15 00:26:42 2009
New Revision: 200560
URL: http://svn.freebsd.org/changeset/base/200560

Log:
  sync with head

Modified:
  stable/8/release/picobsd/bridge/PICOBSD
  stable/8/release/picobsd/bridge/crunch.conf
  stable/8/release/picobsd/build/picobsd

Modified: stable/8/release/picobsd/bridge/PICOBSD
==============================================================================
--- stable/8/release/picobsd/bridge/PICOBSD	Mon Dec 14 23:49:06 2009	(r200559)
+++ stable/8/release/picobsd/bridge/PICOBSD	Tue Dec 15 00:26:42 2009	(r200560)
@@ -11,11 +11,14 @@ hints	"PICOBSD.hints"
 # values accessible through getenv()
 # env		"PICOBSD.env"
 
-cpu		I486_CPU
+#cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
 ident		PICOBSD
 
+options                SMP
+device apic
+
 options		SCHED_4BSD		# mandatory to have one scheduler
 #options	MATH_EMULATE		#Support for x87 emulation
 options 	INET			#InterNETworking
@@ -43,7 +46,7 @@ options		IPDIVERT		# divert (for natd)
 # Support for bridging and bandwidth limiting
 options		DUMMYNET
 device		if_bridge
-options		HZ=1000
+#options		HZ=1000
 
 device		random			# used by ssh
 device		pci

Modified: stable/8/release/picobsd/bridge/crunch.conf
==============================================================================
--- stable/8/release/picobsd/bridge/crunch.conf	Mon Dec 14 23:49:06 2009	(r200559)
+++ stable/8/release/picobsd/bridge/crunch.conf	Tue Dec 15 00:26:42 2009	(r200560)
@@ -98,13 +98,15 @@ progs cat tail tee
 progs test
 ln test [
 
+progs less
+ln less more
 progs mount
 progs minigzip
 ln minigzip gzip
 progs kill
 progs df
 progs ps
-progs ns	# this is the 
+progs ns	# this is the picobsd version
 ln ns netstat
 progs vm
 progs hostname
@@ -178,3 +180,4 @@ libs_so -lkvm
 libs_so -lz
 libs_so -lbsdxml
 libs_so -lsbuf
+libs_so -ljail		# used by ifconfig

Modified: stable/8/release/picobsd/build/picobsd
==============================================================================
--- stable/8/release/picobsd/build/picobsd	Mon Dec 14 23:49:06 2009	(r200559)
+++ stable/8/release/picobsd/build/picobsd	Tue Dec 15 00:26:42 2009	(r200560)
@@ -167,7 +167,7 @@ create_includes_and_libraries2() { # opt
     local no
     log "create_includes_and_libraries2() for ${SRC}"
     if [ ${OSVERSION} -ge 600000 ] ; then
-	no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R"
+	no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITOUT_CDDL=1"
     else
 	no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R"
     fi
@@ -587,8 +587,9 @@ find_progs() {	# programs
 	local i
 	u_progs="`find_progs_helper $*`"
 	local o=${o_objdir:-${_SHLIBDIRPREFIX}}
+	log "looking for libs for $u_progs in $_SHLIBDIRPREFIX"
 	[ -z "${u_progs}" ] && return 1	# not found, error
-	i="`ldd ${u_progs} | grep -v '^/' | awk '{print $1}' | sort | uniq`"
+	i="`LD_LIBRARY_PATH=$o/lib ldd ${u_progs} | grep -v '^/' | awk '{print $1}' | sort | uniq`"
 	u_libs="`find_progs_helper $i`"
 	return 0
 }
@@ -719,8 +720,7 @@ populate_mfs_tree() {
 	(cd ${dst}; chown -R root . )
     fi
 
-    # If we are building a shared 'crunch', take the libraries
-    # and the dynamic loader as well
+    log "for a shared 'crunch' take libraries and dynamic loader as well"
     find_progs ${dst}/stand/crunch
     if [ -n "${u_libs}" ] ; then
 	mkdir -p ${dst}/lib && cp -p ${u_libs} ${dst}/lib