drop the libqmi fork: Alpine's snapshot is past the !470 merge
Alpine's community/libqmi is at upstream 1c972b8a (2026-10-05), 23 commits past the 30f3e998 this fork pinned "just past the !470 merge", with the qmi-glib 1.39.1 the GNSS patches in modemmanager need. No patch was left; the fork's one remaining addition, the FP6-tuned build (-march/-mtune, whose gain was never measured), goes with it. build.sh loses its tarball, checksum and build steps. The registry still serves the fork (1.39.1_git20260808-r100 and -r101), and that version outranks Alpine's 1.38.0_git* line, so with the aport alone installed phones keep the fork and a fresh image takes it back at its first 'apk upgrade': the fork's packages are deleted from the registry with this push. Fresh images then install Alpine's libqmi and keep it. Installed phones keep the fork until 'apk upgrade -a' downgrades them to Alpine's or Alpine's version passes 1.39.1; the new modemmanager works on either (verified on the FP6 with both). pmbootstrap keeps a local package repository in its work dir and consults it before every other repository. Whether that dir survives from one CI run to the next is not established (run 60 rebuilt libqmi, modemmanager and libcamera at the versions run 58 had built, which says it did not), but nothing guarantees it either way, so build.sh deletes any libqmi/qmi-utils apks found there before building, re-indexes the repository from the files present and fails the run if any are left; the publish step skips libqmi-*/qmi-utils-* as the backstop. pmbootstrap's 'zap --pkgs-local-mismatch' cannot do this: with systemd selected it looks at packages/systemd-edge, not at the packages/edge the builds land in.
This commit is contained in:
parent
71ee495d6f
commit
7157c54b10
GPG key ID:
2937E59CDCC1BCFB
4 changed files with 31 additions and 95 deletions
|
|
@ -1,77 +0,0 @@
|
|||
# fp6-img fork of Alpine community/libqmi: snapshot bumped to upstream main
|
||||
# just past the !470 merge (LOC Register Events client-identification TLVs,
|
||||
# half of working GNSS on the FP6) - which also provides the qmi-glib 1.39.1
|
||||
# our modemmanager patches require. Drop when Alpine's snapshot catches up.
|
||||
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
|
||||
maintainer="Achill Gilgenast <achill@achill.org>"
|
||||
pkgname=libqmi
|
||||
pkgver=1.39.1_git20260808
|
||||
_commit=30f3e998e6cbda364ac1bc73223de20561e6d555
|
||||
pkgrel=101
|
||||
pkgdesc="QMI modem protocol helper library"
|
||||
url="https://www.freedesktop.org/wiki/Software/libqmi"
|
||||
arch="all"
|
||||
license="GPL-2.0-or-later AND LGPL-2.1-or-later"
|
||||
makedepends="
|
||||
bash-completion-dev
|
||||
glib-dev
|
||||
gobject-introspection-dev
|
||||
help2man
|
||||
libgudev-dev
|
||||
libmbim-dev
|
||||
libqrtr-glib-dev
|
||||
linux-headers
|
||||
meson
|
||||
python3
|
||||
"
|
||||
# fp6-img: crossdirect breaks meson compiler introspection (cc1 spawn
|
||||
# failure), same as modemmanager; build under plain qemu.
|
||||
options="!pmb:crossdirect"
|
||||
# fp6-img: this package only ever runs on the FP6 (4x Cortex-A520 + 4x
|
||||
# Cortex-A720), so build for it. armv8.6-a is the highest level whose
|
||||
# mandatory set the phone exposes (8.7 would assume WFxT, 9.x SVE2; neither
|
||||
# is in its hwcaps); +fp16fml+aes+sha3+sm4 are the optional extensions it
|
||||
# has, the same set `gcc -march=native` derives on the phone. One spelling
|
||||
# for gcc and clang, and the same string the kernel aport uses.
|
||||
export CFLAGS="$CFLAGS -march=armv8.6-a+fp16fml+aes+sha3+sm4 -mtune=cortex-a720"
|
||||
subpackages="
|
||||
$pkgname-dev
|
||||
$pkgname-doc
|
||||
$pkgname-bash-completion
|
||||
qmi-utils
|
||||
"
|
||||
#source="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$pkgver/libqmi-$pkgver.tar.gz"
|
||||
# fp6-img: local tarball, generated by build.sh from a git clone — fd.o's
|
||||
# archive endpoint 504s for hours at a stretch (killed CI runs 27/30/31)
|
||||
source="libqmi-$_commit.tar.gz
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$_commit"
|
||||
|
||||
build() {
|
||||
abuild-meson \
|
||||
-Db_lto=true \
|
||||
. output
|
||||
meson compile -C output
|
||||
}
|
||||
|
||||
check() {
|
||||
local tests=$(meson test --list -C output)
|
||||
case "$CARCH" in
|
||||
s390x) tests=${tests//test-message} ;;
|
||||
esac
|
||||
meson test --print-errorlogs -C output $tests
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" meson install --no-rebuild -C output
|
||||
}
|
||||
|
||||
utils() {
|
||||
pkgdesc="$pkgdesc (CLI utilities)"
|
||||
|
||||
amove usr/bin
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
fc178689675b47faaa46c14b126dc054354044238ea00464b4cc4910c5f2c73faaa12d80a5219fbfad65ab575e38f7af3fd79ae7974ea80ed67bfffe027b85c3 libqmi-cff17a676e10d75081516dafa997fe9bc9043c38.tar.gz
|
||||
"
|
||||
Loading…
Reference in a new issue