From e2ee631832d3aab747a166a8f46f60d1df9244e9 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 9 Oct 2023 17:34:57 +0200
Subject: [PATCH] meta-digi: [cosmetic] alphabetize compatible machine string

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb        | 2 +-
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb        | 4 ++--
 meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 4 ++--
 meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb               | 4 ++--
 .../kernel-module-qualcomm/kernel-module-qualcomm.bb          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb          | 2 +-
 meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb       | 2 +-
 meta-digi-dey/recipes-connectivity/xbee/xbee.bb               | 4 ++--
 meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb | 2 +-
 .../recipes-digi/dey-examples/dey-examples-adc-cmp.bb         | 4 ++--
 .../recipes-digi/dey-examples/dey-examples-cryptochip.bb      | 4 ++--
 .../recipes-digi/packagegroups/packagegroup-dey-examples.bb   | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
index 58b65f655..fc3437f36 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -144,4 +144,4 @@ FILES:${PN}-${QCA_MODEL}-bt = "/lib/firmware/qca"
 FILES:${PN}-${QCA_MODEL}-wifi = "/lib/firmware"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x|ccimx8m)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
index ac3ca7119..c75695de1 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2022 Digi International
+# Copyright (C) 2020-2023 Digi International
 
 require u-boot-dey.inc
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
@@ -8,4 +8,4 @@ DEPENDS += "flex-native bison-native"
 SRCBRANCH = "v2020.04/master"
 SRCREV = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)"
+COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)"
diff --git a/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb
index ba76662dd..d9114868c 100644
--- a/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb
+++ b/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 Digi International Inc.
+# Copyright (C) 2017-2023 Digi International Inc.
 
 SUMMARY = "Microchip CryptoAuthentication Library"
 SECTION = "libs"
@@ -53,4 +53,4 @@ RDEPENDS:${PN}-test = "${PN}"
 RRECOMMENDS:${PN} = "${PN}-test"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul|ccimx8x|ccimx8m)"
+COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul|ccimx8m|ccimx8x)"
diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb
index cd326f853..49a956947 100644
--- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb
+++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2022 Digi International.
+# Copyright (C) 2016-2023 Digi International.
 
 SUMMARY = "MCA firmware management tool"
 SECTION = "console/tools"
@@ -22,4 +22,4 @@ inherit bin_package
 
 INSANE_SKIP:${PN} = "already-stripped"
 
-COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m|ccmp1)"
+COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x|ccmp1)"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
index 2f778854d..6f7e27844 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
@@ -100,4 +100,4 @@ FILES:${PN} += " \
     ${base_libdir}/firmware/wlan/qcom_cfg.ini \
 "
 
-COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x|ccimx8m)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x)"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
index f3c7c59ea..ecc10eef9 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
@@ -7,4 +7,4 @@ SRCBRANCH:stm32mpcommon = "v5.15.118/stm/master"
 SRCREV = "${AUTOREV}"
 SRCREV:stm32mpcommon = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx6|ccmp1|ccimx8x)"
+COMPATIBLE_MACHINE = "(ccimx6|ccimx6ul|ccimx8m|ccimx8x|ccmp1)"
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb
index f5df5aa02..a9661b0fa 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb
@@ -62,4 +62,4 @@ RDEPENDS:${PN} = "initscripts-functions"
 RDEPENDS:${PN}:append:ccimx93 = " firmware-nxp-wifi-nxpiw612"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x|ccimx8mn|ccimx8mm|ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx93)"
diff --git a/meta-digi-dey/recipes-connectivity/xbee/xbee.bb b/meta-digi-dey/recipes-connectivity/xbee/xbee.bb
index 2b31f2531..6667c182b 100644
--- a/meta-digi-dey/recipes-connectivity/xbee/xbee.bb
+++ b/meta-digi-dey/recipes-connectivity/xbee/xbee.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2022, Digi International Inc.
+# Copyright (C) 2019-2023, Digi International Inc.
 
 SUMMARY = "Digi XBee initialization"
 DESCRIPTION = "Initialization scripts for XBee hardware of Digi boards"
@@ -42,4 +42,4 @@ SYSTEMD_PACKAGES = "${PN}-init"
 SYSTEMD_SERVICE:${PN}-init = "xbee-init.service"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx8m|ccimx8x|ccimx93)"
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
index 1162c099d..47afa79f7 100644
--- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
+++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
@@ -27,4 +27,4 @@ RDEPENDS:${PN} = " \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6|ccimx8x|ccimx8m|ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx6|ccimx8m|ccimx8x|ccimx93)"
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc-cmp.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc-cmp.bb
index bf8275cb2..4822a3272 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc-cmp.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc-cmp.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022, Digi International Inc.
+# Copyright (C) 2017-2023, Digi International Inc.
 
 SUMMARY = "DEY examples: Analog Comparator test application"
 SECTION = "examples"
@@ -15,4 +15,4 @@ do_install() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m)"
+COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)"
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
index 83ee98caf..47b8d3218 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022, Digi International Inc.
+# Copyright (C) 2017-2023, Digi International Inc.
 
 require recipes-digi/dey-examples/dey-examples-src.inc
 
@@ -18,4 +18,4 @@ do_install() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul|ccimx8x|ccimx8m)"
+COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul|ccimx8m|ccimx8x)"
diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
index 507429885..e3943fa24 100644
--- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
+++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
@@ -27,4 +27,4 @@ RDEPENDS:${PN}:append:ccimx6 = "\
 	dey-examples-v4l2 \
 "
 
-COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x|ccimx8m)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x)"