Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "meta-digi-dey: Add fix to return correct error code." 

This reverts commit 3123085e72.

we revert this commit because the patch was already applied on mm-1.6.4

Signed-off-by: Salvador Penalva <salvador.penalva@digi.com>
This commit is contained in:
Salvador Penalva 2017-03-20 16:46:06 +01:00
parent 3bb5312662
commit 65a17c522c
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch
View File

@ -1,25 +0,0 @@
From: Mike Engel <Mike.Engel@digi.com>
Date: Wed, 15 Mar 2017 18:01:06 +0100
Subject: [PATCH] meta-digi-dey: Add fix to return correct error code.
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
---
.../meta-digi-dey/recipes-connectivity/modemmanager/mm-broadband-modem-qmi.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index bc13925..f60d0f4 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -1740,7 +1740,10 @@ dms_uim_get_pin_status_ready (QmiClientDms *client,
/* We get InvalidQmiCommand on newer devices which don't like the legacy way */
if (g_error_matches (error,
QMI_PROTOCOL_ERROR,
- QMI_PROTOCOL_ERROR_INVALID_QMI_COMMAND)) {
+ QMI_PROTOCOL_ERROR_INVALID_QMI_COMMAND) ||
+ g_error_matches (error,
+ QMI_PROTOCOL_ERROR,
+ QMI_PROTOCOL_ERROR_NOT_SUPPORTED)) {
g_error_free (error);
qmi_message_dms_uim_get_pin_status_output_unref (output);
/* Flag that the command is unsupported, and try with the new way */

5
meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend
View File

@ -2,10 +2,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI += " \ SRC_URI += "file://cellularifupdown"
file://cellularifupdown \
file://0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch \
"
# 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So # 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So
# remove 'polkit' support to be able to build ModemManager on a framebuffer # remove 'polkit' support to be able to build ModemManager on a framebuffer