diff options
author | Adrian Bunk <bunk@stusta.de> | 2018-10-21 17:34:25 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-10-21 08:10:42 -0700 |
commit | b8a8e65e03b7c8ffc3def864ea7324c49e89ca88 (patch) | |
tree | 06a368f909f246741cfa2b49041228b7f38221fd | |
parent | 42ab6b30ec52a12a6b9ce1c661d126a66b9ded9c (diff) | |
download | meta-openembedded-b8a8e65e03b7c8ffc3def864ea7324c49e89ca88.tar.gz |
libqmi: Add upstream fix for a 1.20.2 regression
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch | 41 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb | 1 |
2 files changed, 42 insertions, 0 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 new file mode 100644 index 000000000..d230d6803 --- /dev/null +++ b/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 8269f4d86927fbe19e78776a12736680fe9169b6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian Bunk <bunk@stusta.de> | ||
3 | Date: Mon, 1 Oct 2018 16:53:31 +0300 | ||
4 | Subject: [PATCH] qmi-network: Don't create invalid --wds-start-network when | ||
5 | APN is not set | ||
6 | |||
7 | In 1.20.2 the warning for this was turned into an error. | ||
8 | |||
9 | (cherry picked from commit 289d8ad6419895e2e1fba3d78a54a0db65da521d) | ||
10 | --- | ||
11 | Upstream-Status: Backport | ||
12 | |||
13 | utils/qmi-network.in | 12 +++++++----- | ||
14 | 1 file changed, 7 insertions(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/utils/qmi-network.in b/utils/qmi-network.in | ||
17 | index 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 | -- | ||
40 | 2.7.4 | ||
41 | |||
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb index 3e08c4f9e..6811ce020 100644 --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb | |||
@@ -12,6 +12,7 @@ DEPENDS = "glib-2.0 libgudev libmbim glib-2.0-native" | |||
12 | inherit autotools pkgconfig bash-completion | 12 | inherit autotools pkgconfig bash-completion |
13 | 13 | ||
14 | SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ | 14 | SRC_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 \ | ||
15 | file://0001-Detect-clang.patch \ | 16 | file://0001-Detect-clang.patch \ |
16 | " | 17 | " |
17 | SRC_URI[md5sum] = "584214476ab75c394160cb85fbccaa1d" | 18 | SRC_URI[md5sum] = "584214476ab75c394160cb85fbccaa1d" |