linux-pine64-pinenote: upgrade to 6.15.2, use upstream linux tar

Uses patchset from hrdl rather than m-weigand. It was rebased against
v6.15 by myself, from v6.15_rc3. hrdl rebased m-weigand's patchset from
v6.12 and improved upon it.

Much like linux-rpi, source code is generated by first using upstream
linux source code, patched with minor release patchset. The PineNote
downstream patches are then applied.

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6667
This commit is contained in:
Antoine Martin 2025-06-15 22:51:01 -04:00
parent b2f0e4f00c
commit 6f78bbc5df
No known key found for this signature in database
GPG key ID: 7A342565FF635F79
3 changed files with 457 additions and 245 deletions

View file

@ -2,8 +2,9 @@
# Kernel config based on: arch/arm64/configs/pinenote_defconfig
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=linux-pine64-pinenote
pkgver=6.12.0
pkgrel=1
pkgver=6.15.2
_kernver=${pkgver%.*}
pkgrel=0
pkgdesc="Pine64 PineNote close to mainline fork"
arch="aarch64"
_carch="arm64"
@ -23,12 +24,15 @@ makedepends="
# Source
_config="config-$_flavor.$arch"
_commit="9d066a65f5cbaa8cd3bfc73a1b54fbac2d0f76ac"
_commit="fa594ab9a7c3f6cf1e1fb69a112d709472bddba7"
source="
$pkgname-$_commit.tar.gz::https://github.com/m-weigand/linux/archive/$_commit.tar.gz
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
$pkgname-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz
$pkgname-$_kernver-$_commit.patch::https://ayakael.net/forge/linux-pinenote/compare/$_commit..v$_kernver.patch
pmos-kconfig-default.patch
$_config
"
builddir="$srcdir/linux-$_commit"
builddir="$srcdir"/linux-$_kernver
prepare() {
default_prepare
@ -60,6 +64,9 @@ package() {
}
sha512sums="
d3c2510f9f835a0570fbb812cec2f9e12e402878c1f9f214364ae1918bc4c00f69a1fc5e005cf6b85c0690e6fd5f6ce9e61efd88145a83725ed12b6b8c07b97e linux-pine64-pinenote-9d066a65f5cbaa8cd3bfc73a1b54fbac2d0f76ac.tar.gz
c9183c618318dd76ae74a0dacf7e09a6cd9d664008128fc82d7c4a3fc2510287a2f3d44ffba9ee3b8428ef7ce1c98b5a22f7da9a693de407b4746700b5283009 config-pine64-pinenote.aarch64
d03788ffa8d8ae1b84ef1286bb44a08fc01432e509dfec6cccae5c5a5a47201d378aec2bcd21e6f0bbd1e625b26f47780c06ee9c1cef3775358f98b160923f30 linux-6.15.tar.xz
545f2d859ad9d3018bf2a44b6ce8b341e32407a9300a47b672d426ebd64b866e2bc3f334f0fad9cce7ea7e64ba139ce133e966fb6ba7a76219fc1407f936ce74 linux-pine64-pinenote-6.15.2.patch.xz
4d35ee18a5631b8cdb381caad81fcc8ab64f050e197bfda168c7f4f12339eced201b8cc89f8f7353b405fde7e9734de04c4c63f7413db9e73d3f70d3e366a9b5 linux-pine64-pinenote-6.15-fa594ab9a7c3f6cf1e1fb69a112d709472bddba7.patch
522c7c38800ac0479f6e99e4e97ba88add5021fe6ab6eeba6e604a37635e48622c113919a425607edbe0abf2aa6bb95b2e824d5d2fe293e149fe588e05374122 pmos-kconfig-default.patch
e45862d4a1eeae61cd97f6878b19035fbadbdd7618d003d43527ca0fc8c74cc835e454ef5e4ef9ca40b82c3b7a93f469fdb604537931ba685ca7a9748c14bda3 config-pine64-pinenote.aarch64
"

View file

@ -0,0 +1,23 @@
diff --git a/./arch/arm64/configs/pinenote_defconfig.orig b/./arch/arm64/configs/pinenote_defconfig
index f27b482f62..9643021619 100644
--- a/./arch/arm64/configs/pinenote_defconfig.orig
+++ b/./arch/arm64/configs/pinenote_defconfig
@@ -1,3 +1,10 @@
+CONFIG_UEVENT_HELPER=y
+CONFIG_NULL_TTY=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_XZ=y
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_UDMABUF=y
CONFIG_DEFAULT_HOSTNAME="pinenote"
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
@@ -16,7 +22,6 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_IKCONFIG=m
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=18