diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 1c125cfe1..5469300ab 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -38,6 +38,12 @@ class Gencontrol(Base): 'check-size': config.SchemaItemInteger(), 'check-size-with-dtb': config.SchemaItemBoolean(), 'check-uncompressed-size': config.SchemaItemInteger(), + 'depends': config.SchemaItemList(','), + 'provides': config.SchemaItemList(','), + 'suggests': config.SchemaItemList(','), + 'recommends': config.SchemaItemList(','), + 'conflicts': config.SchemaItemList(','), + 'breaks': config.SchemaItemList(','), }, 'relations': { }, @@ -371,11 +377,13 @@ class Gencontrol(Base): flavour) config_entry_description = self.config.merge('description', arch, featureset, flavour) - config_entry_image = self.config.merge('image', arch, featureset, - flavour) config_entry_relations = self.config.merge('relations', arch, featureset, flavour) + def config_entry_image(key, *args, **kwargs): + return self.config.get_merge( + 'image', arch, featureset, flavour, key, *args, **kwargs) + compiler = config_entry_base.get('compiler', 'gcc') # Work out dependency from linux-headers to compiler. Drop @@ -403,10 +411,11 @@ class Gencontrol(Base): image_fields = {'Description': PackageDescription()} for field in ('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts', 'Breaks'): - image_fields[field] = PackageRelation(config_entry_image.get( - field.lower(), None), override_arches=(arch,)) + image_fields[field] = PackageRelation( + config_entry_image(field.lower(), None), + override_arches=(arch,)) - generators = config_entry_image['initramfs-generators'] + generators = config_entry_image('initramfs-generators') group = PackageRelationGroup() for i in generators: i = config_entry_relations.get(i, i) @@ -419,7 +428,7 @@ class Gencontrol(Base): item.arches = [arch] image_fields['Depends'].append(group) - bootloaders = config_entry_image.get('bootloaders') + bootloaders = config_entry_image('bootloaders', None) if bootloaders: group = PackageRelationGroup() for i in bootloaders: diff --git a/debian/changelog b/debian/changelog index b00c707f9..2ae5c2e77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -806,6 +806,7 @@ linux (4.19.34-1) UNRELEASED; urgency=medium * [powerpc,ppc64,ppc64el] linux-image: Recommend grub-ieee1275 * [i386] Add grub-efi-ia32 as an alternate recommended bootloader * linux-source: Recommend bison and flex, always needed to build the kernel + * [armel/marvell,sh4] linux-image: Recommend apparmor, like all other configs [ YunQiang Su ] * [mips*r6] Re-enable CONFIG_JUMP_LABEL, which has been fixed in upstream.