diff options
author | Adrian Freihofer <adrian.freihofer@gmail.com> | 2022-03-03 14:06:16 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-03-03 23:07:50 -0800 |
commit | d6a72c62dd1eb9a1b84ff2c1aa6a6c7707955e46 (patch) | |
tree | 8b4e1b8e71fcffdabee64c38674a1d04ec983193 /meta-oe | |
parent | 7a7604faad34633f77c6c36e1df68070c3da576f (diff) | |
download | meta-openembedded-d6a72c62dd1eb9a1b84ff2c1aa6a6c7707955e46.tar.gz |
libqmi: switch to meson and git
- 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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb | 23 |
2 files changed, 50 insertions, 6 deletions
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 000000000..e345d2803 --- /dev/null +++ b/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001 | ||
2 | From: goapunk <goapunk@riseup.net> | ||
3 | Date: Mon, 13 Sep 2021 13:45:41 +0200 | ||
4 | Subject: [PATCH] build: use python3 everywhere | ||
5 | |||
6 | --- | ||
7 | build-aux/qmi-codegen/qmi-codegen | 2 +- | ||
8 | examples/simple-tester-python/simple-tester-python | 2 +- | ||
9 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen | ||
12 | index 1fea7c1..1092c8e 100755 | ||
13 | --- a/build-aux/qmi-codegen/qmi-codegen | ||
14 | +++ b/build-aux/qmi-codegen/qmi-codegen | ||
15 | @@ -1,4 +1,4 @@ | ||
16 | -#!/usr/bin/env python | ||
17 | +#!/usr/bin/env python3 | ||
18 | # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
19 | # | ||
20 | # This program is free software; you can redistribute it and/or modify it under | ||
21 | diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python | ||
22 | index af9065a..a35e505 100755 | ||
23 | --- a/examples/simple-tester-python/simple-tester-python | ||
24 | +++ b/examples/simple-tester-python/simple-tester-python | ||
25 | @@ -1,4 +1,4 @@ | ||
26 | -#!/usr/bin/env python | ||
27 | +#!/usr/bin/env python3 | ||
28 | # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
29 | # | ||
30 | # This program is free software; you can redistribute it and/or modify it under | ||
31 | -- | ||
32 | 2.34.1 | ||
33 | |||
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 dee36d7b4..4807244a5 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" | |||
2 | DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ | 2 | DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ |
3 | devices which speak the Qualcomm MSM Interface (QMI) protocol" | 3 | devices which speak the Qualcomm MSM Interface (QMI) protocol" |
4 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" | 4 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" |
5 | LICENSE = "GPLv2 & LGPLv2.1" | 5 | LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
8 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | 8 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ |
@@ -10,12 +10,23 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS = "glib-2.0 glib-2.0-native" | 11 | DEPENDS = "glib-2.0 glib-2.0-native" |
12 | 12 | ||
13 | inherit autotools pkgconfig bash-completion gobject-introspection | 13 | inherit meson pkgconfig bash-completion gobject-introspection |
14 | 14 | ||
15 | SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" | 15 | SRCREV ?= "f6c2feaf199e0f129a0bde8c5e6cba5f2117b564" |
16 | # patch 0001 is on main branch upstream | ||
17 | SRC_URI = "\ | ||
18 | git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-30 \ | ||
19 | file://0001-build-use-python3-everywhere.patch \ | ||
20 | " | ||
16 | 21 | ||
17 | SRC_URI[sha256sum] = "00d7da30a4f8d1185f37cba289cfaf1dfcd04a58f2f76d6acfdf5b85312d6ed6" | 22 | S = "${WORKDIR}/git" |
18 | 23 | ||
19 | PACKAGECONFIG ??= "udev mbim" | 24 | PACKAGECONFIG ??= "udev mbim" |
20 | PACKAGECONFIG[udev] = ",--without-udev,libgudev" | 25 | PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev" |
21 | PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" | 26 | PACKAGECONFIG[mbim] = "-Dmbim_qmux=true,-Dmbim_qmux=false,libmbim" |
27 | PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib" | ||
28 | |||
29 | EXTRA_OEMESON = " \ | ||
30 | -Dgtk_doc=false \ | ||
31 | -Dman=false \ | ||
32 | " | ||