[oe] [meta-oe][PATCH v2] libqmi: Update to 1.22.0

[Glenn Stroz]

Hi Khem,

Yeah it looks like gmail cuts off lines when pasting patches into the web
forum - even with plain text. My organization restricts SMTP so I can't use
git send-email. Is it possible to attach the patch or does it need to be
inline?



On Thu, Jan 24, 2019 at 8:54 PM Khem Raj <raj.khem at gmail.com> wrote:

> Hi Glenn
>
> Thanks for patch but it does not apply,
>
> Applying: libqmi: Update to 1.22.0
> error: corrupt patch at line 56
> Patch failed at 0001 libqmi: Update to 1.22.0
>
> Can you generate this patch on top of master and
> use git format-patch to generate the patch and resend it
>
> On Thu, Jan 24, 2019 at 5:57 PM Glenn Stroz via Openembedded-devel
> <openembedded-devel at lists.openembedded.org> wrote:
> >
> > Signed-off-by: Glenn Stroz <gstroz at uber.com>
> > ---
> >  ...t-create-invalid-wds-start-network-w.patch | 41 -------------------
> >  .../{libqmi_1.20.2.bb => libqmi_1.22.0.bb}    |  6 +--
> >  2 files changed, 3 insertions(+), 44 deletions(-)
> >  delete mode 100644
> >
> meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch
> >  rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.20.2.bb =>
> > libqmi_1.22.0.bb} (78%)
> >
> > 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 at 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.22.0.bb
> > similarity index 78%
> > rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb
> > rename to 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"
> >  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"
> > +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"
> > +
> > --
> > 2.20.1
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>