snlavaise/pmaports-rtwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "linux-postmarketos-allwinner: HACK: disable cross-native"

Browse Source 
This was only needed as a temporary workaround[1].

This reverts commit a184bf63e2.

 [1]: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8295#note_546725

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8476>
This commit is contained in:
Stefan Hansson
2026-05-03 09:27:01 +02:00
committed by The Friendly Meow (merge) Bot
parent f43a60639d
commit c6caa19a8f
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/testcases/test_kernel.py
-3
View File
@@ -21,9 +21,6 @@ def test_aports_kernel():
if aport_name == "linux-pam-pmos": if aport_name == "linux-pam-pmos":
continue # This package isn't a linux kernel! 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"]: if "pmb:cross-native" not in apkbuild["options"]:
raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in" raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
" options= line") " options= line")
device/community/linux-postmarketos-allwinner/APKBUILD
+2 -1
View File
@@ -4,7 +4,7 @@ _flavor=postmarketos-allwinner
_config="config-$_flavor.$CARCH" _config="config-$_flavor.$CARCH"
pkgname=linux-$_flavor pkgname=linux-$_flavor
pkgver=6.18.3_git20260105 pkgver=6.18.3_git20260105
pkgrel=1 pkgrel=2
_tag="orange-pi-6.18-20260105-0049" _tag="orange-pi-6.18-20260105-0049"
pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
arch="aarch64 armv7" arch="aarch64 armv7"
@@ -29,6 +29,7 @@ makedepends="
bash bash
" "
options="!strip !check !tracedeps options="!strip !check !tracedeps
pmb:cross-native
pmb:kconfigcheck-community pmb:kconfigcheck-community
" "
source="$pkgname-$_tag.tar.gz::https://codeberg.org/megi/linux/archive/$_tag.tar.gz source="$pkgname-$_tag.tar.gz::https://codeberg.org/megi/linux/archive/$_tag.tar.gz