forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

device-qemu-*: fix sway subpackage install conditions (MR 2749)

Browse source 
By setting the `install_if` to include postmarketos-ui-sway instead of
sway, apk doesn't seem to be confused if it is also trying to install
some other package with `provides=sway` in it.

fixes #1343

[ci:skip-build] already built successfully in CI
This commit is contained in:
Clayton Craft 2021-12-13 22:26:55 -08:00
parent d5c96ecc4c
commit 051a9d763a
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
device/main/device-qemu-aarch64/APKBUILD
View file

@ -3,7 +3,7 @@
# Co-Maintainer: Daniele Debernardi <drebrez@gmail.com> # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=device-qemu-aarch64 pkgname=device-qemu-aarch64
pkgver=2.4 pkgver=2.4
pkgrel=0 pkgrel=1
pkgdesc="Simulated device in QEMU (aarch64)" pkgdesc="Simulated device in QEMU (aarch64)"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="aarch64" arch="aarch64"
@ -41,7 +41,7 @@ mce() {
} }
sway() { sway() {
install_if="$pkgname=$pkgver-r$pkgrel sway" install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway"
depends="postmarketos-ui-sway-logo-key-alt" depends="postmarketos-ui-sway-logo-key-alt"
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }

4
device/main/device-qemu-amd64/APKBUILD
View file

@ -3,7 +3,7 @@
# Co-Maintainer: Daniele Debernardi <drebrez@gmail.com> # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=device-qemu-amd64 pkgname=device-qemu-amd64
pkgver=2.5 pkgver=2.5
pkgrel=0 pkgrel=1
pkgdesc="Simulated device in QEMU (x86_64)" pkgdesc="Simulated device in QEMU (x86_64)"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="x86_64" arch="x86_64"
@ -40,7 +40,7 @@ mce() {
} }
sway() { sway() {
install_if="$pkgname=$pkgver-r$pkgrel sway" install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway"
depends="postmarketos-ui-sway-logo-key-alt" depends="postmarketos-ui-sway-logo-key-alt"
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }