UBUNTU: [Config]: Switch kernel compression from LZO to LZ4 on s390x

BugLink: https://bugs.launchpad.net/bugs/1840934
While at it, update the annotations file to match reality.

Suggested-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 4acc2a4b208030beaf9bf90a574a10f640920894..222566650b9308f65e9c27c6304ae3ad5f87e09c 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -274,7 +274,6 @@ CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
 # CONFIG_KERNEL_GZIP is not set
 CONFIG_KERNEL_LZ4=y
-# CONFIG_KERNEL_LZO is not set
 CONFIG_KEXEC_FILE=y
 CONFIG_KVM=m
 CONFIG_LAPB=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 3d0580116574c443d3966fd2282925720ab5c1fa..d717f44e54e3a0edff626059f306642105feb7e8 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10292,15 +10292,13 @@ CONFIG_PERF_EVENTS                              policy<{'amd64': 'y', 'arm64': '
 CONFIG_DEBUG_PERF_USE_VMALLOC                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 's390x': 'n'}>
 
 # Menu: General setup >> Kernel compression mode
-CONFIG_KERNEL_GZIP                              policy<{'amd64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}>
+CONFIG_KERNEL_GZIP                              policy<{'amd64': 'n', 'armhf': 'y', 'i386': 'n', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_KERNEL_BZIP2                             policy<{'amd64': 'n', 'i386': 'n', 's390x': 'n'}>
 CONFIG_KERNEL_LZMA                              policy<{'amd64': 'n', 'armhf': 'n', 'i386': 'n', 's390x': 'n'}>
-CONFIG_KERNEL_XZ                                policy<{'amd64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'y'}>
+CONFIG_KERNEL_XZ                                policy<{'amd64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_KERNEL_LZO                               policy<{'amd64': 'n', 'armhf': 'n', 'i386': 'n', 's390x': 'n'}>
-CONFIG_KERNEL_LZ4                               policy<{'amd64': 'n', 'armhf': 'n', 'i386': 'n', 's390x': 'n'}>
+CONFIG_KERNEL_LZ4                               policy<{'amd64': 'y', 'armhf': 'n', 'i386': 'y', 's390x': 'y'}>
 CONFIG_KERNEL_UNCOMPRESSED                      policy<{'s390x': 'n'}>
-#
-CONFIG_KERNEL_GZIP                              flag<REVIEW> note<does s390x care the format here?>
 
 # Menu: General setup >> Namespaces support
 CONFIG_NAMESPACES                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index f94a92cc47899c23db0a84e876f0b6c4eae53aba..4e9b507a8349e55cae41d4d269fca05ea386a633 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -276,7 +276,6 @@ CONFIG_JME=m
 CONFIG_KARMA_PARTITION=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZ4 is not set
-# CONFIG_KERNEL_LZO is not set
 CONFIG_KVM=y
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 49592681d0392b15f3c48c293303be185a09635c..a8d8746194fe23a8b23de6f4b984fc909c11cec0 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4897,6 +4897,7 @@ CONFIG_KDB_KEYBOARD=y
 CONFIG_KEMPLD_WDT=m
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
 CONFIG_KERNEL_MODE_NEON=y
 # CONFIG_KERNEL_NOBP is not set
 CONFIG_KERNEL_START=0xc000000000000000

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 9c434a6c20752a133fb87ae691b9754a435547c1..c4d36de66ac4c713150365026665fa56427887b1 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -270,7 +270,6 @@ CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
 # CONFIG_KERNEL_GZIP is not set
 CONFIG_KERNEL_LZ4=y
-# CONFIG_KERNEL_LZO is not set
 CONFIG_KVM=m
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 56e87a37391e58b0df18fb18e05eeff89dc99a76..049e108a82b848532edbbb1d8551406292b9247b 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -257,8 +257,7 @@ CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_JUMP_LABEL=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_KERNEL_LZO=y
+CONFIG_KERNEL_LZ4=y
 # CONFIG_KEXEC_FILE is not set
 CONFIG_KVM=y
 # CONFIG_LAPB is not set