From 53b9c69fb387aad267adcad5343d1f249931f74c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III via Openembedded-devel"
 <openembedded-devel@lists.openembedded.org>
Date: Thu, 24 Jan 2019 22:39:42 -0500
Subject: libqmi: Update to 1.22.0

Giving up on inline patches for now.

>From b1fa081fcd795384e37dd2078072e77070559cf1 Mon Sep 17 00:00:00 2001
From: Glenn Stroz <gstroz@uber.com>
Date: Wed, 23 Jan 2019 19:58:01 -0500
Subject: [PATCH] libqmi: Upgrade to 1.22.0

Signed-off-by: Glenn Stroz <gstroz@uber.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-Don-t-create-invalid-wds-start-network-w.patch | 41 ----------------------
 .../recipes-connectivity/libqmi/libqmi_1.20.2.bb   | 23 ------------
 .../recipes-connectivity/libqmi/libqmi_1.22.0.bb   | 23 ++++++++++++
 3 files changed, 23 insertions(+), 64 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch
 delete mode 100644 meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb
 create mode 100644 meta-oe/recipes-connectivity/libqmi/libqmi_1.22.0.bb

(limited to 'meta-oe/recipes-connectivity/libqmi')

diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch b/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch
deleted file mode 100644
index d230d6803..000000000
--- a/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8269f4d86927fbe19e78776a12736680fe9169b6 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@stusta.de>
-Date: Mon, 1 Oct 2018 16:53:31 +0300
-Subject: [PATCH] qmi-network: Don't create invalid --wds-start-network when
- APN is not set
-
-In 1.20.2 the warning for this was turned into an error.
-
-(cherry picked from commit 289d8ad6419895e2e1fba3d78a54a0db65da521d)
----
-Upstream-Status: Backport
-
- utils/qmi-network.in | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/utils/qmi-network.in b/utils/qmi-network.in
-index bf7bed9..a9e5299 100755
---- a/utils/qmi-network.in
-+++ b/utils/qmi-network.in
-@@ -334,11 +334,13 @@ start_network ()
- 
-     setup_data_format
- 
--    START_NETWORK_ARGS="apn='$APN'"
--    if [ -n "$APN_USER" ]; then
--        START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'"
--        if [ -n "$APN_PASS" ]; then
--            START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'"
-+    if [ -n "$APN" ]; then
-+        START_NETWORK_ARGS="apn='$APN'"
-+        if [ -n "$APN_USER" ]; then
-+            START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'"
-+            if [ -n "$APN_PASS" ]; then
-+                START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'"
-+            fi
-         fi
-     fi
- 
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb
deleted file mode 100644
index f0bc81cc9..000000000
--- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol"
-DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol"
-HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
-"
-
-DEPENDS = "glib-2.0 glib-2.0-native"
-
-inherit autotools pkgconfig bash-completion
-
-SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
-           file://0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch \
-           file://0001-Detect-clang.patch \
-           "
-SRC_URI[md5sum] = "584214476ab75c394160cb85fbccaa1d"
-SRC_URI[sha256sum] = "c73459ca8bfe1213f8047858d4946fc1f58e164d4f488a7a6904edee25e2ca44"
-
-PACKAGECONFIG ??= "udev mbim"
-PACKAGECONFIG[udev] = ",--without-udev,libgudev"
-PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim"
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.0.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.0.bb
new file mode 100644
index 000000000..c15dfb472
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.0.bb
@@ -0,0 +1,23 @@
+SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol"
+DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+"
+
+DEPENDS = "glib-2.0 glib-2.0-native"
+
+inherit autotools pkgconfig bash-completion
+
+SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
+           file://0001-Detect-clang.patch \
+           "
+SRC_URI[md5sum] = "35f7e1b03f9b6218a30c78422f72c6ac"
+SRC_URI[sha256sum] = "21c198b481f1617bb7edb1960d823569de3e38b269dbf513af1b56048cafaa17"
+
+PACKAGECONFIG ??= "udev mbim"
+PACKAGECONFIG[udev] = ",--without-udev,libgudev"
+PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim"
+
-- 
cgit v1.2.3-54-g00ecf