# HG changeset patch # User Pascal Bellard # Date 1344597667 -7200 # Node ID e36062a9b1691966efdea4da19de64d055c4c1b4 # Parent 3de1f0f3086f1d0506326debec59118bdb080fe2 Up mongodb (2.0.6) diff -r 3de1f0f3086f -r e36062a9b169 linux-source/stuff/rdev --- a/linux-source/stuff/rdev Wed Aug 08 09:06:49 2012 +0200 +++ b/linux-source/stuff/rdev Fri Aug 10 13:21:07 2012 +0200 @@ -1,56 +1,55 @@ #!/bin/sh -devname() +dev() { - d=$(find /dev -type b | while read b ; do - [ "$(stat -c %02t%02T $b)" == "$1" ] && echo $b && break - done) - [ -n "$d" ] && echo $d || echo 0x$1 +for b in $(find /dev -type b); do + [ $(stat -c %02t%02T $b) = $1 ] && echo $b && return +done +echo 0x$1 } -sw="" +s= case "$0" in -*rootflags) sw="-R" ;; -*ramsize) sw="-r" ;; -*vidmode) sw="-v" ;; +*gs) s=-R;; +*ze) s=-r;; +*de) s=-v esac -[ -n "$sw" ] && set -- $sw "$@" +set -- $s "$@" -ofs=508 -img= -val= -fmt= +o=508 +i= +v= +f= while [ -n "$1" ]; do - case "$1" in - -R) ofs=498; fmt="Root flags" ;; - -r) ofs=504; fmt="Ramsize" ;; - -v) ofs=506; fmt="Video mode" ;; - -o) ofs=$(($2)); shift ;; - *-h*) echo "Usage: rdev [-Rrvh] [-o offset] [kernel [data [offset]]]" - exit 1 ;; - *) if [ -z "$img" ]; then - img="$1" - elif [ -z "$val" ]; then - [ "${1:0:5}" == "/dev/" ] && val=0x$(stat -c %t%02T $1) - val=$((${val:-$1})) - else - ofs=$(($1)) - fi - esac - shift +case "$1" in +-R) o=498; f="Root flags";; +-r) o=504; f="Ramsize";; +-v) o=506; f="Video mode";; +-o) o=$(($2)); f=" "; shift;; +-*) echo "Usage: rdev [-Rrvh] [-o offset] [kernel [data [offset]]]" + exit 1;; +*) if [ -z "$i" ]; then + i="$1" + elif [ -z "$v" ]; then + [ -b "$1" ] && v=0x$(stat -c %t%02T $1) + v=$((${v:-$1})) + else + o=$(($1)) + fi +esac +shift done dd="dd bs=1 conv=notrunc count=2" -if [ ! -s "$img" ]; then - echo $(devname $(stat -c %04D /)) / -elif [ -n "$val" ]; then +if [ ! -s "$i" ]; then + echo $(dev $(stat -c %04D /)) / +elif [ -n "$v" ]; then for i in 1 2; do - printf '\\\\x%02X' $(($val & 255)) - val=$(($val >> 8)) - done | xargs echo -en | $dd of=$img seek=$ofs -elif [ -n "$fmt" ]; then - $dd if=$img skip=$ofs | hexdump -e "\"\" 1/2 \"$fmt %u\" \"\n\"" + printf '\\\\x%02X' $(($v&255)) + v=$(($v>>8)) + done | xargs echo -en | $dd of=$i seek=$o +elif [ -n "$f" ]; then + echo $f $($dd if=$i skip=$o | od -dAn) else - echo -n "Root device " - devname $($dd if=$img skip=$ofs | hexdump -e '"" 1/2 "%04X" "\n"') + echo "Root device $(dev $($dd if=$i skip=$o | od -xAn))" fi 2>/dev/null diff -r 3de1f0f3086f -r e36062a9b169 linux/stuff/linux-slitaz.config --- a/linux/stuff/linux-slitaz.config Wed Aug 08 09:06:49 2012 +0200 +++ b/linux/stuff/linux-slitaz.config Fri Aug 10 13:21:07 2012 +0200 @@ -1750,7 +1750,7 @@ CONFIG_NET_VENDOR_RACAL=y CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m -# CONFIG_8139CP is not set +CONFIG_8139CP=m CONFIG_8139TOO=y # CONFIG_8139TOO_PIO is not set CONFIG_8139TOO_TUNE_TWISTER=y diff -r 3de1f0f3086f -r e36062a9b169 mongodb/receipt --- a/mongodb/receipt Wed Aug 08 09:06:49 2012 +0200 +++ b/mongodb/receipt Fri Aug 10 13:21:07 2012 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mongodb" -VERSION="2.0.5" +VERSION="2.0.6" CATEGORY="system-tools" SHORT_DESC="MongoDB bridges the gap between key-value stores and traditional RDBMS systems" MAINTAINER="pankso@slitaz.org" @@ -17,6 +17,14 @@ compile_rules() { cd $src + + sed -i 's/native_directory_//' db*/*.cpp + sed -i 's/native_file_//' db*/*.cpp shell/shell_utils.cpp + sed -i 's/leaf()/leaf().string()/' */*.cpp + sed -i 's|.*default_name_check|// &|' tools/tool.cpp db/db.cpp + sed -i '/FILESYSTEM_VERSION/d' pch.h + grep -rl TIME_UTC util | xargs sed -i 's/TIME_UTC/TIME_UTC_/' + scons all && scons --prefix=$DESTDIR/usr install } @@ -25,5 +33,5 @@ genpkg_rules() { mkdir -p $fs/usr - cp -a $_pkg/usr/bin $fs/usr + cp -a $install/usr/bin $fs/usr }