From 2fc7f2c5e0a873ddb83369283a1b0391609c6459 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Tue, 25 Oct 2022 10:07:09 +0800 Subject: [PATCH] generate-compatibility-deps: fix empty api files Signed-off-by: Chunmei Xu --- generate-compatibility-deps | 10 +++++++++- system-rpm-config.spec | 7 +++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/generate-compatibility-deps b/generate-compatibility-deps index 446f754..ba39781 100755 --- a/generate-compatibility-deps +++ b/generate-compatibility-deps @@ -37,7 +37,15 @@ for dir in $sbindir $bindir ; do 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 || : + if file $full_name | grep executable > /dev/null 2>&1; then + if $full_name --help > /dev/null 2>&1; then + $full_name --help > $f-option.list + elif $full_name help > /dev/null 2>&1; then + $full_name help > $f-option.list + elif $full_name -h > /dev/null 2>&1; then + $full_name -h > $f-option.list + fi + fi done done diff --git a/system-rpm-config.spec b/system-rpm-config.spec index ec5c2d9..12ac6fa 100644 --- a/system-rpm-config.spec +++ b/system-rpm-config.spec @@ -1,4 +1,4 @@ -%define anolis_release 11 +%define anolis_release 12 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 +* Tue Oct 25 2022 Chunmei Xu - 23.12 +- generate-compatibility-deps: fix empty api files + * Fri Oct 21 2022 Chunmei Xu - 23.11 - generate-compatibility-deps: remove unexpected files @@ -207,7 +210,7 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/anolis/srpm forge.lua * Wed Mar 16 2022 Chunmei Xu - 23.4 - fix __cflags_arch_x86_64 -* Thu Mar 15 2022 Chunmei Xu - 23.3 +* Tue Mar 15 2022 Chunmei Xu - 23.3 - set rust-srpm-macros as requires * Thu Mar 10 2022 Chunmei Xu - 23.2 -- Gitee