On Thu, Mar 31, 2011 at 2:56 PM, Sedat Dilek <sedat.di...@googlemail.com> wrote: > [ Please CC me I am not subscribed to the list ] > > [QUOTE] > On Thu, Mar 31, 2011 at 12:04:13PM +0200, Sedat Dilek wrote: >> linux-2.6 (2.6.39~rc1-1~next20110331.dileks1) UNRELEASED; urgency=low > > This version splits into "2.6.39~rc1" and "1~next20110331.dileks1". > >> $ head -2 debian/config/defines >> [abi] >> abiname: next20110331-1 >> >> If I remove "~rc1" means (2.6.39-1~next20110331.dileks.1) from >> debian/changelog, the desired "ABINAME=next20110331-1" successfully is >> set. > > A version of the "A.B.C~rcX" always forces the abiname. There is no > reason for Debian kernel to do it different. > >> Can you give some help? > > You want a different version. Something like 2.6.39~rc1+next20110331-1. > Or remove the check in your tree. > > Bastian > [/QUOTE] > > I tried with: > > $ head -1 debian/changelog > linux-2.6 (2.6.39~rc1+next20110331-1) UNRELEASED; urgency=low > > $ head -2 debian/config/defines > [abi] > abiname: next20110331-1 > > NOPE. > > $ grep -i ABINAME= setup.log > make -f debian/rules.real setup-flavour ABINAME='' ARCH='i386' > COMPILER='gcc-4.4' FEATURESET='none' FLAVOUR='686' > INITRD_CMD='update-initramfs' KCONFIG='debian/config/config > debian/config/kernelarch-x86/config > debian/config/kernelarch-x86/config-arch-32 > debian/config/i386/none/config.686' KERNEL_ARCH='x86' > LOCALVERSION='-686' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-686' > MAJOR='2.6' MODULES='True' SOURCEVERSION='2.6.39~rc1+next20110331-1' > TYPE='plain' UPSTREAMVERSION='2.6.39-rc1+next20110331' > VERSION='2.6.39' > > The next what I see with your version-string, what is the name of the > resulting orig-tarball? > The idea behind mine was X~rc1.orig.tar.{gz|bz|xz}. > > What do you mean by "Or remove the check in your tree."? > Where exactly? > > - Sedat - >
With this Workaround ABINAME is correct set. - Sedat - diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index a0cdfec..422a88f 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -323,10 +323,11 @@ class Gencontrol(Base): versions.append(i.version) self.versions = versions version = self.version = self.changelog[0].version - if self.version.linux_modifier is not None: - self.abiname = '' - else: - self.abiname = '-%s' % self.config['abi',]['abiname'] + # XXX: Workaround, remove this check + #if self.version.linux_modifier is not None: + # self.abiname = '' + #else: + self.abiname = '-%s' % self.config['abi',]['abiname'] self.vars = { 'upstreamversion': self.version.linux_upstream, 'version': self.version.linux_version, -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/AANLkTimnYFU7jL4rkeX80wTH70=FgmmfOTE4x=gwd...@mail.gmail.com