From: David Galloway Date: Thu, 30 Jan 2020 18:41:28 +0000 (-0500) Subject: Revert "dpdk: drop dpdk submodule" X-Git-Tag: v15.1.1~598^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d3dc03878e8f7c4915243135b6fedef07b31717;p=ceph.git Revert "dpdk: drop dpdk submodule" This reverts commit cb8087dfac31b8490fefdfca28d389b7b9901ef8. The seastar submodule's .gitmodules links to `../dpdk` which is no longer present after removing dpdk from ceph.git's .gitmodules. ``` the ceph/seastar repo uses awful URLs for the submodules and those awful URLs are the real reason it's failing dgalloway: ^^^ seastar's .gitmodules references repos in the parent directory, so that when it's checked out as a submodule of ceph, you don't download the repos twice (and git will probably also use references instead of duplicating the local .git); however, ceph doesn't have a submodule for dpdk anymore so seastar's referencing a dpdk repo that doesn't exist i think i follow. so you're suggesting revert https://github.com/ceph/ceph/commit/cb8087dfac31b8490fefdfca28d389b7b9901ef8 ? yep that'd be one way to fix it ... dgalloway: I'd suggest revert for now, and let the crimson folks figure out the longer term fix when they're back ``` Signed-off-by: David Galloway --- diff --git a/.gitmodules b/.gitmodules index bd07553dc9c0..5a1c131ecfc1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,6 +40,9 @@ url = https://github.com/ceph/lua.git branch = lua-5.3-ceph ignore = dirty +[submodule "src/dpdk"] + path = src/dpdk + url = https://github.com/ceph/dpdk [submodule "src/zstd"] path = src/zstd url = https://github.com/facebook/zstd