Ignore:
Timestamp:
Jul 6, 2007, 2:28:03 PM (13 years ago)
Author:
Bruno Cornec
Message:
  • ChangeLogs? updated for upcoming 2.2.4
  • Attempt to fix #177 by removing first headers and repodata directory before regenerating them.
  • Fix a problem in directory link handling in mindi (seen on gentoo 64) with the precious help of Francesco Talamona ti.liame_at_email.it
  • Gentoo ebuild are now unmasked on my side
  • usb-storage instead of usb_storage as a module name for Virtual CD support seems better
  • Document support for Proliant Virtual Media with mindi
  • Mandriva packages go first to contrib/testing not backport
  • Size of DVD is 4482 (or more surely 4480 to avoid problems). Fixed everywhere.
  • Fix a bug in Mandriva official package creation

(merge -r1519:1528 $SVN_M/branches/2.2.4)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r1508 r1529  
    301301
    302302CopyDependenciesToDirectory() {
    303     local outdir incoming fname filesize counter
     303    local outdir incoming fname filesize counter d found
    304304    outdir=$1
    305305    mkdir -p $outdir
     
    307307    counter=0
    308308    while [ "$incoming" != "" ] ; do
    309         if [ -d "$incoming" ] ; then
     309        # Non absolute file names should not arrive till here => skipped
     310        if [ `echo "$incoming" | cut -c1` != '/' ]; then
     311            LogIt "Unable to handle $incoming"
     312            incoming=`ReadLine`
     313            continue
     314        fi
     315        # no parent directory of incoming should be a link, copy is not possible in that case
     316        d=`dirname "$incoming"`
     317        found="false"
     318        while [ $d != "/" -a $found = "false" ]; do
     319            [ -h "$d" ] && found="true"
     320            d=`dirname "$d"`
     321        done
     322        if [ -d "$incoming" ] && [ ! -h "$incoming" ]; then
    310323            find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir
    311         elif [ -e "$incoming" ] ; then
     324        elif [ -e "$incoming" ] && [ $found = "false" ]; then
    312325            filesize=`du -sk $incoming | cut -f1`
    313326            if [ "$filesize" -gt "$(($CHOPSIZE*2))" ] && [ ! -h "$incoming" ] ; then
     
    9941007            echo "$fname is softlink" >> $LOGFILE
    9951008        else
    996             ldd $fname 2> /dev/null | ProcessLDD $fname
     1009            ldd $fname 2> /dev/null | ProcessLDD
    9971010        fi
    9981011    done
     
    10251038    local i path fname_to_find location output resolved tmp stub cache_id loclist
    10261039    fname_to_find="$1"
     1040    # It's an absolute path
    10271041    if echo "$fname_to_find" | grep -x "/.*" ; then
    10281042        output="$fname_to_find"
     
    10331047        return 0
    10341048    fi
     1049    # It's not an absolute path
    10351050    output=""
    1036     for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
    1037         [ ! -d "$path" ] && continue
    1038         for location in "$path/$fname_to_find" ; do
    1039             [ ! -e "$location" ] && continue
    1040             output="$location $output"
    1041             if [ -h "$location" ] ; then
    1042                 output="`ReadAllLink $location` $output"
    1043             fi
    1044         done
     1051    for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin `find /usr/lib /lib /usr/local/lib /usr/X11R6/lib /usr/lib64 /lib64 /usr/local/lib64 /usr/X11R6/lib64 -type d -maxdepth 1 2> /dev/null` ; do
     1052    #for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
     1053        [ -h "$path" ] && continue
     1054        [ ! -e "$path/$fname_to_find" ] && continue
     1055        output="$path/$fname_to_find $output"
     1056        if [ -h "$path/$fname_to_find" ] ; then
     1057            output="`ReadAllLink $path/$fname_to_find` $output"
     1058        fi
    10451059    done
    10461060    if [ "$output" = "" ] ; then
     
    23142328
    23152329ProcessLDD() {
    2316     local main_fname incoming j i fname f newf
    2317     main_fname=$1
     2330    local incoming f
    23182331    read incoming
    23192332    while [ "$incoming" != "" ] ; do
    23202333        # We take the full path name of the dyn. lib. we want
    2321         incoming=`echo "$incoming" | sed '/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*(.*/d ; s/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*\(\/.*\)/\1/ ; s/[[:blank:]]*\(\/.*\)[[:blank:]]*(.*/\1/'`
    2322         for f in `echo "$incoming"` ; do
     2334        incoming=`echo "$incoming" | awk '{if (match($1,/\//)) {print $1} else {if (match($3,/\//)) print $3} fi}'`
     2335        for f in $incoming ; do
    23232336            echo "$f `ReadAllLink $f`"
    23242337        done
Note: See TracChangeset for help on using the changeset viewer.