From patchwork Sun Feb 12 18:04:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Gotthard X-Patchwork-Id: 19421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCD3AC636D3 for ; Sun, 12 Feb 2023 18:04:16 +0000 (UTC) Received: from APC01-SG2-obe.outbound.protection.outlook.com (APC01-SG2-obe.outbound.protection.outlook.com [40.107.215.76]) by mx.groups.io with SMTP id smtpd.web10.16603.1676225050644349619 for ; Sun, 12 Feb 2023 10:04:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@advantech.cz header.s=selector1 header.b=QPxVtvy9; spf=pass (domain: advantech.cz, ip: 40.107.215.76, mailfrom: petr.gotthard@advantech.cz) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ALVoH2Y84/6bePfVXcoO8Py5p31d0YNRTm1gQrrvLYVAds3+65tDzR7bPFvflKpeZRozkTdqcNrLZnKuiLL+skI9CMcBIs7MmzO1ZBrauSAMWGQ8MEzlryP3DbClDP+SffD2Noiru4c6fEHxwC0gBd2mrb5tLZAsIVoLsm7OJUPDsZy9uxKfJrozAFdYZD7EWlo6lSA2A/+FUisdDtPZG4I3283rIY7bZnLHE5KvVIR+V6QwOKknsdHDMXvKFlyeVt+jbsezhnengvY47Cxbi0WcOeWV/mPO6BLTRK9uhkBxlKzhpj2ZvzYOTZ9UA7NP5PQcEl4UwlKwqho1y+w4Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mEBcFLix2homQtSfG4ky+z0RSerq5IbVnOggSUsDqj4=; b=Ss9iAeajKObXFtgZfPV29M1EN5Xix8IzGEgA/1xx0CvUW3h0RMwVoeF2oFeaqXZ1ul6/PAfzxg0tiFQZe64TbJqPK4wItwuyDfoCUffrrMGPOZH2BauIyrE49EmwwK6aO7KhCMZ7mGDODhd44uOeUDMJVByo2yGAgyugKFE7H0C14FQHR1FgUe1nNExaLaYB/4Wah45WKdiLrT5OJR+bocCDwSiiouFbZ8fbUU5wQizs8dJ9akswMQy+nFjIva1NJnUVRMFHyjI4Z/wGFye/W6VdFcf4Ur4pVs1pYwTAmPjrAkz8GvXkG3aSgOi3OdXw5wIFvg0kgqCwzz2chAKtAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=advantech.cz; dmarc=pass action=none header.from=advantech.cz; dkim=pass header.d=advantech.cz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=advantech.cz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mEBcFLix2homQtSfG4ky+z0RSerq5IbVnOggSUsDqj4=; b=QPxVtvy9/cGO0PwUhdFShoNgwbetJBWGjKmbNTqI3GgWH4skKgO5IAiwanLA1yzkeY4KjqJLhq3D+DamkbQGWPozogK4l4fbvTQt379G+jDZmEMa/ILDrlUtQV1Anw6VobBCa90fRAyDxRQuux5a5ssfNAAXKfsFuwb/LWB/3/Q7xa3YtrzD96OLj/LsbRDz3/ydMAjdUmRxST8tYhjUeeQOzFPknbBZ6t5CxFP7Sbnpx8uq55gJMl6pvmimuH/89PVALnDjV7x+S8zbOS783xD4/ek1VomvERkySu7jbbJAC+M6dWOa/qd3B1Ebprg21SemcUXT2lqsspIIget+5A== Received: from TY2PR02MB3678.apcprd02.prod.outlook.com (2603:1096:404:b7::12) by SI2PR02MB5067.apcprd02.prod.outlook.com (2603:1096:4:15d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.23; Sun, 12 Feb 2023 18:04:06 +0000 Received: from TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::e2f4:d03b:1736:e417]) by TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::e2f4:d03b:1736:e417%7]) with mapi id 15.20.6086.023; Sun, 12 Feb 2023 18:04:06 +0000 From: Petr Gotthard To: "openembedded-devel@lists.openembedded.org" Subject: [meta-oe][PATCH 3/3] modemmanager: upgrade 1.18.12 -> 1.20.4 Thread-Topic: [meta-oe][PATCH 3/3] modemmanager: upgrade 1.18.12 -> 1.20.4 Thread-Index: Adk/CaNb9LPYsA9lRQS94511I94aLA== Date: Sun, 12 Feb 2023 18:04:06 +0000 Message-ID: Accept-Language: en-US Content-Language: cs-CZ X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=advantech.cz; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TY2PR02MB3678:EE_|SI2PR02MB5067:EE_ x-ms-office365-filtering-correlation-id: badb638d-2b2e-4fd4-9c6a-08db0d238812 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Sk4uWSYNidOBKHprylPgspnxAP+ohe20g+lRvnQFg/rF1TxTYuN9+uyN3uubrYwxITd3gW6C09SQHEYkW1pVLyZ8HmVuiLiRQu9KNDI6A+Jkx78TiCC8ZyCmyPoItiY66M5CSxAE5joWriz+aEeIAbDDE75F3Sk2DRSk83uHkfaTIquH1ezyO7l9qDZuK58BqITnPTy1DbAaHfHscshj8gSqnSiLudxF9rDvXl16WRYSWDhahAnVwNb67xbN0pCqGi9U1xdFJaybmOIQVdt+ZR0bP7ygT79qdHNPiQtlQr7Sjx/61M3HzrlZhpQsYF3JdzOpnqUfmcU6sIlh/NPKcxNlqCgaMc33tIaU/98xQOkgh9oNgFMy5bGYIKowG3KyE7cpzvjhWBKAuY59EoBmNRBoVhKD5rUfuU2AsJuUwO7bG88vGfkgCtI98CpPA+OGCFBcLvWHOgKEcexYGbWMsqvYUeuifWoxiewrCXD/36bajOBTgf8RL0cIWEV5HleiaZ3J9dKTZRFn5ZGKEFEQXP1+AAP0p9ldoOx/KKHm3g1QXnR3gwU/86R9OcBT8R9FR+VGi9veinrz/MCBmA2QxC1+rKlJtmzWK/vwuMvrUiB2TgDAWsyoddqBW1r31WfGTCkum7QPRZ8l31BtnvZDdQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TY2PR02MB3678.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(136003)(376002)(396003)(366004)(39850400004)(346002)(451199018)(8676002)(8936002)(71200400001)(7696005)(52536014)(38100700002)(55016003)(44832011)(2906002)(5660300002)(86362001)(122000001)(9686003)(26005)(186003)(6506007)(41300700001)(966005)(478600001)(316002)(66946007)(76116006)(6916009)(66556008)(66476007)(64756008)(66446008)(38070700005)(33656002)(83380400001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?rC6442aGqXVBDu0pgOH7TJGNHlJb?= =?utf-8?q?zB070WoJJjaCJWx2HKBo8eCMTKDEEMxYhB7+O5xbBqN4/VoXAfFPq+fS/3LBeGHJH?= =?utf-8?q?FepQW4/lrxcNDCll4yo6Cr9oAhPsyrPfbNBnEfcc+ncxO6Q1JtH0JhLQKcDCkP6Ra?= =?utf-8?q?0X2+UC8NFXPU6EWVEmVDKXFuA64ua5uMY11dtYIqmKkv9RCb8qV26l8tOrYVd8w8/?= =?utf-8?q?r1f1JeQb7EOVWt9wH4I3gixFu3Z32yzhhBCdfMHueOxIkW79xV67oppIEhizB9VqW?= =?utf-8?q?aGpTk87FtxCrWQ5YtBkSQDOSzcwpjLDkOiAy5rqnqgY6DAByNsa/kfaYja8YZfWqC?= =?utf-8?q?MSvPEZfViAZSi6M0ll8EfwdyIuTH1t6nyTIZfKglCVESKWWDs6oK3U2JAFvaPDTQn?= =?utf-8?q?BA/7IwCzzXfGYFzeI9RUkOfgZnFNVgIiC+GoGwhxZ477o9H9oxQc7VOsK9ZE9IrLw?= =?utf-8?q?ry9HW1RRtNz05iUpYwc0wMloRyGwP2U0C+PWopWcPVJUdX85i9z5gIa1g9f9yFEwD?= =?utf-8?q?HrH19JVw+pawLPLpF9XL6j0OY3s4z+PEG1eNozhQPPv1JtzvytFLE5PMB7+cYggDn?= =?utf-8?q?3qNDvsyGTgu1caPJOHdzLjrPO+mwb/iXPf5TcRQnwpcexMCU8xFgyrPD22ItLaQFR?= =?utf-8?q?XQDyPMwu/tNhHdc8ui18vHcciO0TKi9xgSlB6FROo620asqlh3pKEj+g6d+CaUDCT?= =?utf-8?q?JKBJRQjFt5WNCZt8219wW1/92qS2+B1fZvvsOPb8gr1n7w4oE4vNjJGbCLz3LXGi2?= =?utf-8?q?wrUv4vMfpIaWjVXl2Vg1+PWbBJPNkxYucOkVjrJwNL33j1MLfcCT5ExfkOAvIAbWz?= =?utf-8?q?94v4s38XWCY5/GopRaRrkQq6uAurkvcmGlxJeGNVr4koQg1uGwneai2C1UrbHTayT?= =?utf-8?q?gf4c6oQBlNvlbvOyad2UQP8RSL3iGAQopL962qhT0puw3nJgopxUCUz1v9vQ6SAi9?= =?utf-8?q?USeiWRKs4ABIeM/EEVZ31Zf3Wi5CWfsq8dW4/vY+X9I8hV+Hf0vtoX599W64d2xXx?= =?utf-8?q?9SX0sEEzWhVXlLvdujt9kBBA/AkofU/KL7NPS0Ixl3JgZXUy2HSf+194z7zN8W5mn?= =?utf-8?q?iy1tC+K2szl4q6sb+CjrKckX7ZSeBzcmcv8+2zUXFyKZ8wxXlq125gUJXxCn3hmjf?= =?utf-8?q?jwy5gBPqk4CzrJLsaTpNWKbbeZUXeQYCufRxixQW6gL/+VNZP2KeXttu2bxEUq3w/?= =?utf-8?q?VtygRICSBCeQZDU80aKAshBWvGb7yaBNsE9ZNgPcx7lKWaX2gBzordSZePN+2CPOX?= =?utf-8?q?mDoMhYIQITkTv2RP6BXftifz7FKZAHNhl5cuCYIgZZN5sGQ7kr0I8nElBT9Tba0rI?= =?utf-8?q?FjOm8bGhlK7FPtWNgkWgYELuiRPrNAHYvqytrVfIeStPgWqVTQowOvcoSzmo8c+vW?= =?utf-8?q?Xj8ohw4OKu6ZJOgOjO2s58uqKzvDgS8QpTroYZxPxOYuv1Dnqg4rMmpKszo9zbUVJ?= =?utf-8?q?0124T5OZSU1vXBkOc9O9p71YyW95UkzhGR6pimiHQ+CBc0MK2+LqnfB3IMYUvBOUZ?= =?utf-8?q?M0zXYBbN2I3PPg0fwxn09ZjtYaoYiyY1hQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: advantech.cz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TY2PR02MB3678.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: badb638d-2b2e-4fd4-9c6a-08db0d238812 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Feb 2023 18:04:06.0525 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a77d40d9-dcba-4dda-b571-5f18e6da853f X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: sGiYlMr3KZtXv5bDgvhf/TvB3FsYXvaNCfYyJirng1s0qpFr8hdkr9vGJql80RBNNZsXZFGtlMG3ytqxd9zT2qm4aOKMlm+YosH1C0YT1t4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR02MB5067 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 12 Feb 2023 18:04:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101059 Changelog: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/blob/mm-1-20/NEWS Signed-off-by: Petr Gotthard --- ...-shell-scripts-to-use-bin-sh-for-use.patch | 70 ------------------- ...ager_1.18.12.bb => modemmanager_1.20.4.bb} | 9 +-- 2 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.18.12.bb => modemmanager_1.20.4.bb} (87%) -- 2.34.1 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 914760512..000000000 --- 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 b06e3ebda..fe44ef965 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"