From 26adf9b88baf9357c9a574c7b82b2756362b6f57 Mon Sep 17 00:00:00 2001 From: Petr Gotthard Date: Sun, 12 Feb 2023 18:03:36 +0000 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- .../0001-build-use-python3-everywhere.patch | 33 ------------------- .../{libqmi_1.30.8.bb => libqmi_1.32.2.bb} | 8 ++--- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.30.8.bb => libqmi_1.32.2.bb} (77%) 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 @@ -From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001 -From: goapunk -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.8.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.32.2.bb similarity index 77% rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.30.8.bb rename to 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" inherit meson pkgconfig bash-completion gobject-introspection -SRCREV ?= "95108b6eebfefa6621a1c34565f562eeca9308b9" -# 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 \ -" +SRCREV = "c6b38cc2752873c0c6c1f8c472d9ddea2b34ec72" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-32" S = "${WORKDIR}/git"