diff --git a/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch b/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch deleted file mode 100644 index 914760512a7..00000000000 --- a/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 35173fa04d0116ba30a86dc1a19f859f2be14a24 Mon Sep 17 00:00:00 2001 -From: "Bruce A. Johnson" -Date: Wed, 22 Dec 2021 14:24:02 -0500 -Subject: [PATCH] core: switch bash shell scripts to use /bin/sh for use - w/Busybox. - -Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/483 - -%% original patch: 0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch ---- - data/dispatcher-fcc-unlock/105b | 2 +- - data/dispatcher-fcc-unlock/1199 | 2 +- - data/dispatcher-fcc-unlock/1eac | 2 +- - test/mmcli-test-sms | 2 +- - tools/tests/test-wrapper.sh.in | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/dispatcher-fcc-unlock/105b b/data/dispatcher-fcc-unlock/105b -index 444bd51f..772c90f4 100644 ---- a/data/dispatcher-fcc-unlock/105b -+++ b/data/dispatcher-fcc-unlock/105b -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # SPDX-License-Identifier: CC0-1.0 - # 2021 Aleksander Morgado -diff --git a/data/dispatcher-fcc-unlock/1199 b/data/dispatcher-fcc-unlock/1199 -index 83ab2c9e..6dbf8d1b 100644 ---- a/data/dispatcher-fcc-unlock/1199 -+++ b/data/dispatcher-fcc-unlock/1199 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # SPDX-License-Identifier: CC0-1.0 - # 2021 Aleksander Morgado -diff --git a/data/dispatcher-fcc-unlock/1eac b/data/dispatcher-fcc-unlock/1eac -index 1a048dc8..44ce46d7 100644 ---- a/data/dispatcher-fcc-unlock/1eac -+++ b/data/dispatcher-fcc-unlock/1eac -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # SPDX-License-Identifier: CC0-1.0 - # 2021 Aleksander Morgado -diff --git a/test/mmcli-test-sms b/test/mmcli-test-sms -index 18e0a7b4..7136ee0d 100755 ---- a/test/mmcli-test-sms -+++ b/test/mmcli-test-sms -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - print_usage () { - echo "usage: $0 [MODEM INDEX] [all|ucs2|gsm7|data] [NUMBER]" -diff --git a/tools/tests/test-wrapper.sh.in b/tools/tests/test-wrapper.sh.in -index d64ea4cb..fcdb56de 100644 ---- a/tools/tests/test-wrapper.sh.in -+++ b/tools/tests/test-wrapper.sh.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # For debugging behavior of test-modemmanager-service.py, you can modify - # this line to add --log-file option --- -2.35.3 - diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.20.4.bb similarity index 87% rename from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb rename to meta-oe/recipes-connectivity/modemmanager/modemmanager_1.20.4.bb index b06e3ebdabd..fe44ef965ef 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.20.4.bb @@ -12,13 +12,8 @@ inherit gnomebase gettext systemd gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev libxslt-native dbus" -SRCREV ?= "c234bd55c9d9618c1478b5e80aaf4b8f965be181" - -# Patch 0001 will be in ModemManager > 1.19 -SRC_URI = " \ - git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-18 \ - file://0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch \ -" +SRCREV = "6926459500fd927e7cceb589a9e4113d4edb04e6" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-20" S = "${WORKDIR}/git"