[meta-oe,2/4] libqmi: switch to meson and git

Message ID 20220303130618.1108977-3-adrian.freihofer@siemens.com
State New
Headers show
Series update modemmanager | expand

Commit Message

Adrian Freihofer March 3, 2022, 1:06 p.m. UTC
- Switching to meson and git because of the following statement from news file:
  "The next major release will likely be a meson-only one, and will therefore
   not be based on a source release tarball any more, but on specific git tags
   instead."
- Add PACKAGECONFIG for qrtr.
- Updateing deprecated licenses acc. to
  https://gitlab.freedesktop.org/mobile-broadband/libqmi/#license

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
---
 .../0001-build-use-python3-everywhere.patch   | 33 +++++++++++++++++++
 .../libqmi/libqmi_1.30.4.bb                   | 23 +++++++++----
 2 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch

Comments

Khem Raj March 3, 2022, 7 p.m. UTC | #1
On Thu, Mar 3, 2022 at 5:07 AM Adrian Freihofer
<adrian.freihofer@gmail.com> wrote:
>
> - Switching to meson and git because of the following statement from news file:
>   "The next major release will likely be a meson-only one, and will therefore
>    not be based on a source release tarball any more, but on specific git tags
>    instead."
> - Add PACKAGECONFIG for qrtr.
> - Updateing deprecated licenses acc. to
>   https://gitlab.freedesktop.org/mobile-broadband/libqmi/#license
>
> Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
> ---
>  .../0001-build-use-python3-everywhere.patch   | 33 +++++++++++++++++++
>  .../libqmi/libqmi_1.30.4.bb                   | 23 +++++++++----
>  2 files changed, 50 insertions(+), 6 deletions(-)
>  create mode 100644 meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
>
> diff --git a/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> new file mode 100644
> index 0000000000..e345d28031
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> @@ -0,0 +1,33 @@
> +From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001
> +From: goapunk <goapunk@riseup.net>
> +Date: Mon, 13 Sep 2021 13:45:41 +0200
> +Subject: [PATCH] build: use python3 everywhere
> +
> +---
> + build-aux/qmi-codegen/qmi-codegen                  | 2 +-
> + examples/simple-tester-python/simple-tester-python | 2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen
> +index 1fea7c1..1092c8e 100755
> +--- a/build-aux/qmi-codegen/qmi-codegen
> ++++ b/build-aux/qmi-codegen/qmi-codegen
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/env python
> ++#!/usr/bin/env python3
> + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> + #
> + # This program is free software; you can redistribute it and/or modify it under
> +diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python
> +index af9065a..a35e505 100755
> +--- a/examples/simple-tester-python/simple-tester-python
> ++++ b/examples/simple-tester-python/simple-tester-python
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/env python
> ++#!/usr/bin/env python3
> + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> + #
> + # This program is free software; you can redistribute it and/or modify it under
> +--
> +2.34.1
> +
> diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> index dee36d7b45..4807244a58 100644
> --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> @@ -2,7 +2,7 @@ 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"
> +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
>  LIC_FILES_CHKSUM = " \
>      file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>      file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
> @@ -10,12 +10,23 @@ LIC_FILES_CHKSUM = " \
>
>  DEPENDS = "glib-2.0 glib-2.0-native"
>
> -inherit autotools pkgconfig bash-completion gobject-introspection
> +inherit meson pkgconfig bash-completion gobject-introspection
>
> -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz"
> +SRCREV ?= "f6c2feaf199e0f129a0bde8c5e6cba5f2117b564"

it this same SHA which is used for 1.30.4 release tarball ?

> +# patch 0001 is on main branch upstream
> +SRC_URI = "\
> +    git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-30 \
> +    file://0001-build-use-python3-everywhere.patch \
> +"
>
> -SRC_URI[sha256sum] = "00d7da30a4f8d1185f37cba289cfaf1dfcd04a58f2f76d6acfdf5b85312d6ed6"
> +S = "${WORKDIR}/git"
>
>  PACKAGECONFIG ??= "udev mbim"
> -PACKAGECONFIG[udev] = ",--without-udev,libgudev"
> -PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim"
> +PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev"
> +PACKAGECONFIG[mbim] = "-Dmbim_qmux=true,-Dmbim_qmux=false,libmbim"
> +PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib"
> +
> +EXTRA_OEMESON = " \
> +    -Dgtk_doc=false \
> +    -Dman=false \
> +"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95741): https://lists.openembedded.org/g/openembedded-devel/message/95741
> Mute This Topic: https://lists.openembedded.org/mt/89524244/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Adrian Freihofer March 3, 2022, 8:59 p.m. UTC | #2
On Thu, 2022-03-03 at 11:00 -0800, Khem Raj wrote:
> On Thu, Mar 3, 2022 at 5:07 AM Adrian Freihofer
> <adrian.freihofer@gmail.com> wrote:
> > 
> > - Switching to meson and git because of the following statement from news file:
> >   "The next major release will likely be a meson-only one, and will therefore
> >    not be based on a source release tarball any more, but on specific git tags
> >    instead."
> > - Add PACKAGECONFIG for qrtr.
> > - Updateing deprecated licenses acc. to
> >   https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fmobile-broadband%2Flibqmi%2F%23license&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7C1120c4a6299d42db9ce208d9fd481c0d%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819308411861783%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=qVoaU%2F9Y52BQ3Ot6DQ8otraIhn4PzeD6yvBfD1XoLwA%3D&amp;reserved=0
> > 
> > Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
> > ---
> >  .../0001-build-use-python3-everywhere.patch   | 33 +++++++++++++++++++
> >  .../libqmi/libqmi_1.30.4.bb                   | 23 +++++++++----
> >  2 files changed, 50 insertions(+), 6 deletions(-)
> >  create mode 100644 meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > 
> > diff --git a/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > new file mode 100644
> > index 0000000000..e345d28031
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > @@ -0,0 +1,33 @@
> > +From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001
> > +From: goapunk <goapunk@riseup.net>
> > +Date: Mon, 13 Sep 2021 13:45:41 +0200
> > +Subject: [PATCH] build: use python3 everywhere
> > +
> > +---
> > + build-aux/qmi-codegen/qmi-codegen                  | 2 +-
> > + examples/simple-tester-python/simple-tester-python | 2 +-
> > + 2 files changed, 2 insertions(+), 2 deletions(-)
> > +
> > +diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen
> > +index 1fea7c1..1092c8e 100755
> > +--- a/build-aux/qmi-codegen/qmi-codegen
> > ++++ b/build-aux/qmi-codegen/qmi-codegen
> > +@@ -1,4 +1,4 @@
> > +-#!/usr/bin/env python
> > ++#!/usr/bin/env python3
> > + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> > + #
> > + # This program is free software; you can redistribute it and/or modify it under
> > +diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python
> > +index af9065a..a35e505 100755
> > +--- a/examples/simple-tester-python/simple-tester-python
> > ++++ b/examples/simple-tester-python/simple-tester-python
> > +@@ -1,4 +1,4 @@
> > +-#!/usr/bin/env python
> > ++#!/usr/bin/env python3
> > + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> > + #
> > + # This program is free software; you can redistribute it and/or modify it under
> > +--
> > +2.34.1
> > +
> > diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > index dee36d7b45..4807244a58 100644
> > --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > @@ -2,7 +2,7 @@ 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 = "https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.freedesktop.org%2Fwiki%2FSoftware%2Flibqmi&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7C1120c4a6299d42db9ce208d9fd481c0d%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819308411861783%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=rEwaleK%2FFa04uAEVgsUkUWRzuRW1SxXcPOwMhhxHgIo%3D&amp;reserved=0"
> > -LICENSE = "GPLv2 & LGPLv2.1"
> > +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
> >  LIC_FILES_CHKSUM = " \
> >      file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> >      file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
> > @@ -10,12 +10,23 @@ LIC_FILES_CHKSUM = " \
> > 
> >  DEPENDS = "glib-2.0 glib-2.0-native"
> > 
> > -inherit autotools pkgconfig bash-completion gobject-introspection
> > +inherit meson pkgconfig bash-completion gobject-introspection
> > 
> > -SRC_URI = "https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.freedesktop.org%2Fsoftware%2F%24&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7C1120c4a6299d42db9ce208d9fd481c0d%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819308411861783%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=7tcIiPzWRwpqXzrMU6zU5Cdja5IhY2v094wNjnGTmcY%3D&amp;reserved=0{BPN}/${BPN}-${PV}.tar.xz"
> > +SRCREV ?= "f6c2feaf199e0f129a0bde8c5e6cba5f2117b564"
> 
> it this same SHA which is used for 1.30.4 release tarball ?

Yes the version did not change. See
https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/tags/1.30.4

> 
> > +# patch 0001 is on main branch upstream
> > +SRC_URI = "\
> > +    git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-30 \
> > +    file://0001-build-use-python3-everywhere.patch \
> > +"
> > 
> > -SRC_URI[sha256sum] = "00d7da30a4f8d1185f37cba289cfaf1dfcd04a58f2f76d6acfdf5b85312d6ed6"
> > +S = "${WORKDIR}/git"
> > 
> >  PACKAGECONFIG ??= "udev mbim"
> > -PACKAGECONFIG[udev] = ",--without-udev,libgudev"
> > -PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim"
> > +PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev"
> > +PACKAGECONFIG[mbim] = "-Dmbim_qmux=true,-Dmbim_qmux=false,libmbim"
> > +PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib"
> > +
> > +EXTRA_OEMESON = " \
> > +    -Dgtk_doc=false \
> > +    -Dman=false \
> > +"
> > --
> > 2.34.1
> > 
> > 
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#95741): https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.openembedded.org%2Fg%2Fopenembedded-devel%2Fmessage%2F95741&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7C1120c4a6299d42db9ce208d9fd481c0d%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819308411861783%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=7TfE%2FbW26C8V%2BDFIsxJuinFLENh1BaSrcQfOw778ApM%3D&amp;reserved=0
> > Mute This Topic: https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.openembedded.org%2Fmt%2F89524244%2F1997914&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7C1120c4a6299d42db9ce208d9fd481c0d%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819308411861783%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=kwITRUVYzLshwIGNz9DusIl44Tj9Y4yRsBQR1E7lN4U%3D&amp;reserved=0
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.openembedded.org%2Fg%2Fopenembedded-devel%2Funsub&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7C1120c4a6299d42db9ce208d9fd481c0d%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819308411861783%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=jd3zN78iGp9y7wMfEpNYhi0rENd680qRZar8CWHu1pM%3D&amp;reserved=0 [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
Khem Raj March 3, 2022, 9:15 p.m. UTC | #3
On Thu, Mar 3, 2022 at 12:59 PM Adrian Freihofer
<adrian.freihofer@gmail.com> wrote:
>
> On Thu, 2022-03-03 at 11:00 -0800, Khem Raj wrote:
> > On Thu, Mar 3, 2022 at 5:07 AM Adrian Freihofer
> > <adrian.freihofer@gmail.com> wrote:
> > >
> > > - Switching to meson and git because of the following statement from news file:
> > >   "The next major release will likely be a meson-only one, and will therefore
> > >    not be based on a source release tarball any more, but on specific git tags
> > >    instead."
> > > - Add PACKAGECONFIG for qrtr.
> > > - Updateing deprecated licenses acc. to
> > >   https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fmobile-broadband%2Flibqmi%2F%23license&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7C1120c4a6299d42db9ce208d9fd481c0d%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819308411861783%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=qVoaU%2F9Y52BQ3Ot6DQ8otraIhn4PzeD6yvBfD1XoLwA%3D&amp;reserved=0
> > >
> > > Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
> > > ---
> > >  .../0001-build-use-python3-everywhere.patch   | 33 +++++++++++++++++++
> > >  .../libqmi/libqmi_1.30.4.bb                   | 23 +++++++++----
> > >  2 files changed, 50 insertions(+), 6 deletions(-)
> > >  create mode 100644 meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > >
> > > diff --git a/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > > new file mode 100644
> > > index 0000000000..e345d28031
> > > --- /dev/null
> > > +++ b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > > @@ -0,0 +1,33 @@
> > > +From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001
> > > +From: goapunk <goapunk@riseup.net>
> > > +Date: Mon, 13 Sep 2021 13:45:41 +0200
> > > +Subject: [PATCH] build: use python3 everywhere
> > > +
> > > +---
> > > + build-aux/qmi-codegen/qmi-codegen                  | 2 +-
> > > + examples/simple-tester-python/simple-tester-python | 2 +-
> > > + 2 files changed, 2 insertions(+), 2 deletions(-)
> > > +
> > > +diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen
> > > +index 1fea7c1..1092c8e 100755
> > > +--- a/build-aux/qmi-codegen/qmi-codegen
> > > ++++ b/build-aux/qmi-codegen/qmi-codegen
> > > +@@ -1,4 +1,4 @@
> > > +-#!/usr/bin/env python
> > > ++#!/usr/bin/env python3
> > > + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> > > + #
> > > + # This program is free software; you can redistribute it and/or modify it under
> > > +diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python
> > > +index af9065a..a35e505 100755
> > > +--- a/examples/simple-tester-python/simple-tester-python
> > > ++++ b/examples/simple-tester-python/simple-tester-python
> > > +@@ -1,4 +1,4 @@
> > > +-#!/usr/bin/env python
> > > ++#!/usr/bin/env python3
> > > + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> > > + #
> > > + # This program is free software; you can redistribute it and/or modify it under
> > > +--
> > > +2.34.1
> > > +
> > > diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > > index dee36d7b45..4807244a58 100644
> > > --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > > +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > > @@ -2,7 +2,7 @@ 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 = "https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.freedesktop.org%2Fwiki%2FSoftware%2Flibqmi&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7C1120c4a6299d42db9ce208d9fd481c0d%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819308411861783%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=rEwaleK%2FFa04uAEVgsUkUWRzuRW1SxXcPOwMhhxHgIo%3D&amp;reserved=0"
> > > -LICENSE = "GPLv2 & LGPLv2.1"
> > > +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
> > >  LIC_FILES_CHKSUM = " \
> > >      file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> > >      file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
> > > @@ -10,12 +10,23 @@ LIC_FILES_CHKSUM = " \
> > >
> > >  DEPENDS = "glib-2.0 glib-2.0-native"
> > >
> > > -inherit autotools pkgconfig bash-completion gobject-introspection
> > > +inherit meson pkgconfig bash-completion gobject-introspection
> > >
> > > -SRC_URI = "https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.freedesktop.org%2Fsoftware%2F%24&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7C1120c4a6299d42db9ce208d9fd481c0d%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819308411861783%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=7tcIiPzWRwpqXzrMU6zU5Cdja5IhY2v094wNjnGTmcY%3D&amp;reserved=0{BPN}/${BPN}-${PV}.tar.xz"
> > > +SRCREV ?= "f6c2feaf199e0f129a0bde8c5e6cba5f2117b564"
> >
> > it this same SHA which is used for 1.30.4 release tarball ?
>
> Yes the version did not change. See
> https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/tags/1.30.4
>

so its for convenience to use git here then, perhaps for same reasons
we discussed yesterday
perhaps sticking to tarball is a better approach. ?
Adrian Freihofer March 3, 2022, 9:46 p.m. UTC | #4
On Thu, 2022-03-03 at 13:15 -0800, Khem Raj via lists.openembedded.org
wrote:
> On Thu, Mar 3, 2022 at 12:59 PM Adrian Freihofer
> <adrian.freihofer@gmail.com> wrote:
> > 
> > On Thu, 2022-03-03 at 11:00 -0800, Khem Raj wrote:
> > > On Thu, Mar 3, 2022 at 5:07 AM Adrian Freihofer
> > > <adrian.freihofer@gmail.com> wrote:
> > > > 
> > > > - Switching to meson and git because of the following statement from news file:
> > > >   "The next major release will likely be a meson-only one, and will therefore
> > > >    not be based on a source release tarball any more, but on specific git tags
> > > >    instead."
> > > > - Add PACKAGECONFIG for qrtr.
> > > > - Updateing deprecated licenses acc. to
> > > >   https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fmobile-broadband%2Flibqmi%2F%23license&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7Cf7ebbe47af824ea9229808d9fd5afc09%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819389490459432%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=0ugE3JGPM6qGMhsljzUTU5dsSyH2I8hqqZnX8GHKnoM%3D&amp;reserved=0
> > > > 
> > > > Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
> > > > ---
> > > >  .../0001-build-use-python3-everywhere.patch   | 33 +++++++++++++++++++
> > > >  .../libqmi/libqmi_1.30.4.bb                   | 23 +++++++++----
> > > >  2 files changed, 50 insertions(+), 6 deletions(-)
> > > >  create mode 100644 meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > > > 
> > > > diff --git a/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > > > new file mode 100644
> > > > index 0000000000..e345d28031
> > > > --- /dev/null
> > > > +++ b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > > > @@ -0,0 +1,33 @@
> > > > +From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001
> > > > +From: goapunk <goapunk@riseup.net>
> > > > +Date: Mon, 13 Sep 2021 13:45:41 +0200
> > > > +Subject: [PATCH] build: use python3 everywhere
> > > > +
> > > > +---
> > > > + build-aux/qmi-codegen/qmi-codegen                  | 2 +-
> > > > + examples/simple-tester-python/simple-tester-python | 2 +-
> > > > + 2 files changed, 2 insertions(+), 2 deletions(-)
> > > > +
> > > > +diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen
> > > > +index 1fea7c1..1092c8e 100755
> > > > +--- a/build-aux/qmi-codegen/qmi-codegen
> > > > ++++ b/build-aux/qmi-codegen/qmi-codegen
> > > > +@@ -1,4 +1,4 @@
> > > > +-#!/usr/bin/env python
> > > > ++#!/usr/bin/env python3
> > > > + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> > > > + #
> > > > + # This program is free software; you can redistribute it and/or modify it under
> > > > +diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python
> > > > +index af9065a..a35e505 100755
> > > > +--- a/examples/simple-tester-python/simple-tester-python
> > > > ++++ b/examples/simple-tester-python/simple-tester-python
> > > > +@@ -1,4 +1,4 @@
> > > > +-#!/usr/bin/env python
> > > > ++#!/usr/bin/env python3
> > > > + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> > > > + #
> > > > + # This program is free software; you can redistribute it and/or modify it under
> > > > +--
> > > > +2.34.1
> > > > +
> > > > diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > > > index dee36d7b45..4807244a58 100644
> > > > --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > > > +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > > > @@ -2,7 +2,7 @@ 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 = "https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.freedesktop.org%2Fwiki%2FSoftware%2Flibqmi&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7Cf7ebbe47af824ea9229808d9fd5afc09%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819389490459432%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=dWHuppNvGtDzV%2Fu4MHiLiE1ddOXzyxxDJE5T%2FMV7C%2B8%3D&amp;reserved=0"
> > > > -LICENSE = "GPLv2 & LGPLv2.1"
> > > > +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
> > > >  LIC_FILES_CHKSUM = " \
> > > >      file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> > > >      file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
> > > > @@ -10,12 +10,23 @@ LIC_FILES_CHKSUM = " \
> > > > 
> > > >  DEPENDS = "glib-2.0 glib-2.0-native"
> > > > 
> > > > -inherit autotools pkgconfig bash-completion gobject-introspection
> > > > +inherit meson pkgconfig bash-completion gobject-introspection
> > > > 
> > > > -SRC_URI = "https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.freedesktop.org%2Fsoftware%2F%24&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7Cf7ebbe47af824ea9229808d9fd5afc09%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819389490459432%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=A5%2Fk3gLTbBPWeP0WOVhjQvG1Nqj%2ByXCmY4mxMrbSOXo%3D&amp;reserved=0{BPN}/${BPN}-${PV}.tar.xz"
> > > > +SRCREV ?= "f6c2feaf199e0f129a0bde8c5e6cba5f2117b564"
> > > 
> > > it this same SHA which is used for 1.30.4 release tarball ?
> > 
> > Yes the version did not change. See
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fmobile-broadband%2Flibqmi%2F-%2Ftags%2F1.30.4&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7Cf7ebbe47af824ea9229808d9fd5afc09%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819389490459432%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=e%2B%2BhzTGb%2Fp1MSKqKTalkv3klm1zLq8o%2FuYBIfLBI1CE%3D&amp;reserved=0
> > 
> 
> so its for convenience to use git here then, perhaps for same reasons
> we discussed yesterday
> perhaps sticking to tarball is a better approach. ?

I try hard not to send the same error twice to a busy maintainer. ;-)

No, this time it is because the changelog file mentions that for the
next version there will be no tar available and only a git tag.
Currently the tar is still available, but there is no meson.build file
in the tar. This seems to be the way some freedesktop projects will go:
autotools and tar are replaced by git tags and meson.
I have also cited this in my commit messages.

> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95758): https://lists.openembedded.org/g/openembedded-devel/message/95758
> Mute This Topic: https://lists.openembedded.org/mt/89524244/3616858
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [adrian.freihofer@siemens.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj March 3, 2022, 9:49 p.m. UTC | #5
On Thu, Mar 3, 2022 at 1:46 PM Adrian Freihofer
<adrian.freihofer@gmail.com> wrote:
>
> On Thu, 2022-03-03 at 13:15 -0800, Khem Raj via lists.openembedded.org
> wrote:
> > On Thu, Mar 3, 2022 at 12:59 PM Adrian Freihofer
> > <adrian.freihofer@gmail.com> wrote:
> > >
> > > On Thu, 2022-03-03 at 11:00 -0800, Khem Raj wrote:
> > > > On Thu, Mar 3, 2022 at 5:07 AM Adrian Freihofer
> > > > <adrian.freihofer@gmail.com> wrote:
> > > > >
> > > > > - Switching to meson and git because of the following statement from news file:
> > > > >   "The next major release will likely be a meson-only one, and will therefore
> > > > >    not be based on a source release tarball any more, but on specific git tags
> > > > >    instead."
> > > > > - Add PACKAGECONFIG for qrtr.
> > > > > - Updateing deprecated licenses acc. to
> > > > >   https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fmobile-broadband%2Flibqmi%2F%23license&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7Cf7ebbe47af824ea9229808d9fd5afc09%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819389490459432%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=0ugE3JGPM6qGMhsljzUTU5dsSyH2I8hqqZnX8GHKnoM%3D&amp;reserved=0
> > > > >
> > > > > Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
> > > > > ---
> > > > >  .../0001-build-use-python3-everywhere.patch   | 33 +++++++++++++++++++
> > > > >  .../libqmi/libqmi_1.30.4.bb                   | 23 +++++++++----
> > > > >  2 files changed, 50 insertions(+), 6 deletions(-)
> > > > >  create mode 100644 meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > > > >
> > > > > diff --git a/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > > > > new file mode 100644
> > > > > index 0000000000..e345d28031
> > > > > --- /dev/null
> > > > > +++ b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
> > > > > @@ -0,0 +1,33 @@
> > > > > +From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001
> > > > > +From: goapunk <goapunk@riseup.net>
> > > > > +Date: Mon, 13 Sep 2021 13:45:41 +0200
> > > > > +Subject: [PATCH] build: use python3 everywhere
> > > > > +
> > > > > +---
> > > > > + build-aux/qmi-codegen/qmi-codegen                  | 2 +-
> > > > > + examples/simple-tester-python/simple-tester-python | 2 +-
> > > > > + 2 files changed, 2 insertions(+), 2 deletions(-)
> > > > > +
> > > > > +diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen
> > > > > +index 1fea7c1..1092c8e 100755
> > > > > +--- a/build-aux/qmi-codegen/qmi-codegen
> > > > > ++++ b/build-aux/qmi-codegen/qmi-codegen
> > > > > +@@ -1,4 +1,4 @@
> > > > > +-#!/usr/bin/env python
> > > > > ++#!/usr/bin/env python3
> > > > > + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> > > > > + #
> > > > > + # This program is free software; you can redistribute it and/or modify it under
> > > > > +diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python
> > > > > +index af9065a..a35e505 100755
> > > > > +--- a/examples/simple-tester-python/simple-tester-python
> > > > > ++++ b/examples/simple-tester-python/simple-tester-python
> > > > > +@@ -1,4 +1,4 @@
> > > > > +-#!/usr/bin/env python
> > > > > ++#!/usr/bin/env python3
> > > > > + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> > > > > + #
> > > > > + # This program is free software; you can redistribute it and/or modify it under
> > > > > +--
> > > > > +2.34.1
> > > > > +
> > > > > diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > > > > index dee36d7b45..4807244a58 100644
> > > > > --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > > > > +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
> > > > > @@ -2,7 +2,7 @@ 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 = "https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.freedesktop.org%2Fwiki%2FSoftware%2Flibqmi&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7Cf7ebbe47af824ea9229808d9fd5afc09%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819389490459432%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=dWHuppNvGtDzV%2Fu4MHiLiE1ddOXzyxxDJE5T%2FMV7C%2B8%3D&amp;reserved=0"
> > > > > -LICENSE = "GPLv2 & LGPLv2.1"
> > > > > +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
> > > > >  LIC_FILES_CHKSUM = " \
> > > > >      file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> > > > >      file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
> > > > > @@ -10,12 +10,23 @@ LIC_FILES_CHKSUM = " \
> > > > >
> > > > >  DEPENDS = "glib-2.0 glib-2.0-native"
> > > > >
> > > > > -inherit autotools pkgconfig bash-completion gobject-introspection
> > > > > +inherit meson pkgconfig bash-completion gobject-introspection
> > > > >
> > > > > -SRC_URI = "https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.freedesktop.org%2Fsoftware%2F%24&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7Cf7ebbe47af824ea9229808d9fd5afc09%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819389490459432%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=A5%2Fk3gLTbBPWeP0WOVhjQvG1Nqj%2ByXCmY4mxMrbSOXo%3D&amp;reserved=0{BPN}/${BPN}-${PV}.tar.xz"
> > > > > +SRCREV ?= "f6c2feaf199e0f129a0bde8c5e6cba5f2117b564"
> > > >
> > > > it this same SHA which is used for 1.30.4 release tarball ?
> > >
> > > Yes the version did not change. See
> > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fmobile-broadband%2Flibqmi%2F-%2Ftags%2F1.30.4&amp;data=04%7C01%7Cadrian.freihofer%40siemens.com%7Cf7ebbe47af824ea9229808d9fd5afc09%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637819389490459432%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=e%2B%2BhzTGb%2Fp1MSKqKTalkv3klm1zLq8o%2FuYBIfLBI1CE%3D&amp;reserved=0
> > >
> >
> > so its for convenience to use git here then, perhaps for same reasons
> > we discussed yesterday
> > perhaps sticking to tarball is a better approach. ?
>
> I try hard not to send the same error twice to a busy maintainer. ;-)
>
> No, this time it is because the changelog file mentions that for the
> next version there will be no tar available and only a git tag.
> Currently the tar is still available, but there is no meson.build file
> in the tar. This seems to be the way some freedesktop projects will go:
> autotools and tar are replaced by git tags and meson.
> I have also cited this in my commit messages.

thanks for the info. Makes sense

>
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#95758): https://lists.openembedded.org/g/openembedded-devel/message/95758
> > Mute This Topic: https://lists.openembedded.org/mt/89524244/3616858
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [adrian.freihofer@siemens.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>

Patch

diff --git a/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
new file mode 100644
index 0000000000..e345d28031
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
@@ -0,0 +1,33 @@ 
+From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001
+From: goapunk <goapunk@riseup.net>
+Date: Mon, 13 Sep 2021 13:45:41 +0200
+Subject: [PATCH] build: use python3 everywhere
+
+---
+ build-aux/qmi-codegen/qmi-codegen                  | 2 +-
+ examples/simple-tester-python/simple-tester-python | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen
+index 1fea7c1..1092c8e 100755
+--- a/build-aux/qmi-codegen/qmi-codegen
++++ b/build-aux/qmi-codegen/qmi-codegen
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ #
+ # This program is free software; you can redistribute it and/or modify it under
+diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python
+index af9065a..a35e505 100755
+--- a/examples/simple-tester-python/simple-tester-python
++++ b/examples/simple-tester-python/simple-tester-python
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ #
+ # This program is free software; you can redistribute it and/or modify it under
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
index dee36d7b45..4807244a58 100644
--- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb
@@ -2,7 +2,7 @@  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"
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
@@ -10,12 +10,23 @@  LIC_FILES_CHKSUM = " \
 
 DEPENDS = "glib-2.0 glib-2.0-native"
 
-inherit autotools pkgconfig bash-completion gobject-introspection
+inherit meson pkgconfig bash-completion gobject-introspection
 
-SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz"
+SRCREV ?= "f6c2feaf199e0f129a0bde8c5e6cba5f2117b564"
+# patch 0001 is on main branch upstream
+SRC_URI = "\
+    git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-30 \
+    file://0001-build-use-python3-everywhere.patch \
+"
 
-SRC_URI[sha256sum] = "00d7da30a4f8d1185f37cba289cfaf1dfcd04a58f2f76d6acfdf5b85312d6ed6"
+S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "udev mbim"
-PACKAGECONFIG[udev] = ",--without-udev,libgudev"
-PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim"
+PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev"
+PACKAGECONFIG[mbim] = "-Dmbim_qmux=true,-Dmbim_qmux=false,libmbim"
+PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib"
+
+EXTRA_OEMESON = " \
+    -Dgtk_doc=false \
+    -Dman=false \
+"