gencontrol.py: add support for disabling libc-dev package
This commit is contained in:
parent
1f9192267c
commit
6759b9a57e
|
@ -45,6 +45,7 @@ class Gencontrol(Base):
|
||||||
'packages': {
|
'packages': {
|
||||||
'docs': config.SchemaItemBoolean(),
|
'docs': config.SchemaItemBoolean(),
|
||||||
'installer': config.SchemaItemBoolean(),
|
'installer': config.SchemaItemBoolean(),
|
||||||
|
'libc-dev': config.SchemaItemBoolean(),
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -151,12 +152,16 @@ class Gencontrol(Base):
|
||||||
else:
|
else:
|
||||||
headers_arch = self.templates["control.headers.arch"]
|
headers_arch = self.templates["control.headers.arch"]
|
||||||
packages_headers_arch = self.process_packages(headers_arch, vars)
|
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)
|
self.merge_packages(packages, packages_headers_arch, arch)
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,9 @@ MAKEOVERRIDES =
|
||||||
ifneq ($(FOREIGN_KERNEL),True)
|
ifneq ($(FOREIGN_KERNEL),True)
|
||||||
binary-arch-arch: install-headers_$(ARCH)
|
binary-arch-arch: install-headers_$(ARCH)
|
||||||
endif
|
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-featureset: install-headers_$(ARCH)_$(FEATURESET)
|
||||||
binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
|
binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
|
||||||
ifeq ($(DEBUG),True)
|
ifeq ($(DEBUG),True)
|
||||||
|
|
Loading…
Reference in New Issue