From 9cfd03ad984864467c39a074157511b0c71e7330 Mon Sep 17 00:00:00 2001
From: Wenlong Zhang <zhangwenlong@loongson.cn>
Date: Wed, 7 Aug 2024 02:01:03 +0000
Subject: [PATCH] sync from a23

---
 brp-mangle-shebangs         | 6 +++---
 generate-compatibility-deps | 8 ++++----
 system-rpm-config.spec      | 8 +++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/brp-mangle-shebangs b/brp-mangle-shebangs
index 5255204..e08d257 100755
--- a/brp-mangle-shebangs
+++ b/brp-mangle-shebangs
@@ -145,11 +145,11 @@ while IFS= read -r line; do
   # If the shebang now starts with /bin, change it to /usr/bin
   shebang=$(echo "$shebang" | sed -r -e 's@^/bin/@/usr/bin/@')
 
-  # Replace ambiguous python with python2
-  py_shebang=$(echo "$shebang" | sed -r -e 's@/usr/bin/python(\s|$)@/usr/bin/python2\1@')
+  # Replace ambiguous python with python3
+  py_shebang=$(echo "$shebang" | sed -r -e 's@/usr/bin/python(\s|$)@/usr/bin/python3\1@')
 
   if [ "$shebang" != "$py_shebang" ]; then
-    echo >&2 "*** ERROR: ambiguous python shebang in $path: #!$orig_shebang. Change it to python3 (or python2) explicitly."
+    echo >&2 "*** ERROR: ambiguous python shebang in $path: #!$orig_shebang. Change it to python3 explicitly."
     fail=1
   elif [ "#!$shebang" != "#!$orig_shebang" ]; then
     echo "mangling shebang in $path from $orig_shebang to #!$shebang"
diff --git a/generate-compatibility-deps b/generate-compatibility-deps
index b8721ec..2a1b866 100755
--- a/generate-compatibility-deps
+++ b/generate-compatibility-deps
@@ -38,13 +38,13 @@ for dir in $sbindir $bindir ; do
     for f in $(ls $RPM_BUILD_ROOT/$dir) ; do
         full_name=$RPM_BUILD_ROOT/$dir/$f
         if file $full_name | grep executable > /dev/null 2>&1; then
-            if $full_name --help > /dev/null 2>&1; then
+            if timeout 5 $full_name --help > /dev/null 2>&1; then
                 $full_name --help > $f-option.list
-            elif $full_name -help > /dev/null 2>&1; then
+            elif timeout 5 $full_name -help > /dev/null 2>&1; then
                 $full_name -help > $f-option.list
-            elif $full_name help > /dev/null 2>&1; then
+            elif timeout 5 $full_name help > /dev/null 2>&1; then
                 $full_name help > $f-option.list
-            elif $full_name -h > /dev/null 2>&1; then
+            elif timeout 5 $full_name -h > /dev/null 2>&1; then
                 $full_name -h > $f-option.list
             fi
         fi
diff --git a/system-rpm-config.spec b/system-rpm-config.spec
index 3972bc4..48b2e68 100644
--- a/system-rpm-config.spec
+++ b/system-rpm-config.spec
@@ -1,4 +1,4 @@
-%define anolis_release 35
+%define anolis_release 37
 
 Summary: Anolis OS specific rpm configuration files
 Name: system-rpm-config
@@ -211,6 +211,12 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/anolis/srpm forge.lua
 %license MulanPSL
 
 %changelog
+* Wed Jul 24 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 1:23-37
+- add timeout when create option.list
+
+* Wed Jul 17 2024 Chunmei Xu <xuchunmei@linux.alibaba.com> - 1:23-36
+- brp-mangle-shebangs: remove python2 related
+
 * Fri Mar 15 2024 Chang Gao <gc-taifu@linux.alibaba.com> - 1:23-35
 - Remove -fno-openmp-implicit-rpath clang ldflags
 
-- 
Gitee