summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Gotthard <petr.gotthard@advantech.cz>2023-02-12 18:03:36 +0000
committerKhem Raj <raj.khem@gmail.com>2023-02-12 21:48:33 -0800
commit26adf9b88baf9357c9a574c7b82b2756362b6f57 (patch)
tree80ddfdd9bdce5203dead2e7730ee8ee0065966ca
parent892aac07aaf9c57dfd4e777bc870324b6e117670 (diff)
downloadmeta-openembedded-26adf9b88baf9357c9a574c7b82b2756362b6f57.tar.gz
libqmi: upgrade 1.30.8 -> 1.32.2
Changelog: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/qmi-1-32/NEWS Signed-off-by: Petr Gotthard <petr.gotthard@advantech.cz> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch33
-rw-r--r--meta-oe/recipes-connectivity/libqmi/libqmi_1.32.2.bb (renamed from meta-oe/recipes-connectivity/libqmi/libqmi_1.30.8.bb)8
2 files changed, 2 insertions, 39 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
deleted file mode 100644
index e345d28031..0000000000
--- a/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001
2From: goapunk <goapunk@riseup.net>
3Date: Mon, 13 Sep 2021 13:45:41 +0200
4Subject: [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
11diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen
12index 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
21diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python
22index 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--
322.34.1
33
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.8.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.32.2.bb
index a1cfe29cca..3a91a5bd5c 100644
--- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.8.bb
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.32.2.bb
@@ -12,12 +12,8 @@ DEPENDS = "glib-2.0 glib-2.0-native"
12 12
13inherit meson pkgconfig bash-completion gobject-introspection 13inherit meson pkgconfig bash-completion gobject-introspection
14 14
15SRCREV ?= "95108b6eebfefa6621a1c34565f562eeca9308b9" 15SRCREV = "c6b38cc2752873c0c6c1f8c472d9ddea2b34ec72"
16# patch 0001 is on main branch upstream 16SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-32"
17SRC_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"
21 17
22S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
23 19