From 9e369cf7a451f5b15e4fbb344a22b0b524a32d71 Mon Sep 17 00:00:00 2001
From: Aki Tomita <aki.tomita@ni.com>
Date: Mon, 30 Oct 2023 22:15:03 -0500
Subject: [PATCH] meta-ettus: update to uhd v4.6.0.0-rc1

---
 meta-alchemy/conf/distro/Alchemy.conf         |  2 +-
 .../recipes-support/uhd/mpmd_4.6.bb           |  4 ++++
 .../uhd/uhd-fpga-images_4.6.bb                |  2 ++
 .../recipes-support/uhd/uhd_4.6.bb            |  4 ++++
 .../recipes-support/uhd/uhd_4.6_src.inc       | 20 +++++++++++++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 meta-ettus-core/recipes-support/uhd/mpmd_4.6.bb
 create mode 100644 meta-ettus-core/recipes-support/uhd/uhd-fpga-images_4.6.bb
 create mode 100644 meta-ettus-core/recipes-support/uhd/uhd_4.6.bb
 create mode 100644 meta-ettus-core/recipes-support/uhd/uhd_4.6_src.inc

diff --git a/meta-alchemy/conf/distro/Alchemy.conf b/meta-alchemy/conf/distro/Alchemy.conf
index 45faa2b6..31eb7332 100644
--- a/meta-alchemy/conf/distro/Alchemy.conf
+++ b/meta-alchemy/conf/distro/Alchemy.conf
@@ -20,7 +20,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 
 VIRTUAL-RUNTIME_init_manager = "systemd"
 
-PREFERRED_UHD_VERSION ?= "4.5%"
+PREFERRED_UHD_VERSION ?= "4.6%"
 PREFERRED_VERSION_uhd ?= "${PREFERRED_UHD_VERSION}"
 PREFERRED_VERSION_uhd-fpga-images ?= "${PREFERRED_UHD_VERSION}"
 PREFERRED_VERSION_mpmd ?= "${PREFERRED_UHD_VERSION}"
diff --git a/meta-ettus-core/recipes-support/uhd/mpmd_4.6.bb b/meta-ettus-core/recipes-support/uhd/mpmd_4.6.bb
new file mode 100644
index 00000000..935eeec5
--- /dev/null
+++ b/meta-ettus-core/recipes-support/uhd/mpmd_4.6.bb
@@ -0,0 +1,4 @@
+require mpmd.inc
+require uhd_4.6_src.inc
+
+LIC_FILES_CHKSUM = "file://../host/LICENSE;md5=8255adf1069294c928e0e18b01a16282"
diff --git a/meta-ettus-core/recipes-support/uhd/uhd-fpga-images_4.6.bb b/meta-ettus-core/recipes-support/uhd/uhd-fpga-images_4.6.bb
new file mode 100644
index 00000000..42c6aa82
--- /dev/null
+++ b/meta-ettus-core/recipes-support/uhd/uhd-fpga-images_4.6.bb
@@ -0,0 +1,2 @@
+require uhd_4.6_src.inc
+require uhd-fpga-images.inc
diff --git a/meta-ettus-core/recipes-support/uhd/uhd_4.6.bb b/meta-ettus-core/recipes-support/uhd/uhd_4.6.bb
new file mode 100644
index 00000000..47ccb1d2
--- /dev/null
+++ b/meta-ettus-core/recipes-support/uhd/uhd_4.6.bb
@@ -0,0 +1,4 @@
+require uhd.inc
+require uhd_4.6_src.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8255adf1069294c928e0e18b01a16282"
diff --git a/meta-ettus-core/recipes-support/uhd/uhd_4.6_src.inc b/meta-ettus-core/recipes-support/uhd/uhd_4.6_src.inc
new file mode 100644
index 00000000..1d95bdca
--- /dev/null
+++ b/meta-ettus-core/recipes-support/uhd/uhd_4.6_src.inc
@@ -0,0 +1,20 @@
+SRC_URI = "git://github.com/EttusResearch/uhd.git;branch=UHD-4.6;protocol=https"
+SRCREV = "c2dd6c1d9989289fc78820d6a70994c3a3a73dc1"
+
+# A note on PR and PV:
+# PV is the package version, and PR is the package revision from the OE
+# perspective. So if we need to modify meta-ettus to fix a version of UHD, but
+# UHD itself is not changing, then we start incrementing the revision. We can
+# leave out PR otherwise, but we can't retroactively take out PR because that
+# would look like we're going back on the version numbers.
+# General guidelines:
+# - The first time we release a UHD + OE version, we put the version number into
+#   PV, and remove PR if it's set.
+# - Pre-releases to that use the `+foo` notation to append something to the
+#   version number, such as `+rc1` or `+git5`.
+# - If we need to modify the OE package info after tagging a UHD release, and
+#   we've already published a version within OE, we start incrementing PR as in
+#   r1, r2, etc.
+
+PV = "4.6.0.0+rc1"
+#PR = "r1"