Not a problem Martin, I'll drop my local changes and pick up your commit
at the next sync.
On Fri, 2009-11-06 at 08:58 -0600, Martin Hicks wrote:
> On Sat, Oct 31, 2009 at 02:43:43PM +1100, Ken McDonell wrote:
> > Martin,
> >
> > OK, for 600 you should be using 600.out.linux.1 ... that was the version
> > that worked for SLES9 (the last comment I could find in the qa test) and
> > looks like it is still the expected version.
> >
> > Rather than play the glibc version games, it would probably be simpler
> > to just use 600.out.linux.1 for SLES ... could you try the attached
> > version of 600 and see if that works for you?
>
> Oops. I applied and pushed a similar patch. I'd forgotten that you had
> provided me with a modified 600.
>
> commit 41c25b671acb639b1e6e019c997d0a81d54caede
> Author: Martin Hicks <mort@xxxxxxxx>
> Date: Fri Nov 6 09:53:04 2009 -0500
>
> 600 Always use linux.1 for SuSE systems
>
> opensuse11.1 seems to generate the same out put as sles9 systems,
> so just use linux.1 for all SuSE systems.
>
> diff --git a/600 b/600
> index 174cde0..3c891cd 100755
> --- a/600
> +++ b/600
> @@ -64,7 +64,14 @@ then
> ls -l /lib/libc-*.so
> exit 1
> fi
> - if [ "$a" -lt 2 ]
> +
> + # Suse systems seem to work with linux.1
> + if [ -f /etc/SuSE-release ]
> + then
> + ln $seq.out.linux.1 $seq.out
> +
> + # Otherwise use glibc version
> + elif [ "$a" -lt 2 ]
> then
> # a.?.?, a < 2
> ln $seq.out.linux.0 $seq.out
>
>
> mh
>
|