summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/libqmi
diff options
context:
space:
mode:
authorWilliam A. Kennington III via Openembedded-devel <openembedded-devel@lists.openembedded.org>2019-01-24 22:39:42 -0500
committerKhem Raj <raj.khem@gmail.com>2019-02-01 07:01:29 -0800
commit53b9c69fb387aad267adcad5343d1f249931f74c (patch)
treeb8579cf11c3e62998b6784e2f0a09aa651dc828c /meta-oe/recipes-connectivity/libqmi
parent5ca9c88503770ed9d2aeea7a77ad8e28d7941787 (diff)
downloadmeta-openembedded-53b9c69fb387aad267adcad5343d1f249931f74c.tar.gz
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>
Diffstat (limited to 'meta-oe/recipes-connectivity/libqmi')
-rw-r--r--meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch41
-rw-r--r--meta-oe/recipes-connectivity/libqmi/libqmi_1.22.0.bb (renamed from meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb)6
2 files changed, 3 insertions, 44 deletions
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 @@
1From 8269f4d86927fbe19e78776a12736680fe9169b6 Mon Sep 17 00:00:00 2001
2From: Adrian Bunk <bunk@stusta.de>
3Date: Mon, 1 Oct 2018 16:53:31 +0300
4Subject: [PATCH] qmi-network: Don't create invalid --wds-start-network when
5 APN is not set
6
7In 1.20.2 the warning for this was turned into an error.
8
9(cherry picked from commit 289d8ad6419895e2e1fba3d78a54a0db65da521d)
10---
11Upstream-Status: Backport
12
13 utils/qmi-network.in | 12 +++++++-----
14 1 file changed, 7 insertions(+), 5 deletions(-)
15
16diff --git a/utils/qmi-network.in b/utils/qmi-network.in
17index bf7bed9..a9e5299 100755
18--- a/utils/qmi-network.in
19+++ b/utils/qmi-network.in
20@@ -334,11 +334,13 @@ start_network ()
21
22 setup_data_format
23
24- START_NETWORK_ARGS="apn='$APN'"
25- if [ -n "$APN_USER" ]; then
26- START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'"
27- if [ -n "$APN_PASS" ]; then
28- START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'"
29+ if [ -n "$APN" ]; then
30+ START_NETWORK_ARGS="apn='$APN'"
31+ if [ -n "$APN_USER" ]; then
32+ START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'"
33+ if [ -n "$APN_PASS" ]; then
34+ START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'"
35+ fi
36 fi
37 fi
38
39--
402.7.4
41
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.0.bb
index f0bc81cc9..c15dfb472 100644
--- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.0.bb
@@ -12,12 +12,12 @@ DEPENDS = "glib-2.0 glib-2.0-native"
12inherit autotools pkgconfig bash-completion 12inherit autotools pkgconfig bash-completion
13 13
14SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ 14SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
15 file://0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch \
16 file://0001-Detect-clang.patch \ 15 file://0001-Detect-clang.patch \
17 " 16 "
18SRC_URI[md5sum] = "584214476ab75c394160cb85fbccaa1d" 17SRC_URI[md5sum] = "35f7e1b03f9b6218a30c78422f72c6ac"
19SRC_URI[sha256sum] = "c73459ca8bfe1213f8047858d4946fc1f58e164d4f488a7a6904edee25e2ca44" 18SRC_URI[sha256sum] = "21c198b481f1617bb7edb1960d823569de3e38b269dbf513af1b56048cafaa17"
20 19
21PACKAGECONFIG ??= "udev mbim" 20PACKAGECONFIG ??= "udev mbim"
22PACKAGECONFIG[udev] = ",--without-udev,libgudev" 21PACKAGECONFIG[udev] = ",--without-udev,libgudev"
23PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" 22PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim"
23