meta-ettus-core: added recipes for UHD 4.7 (v4.7.0.0-rc1)

Signed-off-by: Joerg Hofrichter <joerg.hofrichter@ni.com>
EttusResearch · Jun 18, 2024 · 30b14e8 · 30b14e8
1 parent 26a07de
commit 30b14e8
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 8 deletions.
diff --git a/meta-ettus-core/recipes-support/uhd/mpmd.inc b/meta-ettus-core/recipes-support/uhd/mpmd.inc
@@ -6,14 +6,6 @@ LICENSE = "GPL-3.0-or-later"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI += "file://0000-mpm-rpc_server-cast-get_device_info-get_mbeeprom-par.patch;patchdir=.. \
-            file://0000-mpm-get_mender_artifact-fix-obsolete-command.patch;patchdir=.. \
-            file://0001-mpm-tdc-fix-compatibility-with-Python-3.9.0.patch;patchdir=.. \
-            file://0002-mpm-deactivate-Duplicate-Address-Detection-DAD-on-in.patch;patchdir=.. \
-            file://0003-mpm-usrp_update_fs-correct-outdated-mender-command-i.patch;patchdir=.. \
-            file://0004-mpm-avoid-importing-from-rpc_server-when-importing-u.patch;patchdir=.. \
-           "
-
 DEPENDS = " boost \
 	    udev \
 	    pkgconfig-native \

diff --git a/meta-ettus-core/recipes-support/uhd/mpmd_4.6.bb b/meta-ettus-core/recipes-support/uhd/mpmd_4.6.bb
@@ -2,3 +2,11 @@ require uhd_4.6_src.inc
 require mpmd.inc
 
 LIC_FILES_CHKSUM = "file://../host/LICENSE;md5=8255adf1069294c928e0e18b01a16282"
+
+SRC_URI += "file://0000-mpm-rpc_server-cast-get_device_info-get_mbeeprom-par.patch;patchdir=.. \
+            file://0000-mpm-get_mender_artifact-fix-obsolete-command.patch;patchdir=.. \
+            file://0001-mpm-tdc-fix-compatibility-with-Python-3.9.0.patch;patchdir=.. \
+            file://0002-mpm-deactivate-Duplicate-Address-Detection-DAD-on-in.patch;patchdir=.. \
+            file://0003-mpm-usrp_update_fs-correct-outdated-mender-command-i.patch;patchdir=.. \
+            file://0004-mpm-avoid-importing-from-rpc_server-when-importing-u.patch;patchdir=.. \
+           "
diff --git a/meta-ettus-core/recipes-support/uhd/mpmd_4.7.bb b/meta-ettus-core/recipes-support/uhd/mpmd_4.7.bb
@@ -0,0 +1,4 @@
+require uhd_4.7_src.inc
+require mpmd.inc
+
+LIC_FILES_CHKSUM = "file://../host/LICENSE;md5=8255adf1069294c928e0e18b01a16282"
diff --git a/meta-ettus-core/recipes-support/uhd/uhd-fpga-images_4.7.bb b/meta-ettus-core/recipes-support/uhd/uhd-fpga-images_4.7.bb
@@ -0,0 +1,2 @@
+require uhd_4.7_src.inc
+require uhd-fpga-images.inc
diff --git a/meta-ettus-core/recipes-support/uhd/uhd_4.7.bb b/meta-ettus-core/recipes-support/uhd/uhd_4.7.bb
@@ -0,0 +1,4 @@
+require uhd.inc
+require uhd_4.7_src.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8255adf1069294c928e0e18b01a16282"
diff --git a/meta-ettus-core/recipes-support/uhd/uhd_4.7_src.inc b/meta-ettus-core/recipes-support/uhd/uhd_4.7_src.inc
@@ -0,0 +1,20 @@
+SRC_URI = "git://github.com/EttusResearch/uhd.git;branch=master;protocol=https"
+SRCREV = "327f294e2717512bec71907e5f43b5532f03dd2c"
+
+# 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.7.0.0-rc1"
+#PR = "r1"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		require uhd_4.7_src.inc
		require uhd-fpga-images.inc