From c6caa19a8f043327b50e2502ca830e8efae4d696 Mon Sep 17 00:00:00 2001 From: Stefan Hansson Date: Sun, 3 May 2026 09:22:06 +0200 Subject: [PATCH] Revert "linux-postmarketos-allwinner: HACK: disable cross-native" This was only needed as a temporary workaround[1]. This reverts commit a184bf63e21ec6b51598125810be7eefb73e6261. [1]: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8295#note_546725 Part-of: --- .ci/testcases/test_kernel.py | 3 --- device/community/linux-postmarketos-allwinner/APKBUILD | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.ci/testcases/test_kernel.py b/.ci/testcases/test_kernel.py index ebc3c7909..a3a1004c4 100644 --- a/.ci/testcases/test_kernel.py +++ b/.ci/testcases/test_kernel.py @@ -21,9 +21,6 @@ def test_aports_kernel(): if aport_name == "linux-pam-pmos": continue # This package isn't a linux kernel! - if aport_name == "linux-postmarketos-allwinner": - continue # Hack to work around issue (see git blame) - if "pmb:cross-native" not in apkbuild["options"]: raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in" " options= line") diff --git a/device/community/linux-postmarketos-allwinner/APKBUILD b/device/community/linux-postmarketos-allwinner/APKBUILD index 5c3f79a9a..85dd6509d 100644 --- a/device/community/linux-postmarketos-allwinner/APKBUILD +++ b/device/community/linux-postmarketos-allwinner/APKBUILD @@ -4,7 +4,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=6.18.3_git20260105 -pkgrel=1 +pkgrel=2 _tag="orange-pi-6.18-20260105-0049" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -29,6 +29,7 @@ makedepends=" bash " options="!strip !check !tracedeps + pmb:cross-native pmb:kconfigcheck-community " source="$pkgname-$_tag.tar.gz::https://codeberg.org/megi/linux/archive/$_tag.tar.gz