secubox/secubox-deb
1
0
Fork 0
mirror of https://github.com/CyberMind-FR/secubox-deb.git synced 2026-07-29 15:37:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(kernel-build): enforce ZRAM choice via scripts/config after merge (#326)

Browse Source 
merge_config.sh + olddefconfig don't always honour choice-symbol
overrides set in a fragment (kconfig special-cases choices). Run
scripts/config after the merge to set ZRAM_DEF_COMP_ZSTD explicitly
and disable the upstream-default ZRAM_DEF_COMP_LZORLE.

Co-authored-by: CyberMind-FR <gandalf@Gk2.net>
This commit is contained in:
CyberMind 2026-05-22 06:45:59 +02:00 committed by GitHub
parent fc48024e46
commit 8e5e08449f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/build-kernel.yml vendored
View File

@ -70,6 +70,17 @@ jobs:
scripts/kconfig/merge_config.sh -m .config \
"${GITHUB_WORKSPACE}/board/mochabin/kernel/config-6.12-openwrt-merged.fragment" \
"${GITHUB_WORKSPACE}/board/mochabin/kernel/config-6.12.85-secubox-zram.fragment"
# Enforce the choice symbols that merge_config.sh + olddefconfig
# don't always honour when set via a fragment (choice handling is
# special-cased in kconfig). scripts/config edits .config directly
# and olddefconfig then propagates dependencies.
scripts/config --module ZRAM \
--enable ZRAM_DEF_COMP_ZSTD \
--disable ZRAM_DEF_COMP_LZORLE \
--enable ZSMALLOC \
--enable CRYPTO_ZSTD \
--enable CRYPTO_LZ4 \
--enable CRYPTO_LZO
make ARCH=arm64 olddefconfig
# Sanity-check key configs landed.
grep -q "CONFIG_LEDS_IS31FL319X=m" .config || (echo "FAIL: LED module missing" && exit 1)