From fa513ce7ade386cf3b5c3d2c0481924218b19665 Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@linux.alibaba.com>
Date: Fri, 21 Oct 2022 17:05:18 +0800
Subject: [PATCH] generate-compatibility-deps: remove unexpected files

Signed-off-by: Chunmei Xu <xuchunmei@linux.alibaba.com>
---
 generate-compatibility-deps | 40 ++++++++++++++++++++++---------------
 system-rpm-config.spec      |  5 ++++-
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/generate-compatibility-deps b/generate-compatibility-deps
index 60b429b..446f754 100755
--- a/generate-compatibility-deps
+++ b/generate-compatibility-deps
@@ -1,18 +1,18 @@
 #! /bin/bash
 
 if [ $# != 1 ]; then
-	echo "No name specified" >&2
-	exit 1
+    echo "No name specified" >&2
+    exit 1
 fi
 
 if [ -z "$RPM_BUILD_ROOT" ]; then
-	echo "No build root defined" >&2
-	exit 1
+    echo "No build root defined" >&2
+    exit 1
 fi
 
 if [ ! -d "$RPM_BUILD_ROOT" ]; then
-	echo "Invalid build root" >&2
-	exit 1
+    echo "Invalid build root" >&2
+    exit 1
 fi
 
 name=$1
@@ -20,9 +20,9 @@ abidir=usr/lib/compatibility/$name
 mkdir -p $RPM_BUILD_ROOT/$abidir
 pushd $RPM_BUILD_ROOT/$abidir
 for full_name in $(find $RPM_BUILD_ROOT -name "*.so*") ; do
-        f=`echo ${full_name##*/}`
-	ff=`echo ${f%%\.so*}`
-        file $full_name | grep "shared object" > /dev/null 2>&1 && abi-dumper $full_name -o $ff.dump > /dev/null 2>&1 || :
+    f=`echo ${full_name##*/}`
+    ff=`echo ${f%%\.so*}`
+    file $full_name | grep "shared object" > /dev/null 2>&1 && abi-dumper $full_name -o $ff.dump > /dev/null 2>&1 || :
 done
 popd
 
@@ -32,11 +32,19 @@ bindir=`rpm -E %{_bindir}`
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RPM_BUILD_ROOT/$libdir
 pushd $RPM_BUILD_ROOT/$abidir
 for dir in $sbindir $bindir ; do
-	if [ ! -d $RPM_BUILD_ROOT/$dir ]; then
-		continue
-	fi
-        for f in $(ls $RPM_BUILD_ROOT/$dir) ; do
-                full_name=$RPM_BUILD_ROOT/$dir/$f
-                file $full_name | grep executable > /dev/null 2>&1 && $full_name --help > $f-option.list > /dev/null 2>&1 || :
-        done
+    if [ ! -d $RPM_BUILD_ROOT/$dir ]; then
+        continue
+    fi
+    for f in $(ls $RPM_BUILD_ROOT/$dir) ; do
+        full_name=$RPM_BUILD_ROOT/$dir/$f
+        file $full_name | grep executable > /dev/null 2>&1 && $full_name --help > $f-option.list > /dev/null 2>&1 || :
+    done
 done
+
+# check for unexpected files
+pushd $RPM_BUILD_ROOT/$abidir
+for f in $(ls)
+do
+    echo "$f" | grep -q -E '\.dump$' || echo "$f" | grep -q -E '\-option.list$' || rm -f ./$f
+done
+popd
diff --git a/system-rpm-config.spec b/system-rpm-config.spec
index bec61bf..ec5c2d9 100644
--- a/system-rpm-config.spec
+++ b/system-rpm-config.spec
@@ -1,4 +1,4 @@
-%define anolis_release 10
+%define anolis_release 11
 
 Summary: Anolis OS specific rpm configuration files
 Name: system-rpm-config
@@ -180,6 +180,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/anolis/srpm forge.lua
 %license MulanPSL
 
 %changelog
+* Fri Oct 21 2022 Chunmei Xu <xuchunmei@linux.alibaba.com> - 23.11
+- generate-compatibility-deps: remove unexpected files
+
 * Fri Oct 14 2022 Chunmei Xu <xuchunmei@linux.alibaba.com> - 23.10
 - add generate-compatibility-deps to generate abi/api files
 
-- 
Gitee