From f399b0171e6e64c8bbce42599afa35591a9d28f1 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Thu, 3 Sep 2020 16:26:52 +0100 Subject: [PATCH] examples: remove old build system references Remove the references to RTE_SDK and RTE_TARGET environment variables from the build instructions in the comments of the various BPF files, and in the ipsec-secgw common definition script. Signed-off-by: Ciara Power Signed-off-by: Bruce Richardson --- examples/bpf/t2.c | 6 ++++-- examples/bpf/t3.c | 10 ++++++---- examples/ipsec-secgw/test/common_defs.sh | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/examples/bpf/t2.c b/examples/bpf/t2.c index 9878eaf7bd..b9bce746c0 100644 --- a/examples/bpf/t2.c +++ b/examples/bpf/t2.c @@ -9,8 +9,10 @@ * (PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED). * Doesn't touch contents of packet data. * To compile: - * clang -O2 -I${RTE_SDK}/${RTE_TARGET}/include \ - * -target bpf -Wno-int-to-void-pointer-cast -c t2.c + * clang -O2 -target bpf -Wno-int-to-void-pointer-cast -c t2.c + * + * NOTE: if DPDK is not installed system-wide, add compiler flag with path + * to DPDK rte_mbuf.h file, e.g. "clang -I/path/to/dpdk/headers -O2 ..." */ #include diff --git a/examples/bpf/t3.c b/examples/bpf/t3.c index f58ff64b3b..66faf80cc5 100644 --- a/examples/bpf/t3.c +++ b/examples/bpf/t3.c @@ -8,13 +8,15 @@ * Dump the mbuf into stdout if it is an ARP packet (aka tcpdump 'arp'). * * To compile on x86: - * clang -O2 -U __GNUC__ -I${RTE_SDK}/${RTE_TARGET}/include \ - * -target bpf -Wno-int-to-void-pointer-cast -c t3.c + * clang -O2 -U __GNUC__ -target bpf -Wno-int-to-void-pointer-cast -c t3.c * * To compile on ARM: - * clang -O2 -I/usr/include/aarch64-linux-gnu \ - * -I${RTE_SDK}/${RTE_TARGET}/include -target bpf \ + * clang -O2 -I/usr/include/aarch64-linux-gnu -target bpf \ * -Wno-int-to-void-pointer-cast -c t3.c + * + * NOTE: if DPDK is not installed system-wide, add compiler flag with path + * to DPDK rte_mbuf.h file to above commands, + * e.g. "clang -I/path/to/dpdk/headers -O2 ..." */ #include diff --git a/examples/ipsec-secgw/test/common_defs.sh b/examples/ipsec-secgw/test/common_defs.sh index df680805b8..f22eb3ab12 100644 --- a/examples/ipsec-secgw/test/common_defs.sh +++ b/examples/ipsec-secgw/test/common_defs.sh @@ -34,8 +34,8 @@ LOCAL_IPV4=192.168.31.92 REMOTE_IPV6=fd12:3456:789a:0031:0000:0000:0000:0014 LOCAL_IPV6=fd12:3456:789a:0031:0000:0000:0000:0092 -DPDK_PATH=${RTE_SDK:-${PWD}} -DPDK_BUILD=${RTE_TARGET:-x86_64-native-linux-gcc} +DPDK_PATH=${PWD} +DPDK_BUILD="build" DPDK_VARS="" # by default ipsec-secgw can't deal with multi-segment packets -- 2.20.1