wok-next rev 13214
Up mongodb (2.0.6)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Aug 10 13:21:07 2012 +0200 (2012-08-10) |
parents | 3de1f0f3086f |
children | ac4d10ab5a3a |
files | linux-source/stuff/rdev linux/stuff/linux-slitaz.config mongodb/receipt |
line diff
1.1 --- a/linux-source/stuff/rdev Wed Aug 08 09:06:49 2012 +0200 1.2 +++ b/linux-source/stuff/rdev Fri Aug 10 13:21:07 2012 +0200 1.3 @@ -1,56 +1,55 @@ 1.4 #!/bin/sh 1.5 1.6 -devname() 1.7 +dev() 1.8 { 1.9 - d=$(find /dev -type b | while read b ; do 1.10 - [ "$(stat -c %02t%02T $b)" == "$1" ] && echo $b && break 1.11 - done) 1.12 - [ -n "$d" ] && echo $d || echo 0x$1 1.13 +for b in $(find /dev -type b); do 1.14 + [ $(stat -c %02t%02T $b) = $1 ] && echo $b && return 1.15 +done 1.16 +echo 0x$1 1.17 } 1.18 1.19 -sw="" 1.20 +s= 1.21 case "$0" in 1.22 -*rootflags) sw="-R" ;; 1.23 -*ramsize) sw="-r" ;; 1.24 -*vidmode) sw="-v" ;; 1.25 +*gs) s=-R;; 1.26 +*ze) s=-r;; 1.27 +*de) s=-v 1.28 esac 1.29 -[ -n "$sw" ] && set -- $sw "$@" 1.30 +set -- $s "$@" 1.31 1.32 -ofs=508 1.33 -img= 1.34 -val= 1.35 -fmt= 1.36 +o=508 1.37 +i= 1.38 +v= 1.39 +f= 1.40 while [ -n "$1" ]; do 1.41 - case "$1" in 1.42 - -R) ofs=498; fmt="Root flags" ;; 1.43 - -r) ofs=504; fmt="Ramsize" ;; 1.44 - -v) ofs=506; fmt="Video mode" ;; 1.45 - -o) ofs=$(($2)); shift ;; 1.46 - *-h*) echo "Usage: rdev [-Rrvh] [-o offset] [kernel [data [offset]]]" 1.47 - exit 1 ;; 1.48 - *) if [ -z "$img" ]; then 1.49 - img="$1" 1.50 - elif [ -z "$val" ]; then 1.51 - [ "${1:0:5}" == "/dev/" ] && val=0x$(stat -c %t%02T $1) 1.52 - val=$((${val:-$1})) 1.53 - else 1.54 - ofs=$(($1)) 1.55 - fi 1.56 - esac 1.57 - shift 1.58 +case "$1" in 1.59 +-R) o=498; f="Root flags";; 1.60 +-r) o=504; f="Ramsize";; 1.61 +-v) o=506; f="Video mode";; 1.62 +-o) o=$(($2)); f=" "; shift;; 1.63 +-*) echo "Usage: rdev [-Rrvh] [-o offset] [kernel [data [offset]]]" 1.64 + exit 1;; 1.65 +*) if [ -z "$i" ]; then 1.66 + i="$1" 1.67 + elif [ -z "$v" ]; then 1.68 + [ -b "$1" ] && v=0x$(stat -c %t%02T $1) 1.69 + v=$((${v:-$1})) 1.70 + else 1.71 + o=$(($1)) 1.72 + fi 1.73 +esac 1.74 +shift 1.75 done 1.76 1.77 dd="dd bs=1 conv=notrunc count=2" 1.78 -if [ ! -s "$img" ]; then 1.79 - echo $(devname $(stat -c %04D /)) / 1.80 -elif [ -n "$val" ]; then 1.81 +if [ ! -s "$i" ]; then 1.82 + echo $(dev $(stat -c %04D /)) / 1.83 +elif [ -n "$v" ]; then 1.84 for i in 1 2; do 1.85 - printf '\\\\x%02X' $(($val & 255)) 1.86 - val=$(($val >> 8)) 1.87 - done | xargs echo -en | $dd of=$img seek=$ofs 1.88 -elif [ -n "$fmt" ]; then 1.89 - $dd if=$img skip=$ofs | hexdump -e "\"\" 1/2 \"$fmt %u\" \"\n\"" 1.90 + printf '\\\\x%02X' $(($v&255)) 1.91 + v=$(($v>>8)) 1.92 + done | xargs echo -en | $dd of=$i seek=$o 1.93 +elif [ -n "$f" ]; then 1.94 + echo $f $($dd if=$i skip=$o | od -dAn) 1.95 else 1.96 - echo -n "Root device " 1.97 - devname $($dd if=$img skip=$ofs | hexdump -e '"" 1/2 "%04X" "\n"') 1.98 + echo "Root device $(dev $($dd if=$i skip=$o | od -xAn))" 1.99 fi 2>/dev/null
2.1 --- a/linux/stuff/linux-slitaz.config Wed Aug 08 09:06:49 2012 +0200 2.2 +++ b/linux/stuff/linux-slitaz.config Fri Aug 10 13:21:07 2012 +0200 2.3 @@ -1750,7 +1750,7 @@ 2.4 CONFIG_NET_VENDOR_RACAL=y 2.5 CONFIG_NET_VENDOR_REALTEK=y 2.6 CONFIG_ATP=m 2.7 -# CONFIG_8139CP is not set 2.8 +CONFIG_8139CP=m 2.9 CONFIG_8139TOO=y 2.10 # CONFIG_8139TOO_PIO is not set 2.11 CONFIG_8139TOO_TUNE_TWISTER=y
3.1 --- a/mongodb/receipt Wed Aug 08 09:06:49 2012 +0200 3.2 +++ b/mongodb/receipt Fri Aug 10 13:21:07 2012 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="mongodb" 3.7 -VERSION="2.0.5" 3.8 +VERSION="2.0.6" 3.9 CATEGORY="system-tools" 3.10 SHORT_DESC="MongoDB bridges the gap between key-value stores and traditional RDBMS systems" 3.11 MAINTAINER="pankso@slitaz.org" 3.12 @@ -17,6 +17,14 @@ 3.13 compile_rules() 3.14 { 3.15 cd $src 3.16 + 3.17 + sed -i 's/native_directory_//' db*/*.cpp 3.18 + sed -i 's/native_file_//' db*/*.cpp shell/shell_utils.cpp 3.19 + sed -i 's/leaf()/leaf().string()/' */*.cpp 3.20 + sed -i 's|.*default_name_check|// &|' tools/tool.cpp db/db.cpp 3.21 + sed -i '/FILESYSTEM_VERSION/d' pch.h 3.22 + grep -rl TIME_UTC util | xargs sed -i 's/TIME_UTC/TIME_UTC_/' 3.23 + 3.24 scons all && 3.25 scons --prefix=$DESTDIR/usr install 3.26 } 3.27 @@ -25,5 +33,5 @@ 3.28 genpkg_rules() 3.29 { 3.30 mkdir -p $fs/usr 3.31 - cp -a $_pkg/usr/bin $fs/usr 3.32 + cp -a $install/usr/bin $fs/usr 3.33 }