From 7517c6cfad093168c64f24a187c77ab660ef5858 Mon Sep 17 00:00:00 2001 From: Willow Barraco Date: Mon, 27 Mar 2023 08:48:20 +0200 Subject: [PATCH] linux-postmarketos-allwinner: enable FSCACHE and NFS caching (MR 3979) See https://gitlab.com/postmarketOS/pmaports/-/issues/2034 [ci:skip-build]: Already built successfully in CI --- device/main/linux-postmarketos-allwinner/APKBUILD | 6 +++--- .../config-postmarketos-allwinner.aarch64 | 6 ++++-- .../config-postmarketos-allwinner.armv7 | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD index 4f9ff69e8..c60f4d49c 100644 --- a/device/main/linux-postmarketos-allwinner/APKBUILD +++ b/device/main/linux-postmarketos-allwinner/APKBUILD @@ -7,7 +7,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=6.2.7_git20230317 -pkgrel=2 +pkgrel=3 _tag="orange-pi-6.2-20230317-1559" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -86,8 +86,8 @@ package() { sha512sums=" a4f55a84b0866fea78b4b2e10dd818dd2b3894e0bd29ee1e4e72c3d8afe9043e40164234dc3a9a6dd382d3d6c594b1b3f334e3002597d3ab03164907190f32b3 linux-postmarketos-allwinner-orange-pi-6.2-20230317-1559.tar.gz -82694d4927116588f2acf6e156346377d8c7912b9747a6e06a6a017abd7e2e174d71a711a208c22774e6ae661ed83b34ca564a01380720a777969aa55639987b config-postmarketos-allwinner.aarch64 -82ac79f4e856900a3b75398689ce2bc483e0ddfeec0dd9a2db14473d1c8d1d4d9633878cb019878f1d3fbfefc4662542781e2d36937237aada69dbcd6e5abbb5 config-postmarketos-allwinner.armv7 +7b2945db2323376a703528c94fb90e47e31967ba1859fc3cf25b16bfbdf3066a7df09b0bcd7f83a22d49075bcb9e2758027689305535985fcaa871b1364be53a config-postmarketos-allwinner.aarch64 +8506c820cc962bfc76d6534d46b0571901624618a2fc0a19b1e0171fedeeb0f583e4f13a36308a26939409c84f1de3d3846c4016eb4ac4a90a7d478d8d15aa71 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/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index 66e7fe664..98c22280d 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -5672,7 +5672,8 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # # Caches # -# CONFIG_FSCACHE is not set +CONFIG_FSCACHE=m +CONFIG_CACHEFILES=m # end of Caches # @@ -5760,7 +5761,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_UFS_FS is not set # CONFIG_EROFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V2=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set @@ -5768,6 +5769,7 @@ CONFIG_NFS_V4=y # CONFIG_NFS_SWAP is not set CONFIG_NFS_V4_1=y CONFIG_NFS_V4_2=y +CONFIG_NFS_FSCACHE=y CONFIG_PNFS_FILE_LAYOUT=y CONFIG_PNFS_BLOCK=y CONFIG_PNFS_FLEXFILE_LAYOUT=y diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 index 5aa00a1a2..bf8917a47 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 @@ -5516,7 +5516,8 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # # Caches # -# CONFIG_FSCACHE is not set +CONFIG_FSCACHE=m +CONFIG_CACHEFILES=m # end of Caches # @@ -5597,13 +5598,14 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_UFS_FS is not set # CONFIG_EROFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V2=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y # CONFIG_NFS_SWAP is not set # CONFIG_NFS_V4_1 is not set +CONFIG_NFS_FSCACHE=y CONFIG_ROOT_NFS=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y