From 8fcefc201fdbc46e7b07c3cd333fbb8278ebae60 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 5 Apr 2018 22:25:26 +0200 Subject: [PATCH] debian/config: Remove redundant overrides of [build]signed-modules We will keep signed-modules disabled by default, and only enable it on architectures where it makes sense. --- debian/config/alpha/defines | 2 -- debian/config/armel/defines | 4 ---- debian/config/defines | 2 +- debian/config/hppa/defines | 2 -- debian/config/m68k/defines | 2 -- debian/config/mips/defines | 2 -- debian/config/mips64/defines | 2 -- debian/config/mips64el/defines | 2 -- debian/config/mips64r6/defines | 2 -- debian/config/mips64r6el/defines | 2 -- debian/config/mipsel/defines | 2 -- debian/config/mipsr6/defines | 2 -- debian/config/mipsr6el/defines | 2 -- debian/config/powerpcspe/defines | 2 -- debian/config/ppc64/defines | 2 -- debian/config/sh4/defines | 2 -- debian/config/sparc64/defines | 2 -- 17 files changed, 1 insertion(+), 35 deletions(-) diff --git a/debian/config/alpha/defines b/debian/config/alpha/defines index 386809d8d..971b7f0dd 100644 --- a/debian/config/alpha/defines +++ b/debian/config/alpha/defines @@ -4,8 +4,6 @@ kernel-arch: alpha [build] image-file: arch/alpha/boot/vmlinux.gz -# linux-signed only works for architectures in the main archive -signed-modules: false [image] suggests: aboot, fdutils diff --git a/debian/config/armel/defines b/debian/config/armel/defines index b6f172dcc..23377de0a 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -5,10 +5,6 @@ kernel-arch: arm [build] image-file: arch/arm/boot/zImage -# Signature verification disabled to save on code size. This should -# apply only to marvell, but we would then need to build udebs only for -# marvell and we don't have a way to do that. -signed-modules: false # uncompressed-image is just for size checking uncompressed-image-file: arch/arm/boot/Image diff --git a/debian/config/defines b/debian/config/defines index c2bb4db6a..80f12bd29 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -109,7 +109,7 @@ featuresets: [build] debug-info: true -# Disable module signing for now +# Disable module signing by default; this can be overridden per-architecture signed-modules: false [featureset-rt_base] diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines index de084e1d3..f79b6cee5 100644 --- a/debian/config/hppa/defines +++ b/debian/config/hppa/defines @@ -4,8 +4,6 @@ kernel-arch: parisc [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false [image] suggests: palo diff --git a/debian/config/m68k/defines b/debian/config/m68k/defines index 5427964a5..82c0a2897 100644 --- a/debian/config/m68k/defines +++ b/debian/config/m68k/defines @@ -6,8 +6,6 @@ kernel-arch: m68k [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false [image] suggests: vmelilo, fdutils diff --git a/debian/config/mips/defines b/debian/config/mips/defines index 720a05112..e4cc96a70 100644 --- a/debian/config/mips/defines +++ b/debian/config/mips/defines @@ -7,8 +7,6 @@ kernel-arch: mips [build] image-file: vmlinux -# linux-signed should not wait for slow builds -signed-modules: false [image] install-stem: vmlinux diff --git a/debian/config/mips64/defines b/debian/config/mips64/defines index d27c3a51f..a43b9b504 100644 --- a/debian/config/mips64/defines +++ b/debian/config/mips64/defines @@ -6,8 +6,6 @@ kernel-arch: mips [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false [image] install-stem: vmlinux diff --git a/debian/config/mips64el/defines b/debian/config/mips64el/defines index ec3b0eb48..1202eaf23 100644 --- a/debian/config/mips64el/defines +++ b/debian/config/mips64el/defines @@ -7,8 +7,6 @@ kernel-arch: mips [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false [image] install-stem: vmlinux diff --git a/debian/config/mips64r6/defines b/debian/config/mips64r6/defines index dc7f22c6b..1952e1562 100644 --- a/debian/config/mips64r6/defines +++ b/debian/config/mips64r6/defines @@ -5,8 +5,6 @@ kernel-arch: mips [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false [image] install-stem: vmlinux diff --git a/debian/config/mips64r6el/defines b/debian/config/mips64r6el/defines index b60be330b..ac92b9b6d 100644 --- a/debian/config/mips64r6el/defines +++ b/debian/config/mips64r6el/defines @@ -5,8 +5,6 @@ kernel-arch: mips [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false [image] install-stem: vmlinux diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines index b122b2312..20d90ad3f 100644 --- a/debian/config/mipsel/defines +++ b/debian/config/mipsel/defines @@ -8,8 +8,6 @@ kernel-arch: mips [build] image-file: vmlinux -# linux-signed should not wait for slow builds -signed-modules: false [image] install-stem: vmlinux diff --git a/debian/config/mipsr6/defines b/debian/config/mipsr6/defines index b945bdd3d..9f5a11dbb 100644 --- a/debian/config/mipsr6/defines +++ b/debian/config/mipsr6/defines @@ -6,8 +6,6 @@ kernel-arch: mips [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false [image] install-stem: vmlinux diff --git a/debian/config/mipsr6el/defines b/debian/config/mipsr6el/defines index f8e4aa49c..257bc06ed 100644 --- a/debian/config/mipsr6el/defines +++ b/debian/config/mipsr6el/defines @@ -6,8 +6,6 @@ kernel-arch: mips [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false [image] install-stem: vmlinux diff --git a/debian/config/powerpcspe/defines b/debian/config/powerpcspe/defines index e978279a5..adb4bea07 100644 --- a/debian/config/powerpcspe/defines +++ b/debian/config/powerpcspe/defines @@ -5,8 +5,6 @@ kernel-arch: powerpc [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false vdso: true [image] diff --git a/debian/config/ppc64/defines b/debian/config/ppc64/defines index 86b6b2057..7efcb1a95 100644 --- a/debian/config/ppc64/defines +++ b/debian/config/ppc64/defines @@ -5,8 +5,6 @@ kernel-arch: powerpc [build] image-file: vmlinux -# linux-signed only works for architectures in the main archive -signed-modules: false vdso: true [image] diff --git a/debian/config/sh4/defines b/debian/config/sh4/defines index 75b001120..c38abc821 100644 --- a/debian/config/sh4/defines +++ b/debian/config/sh4/defines @@ -6,8 +6,6 @@ kernel-arch: sh [build] image-file: arch/sh/boot/zImage -# linux-signed only works for architectures in the main archive -signed-modules: false [image] install-stem: vmlinuz diff --git a/debian/config/sparc64/defines b/debian/config/sparc64/defines index cd4d9df6a..607a267e3 100644 --- a/debian/config/sparc64/defines +++ b/debian/config/sparc64/defines @@ -6,8 +6,6 @@ kernel-arch: sparc [build] image-file: arch/sparc/boot/zImage -# linux-signed only works for architectures in the main archive -signed-modules: false [image] configs: