aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linaro.org>2019-07-31 23:00:50 -0500
committerAníbal Limón <anibal.limon@linaro.org>2019-07-31 23:12:08 -0500
commitaf043d83135cb8ab10806592c5f3cea57df229d6 (patch)
tree4db3ebcc16351acd1e552608d4dbf4531ce964b2
parent3beeac3a60809607e02f1ff0826b1b86331ab00d (diff)
downloadmeta-qcom-af043d83135cb8ab10806592c5f3cea57df229d6.tar.gz
meta-qcom-af043d83135cb8ab10806592c5f3cea57df229d6.tar.bz2
meta-qcom-af043d83135cb8ab10806592c5f3cea57df229d6.zip
recipes-support: rmtfs bump to rev df6c19d033
Use systemd service file from upstream. Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
-rw-r--r--recipes-support/rmtfs/files/rmtfs.service15
-rw-r--r--recipes-support/rmtfs/rmtfs_git.bb11
2 files changed, 3 insertions, 23 deletions
diff --git a/recipes-support/rmtfs/files/rmtfs.service b/recipes-support/rmtfs/files/rmtfs.service
deleted file mode 100644
index 2002fd6..0000000
--- a/recipes-support/rmtfs/files/rmtfs.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=RMTFS setup
-After=systemd-remount-fs.service qrtr.service
-Requires=qrtr.service
-
-[Service]
-ExecStartPre=/bin/sh -c "[ ! -f /boot/modem_fs1 ] && dd if=/dev/zero of=/boot/modem_fs1 bs=1M count=2 || :"
-ExecStartPre=/bin/sh -c "[ ! -f /boot/modem_fs2 ] && dd if=/dev/zero of=/boot/modem_fs2 bs=1M count=2 || :"
-ExecStartPre=/bin/sh -c "[ ! -f /boot/modem_fsc ] && dd if=/dev/zero of=/boot/modem_fsc bs=1M count=2 || :"
-ExecStartPre=/bin/sh -c "[ ! -f /boot/modem_fsg ] && dd if=/dev/zero of=/boot/modem_fsg bs=1M count=2 || :"
-ExecStart=/usr/bin/rmtfs -v
-ExecStartPost=/bin/sh -c "[ -d /sys/bus/platform/devices/*.hexagon ] && modprobe qcom_q6v5_pil"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-support/rmtfs/rmtfs_git.bb b/recipes-support/rmtfs/rmtfs_git.bb
index 2e79bc0..a5a0f23 100644
--- a/recipes-support/rmtfs/rmtfs_git.bb
+++ b/recipes-support/rmtfs/rmtfs_git.bb
@@ -7,23 +7,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ca25dbf5ebfc1a058bfc657c895aac2f"
inherit systemd
-SRCREV = "0d3c49ec5aa27517afec9f18a3afc4b0800e6cbb"
+SRCREV = "df6c19d0330d251af0a7c812bf5ddb847962ce2c"
SRC_URI = "git://github.com/andersson/${BPN}.git;branch=master;protocol=https"
-SRC_URI += "file://rmtfs.service"
DEPENDS = "qmic-native qrtr udev"
PV = "0.0+${SRCPV}"
S = "${WORKDIR}/git"
-EXTRA_OEMAKE = "'LDFLAGS=${TARGET_LDFLAGS} -L${STAGING_LIBDIR} -lqrtr -ludev'"
+EXTRA_OEMAKE = "'LDFLAGS=${TARGET_LDFLAGS} -L${STAGING_LIBDIR} -lqrtr -ludev -lpthread'"
do_install () {
- oe_runmake install DESTDIR=${D} prefix=${prefix}
-
- sed -i -e s:/usr/bin:${bindir}:g ${WORKDIR}/rmtfs.service
- install -d ${D}${systemd_unitdir}/system/
- install -m 0644 ${WORKDIR}/rmtfs.service ${D}${systemd_unitdir}/system
+ oe_runmake install DESTDIR=${D} prefix=${prefix} servicedir=${systemd_unitdir}/system
}
SYSTEMD_SERVICE_${PN} = "rmtfs.service"