From ccc870dcf9d75b6648d29adc0daeaa05954ab14e Mon Sep 17 00:00:00 2001 From: Jan Jasper de Kroon Date: Mon, 28 Nov 2022 20:43:59 +0100 Subject: [PATCH] device/main/linux-postmarketos-allwinner: Upgrade to 6.1-rc7 (MR 3678) Kernel source updated to 6.1-rc7 Ext2 and Ext3 modules in aarch64 config disabled because Ext4 is backwards compatible. 2 fixes for PinePhone included in this source: pinephone: fix power key behavior during suspend (avoid stuck key during resume) pinephone keyboard: wait for 100ms after enabling power supply and before probing. [ci:skip-build]: already built successfully in CI --- device/main/linux-postmarketos-allwinner/APKBUILD | 10 +++++----- .../config-postmarketos-allwinner.aarch64 | 10 ++++------ .../config-postmarketos-allwinner.armv7 | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD index 846b936fd..b8cba5dc5 100644 --- a/device/main/linux-postmarketos-allwinner/APKBUILD +++ b/device/main/linux-postmarketos-allwinner/APKBUILD @@ -7,9 +7,9 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor -pkgver=6.1.0_rc6_git20221126 +pkgver=6.1.0_rc7_git20221128 pkgrel=0 -_tag="orange-pi-6.1-20221126-1540" +_tag="orange-pi-6.1-20221128-1027" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" url="https://megous.com/git/linux/" @@ -84,9 +84,9 @@ package() { } sha512sums=" -8586ccd1f3922c848f6ff773e781581c53df8573a1fa018e4b687125f50313499d09504c65b10f74d4b0c30459fb1b6ee8c384a4fae6eae03a4f30cc966da231 linux-postmarketos-allwinner-orange-pi-6.1-20221126-1540.tar.gz -08a5b47ce9c5d1d69ab79af936a55cb7e5f445c6176cfc8da50c28670e238083bace2b5fafc117a46858ddeb3d2a506ba582f68fd0d7767d248d33bd610cbe0d config-postmarketos-allwinner.aarch64 -585b5da7d69b2411950ae89681ef85155a6e5c2fd0d2c74f5a767c9ba2b41b25cd3ad6b335f61604b968bd889ba62a95467b79b12a5a029c58d39724cbcd5a5e config-postmarketos-allwinner.armv7 +5223e80d1852337e498d7ac0ce6cbf4268be8102744143499a20a51c1f40aa5daf7da3b71d6f88978f9b14efb147fbec0cf2f8b4e533a808abbff7381701da81 linux-postmarketos-allwinner-orange-pi-6.1-20221128-1027.tar.gz +c10fbaea8f108e324438ff584a640d1fa04afb3908ddf2c69aee936cc1840db12f5b9b4caff777e14cb31dd073de1f7e2fa3cecfc41c06674332e8e0d70bb6e6 config-postmarketos-allwinner.aarch64 +07256e874bbd85465d93ee4592d42fcb15174eac4cbf258dfb74a26d5c5421a4c736158b1375249ef95a9c45e1928409dace43dc501fa551421cd47525fc53fc 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 b5bfd0743..5534c4475 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.0-rc6 Kernel Configuration +# Linux/arm64 6.1.0-rc7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924" CONFIG_CC_IS_GCC=y @@ -5550,12 +5550,10 @@ CONFIG_PM_OPP=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 index c30276da9..3d88afac6 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.0-rc6 Kernel Configuration +# Linux/arm 6.1.0-rc7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924" CONFIG_CC_IS_GCC=y