add postfix _PKTIO to ENABLE_NETMAP

Reviewed-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

4 files changed, 6 insertions, 6 deletions

diff --git a/apply-and-build.sh b/apply-and-build.sh
index 788ce61..3fc9f2b 100755
--- a/apply-and-build.sh
+++ b/apply-and-build.sh
@@ -14,7 +14,7 @@ export CLEANUP="${CLEANUP:-1}"
 export CHECKPATCH="${CHECKPATCH:-1}"
 export CHECKFORMAT="${CHECKFORMAT:-1}"
 export DRYRUN="${DRYRUN:-0}"
-export ENABLE_NETMAP="${ENABLE_NETMAP:-0}"
+export ENABLE_NETMAP_PKTIO="${ENABLE_NETMAP_PKTIO:-0}"
 export ENABLE_DPDK="${ENABLE_DPDK:-0}"
 export NUM_CPUS=${NUM_CPUS:-"$(getconf _NPROCESSORS_ONLN)"}
 export FILE_EXT=${FILE_EXT:-"mbox patch"}
diff --git a/build-netmap.sh b/build-netmap.sh
index 4898964..05e4df0 100755
--- a/build-netmap.sh
+++ b/build-netmap.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export ROOT_DIR=$(readlink -f $(dirname $0))
-export ENABLE_NETMAP=1
+export ENABLE_NETMAP_PKTIO=1
 ${ROOT_DIR}/build.sh
 
 ## vim: set sw=4 sts=4 et foldmethod=syntax : ##
diff --git a/build.sh b/build.sh
index e83e352..f7d1ffc 100755
--- a/build.sh
+++ b/build.sh
@@ -37,7 +37,7 @@ export DRYRUN="${DRYRUN:-0}"
 export BUILD_DEPS="${BUILD_DEPS:-1}"
 export RELOCATE_TEST="${RELOCATE_TEST:-1}"
 export MAKE_CHECK_TEST="${MAKE_CHECK_TEST:-1}"
-export ENABLE_NETMAP="${ENABLE_NETMAP:-0}"
+export ENABLE_NETMAP_PKTIO="${ENABLE_NETMAP_PKTIO:-0}"
 E_VALGRIND="${E_VALGRIND:-0}"
 RUN_VALID_FROM_INSTALL="${RUN_VALID_FROM_INSTALL:-0}"
 if [[ ! -z ${TEST_LIST} ]]; then
diff --git a/helper/platform/generic b/helper/platform/generic
index 49ddd65..9a3d399 100644
--- a/helper/platform/generic
+++ b/helper/platform/generic
@@ -3,21 +3,21 @@
 export NETMAP_SRCDIR=${ROOT_DIR}/netmap
 
 generic_usage() {
-    echo -e "\tENABLE_NETMAP:\t enable build with netmap, default: ${ENABLE_NETMAP}"
+    echo -e "\tENABLE_NETMAP_PKTIO:\t enable build with netmap, default: ${ENABLE_NETMAP_PKTIO}"
     echo -e "\tNETMAP_GIT:\t which NETMAP git repo to use"
     echo -e "\tNETMAP_REV:\t which NETMAP version to use"
 }
 
 generic_prepare() {
     export GIT_URL="${GIT_URL:-git://git.linaro.org/lng/odp.git}"
-    if [[ ${ENABLE_NETMAP} -eq 1 ]]; then
+    if [[ ${ENABLE_NETMAP_PKTIO} -eq 1 ]]; then
         export NETMAP_DIR=${NETMAP_SRCDIR}
         export CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-netmap-path=${NETMAP_DIR}"
     fi
 }
 
 generic_get() {
-    if [[ ${ENABLE_NETMAP} -eq 1 ]]; then
+    if [[ ${ENABLE_NETMAP_PKTIO} -eq 1 ]]; then
         #get netmap so that linux-generic netmap based pktio interfaces can be tested:
         NETMAP_GIT=${NETMAP_GIT:-https://github.com/luigirizzo/netmap.git}
         NETMAP_REV=${NETMAP_REV:-7e9e5e7602f5c620ade87b722bed266dd4226031}