From e2e4e8b48bf4b354a7c8e79d23cd64e7b8c6ba2f Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Wed, 17 Jul 2024 18:49:50 +0800 Subject: [PATCH] brp-mangle-shebangs: remove python2 related Signed-off-by: Chunmei Xu --- brp-mangle-shebangs | 6 +++--- system-rpm-config.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 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/system-rpm-config.spec b/system-rpm-config.spec index 3972bc4..9cab03f 100644 --- a/system-rpm-config.spec +++ b/system-rpm-config.spec @@ -1,4 +1,4 @@ -%define anolis_release 35 +%define anolis_release 36 Summary: Anolis OS specific rpm configuration files Name: system-rpm-config @@ -211,6 +211,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/anolis/srpm forge.lua %license MulanPSL %changelog +* Wed Jul 17 2024 Chunmei Xu - 1:23-36 +- brp-mangle-shebangs: remove python2 related + * Fri Mar 15 2024 Chang Gao - 1:23-35 - Remove -fno-openmp-implicit-rpath clang ldflags -- Gitee