From a26e5cc74095803b535b067a57150d37b80a5410 Mon Sep 17 00:00:00 2001
From: Peter Feerick <peter.feerick@gmail.com>
Date: Fri, 7 Feb 2025 10:30:26 +1000
Subject: [PATCH 1/4] chore: reorder alpha

---
 targets.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/targets.json b/targets.json
index a2e7ad4..95a84f4 100644
--- a/targets.json
+++ b/targets.json
@@ -361,12 +361,26 @@
         "stdlcd"
       ]
     },
+    "boxer": {
+        "description": "RadioMaster Boxer",
+        "tags": [
+          "stdlcd",
+          "bluetooth"
+        ]
+    },
     "mt12": {
       "description": "Radiomaster MT12",
       "tags": [
         "stdlcd"
       ]
     },
+    "pocket": {
+        "description": "RadioMaster Pocket",
+        "tags": [
+          "stdlcd",
+          "bluetooth"
+        ]
+    },
     "t8": {
       "description": "Radiomaster T8",
       "tags": [
@@ -393,20 +407,6 @@
         "bluetooth"
       ]
     },
-    "boxer": {
-      "description": "RadioMaster Boxer",
-      "tags": [
-        "stdlcd",
-        "bluetooth"
-      ]
-    },
-    "pocket": {
-      "description": "RadioMaster Pocket",
-      "tags": [
-        "stdlcd",
-        "bluetooth"
-      ]
-    },
     "zorro": {
       "description": "RadioMaster Zorro",
       "tags": [

From 98b82b8194a9197a0e99e326f42f6b03cf818651 Mon Sep 17 00:00:00 2001
From: Peter Feerick <peter.feerick@gmail.com>
Date: Fri, 7 Feb 2025 10:30:39 +1000
Subject: [PATCH 2/4] chore: add nb4p and gx12

---
 targets.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/targets.json b/targets.json
index 95a84f4..ecdeb96 100644
--- a/targets.json
+++ b/targets.json
@@ -195,6 +195,12 @@
         "colorlcd"
       ]
     },
+    "nb4p": {
+        "description": "Flysky NB4+",
+        "tags": [
+          "colorlcd"
+        ]
+    },
     "x10": {
       "description": "FrSky Horus X10",
       "tags": [
@@ -368,6 +374,13 @@
           "bluetooth"
         ]
     },
+    "gx12": {
+        "description": "Radiomaster GX12",
+        "tags": [
+          "stdlcd",
+          "bluetooth"
+        ]
+    },
     "mt12": {
       "description": "Radiomaster MT12",
       "tags": [

From 439b9ebf4f85568b5cf886e49cbef388970b81d2 Mon Sep 17 00:00:00 2001
From: Peter Feerick <peter.feerick@gmail.com>
Date: Fri, 7 Feb 2025 10:32:35 +1000
Subject: [PATCH 3/4] chore: update excluded targets lists

---
 targets.json | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/targets.json b/targets.json
index ecdeb96..b8d2ec6 100644
--- a/targets.json
+++ b/targets.json
@@ -8,59 +8,65 @@
     },
     "v2.10.6": {
       "sha": "14adf0474ccedbd935fac7d71958946680b5fdfc",
-      "build_container": "ghcr.io/edgetx/edgetx-builder:2.10"
+      "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
+      "exclude_targets": [
+        "gx12", "nb4p"
+      ]
     },
     "v2.10.5": {
       "sha": "6b539d03c66061e431d9090531ac192f7550a102",
-      "build_container": "ghcr.io/edgetx/edgetx-builder:2.10"
+      "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
+      "exclude_targets": [
+        "gx12", "nb4p"
+      ]
     },
     "v2.10.4": {
       "sha": "9b901689fbd84fb4027b4f898460314d76b1f69a",
       "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
       "exclude_targets": [
-        "bumblebee"
+        "bumblebee", "gx12", "nb4p"
       ]
     },
     "v2.10.3": {
       "sha": "2fc5a9acab767b7b3f4861d85dffd359d6ad28f6",
       "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
       "exclude_targets": [
-        "bumblebee"
+        "bumblebee", "gx12", "nb4p"
       ]
     },
     "v2.10.2": {
       "sha": "1de06000cdfe3398840a8d28f7bf5de7fbedc899",
       "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
       "exclude_targets": [
-        "t12max", "tpros", "bumblebee"
+        "t12max", "tpros", "bumblebee", "gx12", "nb4p"
       ]
     },
     "v2.10.1": {
       "sha": "839b60f6cc88d22383a6f686862b3fba4108884e",
       "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
       "exclude_targets": [
-        "f16", "t12max", "tpros", "bumblebee"
+        "f16", "t12max", "tpros", "bumblebee", "gx12", "nb4p"
       ]
     },
     "v2.10.0": {
       "sha": "22ce06d3423fdb265c6c7bce6031f1003027bf0c",
       "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
       "exclude_targets": [
-        "f16", "t12max", "t15", "tpros", "bumblebee"
+        "f16", "t12max", "t15", "tpros", "bumblebee", "gx12", "nb4p"
       ]
     },
     "v2.9.4": {
       "sha": "77884b6a22e20ad91ba6c6656b96bcb2adc86768",
       "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
       "exclude_targets": [
-        "pl18", "pl18ev", "t20", "tprov2", "mt12", "pocket", "f16", "t12max", "t14", "t15", "t20v2", "tpros", "bumblebee"
+        "pl18", "pl18ev", "t20", "tprov2", "mt12", "pocket", "f16", "t12max", "t14", "t15", "t20v2", "tpros", "bumblebee", "gx12", "nb4p"
       ]
     },
     "v2.8.5": {
       "sha": "cbac1063eb8637457d2a63c367863c6bfd6f0c31",
       "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
       "exclude_targets": [
-        "pl18", "pl18ev", "t20", "tprov2", "mt12", "pocket", "f16", "t12max", "t14", "t15", "t20v2", "tpros", "bumblebee"
+        "pl18", "pl18ev", "t20", "tprov2", "mt12", "pocket", "f16", "t12max", "t14", "t15", "t20v2", "tpros", "bumblebee", "gx12", "nb4p"
       ]
     }
   },

From 423ba036dcb8320c7c64d9dcbcbdfbbc6539e68f Mon Sep 17 00:00:00 2001
From: Peter Feerick <peter.feerick@gmail.com>
Date: Fri, 7 Feb 2025 10:37:20 +1000
Subject: [PATCH 4/4] fix: update older pinned build_container versions

---
 targets.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets.json b/targets.json
index b8d2ec6..3dfcb97 100644
--- a/targets.json
+++ b/targets.json
@@ -57,14 +57,14 @@
     },
     "v2.9.4": {
       "sha": "77884b6a22e20ad91ba6c6656b96bcb2adc86768",
-      "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
+      "build_container": "ghcr.io/edgetx/edgetx-builder:2.9.0",
       "exclude_targets": [
         "pl18", "pl18ev", "t20", "tprov2", "mt12", "pocket", "f16", "t12max", "t14", "t15", "t20v2", "tpros", "bumblebee", "gx12", "nb4p"
       ]
     },
     "v2.8.5": {
       "sha": "cbac1063eb8637457d2a63c367863c6bfd6f0c31",
-      "build_container": "ghcr.io/edgetx/edgetx-builder:2.10",
+      "build_container": "ghcr.io/edgetx/edgetx-builder:2.8",
       "exclude_targets": [
         "pl18", "pl18ev", "t20", "tprov2", "mt12", "pocket", "f16", "t12max", "t14", "t15", "t20v2", "tpros", "bumblebee", "gx12", "nb4p"
       ]