[SRU][K][PATCH 02/16] UBUNTU: [Config] Disable CONFIG_EROFS_FS_ZIP_LZMA on riscv64

[Emil Renner Berthing]

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

This option was not annotated in the linux-riscv tree, so let's align it
with the other architectures.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/arm64/config.common.arm64     | 1 -
 debian.master/config/armhf/config.common.armhf     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/riscv64/config.common.riscv64 | 1 -
 debian.master/config/s390x/config.common.s390x     | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c3fd7a196871..4e71ee8464e0 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -124,7 +124,6 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFIVAR_FS=y
 CONFIG_EFS_FS=m
 CONFIG_ENCLOSURE_SERVICES=m
-# CONFIG_EROFS_FS_ZIP_LZMA is not set
 CONFIG_ETHOC=m
 # CONFIG_EVM_LOAD_X509 is not set
 CONFIG_EXFAT_FS=m
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index e03083af3dc3..4649e94119bd 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -135,7 +135,6 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFIVAR_FS=y
 CONFIG_EFS_FS=m
 CONFIG_ENCLOSURE_SERVICES=m
-# CONFIG_EROFS_FS_ZIP_LZMA is not set
 CONFIG_ETHOC=m
 # CONFIG_EVM_LOAD_X509 is not set
 CONFIG_EXFAT_FS=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 6a146143fc34..09da64415cb7 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -127,7 +127,6 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFIVAR_FS=y
 CONFIG_EFS_FS=m
 CONFIG_ENCLOSURE_SERVICES=m
-# CONFIG_EROFS_FS_ZIP_LZMA is not set
 CONFIG_ETHOC=m
 # CONFIG_EVM_LOAD_X509 is not set
 CONFIG_EXFAT_FS=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ab2ad1f3bc4b..c2855fa0d319 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3580,6 +3580,7 @@ CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_ZIP=y
+# CONFIG_EROFS_FS_ZIP_LZMA is not set
 CONFIG_ERRATA_SIFIVE=y
 CONFIG_ERRATA_SIFIVE_CIP_1200=y
 CONFIG_ERRATA_SIFIVE_CIP_453=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index eb4b93eb7026..2e30608710e0 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -126,7 +126,6 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFS_FS=m
 CONFIG_ENCLOSURE_SERVICES=m
-# CONFIG_EROFS_FS_ZIP_LZMA is not set
 CONFIG_ETHOC=m
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EXFAT_FS=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 261dbb049839..15424da6ab39 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -125,7 +125,6 @@ CONFIG_EEPROM_MAX6875=m
 CONFIG_EFIVAR_FS=m
 CONFIG_EFS_FS=m
 CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_EROFS_FS_ZIP_LZMA=y
 CONFIG_ETHOC=m
 # CONFIG_EVM_LOAD_X509 is not set
 CONFIG_EXFAT_FS=m
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 242030babd09..cb977fc5bc42 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -109,7 +109,6 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EROFS_FS_ZIP_LZMA is not set
 # CONFIG_ETHOC is not set
 # CONFIG_EVM_LOAD_X509 is not set
 # CONFIG_EXFAT_FS is not set
-- 
2.36.1