debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* debian/bin/gencontrol.py: Add LOCALVERSION with the same rules than anything else. 

* debian/lib/python/debian_linux/gencontrol.py: Export LOCALVERSION.

svn path=/dists/trunk/linux-2.6/; revision=6041
This commit is contained in:
Bastian Blank 2006-03-03 15:58:44 +00:00
parent a3709b14c1
commit f4739f80c2
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/bin/gencontrol.py vendored
View File

@ -46,11 +46,13 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
def do_subarch_setup(self, vars, makeflags, arch, subarch):
vars.update(self.config.get(('image', arch, subarch), {}))
for i in ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),:
vars['localversion_headers'] = vars['localversion']
for i in (
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
('localversion_headers', 'LOCALVERSION_HEADERS'),
):
if vars.has_key(i[0]):
makeflags[i[1]] = vars[i[0]]
vars['localversion_headers'] = vars['localversion']
makeflags['LOCALVERSION_HEADERS'] = vars['localversion_headers']
def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags, extra):
headers_subarch = self.templates["control.headers.subarch"]
@ -78,17 +80,17 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
vars.update(self.config.get(('image', arch, subarch, flavour), {}))
for i in (
('compiler', 'COMPILER'),
('image-postproc', 'IMAGE_POSTPROC'),
('initramfs', 'INITRAMFS',),
('kernel-arch', 'KERNEL_ARCH'),
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
('kpkg-arch', 'KPKG_ARCH'),
('kpkg-subarch', 'KPKG_SUBARCH'),
('image-postproc', 'IMAGE_POSTPROC'),
('initramfs', 'INITRAMFS',),
('localversion', 'LOCALVERSION'),
('type', 'TYPE'),
):
if vars.has_key(i[0]):
makeflags[i[1]] = vars[i[0]]
makeflags['LOCALVERSION'] = vars['localversion']
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
image = self.templates["control.image"]

8
debian/lib/python/debian_linux/gencontrol.py vendored
View File

@ -185,13 +185,13 @@ class gencontrol(object):
self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, extra)
def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour):
config_entry = self.config.merge('base', arch, subarch, flavour)
for i in (
('compiler', 'COMPILER'),
('kernel-arch', 'KERNEL_ARCH')
('kernel-arch', 'KERNEL_ARCH'),
('localversion', 'LOCALVERSION'),
):
if config_entry.has_key(i[0]):
makeflags[i[1]] = config_entry[i[0]]
if vars.has_key(i[0]):
makeflags[i[1]] = vars[i[0]]
def do_flavour_makefile(self, makefile, arch, subarch, flavour, makeflags):
for i in ('binary-arch', 'build', 'setup'):