Debian Bug report logs - #260443
kernel-source-2.6.7 rules file does not support non-digit revision numbers

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Nathaniel McCallum <npmccallum@gentoo.org>

To: submit@bugs.debian.org

Subject: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: Tue, 20 Jul 2004 13:10:52 -0400

Package: kernel-source-2.6.7
Version: 2.6.7-3

We are creating a custom debian distribution and need to use non-alpha characters
in the revision.  However, the rules file does not support this.  There is a patch 
to fix this at http://www.no-name-yet.com/patches/

Nathaniel

Message #10 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Nathaniel McCallum <npmccallum@gentoo.org>

To: 260443@bugs.debian.org

Date: Tue, 20 Jul 2004 13:44:32 -0400

Direct link to the patch:
http://www.no-name-yet.com/patches/kernel-source-2.6.7.260443.diff.gz

Nathaniel

Message #15 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Jens Schmalzing <j.s@lmu.de>

To: Nathaniel McCallum <npmccallum@gentoo.org>

Cc: 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: 20 Jul 2004 23:03:29 +0200

[Message part 1 (text/plain, inline)]

Hi,

Nathaniel McCallum writes:

> Package: kernel-source-2.6.7
> Version: 2.6.7-3
> 
> We are creating a custom debian distribution and need to use
> non-alpha characters in the revision.  However, the rules file does
> not support this.  There is a patch to fix this at
> http://www.no-name-yet.com/patches/

Thanks a lot.  In fact, we also need to support this, because after
the release of sarge, there will be security updates, whose Debian
revisions typically contain non-digit characters.

Anyway, I slightly changed your patch in three ways: First, I used
functions built into make where possible.  Second, I avoided the use
of sort, which does not use the same algorithm as Debian packaging
tools for comparing revisions, and instead used an awk command to
simply revert the order of revisions extracted from the changelog.
Third, I put the previous revision into in extra variable to avoid
duplicating that long stretch of awk.

Please check out the attached new version of the patch.

Regards, Jens.

[kernel-source-2.6.7.diff (text/x-patch, attachment)]

[Message part 3 (text/plain, inline)]

-- 
J'qbpbe, le m'en fquz pe j'qbpbe!
Le veux aimeb et mqubib panz je pézqbpbe je djuz tqtaj!

Message #20 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Nathaniel McCallum <npmccallum@gentoo.org>

To: Jens Schmalzing <jensen@debian.org>

Cc: 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: Tue, 20 Jul 2004 17:08:48 -0400

On Tue, 2004-07-20 at 17:03, Jens Schmalzing wrote:
> Please check out the attached new version of the patch.

Looks great, though I haven't had a chance to test it yet.  Do you know
when it will be applied?

Nathaniel

Message #25 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Matt Zimmerman <mdz@debian.org>

To: Jens Schmalzing <jensen@debian.org>, 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: Tue, 20 Jul 2004 14:58:03 -0700

On Tue, Jul 20, 2004 at 11:03:29PM +0200, Jens Schmalzing wrote:

> --- debian/rules.orig	Wed Jun 23 17:30:19 2004
> +++ debian/rules	Tue Jul 20 22:57:39 2004
> @@ -14,12 +14,12 @@
>  release	:= $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)-.*).*$$/\1/')
>  version	:= $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)).*$$/\1/')
>  
> -# extract the latest Debian revision from the changelog
> -revisions := $(shell head -1 debian/changelog | sed 's/^.*(.*-\(.*\)).*$$/\1/')
> +# extract all the Debian revisions for this release from the changelog
> +revisions := $(shell grep "^kernel-source-$(release) " debian/changelog | sed 's/^.*(.*-\(.*\)).*$$/\1/' | awk '{for(i=1;i<=NF;i++){a[++j]=$$i}}END{for(i=j;i>=1;i--){print a[i]}}')

More simply:

cat debian/changelog | perl -nle 'print $1 if /^kernel-source-$(release) .*\(.*-(.*)\)/' | rev

-- 
 - mdz

Message #30 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Matt Zimmerman <mdz@debian.org>

To: Jens Schmalzing <jensen@debian.org>, 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: Tue, 20 Jul 2004 15:32:42 -0700

On Tue, Jul 20, 2004 at 02:58:03PM -0700, Matt Zimmerman wrote:

> On Tue, Jul 20, 2004 at 11:03:29PM +0200, Jens Schmalzing wrote:
> 
> > --- debian/rules.orig	Wed Jun 23 17:30:19 2004
> > +++ debian/rules	Tue Jul 20 22:57:39 2004
> > @@ -14,12 +14,12 @@
> >  release	:= $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)-.*).*$$/\1/')
> >  version	:= $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)).*$$/\1/')
> >  
> > -# extract the latest Debian revision from the changelog
> > -revisions := $(shell head -1 debian/changelog | sed 's/^.*(.*-\(.*\)).*$$/\1/')
> > +# extract all the Debian revisions for this release from the changelog
> > +revisions := $(shell grep "^kernel-source-$(release) " debian/changelog | sed 's/^.*(.*-\(.*\)).*$$/\1/' | awk '{for(i=1;i<=NF;i++){a[++j]=$$i}}END{for(i=j;i>=1;i--){print a[i]}}')
> 
> More simply:
> 
> cat debian/changelog | perl -nle 'print $1 if /^kernel-source-$(release) .*\(.*-(.*)\)/' | rev

Er, 'tac' rather than 'rev' (I always get them confused).

-- 
 - mdz

Message #35 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Jens Schmalzing <j.s@lmu.de>

To: Matt Zimmerman <mdz@debian.org>

Cc: 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: 21 Jul 2004 00:42:20 +0200

Hi,

Matt Zimmerman writes:

> More simply:
> 
> [...] | rev

Unfortunately, rev reverts the characters in each line of the input
file, not the lines.  Slightly shorter version:

revisions := $(shell sed -n 's/^kernel-source-$(release)\ .*($(release)-\(.*\)).*$$/\1/p' debian/changelog | awk '{a[++j]=$$0}END{for(i=j;i>=1;i--){print a[i]}}')

Regards, Jens.

-- 
J'qbpbe, le m'en fquz pe j'qbpbe!
Le veux aimeb et mqubib panz je pézqbpbe je djuz tqtaj!

Message #40 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Jens Schmalzing <j.s@lmu.de>

To: Matt Zimmerman <mdz@debian.org>

Cc: 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: 21 Jul 2004 00:45:32 +0200

Hi,

Matt Zimmerman writes:

> > cat debian/changelog | perl -nle 'print $1 if /^kernel-source-$(release) .*\(.*-(.*)\)/' | rev
> 
> Er, 'tac' rather than 'rev' (I always get them confused).

Cool, thanks.

Regards, Jens.

-- 
J'qbpbe, le m'en fquz pe j'qbpbe!
Le veux aimeb et mqubib panz je pézqbpbe je djuz tqtaj!

Message #45 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Jens Schmalzing <j.s@lmu.de>

To: Nathaniel McCallum <npmccallum@gentoo.org>

Cc: 260443@bugs.debian.org, control@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: 21 Jul 2004 02:04:09 +0200

close 260443
thanks

Hi,

Nathaniel McCallum writes:

> Looks great, though I haven't had a chance to test it yet.  Do you know
> when it will be applied?

The patch is in svn now.  Since it only affects the build
infrastructure, I didn't create an entry in the Debian changelog and
will instead close the bug here and now.

Regards, Jens.

-- 
J'qbpbe, le m'en fquz pe j'qbpbe!
Le veux aimeb et mqubib panz je pézqbpbe je djuz tqtaj!

Message #52 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Sven Luther <sven.luther@wanadoo.fr>

To: Jens Schmalzing <jensen@debian.org>, 260443@bugs.debian.org

Cc: Nathaniel McCallum <npmccallum@gentoo.org>, control@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: Wed, 21 Jul 2004 13:50:15 +0200

On Wed, Jul 21, 2004 at 02:04:09AM +0200, Jens Schmalzing wrote:
> close 260443
> thanks
> 
> Hi,
> 
> Nathaniel McCallum writes:
> 
> > Looks great, though I haven't had a chance to test it yet.  Do you know
> > when it will be applied?
> 
> The patch is in svn now.  Since it only affects the build
> infrastructure, I didn't create an entry in the Debian changelog and
> will instead close the bug here and now.

Does this warrants a new kernel-source upload ? 

Friendly,

Sven Luther

Message #57 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Jens Schmalzing <j.s@lmu.de>

To: Sven Luther <sven.luther@wanadoo.fr>, 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: 21 Jul 2004 14:18:37 +0200

Hi,

Sven Luther writes:

> Does this warrants a new kernel-source upload ? 

No.  It only changes the way the package is built, not what goes into it.

Regards, Jens.

-- 
J'qbpbe, le m'en fquz pe j'qbpbe!
Le veux aimeb et mqubib panz je pézqbpbe je djuz tqtaj!

Message #62 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Sven Luther <sven.luther@wanadoo.fr>

To: Jens Schmalzing <j.s@lmu.de>

Cc: Sven Luther <sven.luther@wanadoo.fr>, 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: Wed, 21 Jul 2004 14:22:51 +0200

On Wed, Jul 21, 2004 at 02:18:37PM +0200, Jens Schmalzing wrote:
> Hi,
> 
> Sven Luther writes:
> 
> > Does this warrants a new kernel-source upload ? 
> 
> No.  It only changes the way the package is built, not what goes into it.

Ok. I have added moved the pegasos patches to kernel-source, as it is now in
way to upstream, and also added there the G4 errata fix, for which i will
request a new powerpc build soon, as it fix stability issues with many G4
processors.

Now, what about reading those patches to kernel-patch-powerpc until the new
kernel-source is released, and modify the kernel-pacth rules so it uses
2.6.7-3 version of the kernel-source ? I would provide such a patch.

What is your take on this ? And i guess it is a generic question of how we
will handle patch migration.

Friendly,

Sven Luther

Message #67 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Jens Schmalzing <j.s@lmu.de>

To: Sven Luther <sven.luther@wanadoo.fr>

Cc: 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: 21 Jul 2004 14:29:11 +0200

Hi,

Sven Luther writes:

> Now, what about reading those patches to kernel-patch-powerpc until
> the new kernel-source is released, and modify the kernel-pacth rules
> so it uses 2.6.7-3 version of the kernel-source ?

This sounds confusing and error-prone.

> What is your take on this ?

The powerpc kernel-image packages should be rebuilt against the next
revision of kernel-source.  But if there's need for the former, the
latter shouldn't be a big deal.

Regards, Jens.

-- 
J'qbpbe, le m'en fquz pe j'qbpbe!
Le veux aimeb et mqubib panz je pézqbpbe je djuz tqtaj!

Message #72 received at 260443@bugs.debian.org (full text, mbox, reply):

From: Sven Luther <sven.luther@wanadoo.fr>

To: Jens Schmalzing <j.s@lmu.de>

Cc: Sven Luther <sven.luther@wanadoo.fr>, 260443@bugs.debian.org

Subject: Re: Bug#260443: kernel-source-2.6.7 rules file does not support non-digit revision numbers

Date: Wed, 21 Jul 2004 14:53:55 +0200

On Wed, Jul 21, 2004 at 02:29:11PM +0200, Jens Schmalzing wrote:
> Hi,
> 
> Sven Luther writes:
> 
> > Now, what about reading those patches to kernel-patch-powerpc until
> > the new kernel-source is released, and modify the kernel-pacth rules
> > so it uses 2.6.7-3 version of the kernel-source ?
> 
> This sounds confusing and error-prone.

Confusing and error prone ? Could you elaborate, especially given that this is
how things worked in the Herbert Xu era.

Also notice that this means stability in the build also, since the released
kernel-patch package would stay buildable for any version of the kernel-source
package later than the one it was released with. It is a rather nice property,
and one which has savec my neck a few times in this past year already.

> > What is your take on this ?
> 
> The powerpc kernel-image packages should be rebuilt against the next
> revision of kernel-source.  But if there's need for the former, the
> latter shouldn't be a big deal.

Well, yes, my point being that there are not all that much changes in the
kernel-source package, and that right now, a build of the kernel-patch-powerpc
package will result in missing pegasos support, as well as missing this new G4
errata fix. Which is the real fix of the uhci issue we had previously.

So, right now, if i want this errata fix to go in, we need both a
kernel-source upload and a kernel-patch-powerpc one, while with the proposed
method only the later would be needed.

I have no problem doing a kernel-source upload though, just is this really the
way we want it ? 

Friendly,

Sven Luther

Send a report that this bug log contains spam.