From 65a17c522c0f5b13bdc35f6bc2c12bde8142449e Mon Sep 17 00:00:00 2001 From: Salvador Penalva Date: Mon, 20 Mar 2017 16:46:06 +0100 Subject: [PATCH] Revert "meta-digi-dey: Add fix to return correct error code." This reverts commit 3123085e724c365636572c4ad0dedfd96a36a303. we revert this commit because the patch was already applied on mm-1.6.4 Signed-off-by: Salvador Penalva --- ...Add-fix-to-return-correct-error-code.patch | 25 ------------------- .../modemmanager/modemmanager_%.bbappend | 5 +--- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch deleted file mode 100644 index fd5d39bbd..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Mike Engel -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 ---- - .../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 */ \ No newline at end of file diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend index 58f94be2e..c490ec1bb 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend @@ -2,10 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI += " \ - file://cellularifupdown \ - file://0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch \ -" +SRC_URI += "file://cellularifupdown" # 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So # remove 'polkit' support to be able to build ModemManager on a framebuffer