diff options
| author | luigi <luigi@FreeBSD.org> | 2009-12-15 00:26:42 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2009-12-15 00:26:42 +0000 |
| commit | 8e8d56a5908c39e619d3844dd894b8260ff15e51 (patch) | |
| tree | 27dd33334ff120cb2bbd42df4f522aa4ec4b2a88 /release | |
| parent | 84185732549723ff939aa82e8b971b30ac3074ba (diff) | |
| download | FreeBSD-src-8e8d56a5908c39e619d3844dd894b8260ff15e51.zip FreeBSD-src-8e8d56a5908c39e619d3844dd894b8260ff15e51.tar.gz | |
sync with head
Diffstat (limited to 'release')
| -rw-r--r-- | release/picobsd/bridge/PICOBSD | 7 | ||||
| -rw-r--r-- | release/picobsd/bridge/crunch.conf | 5 | ||||
| -rwxr-xr-x | release/picobsd/build/picobsd | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD index 150a44d..07e3bc2 100644 --- a/release/picobsd/bridge/PICOBSD +++ b/release/picobsd/bridge/PICOBSD @@ -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 diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf index 39c1b1f..c81d00f 100644 --- a/release/picobsd/bridge/crunch.conf +++ b/release/picobsd/bridge/crunch.conf @@ -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 diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd index 9bc08df..0549b0c 100755 --- a/release/picobsd/build/picobsd +++ b/release/picobsd/build/picobsd @@ -167,7 +167,7 @@ create_includes_and_libraries2() { # opt_dir opt_target 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 |
