From 307c46d9431c4545b138f92cda12550ff535fd78 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 3 Sep 2021 09:44:53 -0700 Subject: [PATCH] device-pine64-pinetab: change ucm2 install path to support 5.14 kernel (MR 2471) with 5.14, there's some change to the path that alsa searches for ucm2 for this device. the install path for PineTab.conf is changed, and it references "full" path to HiFi and VoiceCall profiles (which I kept in `PineTab` dir, so that there could be several configs for the same driver later on, if necessary/desired) [ci:skip-build] already built successfully in CI --- device/community/device-pine64-pinetab/APKBUILD | 8 ++++---- device/community/device-pine64-pinetab/ucm/PineTab.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/device/community/device-pine64-pinetab/APKBUILD b/device/community/device-pine64-pinetab/APKBUILD index cbb6c7899..602d31011 100644 --- a/device/community/device-pine64-pinetab/APKBUILD +++ b/device/community/device-pine64-pinetab/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Dylan Van Assche pkgname=device-pine64-pinetab pkgdesc="PINE64 PineTab" -pkgver=0.11 +pkgver=0.12 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -58,7 +58,7 @@ build() { kernel_allwinner() { pkgdesc="Allwinner kernel with support for Pinetab LCD panel (from Early Adopter)" - depends="linux-postmarketos-allwinner" + depends="linux-postmarketos-allwinner>=5.14" devicepkg_subpackage_kernel $startdir $pkgname $subpkgname mkimage \ @@ -121,7 +121,7 @@ package() { # Alsa usecase manager config install -D -m644 "$srcdir"/PineTab.conf \ - "$pkgdir"/usr/share/alsa/ucm2/PineTab/PineTab.conf + "$pkgdir"/usr/share/alsa/ucm2/simple-card/PineTab.conf install -D -m644 "$srcdir"/HiFi.conf \ "$pkgdir"/usr/share/alsa/ucm2/PineTab/HiFi.conf @@ -167,7 +167,7 @@ sha512sums=" 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2 sway.conf 181438ed8723c29bf201a5d4ad1ae588afcd03763deadb267b23d96ad40c8956e08b2e3b800f4ee5d77774625d0b0e6a70c4068f98fbfad50d31e71b30a24164 uboot-script.cmd a2fd8037c9a1af000f31c7005436d791525317f818c553d1e2f472b4df76c71d769ecbf67b369a478bea720a6215eaa9fb6a26ba218ac9410513e2345ebe7b4c HiFi.conf -3bdf9d4c41058680d488d9b4a2ac5fd693ceddc5f319a577480546f8af7d9d64c9d3196e73cb0c00e793697eef4ad075c88c3d274702a5387c15945bc749d844 PineTab.conf +7a19bfc3bf08c11bf34943f822fcae9de57dbdae4759281386e77f711c5d9f7a58fd4970166c4db751e9c29585291fe52f58bc622d80b835d6c645eb339a7263 PineTab.conf 9c472065b19141dd4c7555869b955de2e679b36e597f9fa3bdac18d0e9460986b0e2fffe1e04751301305f1b6474c1375803afb7d6212eeae91b4905d0bf8ff8 pulse-pinetab.conf 6374ef977eab14b71fa88057ebd52ca03035e387e5f41504598a990f24b2e92bccd2db476c545dc541000e08fccdecb6f1cd63e25b5835df706269e0384dacc7 weston.ini ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4 UPower.conf diff --git a/device/community/device-pine64-pinetab/ucm/PineTab.conf b/device/community/device-pine64-pinetab/ucm/PineTab.conf index 51875ed9b..d8e142e3d 100644 --- a/device/community/device-pine64-pinetab/ucm/PineTab.conf +++ b/device/community/device-pine64-pinetab/ucm/PineTab.conf @@ -1,6 +1,6 @@ Syntax 2 SectionUseCase."HiFi" { - File "HiFi.conf" + File "/PineTab/HiFi.conf" Comment "Play HiFi quality music" }