Attachment 157323 Details for Bug 244730 – New version of mkinitrd-6.0.9-nosegneg.patch that fixes the problem

[patch] New version of mkinitrd-6.0.9-nosegneg.patch that fixes the problem

mkinitrd-6.0.9-nosegneg.patch (text/plain), 1.25 KB, created by Eduardo Habkost on 2007-06-18 20:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eduardo Habkost

Created: 2007-06-18 20:20:02 UTC

Size: 1.25 KB

patch

obsolete

>diff -u mkinitrd    2007-05-04 12:27:56.000000000 -0400 mkinitrd
>--- mkinitrd    2007-05-04 12:27:56.000000000 -0400
>+++ mkinitrd	2007-06-18 17:07:11.000000000 -0300
>@@ -206,6 +206,20 @@
> EOF
>             exit 1
>         fi
>+       case "$FILE" in
>+         /lib*)
>+           LIBDIR=`echo "$FILE" | sed 's,$/lib[^/]*$/.*$,\1,'`
>+           BASE=`basename "$FILE"`
>+           # Prefer nosegneg libs over direct segment accesses on i686.
>+           if [ -f "$LIBDIR/i686/nosegneg/$BASE" ]; then
>+             FILES[$n]="$LIBDIR/i686/nosegneg/$BASE"
>+           # Otherwise, prefer base libraries rather than their optimized
>+           # variants.
>+           elif [ -f "$LIBDIR/$BASE" ]; then
>+             FILES[$n]="$LIBDIR/$BASE"
>+           fi
>+           ;;
>+       esac
>         dynamic="yes"
>         let n++
>     done
>@@ -426,7 +440,12 @@ inst() {
>             get_dso_deps "$file"
>             local DEPS="$DSO_DEPS"
>             for x in $DEPS ; do
>-                inst "$x" "$root"
>+               l=`echo "$x" | sed -n 's,$/lib[^/]*$/.*$,\1,p'`
>+               if [ -n "$l" ]; then
>+                 inst "$x" "$root" "$l"/`basename "$x"`
>+               else
>+                 inst "$x" "$root"
>+               fi
>             done
>             RET=$?
>         fi

Actions: View | Diff

Attachments on bug 244730: 157323