From: Jitao Lu <dianlujitao@gmail.com>
Date: Sun, 4 Jun 2023 05:54:01 +0000 (+0800)
Subject: oxnas: Enable CONFIG_CRYPTO_LZ4
X-Git-Tag: v23.05.0-rc2~141
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2804fff57f01134bb992f1d1798e4d5af77d7112;p=openwrt%2Fstaging%2Fpepe2k.git

oxnas: Enable CONFIG_CRYPTO_LZ4

Previously, CONFIG_LZ4_DECOMPRESS=y was selected by CONFIG_RD_LZ4 only.

When building kernel for initramfs, CONFIG_RD_LZ4 will be unset by
Kernel/SetInitramfs if the chosen compression method is not lz4, then
CONFIG_LZ4_DECOMPRESS will become a *module* in the newly generated
kernel config.

However, the newly added module won't be built after
38c150612cc9be488527e342db92d5c74093213f, so packaging kmod-lib-lz4
fails due to missing lz4_decompress.ko.

CONFIG_CRYPTO_LZ4=y makes CONFIG_LZ4_DECOMPRESS=y being selected w/o
CONFIG_RD_LZ4, so that the modules of the default kernel and initramfs
kernel are consistent.

Fixes: #12766
Fixes: 38c150612cc ("build: revert 54070a1 (all kernels are >= 5.10)")
Signed-off-by: Jitao Lu <dianlujitao@gmail.com>
(cherry picked from commit cc87f6629b8a120420075cd984a4e6ece6c669df)
---

diff --git a/target/linux/oxnas/config-5.15 b/target/linux/oxnas/config-5.15
index cdb762a2a0..9540a76774 100644
--- a/target/linux/oxnas/config-5.15
+++ b/target/linux/oxnas/config-5.15
@@ -77,6 +77,7 @@ CONFIG_CRC16=y
 CONFIG_CRC32_SLICEBY8=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_DEBUG_ALIGN_RODATA=y
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -165,6 +166,7 @@ CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LIBFDT=y
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
+CONFIG_LZ4_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 # CONFIG_MACH_OX810SE is not set
@@ -242,6 +244,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIO=y
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_SERPORT=y
+CONFIG_SGL_ALLOC=y
 CONFIG_SLUB_DEBUG=y
 CONFIG_SOCK_DIAG=y
 CONFIG_SPARSE_IRQ=y