From f057894d2670712c316f69bd9aa3a66275a8b3e5 Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Mon, 1 May 2023 20:38:17 +0200
Subject: [PATCH] Allow mcuboot tool to use cbor2 additional to cbor

The mcuboot imgtool uses the python module `cbor`.

An equivalent and updated package `cbor2` requires Python 3.7 or newer.

The arch packages provide a package `python-cbor2`, but no package for
`cbor`.

This patch makes it possible to use the system package by adding
support for the `cbor2` package additionally to the `cbor` package.
---
 tools/mcuboot/imgtool/boot_record.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/mcuboot/imgtool/boot_record.py b/tools/mcuboot/imgtool/boot_record.py
index 4112b225..28797c3c 100644
--- a/tools/mcuboot/imgtool/boot_record.py
+++ b/tools/mcuboot/imgtool/boot_record.py
@@ -14,7 +14,10 @@
 # limitations under the License.
 
 from enum import Enum
-import cbor
+try:
+    import cbor2 as cbor
+except:
+    import cbor
 
 
 class SwComponent(int, Enum):