[PATCH 2/2] devtools: use libabigail rule for mlx glue drivers

[David Marchand]

Convert the existing exception in the ABI script into a libabigail
suppression rule.

Note: file_name_regexp could be used to achive the same with versions of
libabigail < 1.7 but soname_regexp has been preferred here since it is
already used with a recent change on common/mlx5.

While at it, fix indent from a recent change.

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 devtools/check-abi.sh        | 7 -------
 devtools/libabigail.abignore | 8 ++++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/devtools/check-abi.sh b/devtools/check-abi.sh
index 033f6252d0..64e148070d 100755
--- a/devtools/check-abi.sh
+++ b/devtools/check-abi.sh
@@ -37,13 +37,6 @@ fi
 error=
 for dump in $(find $refdir -name "*.dump"); do
 	name=$(basename $dump)
-	# skip glue drivers, example librte_pmd_mlx5_glue.dump
-	# We can't rely on a suppression rule for now:
-	# https://sourceware.org/bugzilla/show_bug.cgi?id=25480
-	if grep -qE "\<soname='[^']*_glue\.so\.[^']*'" $dump; then
-		echo "Skipped glue library $name."
-		continue
-	fi
 	if grep -qE "\<librte_*.*_octeontx2" $dump; then
 		echo "Skipped removed driver $name."
 		continue
diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index 301b3dacb8..9c921c47d4 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -12,10 +12,14 @@
 [suppress_variable]
         name_regexp = _pmd_info$
 
+; Ignore changes on soname for mlx glue internal drivers
+[suppress_file]
+        soname_regexp = ^librte_.*mlx.*glue\.
+
 ; Ignore fields inserted in place of reserved_opts of rte_security_ipsec_sa_options
 [suppress_type]
-       name = rte_security_ipsec_sa_options
-       has_data_member_inserted_between = {offset_of(reserved_opts), end}
+        name = rte_security_ipsec_sa_options
+        has_data_member_inserted_between = {offset_of(reserved_opts), end}
 
 ; Ignore changes to rte_crypto_asym_op, asymmetric crypto API is experimental
 [suppress_type]
-- 
2.23.0