aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linaro.org>2019-07-31 23:00:13 -0500
committerAníbal Limón <anibal.limon@linaro.org>2019-07-31 23:11:34 -0500
commitd22a2ffc7c216af4f21ba4eb70f3e2735176c4e3 (patch)
treef3eb157c908bd2017712e504146604e26da8a4fd
parent350c086d96f1cf0213d714d1f9e4603c5bf0275f (diff)
downloadmeta-qcom-d22a2ffc7c216af4f21ba4eb70f3e2735176c4e3.tar.gz
meta-qcom-d22a2ffc7c216af4f21ba4eb70f3e2735176c4e3.tar.bz2
meta-qcom-d22a2ffc7c216af4f21ba4eb70f3e2735176c4e3.zip
recipes-support: qrtr bump to rev cd6bedd5d0
Use systemd service file from upstream and build one single package qrtr. Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
-rw-r--r--recipes-support/qrtr/files/qrtr.service11
-rw-r--r--recipes-support/qrtr/qrtr_git.bb14
2 files changed, 3 insertions, 22 deletions
diff --git a/recipes-support/qrtr/files/qrtr.service b/recipes-support/qrtr/files/qrtr.service
deleted file mode 100644
index e2f1952..0000000
--- a/recipes-support/qrtr/files/qrtr.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=QRTR service
-After=systemd-remount-fs.service
-
-[Service]
-ExecStartPre=/usr/bin/qrtr-cfg 1
-ExecStart=/usr/bin/qrtr-ns
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-support/qrtr/qrtr_git.bb b/recipes-support/qrtr/qrtr_git.bb
index e5e7463..03566db 100644
--- a/recipes-support/qrtr/qrtr_git.bb
+++ b/recipes-support/qrtr/qrtr_git.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=15329706fbfcb5fc5edcc1bc7c139da5"
inherit systemd
-SRCREV = "a1694a1c938fdcd047553841370ebe2cd7384299"
+SRCREV = "cd6bedd5d00f211e6c1e3803ff2f9f53c246435e"
SRC_URI = "git://github.com/andersson/${BPN}.git;branch=master;protocol=https"
-SRC_URI += "file://qrtr.service"
PV = "0.0+${SRCPV}"
@@ -18,14 +17,7 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE = "prefix=${prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir} LDFLAGS='${LDFLAGS}'"
do_install () {
- oe_runmake install DESTDIR=${D}
-
- sed -i -e s:/usr/bin:${bindir}:g ${WORKDIR}/qrtr.service
- install -d ${D}${systemd_unitdir}/system/
- install -m 0644 ${WORKDIR}/qrtr.service ${D}${systemd_unitdir}/system
+ oe_runmake install DESTDIR=${D} prefix=${prefix} servicedir=${systemd_unitdir}/system
}
-SYSTEMD_SERVICE_${PN} = "qrtr.service"
-
-PACKAGES =+ "qrtr-apps"
-FILES_qrtr-apps = "${bindir}/*"
+SYSTEMD_SERVICE_${PN} = "qrtr-ns.service"