diff options
-rw-r--r-- | conf/machine/include/qcom-apq8016.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/qcom-apq8096.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/qcom-sdm845.inc | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-linaro-qcomlt_5.2.bb | 2 | ||||
-rw-r--r-- | recipes-support/qrtr/files/qrtr.service | 11 | ||||
-rw-r--r-- | recipes-support/qrtr/qrtr_git.bb | 14 | ||||
-rw-r--r-- | recipes-support/rmtfs/files/rmtfs.service | 15 | ||||
-rw-r--r-- | recipes-support/rmtfs/rmtfs_git.bb | 11 | ||||
-rw-r--r-- | recipes-test/images/initramfs-test-image.bb | 2 |
9 files changed, 11 insertions, 50 deletions
diff --git a/conf/machine/include/qcom-apq8016.inc b/conf/machine/include/qcom-apq8016.inc index bd861ae..27eb27e 100644 --- a/conf/machine/include/qcom-apq8016.inc +++ b/conf/machine/include/qcom-apq8016.inc @@ -23,7 +23,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \ - qrtr-apps \ + qrtr \ rmtfs \ " diff --git a/conf/machine/include/qcom-apq8096.inc b/conf/machine/include/qcom-apq8096.inc index cda18e0..5c65f12 100644 --- a/conf/machine/include/qcom-apq8096.inc +++ b/conf/machine/include/qcom-apq8096.inc @@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \ - qrtr-apps \ + qrtr \ rmtfs \ " diff --git a/conf/machine/include/qcom-sdm845.inc b/conf/machine/include/qcom-sdm845.inc index 48e9fe1..40a8b3c 100644 --- a/conf/machine/include/qcom-sdm845.inc +++ b/conf/machine/include/qcom-sdm845.inc @@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \ - qrtr-apps \ + qrtr \ " IMAGE_FSTYPES ?= "ext4.gz" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_5.2.bb b/recipes-kernel/linux/linux-linaro-qcomlt_5.2.bb index 86d5ee6..e3ffe98 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt_5.2.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt_5.2.bb @@ -11,7 +11,7 @@ require recipes-kernel/linux/linux-qcom-bootimg.inc LOCALVERSION ?= "-linaro-lt-qcom" SRCBRANCH ?= "release/db845c/qcomlt-5.2" -SRCREV ?= "a5ea95c538e3d86feb21e048d44b68fd048a27b2" +SRCREV ?= "8ede212e62376289febcf89e91d28ee188ff4f59" COMPATIBLE_MACHINE = "(sdm845)" 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" 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" diff --git a/recipes-test/images/initramfs-test-image.bb b/recipes-test/images/initramfs-test-image.bb index 83ef315..3fe75f9 100644 --- a/recipes-test/images/initramfs-test-image.bb +++ b/recipes-test/images/initramfs-test-image.bb @@ -12,7 +12,7 @@ PACKAGE_INSTALL = " \ iperf3 \ lava-test-shell \ packagegroup-core-boot \ - qrtr-apps \ + qrtr \ rmtfs \ tcpdump \ udev \ |