From a69b28b39782627a424d53314955343bc7fef78e Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 9 Sep 2019 19:58:59 -0400 Subject: radio: Update default presets location Since the changes to run the applications as non-root, the location of the default preset file has not matched with the agl-driver user the application runs as. Since simply changing the install location to /home/1001 would require some post-install SMACK label tinkering, and is perhaps fragile to the application user, the files are now instead installed to /etc/xdg/AGL, with the defaults to be used named radio-presets.conf. A corresponding change to the radio application to look in that location before trying the appdata directory is also required. Bug-AGL: SPEC-2789 Change-Id: Ic5756420e21471096b74b476ad243e44e87ef561 Signed-off-by: Scott Murray (cherry picked from commit abe2d9282954936e222c2989c1d6bbbbead939fc) --- recipes-demo-hmi/radio/radio_git.bb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/recipes-demo-hmi/radio/radio_git.bb b/recipes-demo-hmi/radio/radio_git.bb index 331617671..52a981f25 100644 --- a/recipes-demo-hmi/radio/radio_git.bb +++ b/recipes-demo-hmi/radio/radio_git.bb @@ -25,18 +25,14 @@ inherit qmake5 aglwgt # ALS, CES, FOSDEM available AGL_RADIO_PRESETS_LOCALE ?= "CES" - do_install_append() { - install -d ${D}${ROOT_HOME}/app-data/radio - install -m 0644 ${WORKDIR}/presets-CES.conf ${D}${ROOT_HOME}/app-data/radio/ - install -m 0644 ${WORKDIR}/presets-ALS.conf ${D}${ROOT_HOME}/app-data/radio/ - install -m 0644 ${WORKDIR}/presets-FOSDEM.conf ${D}${ROOT_HOME}/app-data/radio/ - install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}${ROOT_HOME}/app-data/radio/presets.conf + install -d ${D}${sysconfdir}/xdg/AGL + install -m 0644 ${WORKDIR}/presets-CES.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-CES.conf + install -m 0644 ${WORKDIR}/presets-ALS.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-ALS.conf + install -m 0644 ${WORKDIR}/presets-FOSDEM.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-FOSDEM.conf + install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}${sysconfdir}/xdg/AGL/radio-presets.conf } -FILES_${PN} += " \ - ${ROOT_HOME}/app-data/radio/presets-*.conf \ - ${ROOT_HOME}/app-data/radio/presets.conf \ -" +FILES_${PN} += "${sysconfdir}/xdg/AGL/*" RDEPENDS_${PN} += "agl-service-radio" -- cgit 1.2.3-korg