diff options
| author |   Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-07-04 10:40:06 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-07-04 10:48:05 +0200 |
| commit | 8d53e9f3c6001dcb2865f6e894da5b54e1418f88 (patch) | |
| tree | 63907f21c13636a987d43463c675d0727a04e327 /devtools/test-build.sh | |
| parent | e2bea7436061ca2e7e14bfcfdc5870f2555c3965 (diff) | |
New upstream version 18.11.2upstream-18.11-stable
Change-Id: I23eb4f9179abf1f9c659891f8fddb27ee68ad26b
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'devtools/test-build.sh')
| -rwxr-xr-x | devtools/test-build.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/devtools/test-build.sh b/devtools/test-build.sh index 42f4ad00..d37b121c 100755 --- a/devtools/test-build.sh +++ b/devtools/test-build.sh @@ -9,6 +9,7 @@ default_path=$PATH # - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2) # - DPDK_DEP_ARCHIVE # - DPDK_DEP_CFLAGS +# - DPDK_DEP_ELF (y/[n]) # - DPDK_DEP_ISAL (y/[n]) # - DPDK_DEP_JSON (y/[n]) # - DPDK_DEP_LDFLAGS @@ -96,6 +97,7 @@ reset_env () unset CROSS unset DPDK_DEP_ARCHIVE unset DPDK_DEP_CFLAGS + unset DPDK_DEP_ELF unset DPDK_DEP_ISAL unset DPDK_DEP_JSON unset DPDK_DEP_LDFLAGS @@ -148,7 +150,7 @@ config () # <directory> <target> <options> test "$DPDK_DEP_ARCHIVE" != y || \ sed -ri 's,(RESOURCE_TAR=)n,\1y,' $1/.config test "$DPDK_DEP_ISAL" != y || \ - sed -ri 's,(ISAL_PMD=)n,\1y,' $1/.config + sed -ri 's,(PMD_ISAL=)n,\1y,' $1/.config test "$DPDK_DEP_MLX" != y || \ sed -ri 's,(MLX._PMD=)n,\1y,' $1/.config test "$DPDK_DEP_SZE" != y || \ @@ -156,6 +158,8 @@ config () # <directory> <target> <options> test "$DPDK_DEP_ZLIB" != y || \ sed -ri 's,(BNX2X_PMD=)n,\1y,' $1/.config test "$DPDK_DEP_ZLIB" != y || \ + sed -ri 's,(PMD_ZLIB=)n,\1y,' $1/.config + test "$DPDK_DEP_ZLIB" != y || \ sed -ri 's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config test "$DPDK_DEP_PCAP" != y || \ sed -ri 's,(PCAP=)n,\1y,' $1/.config @@ -176,7 +180,7 @@ config () # <directory> <target> <options> test "$DPDK_DEP_SSL" != y || \ sed -ri 's,(PMD_OPENSSL=)n,\1y,' $1/.config test "$DPDK_DEP_SSL" != y || \ - sed -ri 's,(PMD_QAT=)n,\1y,' $1/.config + sed -ri 's,(QAT_SYM=)n,\1y,' $1/.config test -z "$FLEXRAN_SDK" || \ sed -ri 's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config sed -ri 's,(SCHED_.*=)n,\1y,' $1/.config @@ -186,7 +190,9 @@ config () # <directory> <target> <options> sed -ri 's,(MVPP2_PMD=)n,\1y,' $1/.config test -z "$LIBMUSDK_PATH" || \ sed -ri 's,(MVNETA_PMD=)n,\1y,' $1/.config - test -z "$DPDK_DEP_JSON" || \ + test "$DPDK_DEP_ELF" != y || \ + sed -ri 's,(BPF_ELF=)n,\1y,' $1/.config + test "$DPDK_DEP_JSON" != y || \ sed -ri 's,(TELEMETRY=)n,\1y,' $1/.config build_config_hook $1 $2 $3 |