diff options
| author |   Andrei Gherzan <andrei@gherzan.ro> | 2019-05-22 15:16:42 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-05-23 08:26:14 -0700 |
| commit | bde3a38d61754cc82288961ce6d1dcda6f9115be (patch) | |
| tree | 00c5d0fca212af0970f53e1eaf956ad94fddb1ea | |
| parent | bb4aa80bfbd67ddfafeaf7700aff993592387a21 (diff) | |
| download | meta-openembedded-bde3a38d61754cc82288961ce6d1dcda6f9115be.tar.gz | |
modemmanager: Update to 1.10.0
Commit includes removal of upstream merged patch.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch | 31 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.0.bb (renamed from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb) | 6 |
2 files changed, 2 insertions, 35 deletions
diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch deleted file mode 100644 index 5fbafbb5dc..0000000000 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b8862e6af1c6d022b8c182098e7deddb874ece19 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 18 Dec 2018 23:10:44 -0800 -Subject: [PATCH] Do not pass null string to %s printf formatted string - -Here the string is already decided to be NULL and passing -a null pointer to %s will not work - -Fixes -error: '%s' directive argument is null - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mobile-broadband/ModemManager/merge_requests/67] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - plugins/mtk/mm-broadband-modem-mtk.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/mtk/mm-broadband-modem-mtk.c b/plugins/mtk/mm-broadband-modem-mtk.c -index 475a63ac..541de4a5 100644 ---- a/plugins/mtk/mm-broadband-modem-mtk.c -+++ b/plugins/mtk/mm-broadband-modem-mtk.c -@@ -191,7 +191,7 @@ get_supported_modes_ready (MMBaseModem *self, - - response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); - if (!response) { -- mm_dbg ("Fail to get response %s", response); -+ mm_dbg ("Fail to get response"); - g_task_return_error (task, error); - g_object_unref (task); - return; diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.0.bb index f9b302a3db..8254a85fc9 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.0.bb @@ -13,11 +13,9 @@ DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ file://0001-Do-not-set-Wno-unused-but-set-variable.patch \ - file://0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch \ " - -SRC_URI[md5sum] = "a49c9f73e46c7b89e5efedda250d22c0" -SRC_URI[sha256sum] = "96f2a5f0ed15532b4c4c185b756fdc0326e7c2027cea26a1264f91e098260f80" +SRC_URI[md5sum] = "92d25176d0cc9d588ca29700b33c7d98" +SRC_URI[sha256sum] = "fd0f39996025dac96995daea8a58ec7dd571582f7563a8ae0d5f65b571b76ee2" S = "${WORKDIR}/ModemManager-${PV}" |