The config options are updated with sed and the short in-place option.
In order to avoid creating a backup file when using sed in-place,
the argument was tentatively set as an empty suffix.
On Linux, the suffix argument is optional, without space or equal before.
On FreeBSD, the suffix argument of the in-place option is mandatory.
This argument cannot be an empty string if no space before.
In GNU sed, the short option '-i' does not expect '=' before the suffix
argument, so it understands '=' as the file suffix.
As a consequence, a backup file named '.config=' was created
on Linux in the build directory.
There is no common solution (without creating a function)
to skip the backup file with GNU sed and BSD sed.
It is solved by always creating a .config.tmp backup file
which is removed at the end of the configuration.
Fixes: 4a4a20c4775b ("devtools: support FreeBSD")
Cc: olivier.m...@6wind.com
Cc: sta...@dpdk.org
Reported-by: Ali Alnubani <alia...@mellanox.com>
Signed-off-by: Thomas Monjalon <tho...@monjalon.net>
---
v1: try removing = sign
v2: do not skip backup file
---
devtools/test-build.sh | 78 ++++++++++++++++++++++--------------------
1 file changed, 40 insertions(+), 38 deletions(-)
diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index 52305fbb8c..f451d91ad3 100755
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -141,84 +141,86 @@ config () # <directory> <target> <options>
echo 'Customize configuration'
# Built-in options (lowercase)
! echo $3 | grep -q '+default' || \
- sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config
+ sed -ri.tmp 's,(RTE_MACHINE=")native,\1default,' $1/.config
echo $3 | grep -q '+next' || \
- sed -ri="" 's,(NEXT_ABI=)y,\1n,' $1/.config
+ sed -ri.tmp 's,(NEXT_ABI=)y,\1n,' $1/.config
! echo $3 | grep -q '+shared' || \
- sed -ri="" 's,(SHARED_LIB=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(SHARED_LIB=)n,\1y,' $1/.config
! echo $3 | grep -q '+debug' || ( \
- sed -ri="" 's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,'
$1/.config
- sed -ri="" 's,(_DEBUG.*=)n,\1y,' $1/.config
- sed -ri="" 's,(_STAT)([S_].*=|=)n,\1\2y,' $1/.config
- sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
+ sed -ri.tmp 's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,'
$1/.config
+ sed -ri.tmp 's,(_DEBUG.*=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(_STAT)([S_].*=|=)n,\1\2y,' $1/.config
+ sed -ri.tmp 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
# Automatic configuration
test "$DPDK_DEP_NUMA" != n || \
- sed -ri="" 's,(NUMA.*=)y,\1n,' $1/.config
- sed -ri="" 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config
- sed -ri="" 's,(BYPASS=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(NUMA.*=)y,\1n,' $1/.config
+ sed -ri.tmp 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(BYPASS=)n,\1y,' $1/.config
test "$DPDK_DEP_ARCHIVE" != y || \
- sed -ri="" 's,(RESOURCE_TAR=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(RESOURCE_TAR=)n,\1y,' $1/.config
test "$DPDK_DEP_BPF" != y || \
- sed -ri="" 's,(PMD_AF_XDP=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_AF_XDP=)n,\1y,' $1/.config
test "$DPDK_DEP_ISAL" != y || \
- sed -ri="" 's,(PMD_ISAL=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_ISAL=)n,\1y,' $1/.config
test "$DPDK_DEP_MLX" != y || \
- sed -ri="" 's,(MLX._PMD=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(MLX._PMD=)n,\1y,' $1/.config
test "$DPDK_DEP_NFB" != y || \
- sed -ri="" 's,(NFB_PMD=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(NFB_PMD=)n,\1y,' $1/.config
test "$DPDK_DEP_SZE" != y || \
- sed -ri="" 's,(PMD_SZEDATA2=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_SZEDATA2=)n,\1y,' $1/.config
test "$DPDK_DEP_ZLIB" != y || \
- sed -ri="" 's,(BNX2X_PMD=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(BNX2X_PMD=)n,\1y,' $1/.config
test "$DPDK_DEP_ZLIB" != y || \
- sed -ri="" 's,(PMD_ZLIB=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_ZLIB=)n,\1y,' $1/.config
test "$DPDK_DEP_ZLIB" != y || \
- sed -ri="" 's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config
test "$DPDK_DEP_PCAP" != y || \
- sed -ri="" 's,(PCAP=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PCAP=)n,\1y,' $1/.config
test -z "$ARMV8_CRYPTO_LIB_PATH" || \
- sed -ri="" 's,(PMD_ARMV8_CRYPTO=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_ARMV8_CRYPTO=)n,\1y,' $1/.config
test "$DPDK_DEP_IPSEC_MB" != y || \
- sed -ri="" 's,(PMD_AESNI_MB=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_AESNI_MB=)n,\1y,' $1/.config
test "$DPDK_DEP_IPSEC_MB" != y || \
- sed -ri="" 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config
test -z "$LIBSSO_SNOW3G_PATH" || \
- sed -ri="" 's,(PMD_SNOW3G=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_SNOW3G=)n,\1y,' $1/.config
test -z "$LIBSSO_KASUMI_PATH" || \
- sed -ri="" 's,(PMD_KASUMI=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_KASUMI=)n,\1y,' $1/.config
test -z "$LIBSSO_ZUC_PATH" || \
- sed -ri="" 's,(PMD_ZUC=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_ZUC=)n,\1y,' $1/.config
test "$DPDK_DEP_SSL" != y || \
- sed -ri="" 's,(PMD_CCP=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_CCP=)n,\1y,' $1/.config
test "$DPDK_DEP_SSL" != y || \
- sed -ri="" 's,(PMD_OPENSSL=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_OPENSSL=)n,\1y,' $1/.config
test "$DPDK_DEP_SSL" != y || \
- sed -ri="" 's,(QAT_SYM=)n,\1y,' $1/.config
+ sed -ri.tmp '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
+ sed -ri.tmp 's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(SCHED_.*=)n,\1y,' $1/.config
test -z "$LIBMUSDK_PATH" || \
- sed -ri="" 's,(PMD_MVSAM_CRYPTO=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(PMD_MVSAM_CRYPTO=)n,\1y,' $1/.config
test -z "$LIBMUSDK_PATH" || \
- sed -ri="" 's,(MVPP2_PMD=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(MVPP2_PMD=)n,\1y,' $1/.config
test -z "$LIBMUSDK_PATH" || \
- sed -ri="" 's,(MVNETA_PMD=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(MVNETA_PMD=)n,\1y,' $1/.config
test "$DPDK_DEP_ELF" != y || \
- sed -ri="" 's,(BPF_ELF=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(BPF_ELF=)n,\1y,' $1/.config
test "$DPDK_DEP_JSON" != y || \
- sed -ri="" 's,(TELEMETRY=)n,\1y,' $1/.config
+ sed -ri.tmp 's,(TELEMETRY=)n,\1y,' $1/.config
build_config_hook $1 $2 $3
# Explicit enabler/disabler (uppercase)
for option in $(echo $3 | sed 's,[~+], &,g') ; do
pattern=$(echo $option | cut -c2-)
if echo $option | grep -q '^~' ; then
- sed -ri="" "s,($pattern=)y,\1n," $1/.config
+ sed -ri.tmp "s,($pattern=)y,\1n," $1/.config
elif echo $option | grep -q '^+' ; then
- sed -ri="" "s,($pattern=)n,\1y," $1/.config
+ sed -ri.tmp "s,($pattern=)n,\1y," $1/.config
fi
done
+
+ rm -f $1/.config.tmp
fi
}
--
2.24.0
