On 05/08/2018 12:29 PM, Martin Jansa wrote:
Hi Martin,
all meta-oe patches need to go to openembedded-devel ML.
Thanks
Of course, my bad. Resent now to oe-devel.
On Tue, May 8, 2018 at 8:49 PM, Martin Kelly <[email protected]
<mailto:[email protected]>> wrote:
This version has a ublox plugin for expanded modem support. The
underlying issue
that enum-conversion.patch fixes appears to already have been fixed
upstream, so
we can drop the patch.
Signed-off-by: Martin Kelly <[email protected] <mailto:[email protected]>>
---
.../modemmanager/modemmanager/enum-conversion.patch | 21
---------------------
...odemmanager_1.6.4.bb <http://odemmanager_1.6.4.bb> =>
modemmanager_1.7.991.bb <http://modemmanager_1.7.991.bb>} | 9 ++++-----
2 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100644
meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch
rename
meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.6.4.bb
<http://modemmanager_1.6.4.bb> => modemmanager_1.7.991.bb
<http://modemmanager_1.7.991.bb>} (88%)
diff --git
a/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch
b/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch
deleted file mode 100644
index a3fb0f3eb..000000000
---
a/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fixes errors found bt Clang
-
-| ../../ModemManager-1.6.4/src/mm-bearer-qmi.c:774:50: error:
implicit conversion from enumeration type 'MMBearerStatus' to
different enumeration type 'MMBearerConnectionStatus'
[-Werror,-Wenum-conversion]
-| MMBearerConnectionStatus bearer_status =
mm_base_bearer_get_status (MM_BASE_BEARER (self));
-| ~~~~~~~~~~~~~
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-| 1 error generated.
-
-
-Index: ModemManager-1.6.4/src/mm-bearer-qmi.c
-===================================================================
---- ModemManager-1.6.4.orig/src/mm-bearer-qmi.c
-+++ ModemManager-1.6.4/src/mm-bearer-qmi.c
-@@ -771,7 +771,7 @@ packet_service_status_indication_cb (Qmi
- &connection_status,
- NULL,
- NULL)) {
-- MMBearerConnectionStatus bearer_status =
mm_base_bearer_get_status (MM_BASE_BEARER (self));
-+ MMBearerConnectionStatus bearer_status =
(MMBearerConnectionStatus)mm_base_bearer_get_status (MM_BASE_BEARER
(self));
-
- if (connection_status ==
QMI_WDS_CONNECTION_STATUS_DISCONNECTED &&
- bearer_status !=
MM_BEARER_CONNECTION_STATUS_DISCONNECTED &&
diff --git
a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb
<http://modemmanager_1.6.4.bb>
b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb
<http://modemmanager_1.7.991.bb>
similarity index 88%
rename from
meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb
<http://modemmanager_1.6.4.bb>
rename to
meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb
<http://modemmanager_1.7.991.bb>
index e60cd4b74..4f9400169 100644
---
a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb
<http://modemmanager_1.6.4.bb>
+++
b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb
<http://modemmanager_1.7.991.bb>
@@ -11,11 +11,10 @@ inherit gnomebase gettext systemd vala
gobject-introspection bash-completion
DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native"
-SRC_URI =
"http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz
<http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz>
\
- file://enum-conversion.patch \
-"
-SRC_URI[md5sum] = "06488186c7dd53f8104183b86f7a1568"
-SRC_URI[sha256sum] =
"cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668"
+SRC_URI =
"http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz
<http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz>"
+
+SRC_URI[md5sum] = "4efe6a240cef212bf8855c95424e7c7f"
+SRC_URI[sha256sum] =
"4e366243bd4983f2e6efe35cb901cf5da51939307b5d6299fe622a9fcf411745"
S = "${WORKDIR}/ModemManager-${PV}"
--
2.11.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
<mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
<http://lists.openembedded.org/mailman/listinfo/openembedded-core>
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core