From a71579a1b6109a6b96c8beac66c779f87b610eb4 Mon Sep 17 00:00:00 2001 From: Tobias Jahnke Date: Fri, 9 Nov 2018 11:53:50 +0100 Subject: meta-audio-4a: remove UNICENS legacy hal Bug-AGL: SPEC-1505 - Remove UNICENS legacy hal from build until the new hal plugin is available - Remove ldpath which was required to load the legacy hal (avoids binder startup error since the path is no longer available) Change-Id: If25094d4f944e887fed0ed10c5cae8049ce6db82 Signed-off-by: Tobias Jahnke (cherry picked from commit d531eb3872684bb873d157a09f0048d4fbc70e0d) --- .../recipes-core/packagegroups/packagegroup-agl-audio.bb | 1 - .../recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb b/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb index 907cb1c4..e8926363 100644 --- a/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb +++ b/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb @@ -13,7 +13,6 @@ RDEPENDS_${PN} += "\ agl-service-audio-4a \ VIRTUAL-RUNTIME_alsa-state \ agl-service-unicens \ - 4a-hal-unicens \ bluez-alsa \ 4a-softmixer \ 4a-hal-generic \ diff --git a/meta-audio-4a-framework/recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb b/meta-audio-4a-framework/recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb index 78cb2e7f..c6281e99 100644 --- a/meta-audio-4a-framework/recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb +++ b/meta-audio-4a-framework/recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb @@ -32,7 +32,7 @@ sed -i '/\[Unit\]/ a Before=pulseaudio.service' $svcfile; sed -i '/\[Unit\]/ a ConditionPathExistsGlob=/dev/snd/control*' $svcfile; sed -i '/ExecStartPre=/ a Environment=LIBASOUND_THREAD_SAFE=0' $svcfile; -sed -i -e 's|/usr/bin/afb-daemon\>|& --ldpath=/usr/libexec/agl/4a-alsa-core/lib:/usr/libexec/agl/4a-hal/lib:/usr/libexec/agl/afb-aaaa/lib:/usr/libexec/agl/smixer/lib|' $svcfile +sed -i -e 's|/usr/bin/afb-daemon\>|& --ldpath=/usr/libexec/agl/4a-alsa-core/lib:/usr/libexec/agl/4a-hal/lib:/usr/libexec/agl/smixer/lib|' $svcfile # binder name matters: it must match "afbd-4a-*" => the config file (controller json file) that will be searched will be "policy-4a-*.json" sed -i -e 's|--name afbd-agl-\(.*\)|--name afbd-4a-\1|' $svcfile -- cgit 1.2.3-korg