commit: b31c38ec408234f9d0eae1143ae45165eef7458b Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com> AuthorDate: Fri Dec 5 12:29:06 2025 +0000 Commit: Sv. Lockal <lockalsash <AT> gmail <DOT> com> CommitDate: Fri Dec 5 12:29:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b31c38ec
dev-libs/xrt-xdna: fix 999999 The solution is still ugly and requires manual update of VTD_HASH, which breaks bisecting with EGIT_OVERRIDE_* variables for large periods. If needed in the future, `RESTRICT="network-sandbox"` could be added, for now let's just update hash one more time. Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com> dev-libs/xrt-xdna/Manifest | 3 +++ dev-libs/xrt-xdna/xrt-xdna-999999.ebuild | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dev-libs/xrt-xdna/Manifest b/dev-libs/xrt-xdna/Manifest index 4583c5802e..3297ab7877 100644 --- a/dev-libs/xrt-xdna/Manifest +++ b/dev-libs/xrt-xdna/Manifest @@ -3,5 +3,8 @@ DIST XRT-f848f6f0.tar.gz 14660501 BLAKE2B a9d23772b069296446cc9688679493dca4c4d5 DIST aie-rt-a8b06671.tar.gz 858418 BLAKE2B 4ec9c12ef3377baf6b17d9081c043b4cc9180a8a94ad1b5be5f15ce1a191cc534b5a128c7fcac55212e20f1d991e128d87282b6b794954cec1f1ca253f355ab3 SHA512 93e5d998a8f93b10aa588812ed9c38c3029d6f97702777372915aefe74113cfa430d3b60b8facf85877f07d1c234716a7f8080454a87fc3440fa6e364439201b DIST aiebu-9065273e.tar.gz 18201124 BLAKE2B 59eca62198a79732c1a93d0532c63e965c944a978ae4349313d7f6dacd967842aa2451a1ed9e29f42be88612df77b986488fc14047354167c635fcbb6af5c0b1 SHA512 bd7eb639e1ce3b486b0146192e97a7d7156e9ac2ad56383a78aeba26e8eff29159bba590fb1d404f6ee38705a0fc68ff624e792d7bb9ba9f93c2cef062a99adf DIST xrt-xdna-202610.2.21.21.tar.gz 15181567 BLAKE2B 31ff27118ac9474c7b3ff7f820660ba768be001a4ccd7a5c71293065557794ab60a61c8bcb157cdaa961af8da59dade77d423c17827e2d537d40a1f4018b8430 SHA512 7e7fefefe8c57ed8ecadb85a4e40b9e7e1d899116de8924fd1c47a6974429258378d5f7b576d01dbdc1653b3e7f03043b5152a5b6f130f00b5c9d23142fc4b02 +DIST xrt_smi_npu3-c79b5d21.a 30398964 BLAKE2B 09caebb9ca2ec708b5927d24afe173cb91903f080e3aa394b33caaa3cff759f66c92c5fa403e71c346ede333af24c384a55451c2ebfedef5fa60484864683b09 SHA512 bb39c8d7080a852aa0d33dd9b226caca571a8fdbfad863d1ec15f4c822813a8c99dbcff2d4f3d129b7c43c4d203c5d2b83f67fdbad9530eed969b89bd34266a3 DIST xrt_smi_phx-5f7fec23.a 274220 BLAKE2B 1344cd651aded08075d47a63e3028bfd88016fcec0677c0d72e6880b772ab08a37b2b57d4f3ab20c37adf88c9fbd83b0082bdc41629c136a4518e8a662860cb3 SHA512 e0b587e36f3a52c24413f1600c3be175d8629a64283815e59d1296592a88d2c3f3f476d7b57ef591b9c2174d26375837780af121fac8ea8d4e601cfbba3381c2 +DIST xrt_smi_phx-c79b5d21.a 274220 BLAKE2B 1344cd651aded08075d47a63e3028bfd88016fcec0677c0d72e6880b772ab08a37b2b57d4f3ab20c37adf88c9fbd83b0082bdc41629c136a4518e8a662860cb3 SHA512 e0b587e36f3a52c24413f1600c3be175d8629a64283815e59d1296592a88d2c3f3f476d7b57ef591b9c2174d26375837780af121fac8ea8d4e601cfbba3381c2 DIST xrt_smi_strx-5f7fec23.a 33048194 BLAKE2B 5364d58551b05e63f1819256daa8e76082de870209d33f03239c071a800ba013e250ff14d5d49c0637bcd5f1aaa6f5c60aba530ee5575514b3123bf13c182586 SHA512 ba2149ae9272f3da7c960bedcc0299c2cabb91ae5af8a392c86f2003dccc9ab15146e3029b556be0a2dd78a244c8dc860489af37ea0dd8f1b30999b1b377a883 +DIST xrt_smi_strx-c79b5d21.a 36064464 BLAKE2B 91c06e85e9a072880313af6e5c8ceffd7e1282b7eeb5afa8966599b03e3b0d27efe69133998980c0b47a5967a677298c88704c52ab54e96bba458814b13b7ee6 SHA512 c8445bee94f45e0974c3d06b30b10c88e9bba0b9341599e9dbec8276fa2f65a965fa2965270d3116c5a6fcd87af005739a5aeccb132c93a8c33a9ce1e7a652d3 diff --git a/dev-libs/xrt-xdna/xrt-xdna-999999.ebuild b/dev-libs/xrt-xdna/xrt-xdna-999999.ebuild index 02d1a6d6b6..4602c4ab1b 100644 --- a/dev-libs/xrt-xdna/xrt-xdna-999999.ebuild +++ b/dev-libs/xrt-xdna/xrt-xdna-999999.ebuild @@ -17,7 +17,7 @@ submodules["xrt/src/runtime_src/core/common/elf"]=https://github.com/serge1/ELFI DESCRIPTION="Runtime for AIE and FPGA based platforms" HOMEPAGE="https://github.com/amd/xdna-driver"; -VTD_HASH=5f7fec23620be7a3984c8970bc514f0faa2b2ee3 +VTD_HASH=c79b5d21568a4ffa5b0612a8279b352fc4e1109a if [[ ${PV} == 999999 ]] ; then EGIT_REPO_URI="https://github.com/amd/xdna-driver.git"; @@ -46,6 +46,7 @@ fi SRC_URI+=" https://github.com/Xilinx/VTD/raw/${VTD_HASH}/archive/strx/xrt_smi_strx.a -> xrt_smi_strx-${VTD_HASH:0:8}.a https://github.com/Xilinx/VTD/raw/${VTD_HASH}/archive/phx/xrt_smi_phx.a -> xrt_smi_phx-${VTD_HASH:0:8}.a + https://github.com/Xilinx/VTD/raw/${VTD_HASH}/archive/npu3/xrt_smi_npu3.a -> xrt_smi_npu3-${VTD_HASH:0:8}.a " LICENSE="AMD-Binary-Only" @@ -98,14 +99,17 @@ src_prepare() { fi # Check for new versions and live ebuild - local actual_vtd_hash=$(grep -oP 'VTD/raw/\K[0-9a-f]+' CMake/pkg.cmake | head -n1) + local actual_vtd_hash=$(grep -oP 'VTD/raw/\K[0-9a-f]+' tools/info.json | head -n1) [[ "${actual_vtd_hash}" == "" ]] && die "Failed to extract VTD hash" [[ "${actual_vtd_hash}" != "${VTD_HASH}" ]] && \ die "VTD hash mismatch, ebuild requested ${VTD_HASH} while package wants ${actual_vtd_hash}" - mkdir deps || die - cp "${DISTDIR}/xrt_smi_strx-${VTD_HASH:0:8}.a" deps/xrt_smi_strx.a || die - cp "${DISTDIR}/xrt_smi_phx-${VTD_HASH:0:8}.a" deps/xrt_smi_phx.a || die + mkdir -p "${WORKDIR}"/amdxdna_bins/vtd_archives || die + pushd "${WORKDIR}"/amdxdna_bins/vtd_archives || die + cp "${DISTDIR}/xrt_smi_strx-${VTD_HASH:0:8}.a" xrt_smi_strx.a || die + cp "${DISTDIR}/xrt_smi_phx-${VTD_HASH:0:8}.a" xrt_smi_phx.a || die + cp "${DISTDIR}/xrt_smi_npu3-${VTD_HASH:0:8}.a" xrt_smi_npu3.a || die + popd || die sed -e "/Unknown Linux package flavor/d" -i "CMake/pkg.cmake" || die @@ -121,9 +125,6 @@ src_configure() { -DSKIP_KMOD=1 -DUMQ_HELLO_TEST=n - -DFETCHCONTENT_FULLY_DISCONNECTED=ON - -DFETCHCONTENT_SOURCE_DIR_VTD_STRX_ARCHIVE="${S}/deps" - -DFETCHCONTENT_SOURCE_DIR_VTD_PHX_ARCHIVE="${S}/deps" -DPython3_EXECUTABLE="${PYTHON}" -Wno-dev )
