From b2a82a028d3d24ca27f7d2b1da185db207a70e04 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Sat, 14 Aug 2021 01:18:53 -0700 Subject: [PATCH] main/linux-postmarketos-allwinner: support zram kconfig check (MR 2434) Note: building zram as a module allows for easy reconfiguration at runtime (e.g. using the zram-init service). [ci:skip-build] Already built in a MR --- main/linux-postmarketos-allwinner/APKBUILD | 14 +++++++++----- .../config-postmarketos-allwinner.aarch64 | 15 ++++++++------- .../config-postmarketos-allwinner.armv7 | 15 ++++++++++++--- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD index 07c455888..d1554ae4c 100644 --- a/main/linux-postmarketos-allwinner/APKBUILD +++ b/main/linux-postmarketos-allwinner/APKBUILD @@ -7,7 +7,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.13.6_git20210729 -pkgrel=0 +pkgrel=1 _tag="orange-pi-5.13-20210729-0943" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -27,8 +27,12 @@ makedepends=" rsync xz " -options="!strip !check !tracedeps pmb:cross-native pmb:kconfigcheck-anbox - pmb:kconfigcheck-nftables" +options="!strip !check !tracedeps + pmb:cross-native + pmb:kconfigcheck-anbox + pmb:kconfigcheck-nftables + pmb:kconfigcheck-zram + " source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar.gz config-$_flavor.aarch64 config-$_flavor.armv7 @@ -93,8 +97,8 @@ dev() { sha512sums=" f9596b4ac56462fb72839e04c29fbefd6ec632eeaf12d0a6356bd204fdb27c72c296c6385a18cf4108ff617581182d231f6ec146452a3659f29944de0bbd668f linux-postmarketos-allwinner-orange-pi-5.13-20210729-0943.tar.gz -d4ae50782682f11b9f07114c9af7ec9ba296d5ac843cca46d6141d1a6a04e34dccbb294169349e0cc16ce27fdfac2dba650d0f567bbd75434689daa8ee9729df config-postmarketos-allwinner.aarch64 -8f7e8d2774132d855b5cca4804dfabd68f58f2bc1352b30b2e5ba4d6f7e4301445c3147c4d761840eb8ff4d13cc0076c19ce9b08284156370d3beba83caa619b config-postmarketos-allwinner.armv7 +5b216a05f749c2265de8eda756e6b0e968ae171a0fcec00d2078db896ba7950085041897bbf2042d8a25ab9beb8d6dab91cd4c10a135be1fec2482d23858b3fd config-postmarketos-allwinner.aarch64 +4208c06e529346b7d1116b0cf5746d5c0c38810c443d6daa39b817bd8b85380a7a60778f5f4cd5801a1ec6a31a254173be8d46371cecc9f43c40b4a4dc45ee0b config-postmarketos-allwinner.armv7 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04 0002-dts-add-pinetab-dev-old-display-panel.patch 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa 0003-dts-pinetab-add-missing-bma223-ohci1.patch diff --git a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index 0fb10415d..0759ca917 100644 --- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -819,7 +819,7 @@ CONFIG_CMA_AREAS=7 # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set CONFIG_ZSMALLOC=y -# CONFIG_ZSMALLOC_STAT is not set +CONFIG_ZSMALLOC_STAT=y CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_IDLE_PAGE_TRACKING is not set @@ -1479,13 +1479,14 @@ CONFIG_OF_OVERLAY=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set -CONFIG_ZRAM=y -CONFIG_ZRAM_DEF_COMP_LZORLE=y -# CONFIG_ZRAM_DEF_COMP_ZSTD is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEF_COMP_LZORLE is not set +CONFIG_ZRAM_DEF_COMP_ZSTD=y +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set -CONFIG_ZRAM_DEF_COMP="lzo-rle" +CONFIG_ZRAM_DEF_COMP="zstd" # CONFIG_ZRAM_WRITEBACK is not set -# CONFIG_ZRAM_MEMORY_TRACKING is not set +CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_CRYPTOLOOP is not set @@ -5568,7 +5569,7 @@ CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=m # CONFIG_CRYPTO_LZ4HC is not set CONFIG_CRYPTO_ZSTD=m diff --git a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 index ff823c485..90e38cdfd 100644 --- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 +++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 @@ -765,7 +765,8 @@ CONFIG_CMA=y CONFIG_CMA_AREAS=7 # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set -# CONFIG_ZSMALLOC is not set +CONFIG_ZSMALLOC=y +CONFIG_ZSMALLOC_STAT=y CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set # CONFIG_PERCPU_STATS is not set @@ -1306,6 +1307,12 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set +CONFIG_ZRAM=m +CONFIG_ZRAM_DEF_COMP_ZSTD=y +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set +CONFIG_ZRAM_DEF_COMP="zstd" +# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_CRYPTOLOOP is not set @@ -5288,9 +5295,9 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_LZO is not set # CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=m # CONFIG_CRYPTO_LZ4HC is not set -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m # # Random Number Generation @@ -5393,7 +5400,9 @@ CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZSTD_COMPRESS=m CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y