[P/U] [PATCH RESEND 1/4] UBUNTU: [packaging] split flavour-control.stub

[Masahiro Yamada]

Our debian/control is generated by preprocessing templates, and results
in one of the following configurations:

 - all architectures are signed
 - all architectures are unsigned

To allow signed/unsigned linux-image packages to coexist, linux-image
packages and their dbgsym variants must be processed differently.

Split the file.

Signed-off-by: Masahiro Yamada <masahiro.yamada at canonical.com>
---

 debian.master/control.d/flavour-control.stub  | 40 -------------------
 .../control.d/flavour-signed-control.stub     | 40 +++++++++++++++++++
 debian/scripts/control-create                 |  2 +-
 3 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 debian.master/control.d/flavour-signed-control.stub

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index 7efa04a6ca7d..e1e1afc01859 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -21,29 +21,6 @@
 #
 # XXX: Leave the blank line before the first package!!
 
-Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR
-Build-Profiles: <!stage1>
-Architecture: ARCH
-Section: kernel
-Priority: optional
-Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
-Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-PKGVER-ABINUM-FLAVOUR
-Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
-Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x]
-Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR
-Suggests: fdutils, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR, linux-modules-extra-PKGVER-ABINUM-FLAVOUR
-Description: Linux kernel image for version PKGVER on DESC
- This package contains the=SIGN-ME-TXT= Linux kernel image for version PKGVER on
- DESC.
- .
- Supports SUPPORTED processors.
- .
- TARGET
- .
- You likely do not want to install this package directly. Instead, install
- the linux-FLAVOUR meta-package, which will ensure that upgrades work
- correctly, and that supporting packages are also installed.
-
 Package: linux-modules-PKGVER-ABINUM-FLAVOUR
 Build-Profiles: <!stage1>
 Architecture: ARCH
@@ -111,23 +88,6 @@ Description: Rust library files related to Linux kernel version PKGVER
  This package provides kernel library files for version PKGVER, that allow to
  compile out-of-tree kernel modules written in Rust.
 
-Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR-dbgsym
-Build-Profiles: <!stage1>
-Architecture: ARCH
-Section: devel
-Priority: optional
-Depends: ${misc:Depends}
-Provides: linux-debug
-Description: Linux kernel debug image for version PKGVER on DESC
- This package provides the=SIGN-ME-TXT= kernel debug image for version PKGVER on
- DESC.
- .
- This is for sites that wish to debug the kernel.
- .
- The kernel image contained in this package is NOT meant to boot from. It
- is uncompressed, and unstripped. This package also includes the
- unstripped modules.
-
 Package: linux-tools-PKGVER-ABINUM-FLAVOUR
 Build-Profiles: <!stage1>
 Architecture: ARCH
diff --git a/debian.master/control.d/flavour-signed-control.stub b/debian.master/control.d/flavour-signed-control.stub
new file mode 100644
index 000000000000..175a771894c0
--- /dev/null
+++ b/debian.master/control.d/flavour-signed-control.stub
@@ -0,0 +1,40 @@
+Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR
+Build-Profiles: <!stage1>
+Architecture: ARCH
+Section: kernel
+Priority: optional
+Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
+Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-PKGVER-ABINUM-FLAVOUR
+Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
+Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x]
+Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR
+Suggests: fdutils, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR, linux-modules-extra-PKGVER-ABINUM-FLAVOUR
+Description: Linux kernel image for version PKGVER on DESC
+ This package contains the=SIGN-ME-TXT= Linux kernel image for version PKGVER on
+ DESC.
+ .
+ Supports SUPPORTED processors.
+ .
+ TARGET
+ .
+ You likely do not want to install this package directly. Instead, install
+ the linux-FLAVOUR meta-package, which will ensure that upgrades work
+ correctly, and that supporting packages are also installed.
+
+Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR-dbgsym
+Build-Profiles: <!stage1>
+Architecture: ARCH
+Section: devel
+Priority: optional
+Depends: ${misc:Depends}
+Provides: linux-debug
+Description: Linux kernel debug image for version PKGVER on DESC
+ This package provides the=SIGN-ME-TXT= kernel debug image for version PKGVER on
+ DESC.
+ .
+ This is for sites that wish to debug the kernel.
+ .
+ The kernel image contained in this package is NOT meant to boot from. It
+ is uncompressed, and unstripped. This package also includes the
+ unstripped modules.
+
diff --git a/debian/scripts/control-create b/debian/scripts/control-create
index f2af8b9bb2f4..92aa3d9e3f25 100755
--- a/debian/scripts/control-create
+++ b/debian/scripts/control-create
@@ -10,7 +10,7 @@ any_signed=$2
 [ "$provides" != '' ] && provides="$provides, "
 
 flavour=$(basename $vars | sed 's/.*\.//')
-stub="${DEBIAN}/control.d/flavour-control.stub debian/control.d/flavour-buildinfo.stub"
+stub="${DEBIAN}/control.d/flavour-signed-control.stub ${DEBIAN}/control.d/flavour-control.stub debian/control.d/flavour-buildinfo.stub"
 if [ "$any_signed" = 'true' ]; then
 	sign_me_pkg="-unsigned"
 	sign_me_txt=" unsigned"
-- 
2.43.0