Changeset 859 for branches


Ignore:
Timestamp:
Sep 29, 2006, 11:52:57 PM (13 years ago)
Author:
bruno
Message:

remove a partial patch for x86_64: ldconfig is not needed. What is missing are the library files (symlinks). So rewrite of ProcessLDD.
deplost.txt updated accordingly.
LocateFile? in mindi has been replaced by readlink for all the usages linked to symlinks.

Location:
branches/stable/mindi
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/deplist.txt

    r858 r859  
    3131bzip2 bunzip2 lzop
    3232ctrlaltdel
    33 ld-linux.so.2 ld-2.3.4.so
    34 ldconfig
    3533# Do not remove as they need to be aligned with the kernel
    3634insmod lsmod
  • branches/stable/mindi/mindi

    r855 r859  
    516516    list_of_optimized_libraries=`grep "lib/i[5-7]86/" $filelist`
    517517    if [ "$list_of_optimized_libraries" = "" ] ; then
    518     return 0
     518        return 0
    519519    fi
    520520    echo -en "Dropping i686-optimized libraries if appropriate"
    521521    for optimized_lib_name in $list_of_optimized_libraries ; do
    522     echo -en "."
    523     reason=""
    524     vanilla_lib_name=`echo "$optimized_lib_name" | sed s/i[5-7]86// | tr -s '/' '/'`
    525     echo "$vanilla_lib_name" >> $filelist
    526     resolved=$vanilla_lib_name
    527     echo "Adding $resolved to filelist" >> $LOGFILE
    528     while [ -h "$resolved" ] ; do
    529         resolved=`ls $resolved -l|tr -s ' ' '\t'|$AWK '{printf $NF;}'`
    530         LocateFile $resolved >> $filelist
     522        echo -en "."
     523        reason=""
     524        vanilla_lib_name=`echo "$optimized_lib_name" | sed s/i[5-7]86// | tr -s '/' '/'`
     525        echo "$vanilla_lib_name" >> $filelist
     526        resolved=$vanilla_lib_name
    531527        echo "Adding $resolved to filelist" >> $LOGFILE
    532     done
    533     mkdir -p $outdir$optimized_lib_name > /dev/null 2> /dev/null
    534     rmdir $outdir$optimized_lib_name > /dev/null 2> /dev/null
    535     ln -sf $vanilla_lib_name $outdir$optimized_lib_name
    536     echo "Excluding $optimized_lib_name" >> $LOGFILE
    537     grep -Fvx "$optimized_lib_name $filelist" > $filelist.tmp
    538     echo "Replacing it with $vanilla_lib_name" >> $LOGFILE
    539     echo "$vanilla_lib_name" >> $filelist.tmp
    540     mv -f $filelist.tmp $filelist
     528        while [ -h "$resolved" ] ; do
     529            resolved=`readlink $resolved`
     530            echo "Adding $resolved to filelist" >> $LOGFILE
     531        done
     532        mkdir -p $outdir$optimized_lib_name > /dev/null 2> /dev/null
     533        rmdir $outdir$optimized_lib_name > /dev/null 2> /dev/null
     534        ln -sf $vanilla_lib_name $outdir$optimized_lib_name
     535        echo "Excluding $optimized_lib_name" >> $LOGFILE
     536        grep -Fvx "$optimized_lib_name $filelist" > $filelist.tmp
     537        echo "Replacing it with $vanilla_lib_name" >> $LOGFILE
     538        echo "$vanilla_lib_name" >> $filelist.tmp
     539        mv -f $filelist.tmp $filelist
    541540    done
    542541    sort $filelist | $AWK '{ print $1; }' | uniq > $filelist.tmp
     
    11271126    fi
    11281127    if echo "$fname_to_find" | grep -x "/.*" ; then
    1129     output="$fname_to_find"
    1130     location="$fname_to_find"
    1131     while [ -h "$location" ] ; do
    1132         resolved=`WhatSoftlinkPointsTo $location`
    1133         location=$resolved
    1134         output="$location $output"
    1135     done
    1136     echo "$output"
    1137     return 0
     1128        output="$fname_to_find"
     1129        location="$fname_to_find"
     1130        while [ -h "$location" ] ; do
     1131            resolved=`WhatSoftlinkPointsTo $location`
     1132            location=$resolved
     1133            output="$location $output"
     1134        done
     1135        echo "$output"
     1136        return 0
    11381137    fi
    11391138    output=""
    11401139    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
    1141     [ ! -d "$path" ] && continue
    1142     location=`echo "$path/$fname_to_find" | tr -s '/' '/'`
    1143     if echo "$location" | grep "lib/lib" 2> /dev/null ; then
    1144         loclist=`find $path -maxdepth 1 | grep -F "$fname_to_find"`
    1145     else
    1146         loclist=$location
    1147     fi
    1148     for location in $loclist ; do
    1149         [ ! -e "$location" ] && continue
    1150         output="$location $output"
    1151         copies_found=$(($copies_found+1))
    1152         while [ -h "$location" ] ; do
    1153                 resolved=`WhatSoftlinkPointsTo $location`
    1154                 location=$resolved
    1155                 output="$location $output"
     1140        [ ! -d "$path" ] && continue
     1141        location=`echo "$path/$fname_to_find" | tr -s '/' '/'`
     1142        if echo "$location" | grep "lib/lib" 2> /dev/null ; then
     1143            loclist=`find $path -maxdepth 1 | grep -F "$fname_to_find"`
     1144        else
     1145            loclist=$location
     1146        fi
     1147        for location in $loclist ; do
     1148            [ ! -e "$location" ] && continue
     1149            output="$location $output"
     1150            copies_found=$(($copies_found+1))
     1151            while [ -h "$location" ] ; do
     1152                resolved=`WhatSoftlinkPointsTo $location`
     1153                location=$resolved
     1154                output="$location $output"
    11561155            done
    11571156#       resolved=`file $location | $AWK '{print $NF;}'`
     
    11611160#       fi
    11621161#       fi
    1163     done
     1162        done
    11641163    done
    11651164    if [ "$output" = "" ] ; then
     
    23452344    read incoming
    23462345    while [ "$incoming" != "" ] ; do
    2347         incoming=`echo "$incoming" | sed '/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*(.*/d ; s/[[:blank:]]*\(.*\)[[:blank:]]*=>[[:blank:]]*\/.*/\1/ ; s/[[:blank:]]*\(\/.*\)[[:blank:]]*(.*/\1/'`
    2348         for fname in `echo "$incoming"` ; do
    2349             fname=`LocateFile $fname`
    2350             for f in $fname ; do
    2351                 [ -e "$f" ] && echo $f
    2352             done
     2346        # We take the full path name of the dyn. lib. we want
     2347        incoming=`echo "$incoming" | sed '/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*(.*/d ; s/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*\(\/.*\)/\1/ ; s/[[:blank:]]*\(\/.*\)[[:blank:]]*(.*/\1/'`
     2348        for f in `echo "$incoming"` ; do
     2349            if [ -h "$f" ]; then
     2350                g=`readlink $f`
     2351                if [ -e "$g" ]; then
     2352                    echo "$f $g"
     2353                else
     2354                    echo "Problem with ldd on $f"
     2355                    echo "$f"
     2356                fi
     2357            else
     2358                if [ -e "$f" ]; then
     2359                    echo "$f"
     2360                else
     2361                    echo "Problem with ldd on $f"
     2362                fi
     2363            fi
    23532364        done
    23542365        read incoming
     
    23862397    diskno=1
    23872398    while [ "$diskno" -le "$noof_disks" ] ; do
    2388     mkdir -p $minidir_root/$diskno
     2399        mkdir -p $minidir_root/$diskno
    23892400        cd $minidir_root/$diskno
    23902401        for fname in `find -type d -o -print` ; do
  • branches/stable/mindi/rootfs/sbin/init

    r853 r859  
    481481res=$?
    482482SwapTheMountExecs
    483 ldconfig
    484483ConfigureLoggingDaemons
    485484if [ -e "/tmp/USE-DEVFS" ] ; then
Note: See TracChangeset for help on using the changeset viewer.