From 338e1be46b4ae37d99e2189019f39a8b510cf708 Mon Sep 17 00:00:00 2001 From: aravid-marvell <99587262+aravid-marvell@users.noreply.github.com> Date: Wed, 23 Feb 2022 11:03:48 +0200 Subject: [PATCH 1/2] ipdk: `ipdk connect` instead of 'ipdk connect' Fixed markdown in readme file Signed-off-by: Asaf Ravid --- build/README_DOCKER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/README_DOCKER.md b/build/README_DOCKER.md index 9b3af169..be1535aa 100644 --- a/build/README_DOCKER.md +++ b/build/README_DOCKER.md @@ -137,7 +137,7 @@ for creating the vhost socket interfaces in `volume/intf`, all the log files in `volume/logs` and can be used to share files with the IPDK daemon container where the `VOLUME` directory is available as '/tmp'. -* Run - 'ipdk connect' - To connect to your IPDK container daemon and to use +* Run - `ipdk connect` - To connect to your IPDK container daemon and to use it from a command line. If above commands are successful, at this point you should have your IPDK From 33b29ee8da7203202e7395e72534531dc302c4d8 Mon Sep 17 00:00:00 2001 From: Asaf Ravid Date: Wed, 23 Feb 2022 12:13:59 +0200 Subject: [PATCH 2/2] ipdk: support multiple architectures in PKG_CONFIG_PATH Instead of implicitly using x86_64, use uname -m to detect architecture and parameterize lib/x86_64-linux-gnu/pkgconfig Signed-off-by: Asaf Ravid --- build/scripts/build_p4sde.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/scripts/build_p4sde.sh b/build/scripts/build_p4sde.sh index d966973a..12ce1ac8 100755 --- a/build/scripts/build_p4sde.sh +++ b/build/scripts/build_p4sde.sh @@ -32,7 +32,8 @@ export SDE_INSTALL="$SDE/install" #...Package Config Path...# if [ "${OS}" = "Ubuntu" ] || [ "${VER}" = "20.04" ] ; then - export PKG_CONFIG_PATH=${SDE_INSTALL}/lib/x86_64-linux-gnu/pkgconfig + arch=$(uname -m) + export PKG_CONFIG_PATH=${SDE_INSTALL}/lib/${arch}-linux-gnu/pkgconfig else export PKG_CONFIG_PATH=${SDE_INSTALL}/lib64/pkgconfig fi