r3995 - in trunk/kernel/linux-2.6/debian: . bin
Bastian Blank
waldi at costa.debian.org
Fri Aug 19 23:11:48 UTC 2005
Author: waldi
Date: 2005-08-19 23:11:47 +0000 (Fri, 19 Aug 2005)
New Revision: 3995
Modified:
trunk/kernel/linux-2.6/debian/bin/gencontrol.py
trunk/kernel/linux-2.6/debian/rules.real
Log:
* debian/bin/gencontrol.py: Add special abiname setting for kpkg.
* debian/rules.real: Use KPKG_ABINAME.
Modified: trunk/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- trunk/kernel/linux-2.6/debian/bin/gencontrol.py 2005-08-19 22:26:44 UTC (rev 3994)
+++ trunk/kernel/linux-2.6/debian/bin/gencontrol.py 2005-08-19 23:11:47 UTC (rev 3995)
@@ -211,7 +211,7 @@
version_re = ur"""
^
(?P<source>
- (
+ (?:
\d+\.\d+\.\d+\+
)?
(?P<upstream>
@@ -220,9 +220,11 @@
\.
\d+
)
- (
+ (?:
-
- .+?
+ (?P<modifier>
+ .+?
+ )
)?
)
-
@@ -361,12 +363,19 @@
vars = {}
vars = vars_changelog(vars, changelog)
- version = changelog[0]['Version']
-
c = config()
vars.update(c['base'])
+ version = changelog[0]['Version']
+ if version['modifier'] is not None:
+ abiname = version['modifier']
+ kpkg_abiname = ""
+ vars['abiname'] = abiname
+ else:
+ abiname = c['base']['abiname']
+ kpkg_abiname = "-%s" % abiname
+
arches = {}
subarches_architecture = {}
for arch in c['base']['arches']:
@@ -457,7 +466,11 @@
makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch_text, i, arch, subarch_text), None))
subarch_makeflags = arch_makeflags[:]
- subarch_makeflags.extend(["SUBARCH='%s'" % subarch_text, "ABINAME='%s'" % subarch_vars['abiname']])
+ subarch_makeflags.extend([
+ "SUBARCH='%s'" % subarch_text,
+ "ABINAME='%s'" % abiname,
+ "KPKG_ABINAME='%s'" % kpkg_abiname,
+ ])
subarch_makeflags_clean = subarch_makeflags[:]
if subarch_vars.has_key('kpkg-subarch'):
subarch_makeflags.append("KPKG_SUBARCH='%s'" % subarch_vars['kpkg-subarch'])
Modified: trunk/kernel/linux-2.6/debian/rules.real
===================================================================
--- trunk/kernel/linux-2.6/debian/rules.real 2005-08-19 22:26:44 UTC (rev 3994)
+++ trunk/kernel/linux-2.6/debian/rules.real 2005-08-19 23:11:47 UTC (rev 3995)
@@ -40,11 +40,11 @@
# replaced by the flavour for which the command is run.
#
kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
-kpkg_header += make-kpkg --append-to-version $(append)-$(ABINAME)
+kpkg_header += make-kpkg --append-to-version "$(append)$(KPKG_ABINAME)"
kpkg_header += --arch $(ARCH)
kpkg_header += --stem linux
kpkg_header += --config defconfig
-kpkg_image := make-kpkg --append-to-version -$(ABINAME)-$(FLAVOUR)
+kpkg_image := make-kpkg --append-to-version "$(KPKG_ABINAME)-$(FLAVOUR)"
kpkg_image += --arch $(ARCH)
kpkg_image += --stem linux
kpkg_image += --initrd
More information about the Kernel-svn-changes
mailing list