[UNSTABLE][PATCH 3/3] UBUNTU: [Packaging] use ZSTD to compress s390 kernels

[Dimitri John Ledkov]

BugLink: https://bugs.launchpad.net/bugs/1931725

linux-next has ZSTD support for s390 arch now, cherry-pick those
commits and enable ZSTD compression for s390x like it was already done
on amd64.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---
 debian.master/config/annotations               | 4 ++--
 debian.master/config/armhf/config.common.armhf | 1 -
 debian.master/config/config.common.ubuntu      | 1 +
 debian.master/config/s390x/config.common.s390x | 1 -
 debian.master/control.stub.in                  | 3 +--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 930e8f5b01f0..b17c7eb3df31 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11165,8 +11165,8 @@ CONFIG_KERNEL_BZIP2                             policy<{'amd64': 'n', 's390x': '
 CONFIG_KERNEL_LZMA                              policy<{'amd64': 'n', 'armhf': 'n', 's390x': 'n'}>
 CONFIG_KERNEL_XZ                                policy<{'amd64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_KERNEL_LZO                               policy<{'amd64': 'n', 'armhf': 'n', 's390x': 'n'}>
-CONFIG_KERNEL_LZ4                               policy<{'amd64': 'n', 'armhf': 'n', 's390x': 'y'}>
-CONFIG_KERNEL_ZSTD                              policy<{'amd64': 'y'}>
+CONFIG_KERNEL_LZ4                               policy<{'amd64': 'n', 'armhf': 'n', 's390x': 'n'}>
+CONFIG_KERNEL_ZSTD                              policy<{'amd64': 'y', 's390x': 'y'}>
 CONFIG_KERNEL_UNCOMPRESSED                      policy<{'s390x': 'n'}>
 
 # Menu: General setup >> Namespaces support
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 0b19ab2f9efa..9c066fa720b0 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -289,7 +289,6 @@ CONFIG_JME=m
 # CONFIG_JUMP_LABEL is not set
 CONFIG_KARMA_PARTITION=y
 CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_LZ4 is not set
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set
 CONFIG_LCD_CLASS_DEVICE=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ab828d5f61dd..31ae3a25e209 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5363,6 +5363,7 @@ CONFIG_KDB_KEYBOARD=y
 CONFIG_KEEMBAY_WATCHDOG=m
 CONFIG_KEMPLD_WDT=m
 # CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZ4 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_LZO is not set
 CONFIG_KERNEL_MODE_NEON=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 7c47e20d833c..0ec9892dbd27 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -263,7 +263,6 @@ CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_JUMP_LABEL=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZ4=y
 # CONFIG_KEXEC_FILE is not set
 CONFIG_KVM=y
 # CONFIG_LAPB is not set
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 01cd82721efd..31386fad5dc6 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -37,8 +37,7 @@ Build-Depends:
  libnuma-dev [amd64 arm64 ppc64el s390x] <!stage1>,
  dkms <!stage1>,
  curl <!stage1>,
- lz4 [s390x] <!stage1>,
- zstd [amd64] <!stage1>,
+ zstd [amd64 s390x] <!stage1>,
  dwarves [amd64 arm64 armhf ppc64el s390x] <!stage1>,
 Build-Depends-Indep:
  xmlto <!stage1>,
-- 
2.27.0