X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-audio-4a-framework%2Frecipes-multimedia%2Fagl-service-audio-4a%2Fagl-service-audio-4a_git.bb;h=8aa50efa9250dd425d365919a3528b6abec1ea70;hb=a67dca365dcd18d38de2f3e8a610a251fdb72e44;hp=260c636d502606dc7b2563b717e8c1a993d55be1;hpb=54447aa1f8eb8366567a96f45713fd1cae036e1e;p=AGL%2Fmeta-agl-devel.git

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 260c636d..8aa50efa 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
@@ -7,25 +7,35 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/agl-service-audio-4a;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AUTOREV}"
+SRCREV = "${AGL_APP_REVISION}"
 
-PV = "0.1"
+PV = "0.1+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 inherit cmake aglwgt pkgconfig
 
-DEPENDS += "alsa-lib json-c systemd af-binder glib-2.0"
+DEPENDS += "alsa-lib json-c systemd af-binder glib-2.0 lua"
 
 do_aglwgt_deploy_append() {
 	cat <<'EOF' >${D}/${sysconfdir}/agl-postinsts/99_4A_service_patch.sh
-svcfile=/usr/local/lib/systemd/user/afm-service-agl-service-audio-4a@1.0.service
+N=600
+svcfile="/usr/local/lib/systemd/*/afm-service-agl-service-audio-4a*.service"
 set -x
 echo "-- TMP 4A INSTALL FIX from meta-agl/meta-app-framework/recipes-multimedia/agl-service-audio-4a/agl-service-audio-4a_git.bb - MUST BE REMOVED !!!"
-while [ ! -f $svcfile ]; do
+while ! ls $svcfile > /dev/null; do
+	if [ $N = 0 ]; then echo "-- TMP 4A INSTALL NOT FIXED"; exit 0; fi
 	echo .
 	sleep 0.2
+	N=$(expr $N - 1)
 done
-sed -i -e 's|--verbose |--verbose --ldpath=/usr/libexec/agl/afb-aaaa/lib/:/usr/libexec/agl/4a-alsa-core/lib/ |' $svcfile
+sed -i '/\[Unit\]/ a Before=pulseaudio.service' $svcfile;
+sed -i '/\[Unit\]/ a ConditionPathExistsGlob=/dev/snd/control*' $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
+
+# 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
+
 echo "-- TMP 4A INSTALL FIX END"
 
 EOF