Merge branch 'honister' into kirkstone-next

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 8 insertions, 7 deletions

diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
index da09ec0f..ba42fd5f 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
@@ -2,6 +2,7 @@ REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-BRANCH= "2022.1"
-SRCREV= "2a6dc026480914ea1c9f02977a6ab4b57e8a3c8d"
-PV = "202210.2.13.0"
+BRANCH= "master"
+SRCREV= "910828b3abdbf66b10cb6efc952e75df64962340"
+PV = "202220.2.14.0"
+
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
index f55b83ae..b8071a65 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
                     file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
                     file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://runtime_src/core/pcie/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 \
-                    file://runtime_src/core/edge/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 "
+                    file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 "
 
 S = "${WORKDIR}/git/src"
 
-inherit cmake pkgconfig
+inherit cmake
 
 BBCLASSEXTEND = "native nativesdk"
 
@@ -41,7 +40,8 @@ FILES:${PN} += "\
     ${libdir}/lib*.so \
     ${libdir}/lib*.so.* \
     ${libdir}/ps_kernels_lib \
-    /lib/*.so* "
+    /lib/*.so* \
+    ${datadir}"
 INSANE_SKIP:${PN} += "dev-so"
 
 pkg_postinst_ontarget:${PN}() {