gencontrol.py: add support for disabling libc-dev package

This commit is contained in:
Yves-Alexis Perez 2015-11-12 23:02:36 +01:00
parent 1f9192267c
commit 6759b9a57e
2 changed files with 12 additions and 5 deletions

View File

@ -45,6 +45,7 @@ class Gencontrol(Base):
'packages': {
'docs': config.SchemaItemBoolean(),
'installer': config.SchemaItemBoolean(),
'libc-dev': config.SchemaItemBoolean(),
}
}
@ -151,12 +152,16 @@ class Gencontrol(Base):
else:
headers_arch = self.templates["control.headers.arch"]
packages_headers_arch = self.process_packages(headers_arch, vars)
packages_headers_arch[-1]['Depends'].extend(PackageRelation())
extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends']
if self.config.merge('packages').get('libc-dev', True):
libc_dev = self.templates["control.libc-dev"]
packages_headers_arch[0:0] = self.process_packages(libc_dev, {})
else:
makeflags['DO_LIBC'] = False
libc_dev = self.templates["control.libc-dev"]
packages_headers_arch[0:0] = self.process_packages(libc_dev, {})
packages_headers_arch[-1]['Depends'].extend(PackageRelation())
extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends']
self.merge_packages(packages, packages_headers_arch, arch)

4
debian/rules.real vendored
View File

@ -53,7 +53,9 @@ MAKEOVERRIDES =
ifneq ($(FOREIGN_KERNEL),True)
binary-arch-arch: install-headers_$(ARCH)
endif
binary-arch-arch: install-libc-dev_$(ARCH)
ifneq ($(DO_LIBC),False)
binary-arch-arch: install-libc-dev_$(ARCH)
endif
binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
ifeq ($(DEBUG),True)