nemo-qml-plugin-systemsettins: Provide /etc/location/location.conf instead of...

nemo-qml-plugin-systemsettins: Provide /etc/location/location.conf instead of geoclue-provider-hybris

recipes-nemomobile/geoclue-providers/geoclue-provider-hybris_git.bb

@@ -4,8 +4,7 @@ LICENSE = "LGPL-2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "git://github.com/mer-hybris/geoclue-providers-hybris.git;protocol=https \
-           file://0001-DeviceControl-Power-the-device-on-by-default-tempora.patch \
-           file://location.conf"
+           file://0001-DeviceControl-Power-the-device-on-by-default-tempora.patch"
 SRCREV = "29ec9933d09beefcc7ef24b83ef046f0150ec31e"
 PR = "r1"
 PV = "+git${SRCPV}"
@@ -16,9 +15,6 @@ inherit qmake5
 
 do_install_append() {
     chmod 04755 ${D}/usr/libexec/geoclue-hybris
-
-    mkdir ${D}/etc/location/
-    cp ${WORKDIR}/location.conf ${D}/etc/location/
 }
 
 FILES_${PN} += "/usr/share/dbus-1 /usr/share/geoclue-providers"

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings_git.bb

@@ -4,6 +4,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://src/displaysettings.cpp;beginline=1;endline=31;md5=99ff23884718e3e2c85992a9294d18df"
 
 SRC_URI = "git://git.merproject.org/mer-core/nemo-qml-plugin-systemsettings.git;protocol=https \
+    file://location.conf \
     file://0001-Disable-SSU-dependency.patch \
     file://0002-languagemodel-install-languages-in-usr-share-support.patch \
     file://0004-LanguageModel-Notify-asteroid-launcher-of-locale-cha.patch"
@@ -13,6 +14,10 @@ PV = "+git${SRCPV}"
 S = "${WORKDIR}/git"
 inherit qmake5
 
+do_install_append() {
+    cp ${WORKDIR}/location.conf ${D}/etc/location/
+}
+
 DEPENDS += "qtdeclarative profiled usb-moded-qt5 mlite mce timed qtsystems libshadowutils nemo-qml-plugin-models libsailfishkeyprovider libconnman-qt5"
 RDEPENDS_${PN} += "profiled"