* Re: grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 [not found] <20100202200622.28744.65677.reportbug@tux64.internal.ucko.debian.net> @ 2010-07-13 1:12 ` Colin Watson 2010-07-13 1:13 ` Colin Watson 2010-07-13 9:05 ` Vladimir 'φ-coder/phcoder' Serbinenko 0 siblings, 2 replies; 6+ messages in thread From: Colin Watson @ 2010-07-13 1:12 UTC (permalink / raw) To: grub-devel; +Cc: Aaron M. Ucko, 568160-forwarded On Tue, Feb 02, 2010 at 03:06:22PM -0500, Aaron M. Ucko wrote: > In the rush to make official 2.6.32 kernel packages available in > Debian, the maintainers initially used image names of the form > vmlinuz-2.6.32-trunk-FLAVOR to indicate that they hadn't yet reached a > final -1 ABI. They now have, but grub's version comparison function > incorrectly treats the older -trunk packages as newer. (I'm not sure > why the maintainers chose -trunk rather than -0 or ~trunk, but what's > done is done.) > > The good news is that the relevant shell function (version_test_gt > from grub-mkconfig_lib) already has a provision for sorting some > suffixes early, so I propose simply adjusting it to do the same for > -trunk: > > --- /usr/lib/grub/grub-mkconfig_lib 2010-01-28 11:05:49.000000000 -0500 > +++ /home/amu/tmp/grub-mkconfig_lib 2010-02-02 14:38:27.000000000 -0500 > @@ -163,8 +163,9 @@ > > version_test_gt () > { > - local a=`echo $1 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` > - local b=`echo $2 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` > + local sedexp="s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" > + local a=`echo $1 | sed -e "$sedexp"` > + local b=`echo $2 | sed -e "$sedexp"` > local cmp=gt > if [ "x$b" = "x" ] ; then > return 0 > > Could you please do so? This patch looks reasonable to me (although sorry that I'm late in paying attention to it). grub-devel, any objections? -- Colin Watson [cjwatson@ubuntu.com] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 2010-07-13 1:12 ` grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 Colin Watson @ 2010-07-13 1:13 ` Colin Watson 2010-07-13 1:59 ` configure --help message for grub-emu Jason Butler 2010-07-13 9:05 ` grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 Vladimir 'φ-coder/phcoder' Serbinenko 2010-07-13 9:05 ` Vladimir 'φ-coder/phcoder' Serbinenko 1 sibling, 2 replies; 6+ messages in thread From: Colin Watson @ 2010-07-13 1:13 UTC (permalink / raw) To: grub-devel; +Cc: Aaron M. Ucko, 568160-forwarded On Tue, Jul 13, 2010 at 02:12:03AM +0100, Colin Watson wrote: > On Tue, Feb 02, 2010 at 03:06:22PM -0500, Aaron M. Ucko wrote: > > --- /usr/lib/grub/grub-mkconfig_lib 2010-01-28 11:05:49.000000000 -0500 > > +++ /home/amu/tmp/grub-mkconfig_lib 2010-02-02 14:38:27.000000000 -0500 > > @@ -163,8 +163,9 @@ > > > > version_test_gt () > > { > > - local a=`echo $1 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` > > - local b=`echo $2 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` > > + local sedexp="s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" > > + local a=`echo $1 | sed -e "$sedexp"` > > + local b=`echo $2 | sed -e "$sedexp"` > > local cmp=gt > > if [ "x$b" = "x" ] ; then > > return 0 > > > > Could you please do so? > > This patch looks reasonable to me (although sorry that I'm late in > paying attention to it). grub-devel, any objections? Err, please disregard this. Apparently the \(pre\|rc\|test\|git\|old\) stuff was already a Debian-specific patch (I guess it is a bit too much hardcoded magic for upstream, really). Sorry for the noise, -- Colin Watson [cjwatson@ubuntu.com] ^ permalink raw reply [flat|nested] 6+ messages in thread
* configure --help message for grub-emu 2010-07-13 1:13 ` Colin Watson @ 2010-07-13 1:59 ` Jason Butler 2010-07-13 2:15 ` Colin Watson 2010-07-13 9:05 ` grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 Vladimir 'φ-coder/phcoder' Serbinenko 1 sibling, 1 reply; 6+ messages in thread From: Jason Butler @ 2010-07-13 1:59 UTC (permalink / raw) To: The development of GNU GRUB I want to alter the configure script so the --help prints the instructions for building grub-emu. I saw it was asked a couple times in #grub where to get it. I think this means altering the configure.ac file but some open source projects generate configure.ac from a script. Is configure.ac the correct file to alter? ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: configure --help message for grub-emu 2010-07-13 1:59 ` configure --help message for grub-emu Jason Butler @ 2010-07-13 2:15 ` Colin Watson 0 siblings, 0 replies; 6+ messages in thread From: Colin Watson @ 2010-07-13 2:15 UTC (permalink / raw) To: The development of GNU GRUB On Mon, Jul 12, 2010 at 06:59:10PM -0700, Jason Butler wrote: > I want to alter the configure script so the --help prints the > instructions for building grub-emu. I saw it was asked a couple times > in #grub where to get it. I think this means altering the configure.ac > file but some open source projects generate configure.ac from a > script. This is rare; configure.ac is normally a source file. > Is configure.ac the correct file to alter? Yes. -- Colin Watson [cjwatson@ubuntu.com] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 2010-07-13 1:13 ` Colin Watson 2010-07-13 1:59 ` configure --help message for grub-emu Jason Butler @ 2010-07-13 9:05 ` Vladimir 'φ-coder/phcoder' Serbinenko 1 sibling, 0 replies; 6+ messages in thread From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2010-07-13 9:05 UTC (permalink / raw) To: grub-devel [-- Attachment #1: Type: text/plain, Size: 1355 bytes --] On 07/13/2010 03:13 AM, Colin Watson wrote: > On Tue, Jul 13, 2010 at 02:12:03AM +0100, Colin Watson wrote: > >> On Tue, Feb 02, 2010 at 03:06:22PM -0500, Aaron M. Ucko wrote: >> >>> --- /usr/lib/grub/grub-mkconfig_lib 2010-01-28 11:05:49.000000000 -0500 >>> +++ /home/amu/tmp/grub-mkconfig_lib 2010-02-02 14:38:27.000000000 -0500 >>> @@ -163,8 +163,9 @@ >>> >>> version_test_gt () >>> { >>> - local a=`echo $1 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` >>> - local b=`echo $2 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` >>> + local sedexp="s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" >>> + local a=`echo $1 | sed -e "$sedexp"` >>> + local b=`echo $2 | sed -e "$sedexp"` >>> local cmp=gt >>> if [ "x$b" = "x" ] ; then >>> return 0 >>> >>> Could you please do so? >>> >> This patch looks reasonable to me (although sorry that I'm late in >> paying attention to it). grub-devel, any objections? >> > Err, please disregard this. Apparently the \(pre\|rc\|test\|git\|old\) > stuff was already a Debian-specific patch (I guess it is a bit too much > hardcoded magic for upstream, really). > > Ok. Please disregard my previous reply > Sorry for the noise, > > -- Regards Vladimir 'φ-coder/phcoder' Serbinenko [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 294 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 2010-07-13 1:12 ` grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 Colin Watson 2010-07-13 1:13 ` Colin Watson @ 2010-07-13 9:05 ` Vladimir 'φ-coder/phcoder' Serbinenko 1 sibling, 0 replies; 6+ messages in thread From: Vladimir 'φ-coder/phcoder' Serbinenko @ 2010-07-13 9:05 UTC (permalink / raw) To: grub-devel [-- Attachment #1: Type: text/plain, Size: 1722 bytes --] On 07/13/2010 03:12 AM, Colin Watson wrote: > On Tue, Feb 02, 2010 at 03:06:22PM -0500, Aaron M. Ucko wrote: > >> In the rush to make official 2.6.32 kernel packages available in >> Debian, the maintainers initially used image names of the form >> vmlinuz-2.6.32-trunk-FLAVOR to indicate that they hadn't yet reached a >> final -1 ABI. They now have, but grub's version comparison function >> incorrectly treats the older -trunk packages as newer. (I'm not sure >> why the maintainers chose -trunk rather than -0 or ~trunk, but what's >> done is done.) >> >> The good news is that the relevant shell function (version_test_gt >> from grub-mkconfig_lib) already has a provision for sorting some >> suffixes early, so I propose simply adjusting it to do the same for >> -trunk: >> >> --- /usr/lib/grub/grub-mkconfig_lib 2010-01-28 11:05:49.000000000 -0500 >> +++ /home/amu/tmp/grub-mkconfig_lib 2010-02-02 14:38:27.000000000 -0500 >> @@ -163,8 +163,9 @@ >> >> version_test_gt () >> { >> - local a=`echo $1 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` >> - local b=`echo $2 | sed -e "s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\)/~\1/g"` >> + local sedexp="s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" >> + local a=`echo $1 | sed -e "$sedexp"` >> + local b=`echo $2 | sed -e "$sedexp"` >> local cmp=gt >> if [ "x$b" = "x" ] ; then >> return 0 >> >> Could you please do so? >> > Go ahead for trunk. Don't forget the Changelog > This patch looks reasonable to me (although sorry that I'm late in > paying attention to it). grub-devel, any objections? > > -- Regards Vladimir 'φ-coder/phcoder' Serbinenko [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 294 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-07-13 9:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20100202200622.28744.65677.reportbug@tux64.internal.ucko.debian.net>
2010-07-13 1:12 ` grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 Colin Watson
2010-07-13 1:13 ` Colin Watson
2010-07-13 1:59 ` configure --help message for grub-emu Jason Butler
2010-07-13 2:15 ` Colin Watson
2010-07-13 9:05 ` grub-common: wrongly sorts 2.6.32-trunk ahead of 2.6.32-1 Vladimir 'φ-coder/phcoder' Serbinenko
2010-07-13 9:05 ` Vladimir 'φ-coder/phcoder' Serbinenko
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.