debian/bin/gencontrol.py
- Simplify libc-dev arch setup. - Use kernel arch as default for list of kernel header arches. svn path=/dists/trunk/linux-2.6/; revision=10057
This commit is contained in:
parent
9e5c6e6291
commit
e93c957573
|
@ -30,10 +30,7 @@ class Gencontrol(Base):
|
||||||
config_base = self.config.get(('base', arch), {})
|
config_base = self.config.get(('base', arch), {})
|
||||||
vars.update(self.config.get(('image', arch), {}))
|
vars.update(self.config.get(('image', arch), {}))
|
||||||
config_libc_dev = self.config.get(('libc-dev', arch), {})
|
config_libc_dev = self.config.get(('libc-dev', arch), {})
|
||||||
arch = config_libc_dev.get('arch', None)
|
makeflags['LIBC_DEV_ARCH'] = config_libc_dev.get('arch', config_base.get('kernel-arch'))
|
||||||
if arch is None:
|
|
||||||
arch = config_base.get('kernel-arch')
|
|
||||||
makeflags['LIBC_DEV_ARCH'] = arch
|
|
||||||
|
|
||||||
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
|
def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
|
||||||
headers_arch = self.templates["control.headers.arch"]
|
headers_arch = self.templates["control.headers.arch"]
|
||||||
|
@ -60,13 +57,8 @@ class Gencontrol(Base):
|
||||||
|
|
||||||
def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
|
def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
|
||||||
vars.update(self.config.get(('image', arch, featureset), {}))
|
vars.update(self.config.get(('image', arch, featureset), {}))
|
||||||
vars['localversion_headers'] = vars['localversion']
|
makeflags['LOCALVERSION_HEADERS'] = vars['localversion_headers'] = vars['localversion']
|
||||||
for i in (
|
makeflags['KERNEL_HEADER_DIRS'] = vars.get('kernel-header-dirs', vars.get('kernel-arch'))
|
||||||
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
|
|
||||||
('localversion_headers', 'LOCALVERSION_HEADERS'),
|
|
||||||
):
|
|
||||||
if vars.has_key(i[0]):
|
|
||||||
makeflags[i[1]] = vars[i[0]]
|
|
||||||
|
|
||||||
def do_featureset_packages(self, packages, makefile, arch, featureset, vars, makeflags, extra):
|
def do_featureset_packages(self, packages, makefile, arch, featureset, vars, makeflags, extra):
|
||||||
headers_featureset = self.templates["control.headers.featureset"]
|
headers_featureset = self.templates["control.headers.featureset"]
|
||||||
|
@ -92,7 +84,6 @@ class Gencontrol(Base):
|
||||||
('compiler', 'COMPILER'),
|
('compiler', 'COMPILER'),
|
||||||
('initramfs', 'INITRAMFS',),
|
('initramfs', 'INITRAMFS',),
|
||||||
('kernel-arch', 'KERNEL_ARCH'),
|
('kernel-arch', 'KERNEL_ARCH'),
|
||||||
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
|
|
||||||
('kpkg-arch', 'KPKG_ARCH'),
|
('kpkg-arch', 'KPKG_ARCH'),
|
||||||
('kpkg-subarch', 'KPKG_SUBARCH'),
|
('kpkg-subarch', 'KPKG_SUBARCH'),
|
||||||
('localversion', 'LOCALVERSION'),
|
('localversion', 'LOCALVERSION'),
|
||||||
|
@ -101,6 +92,7 @@ class Gencontrol(Base):
|
||||||
):
|
):
|
||||||
if vars.has_key(i[0]):
|
if vars.has_key(i[0]):
|
||||||
makeflags[i[1]] = vars[i[0]]
|
makeflags[i[1]] = vars[i[0]]
|
||||||
|
makeflags['KERNEL_HEADER_DIRS'] = vars.get('kernel-header-dirs', vars.get('kernel-arch'))
|
||||||
|
|
||||||
def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
|
def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
|
||||||
headers = self.templates["control.headers"]
|
headers = self.templates["control.headers"]
|
||||||
|
|
Loading…
Reference in New Issue