From 4512f13c0dec0ad4f2cf25009b5462dda79273aa Mon Sep 17 00:00:00 2001
From: Brian Szmyd <bszmyd@ebay.com>
Date: Sun, 21 Jul 2024 13:57:22 -0600
Subject: [PATCH] Adjust dpdk/spdk version.

---
 3rd_party/dpdk/conandata.yml | 4 ++--
 3rd_party/spdk/conandata.yml | 4 ++--
 3rd_party/spdk/conanfile.py  | 2 +-
 conanfile.py                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3rd_party/dpdk/conandata.yml b/3rd_party/dpdk/conandata.yml
index 76686dd..9d9c8ff 100644
--- a/3rd_party/dpdk/conandata.yml
+++ b/3rd_party/dpdk/conandata.yml
@@ -1,8 +1,8 @@
 sources:
-  "21.05":
+  "nbi.21.05":
     url: "https://github.com/spdk/dpdk/archive/bad3c0e51d7a34e3188d75d94f15a36c8f5e8301.zip"
     sha256: "a0db10b41ab8cbfbc19acca517ee6ebb574885b964a02e649b16d084747ce2a6"
 patches:
-  "21.05":
+  "nbi.21.05":
     - patch_file: "numa.patch"
       patch_type: "conan"
diff --git a/3rd_party/spdk/conandata.yml b/3rd_party/spdk/conandata.yml
index 4acd877..d8b3dac 100644
--- a/3rd_party/spdk/conandata.yml
+++ b/3rd_party/spdk/conandata.yml
@@ -1,8 +1,8 @@
 sources:
-  "21.07.y":
+  "nbi.21.07.y":
     url: "https://github.com/SPDK/spdk/archive/96a91684d39bb0f18729f132a24b778876d3e8fc.tar.gz"
     sha256: "07876855efed94cd62150366bf6d97d218bc1432be33c87991c28cb52761ec90"
 patches:
-  "21.07.y":
+  "nbi.21.07.y":
     - patch_file: "patches/patch.diff"
       patch_type: "conan"
diff --git a/3rd_party/spdk/conanfile.py b/3rd_party/spdk/conanfile.py
index 67076e9..65440e5 100644
--- a/3rd_party/spdk/conanfile.py
+++ b/3rd_party/spdk/conanfile.py
@@ -35,7 +35,7 @@ class LibSPDKConan(ConanFile):
     exports_sources = "patches/*"
 
     def requirements(self):
-        self.requires("dpdk/21.05", transitive_headers=True)
+        self.requires("dpdk/nbi.21.05", transitive_headers=True)
         self.requires("liburing/2.4", transitive_headers=True)
         self.requires("openssl/[>=1.1 <4]")
         self.requires("fio/3.28")
diff --git a/conanfile.py b/conanfile.py
index 0cbf54e..928a6fe 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -69,7 +69,7 @@ def requirements(self):
             self.requires("grpc/[>=1.50]")
         self.requires("liburing/2.4", transitive_headers=True)
         if self.options.spdk:
-            self.requires("spdk/21.07.y", transitive_headers=True)
+            self.requires("spdk/nbi.21.07.y", transitive_headers=True)
         self.requires("pistache/0.0.5", transitive_headers=True)
         self.requires("openssl/3.1.3", override=True)
         self.requires("libcurl/8.4.0", override=True)