device/*: fix build due to abuild breaking changes

Since abuild 3.16.0_rc1 split functions are executed in $pkgdir. And
built files in build() are no longer showing up in "$srcdir" but are in
$pkgdir now apparently.

[ci:skip-vercheck] # just build fixes, no change in final package

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7428>
This commit is contained in:
Luca Weiss 2025-11-24 22:48:33 +09:00 committed by The Friendly Merge Bot
parent a21e1717fe
commit f208372359
No known key found for this signature in database
8 changed files with 16 additions and 12 deletions

View file

@ -69,13 +69,13 @@ kernel_lts() {
firmware_amd() {
install_if="$pkgname=$pkgver-r$pkgrel linux-firmware-amdgpu"
install -Dm644 00-amdgpu-firmware.files \
install -Dm644 "$srcdir"/00-amdgpu-firmware.files \
-t "$subpkgdir"/usr/share/mkinitfs/files-extra
}
firmware_intel() {
install_if="$pkgname=$pkgver-r$pkgrel linux-firmware-i915"
install -Dm644 00-i915-firmware.files \
install -Dm644 "$srcdir"/00-i915-firmware.files \
-t "$subpkgdir"/usr/share/mkinitfs/files-extra
}

View file

@ -44,7 +44,7 @@ build() {
package() {
devicepkg_package $startdir $pkgname
install -D "$srcdir"/bootarm.efi \
install -D bootarm.efi \
"$pkgdir"/boot/EFI/Boot/bootarm.efi
}

View file

@ -53,7 +53,8 @@ nonfree_firmware() {
"
install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
install -Dm644 "$srcdir"/q6voiced.conf \
"$subpkgdir"/etc/conf.d/q6voiced
install -Dm644 "$srcdir"/hexagonrpcd.confd \
"$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
}
@ -69,9 +70,11 @@ nonfree_firmware_openrc() {
pmtest() {
depends="bootrr qrtr firmware-shift-sdm845 unl0kr"
install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"
install="$subpkgname.post-install"
install="$subpkgdir/$subpkgname.post-install"
devicepkg_pmtest_post_install "ttyMSM0,115200" > "$subpkgname.post-install"
mkdir -p "$subpkgdir"
devicepkg_pmtest_post_install "ttyMSM0,115200" > "$subpkgdir/$subpkgname.post-install"
}
sha512sums="

View file

@ -49,9 +49,10 @@ nonfree_firmware() {
hexagonrpcd
"
install -Dm644 81-libssc-xiaomi-beryllium.rules \
install -Dm644 "$srcdir"/81-libssc-xiaomi-beryllium.rules \
"$subpkgdir"/etc/udev/rules.d/81-libssc-xiaomi-beryllium.rules
install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
install -Dm644 "$srcdir"/q6voiced.conf \
"$subpkgdir"/etc/conf.d/q6voiced
install -Dm644 "$srcdir"/hexagonrpcd.confd \
"$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
}

View file

@ -53,7 +53,7 @@ build() {
package() {
devicepkg_package $startdir $pkgname
install -Dm644 "$srcdir"/bootriscv64.efi \
install -Dm644 bootriscv64.efi \
"$pkgdir"/boot/efi/boot/bootriscv64.efi
}

View file

@ -39,7 +39,7 @@ package() {
install -Dm644 "$srcdir"/pulse-jolla-c2.conf \
"$pkgdir"/etc/pulse/daemon.conf.d/89-jolla-c2.conf
install -Dm644 "$srcdir"/dummy-initramfs \
install -Dm644 dummy-initramfs \
"$pkgdir"/usr/share/u-boot/reeder-s19mps/dummy-initramfs
install -Dm644 "$srcdir"/90-firmware-loader.rules \
-t "$pkgdir"/usr/lib/udev/rules.d

View file

@ -54,7 +54,7 @@ build() {
package() {
devicepkg_package $startdir $pkgname
install -Dm644 "$srcdir"/bootriscv64.efi \
install -Dm644 bootriscv64.efi \
"$pkgdir"/boot/efi/boot/bootriscv64.efi
}

View file

@ -47,7 +47,7 @@ nonfree_firmware() {
hexagonrpcd>=0.3.2-r3
"
install -Dm644 81-libssc-xiaomi-miatoll.rules \
install -Dm644 "$srcdir"/81-libssc-xiaomi-miatoll.rules \
"$subpkgdir"/etc/udev/rules.d/81-libssc-xiaomi-miatoll.rules
install -Dm644 "$srcdir"/hexagonrpcd.confd \
"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf