diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 29ea618b0..eae272d55 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -338,7 +338,7 @@ class Gencontrol(Base): for group in relations_compiler_build_dep: for item in group: item.arches = [arch] - packages['source']['Build-Depends'].extend(relations_compiler_build_dep) + packages['source']['Build-Depends-Arch'].extend(relations_compiler_build_dep) image_fields = {'Description': PackageDescription()} for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts', 'Breaks': diff --git a/debian/changelog b/debian/changelog index 280139679..2fd7f04de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium - Change all binary packages with priority: extra to priority: optional - Install copyright file (and some other documentation) when the nodoc profile is used + * debian/control: Move many build dependencies to Build-Depends-Arch field [ Uwe Kleine-König ] * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index 92576d10a..7ad5f9327 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -442,6 +442,7 @@ class Package(_ControlFileDict): ('Uploaders', str), ('Standards-Version', str), ('Build-Depends', PackageRelation), + ('Build-Depends-Arch', PackageRelation), ('Build-Depends-Indep', PackageRelation), ('Provides', PackageRelation), ('Pre-Depends', PackageRelation), diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index e7d7d047c..27d5284a8 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -13,6 +13,9 @@ Build-Depends: cpio , # used by upstream to compress kernel and by debian/rules.real to build linux-source xz-utils , +# used by debian/rules.real to build linux-perf and linux-support + dh-python , +Build-Depends-Arch: # used by debian/rules.real to build udebs kernel-wedge (>= 2.93~) , # used by kernel-wedge (only on Linux, thus not declared as a dependency) @@ -55,8 +58,6 @@ Build-Depends: rsync , # used by upstream to build cpupower libpci-dev , -# used by debian/rules.real to build linux-perf and linux-support - dh-python , Build-Depends-Indep: # used by debian/rules.real to build linux-source patchutils ,