Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dlb: upgrade to 8.8 #33834

Merged
merged 3 commits into from May 14, 2024
Merged

dlb: upgrade to 8.8 #33834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3aeb55
dlb: upgrade to 8.8
daixiang0 Apr 26, 2024
3ca7e75
use patch_cmd to copy file
daixiang0 May 14, 2024
d229389
update patch
daixiang0 May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions bazel/foreign_cc/dlb.patch
View file
Open in desktop
@@ -0,0 +1,20 @@
---
Makefile | 2 -
1 files changed, 0(+), 2 deletions(-)

diff --git a/dlb/libdlb/Makefile b/dlb/libdlb/Makefile
index 0ff7c00..d2429ea 100644
--- a/dlb/libdlb/Makefile
+++ b/dlb/libdlb/Makefile
@@ -54,8 +54,6 @@ lib: $(LIB) $(SLIB)

$(BUILD_DIR):
@mkdir $@
- @echo copying dlb2_user.h, please make sure the driver was built.
- @cp $(DLB2_USER_HEADER_DIR)/dlb2_user.h .

$(BUILD_DIR)/%.o: %.c | $(BUILD_DIR)
@echo Compiling $@
--
2.25.1

7 changes: 4 additions & 3 deletions bazel/repositories.bzl
View file
Open in desktop
Expand Up @@ -1372,12 +1372,13 @@ def _intel_dlb():
build_file_content = """
filegroup(
name = "libdlb",
srcs = glob([
"dlb/libdlb/**",
]),
srcs = glob(["dlb/libdlb/*"]),
visibility = ["@envoy//contrib/dlb/source:__pkg__"],
)
""",
patch_args = ["-p1"],
patches = ["@envoy//bazel/foreign_cc:dlb.patch"],
patch_cmds = ["cp dlb/driver/dlb2/uapi/linux/dlb2_user.h dlb/libdlb/"],
daixiang0 marked this conversation as resolved.
Show resolved Hide resolved
)

def _rules_fuzzing():
Expand Down
8 changes: 4 additions & 4 deletions bazel/repository_locations.bzl
View file
Open in desktop
Expand Up @@ -1484,12 +1484,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "Intel Dlb",
project_desc = "Dlb",
project_url = "https://networkbuilders.intel.com/solutionslibrary/queue-management-and-load-balancing-on-intel-architecture",
version = "8.0.0",
sha256 = "075533229bb2bd2f945ec8089a707205f3f8e8d87a8030e9208603d997236171",
urls = ["https://downloadmirror.intel.com/763709/dlb_linux_src_release8.0.0.txz"],
version = "8.8.0",
sha256 = "564534254ef32bfed56e0a464c53fca0907e446b30929c253210e2c3d6de58b9",
urls = ["https://downloadmirror.intel.com/819078/dlb_linux_src_release_8.8.0.txz"],
use_category = ["dataplane_ext"],
extensions = ["envoy.network.connection_balance.dlb"],
release_date = "2022-12-15",
release_date = "2023-12-15",
cpe = "N/A",
),
libpfm = dict(
Expand Down
1 change: 0 additions & 1 deletion contrib/dlb/source/BUILD
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@ envoy_contrib_package()
make(
name = "dlb",
env = {"DLB_DISABLE_DOMAIN_SERVER": "TRUE"},
daixiang0 marked this conversation as resolved.
Show resolved Hide resolved
includes = [],
daixiang0 marked this conversation as resolved.
Show resolved Hide resolved
lib_source = "@intel_dlb//:libdlb",
out_static_libs = ["libdlb.a"],
postfix_script = "mv libdlb.a $INSTALLDIR/lib && rm -rf $INSTALLDIR/include && mkdir -p $INSTALLDIR/include && cp -L *.h $INSTALLDIR/include",
Expand Down