From 3c0173ddb33b5975f10e2517c645c8411e8e6521 Mon Sep 17 00:00:00 2001 From: fly_fzc <2385803914@qq.com> Date: Fri, 3 Nov 2023 15:38:21 +0800 Subject: [PATCH] check if the file is a symbolic link in brp-digest-list --- ...s-a-symbolic-link-in-brp-digest-list.patch | 25 +++++++++++++++++++ openEuler-rpm-config.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch diff --git a/check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch b/check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch new file mode 100644 index 0000000..853ec38 --- /dev/null +++ b/check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch @@ -0,0 +1,25 @@ +From 0eea7318489474d20e391cc55eb81f2a642e36f8 Mon Sep 17 00:00:00 2001 +From: gaoyusong +Date: Fri, 3 Nov 2023 10:55:26 +0800 +Subject: [PATCH] check if the file is a symbolic link in brp-digest-list + +--- + brp-digest-list | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/brp-digest-list b/brp-digest-list +index 9ec50a2..77248c9 100644 +--- a/brp-digest-list ++++ b/brp-digest-list +@@ -18,7 +18,7 @@ cat - > $BIN_PKG_FILES + trap "rm -f \"${BIN_PKG_FILES}\"" 0 2 3 5 10 13 15 + + # File empty, exit +-if [ -z $(head -c 1 $BIN_PKG_FILES) ]; then ++if [ -L $BIN_PKG_FILES ] || [ -z $(head -c 1 $BIN_PKG_FILES) ]; then + exit 0 + fi + +-- +2.27.0 + diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 31d67ca..b245e9b 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 19 +Release: 20 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -14,6 +14,7 @@ Patch0: fix-error-message-for-kmodtool.patch Patch1: Fix-a-typo-in-brp-digest-list.patch Patch2: change-the-openEuler-to-generic-for-common-use.patch Patch3: exclude-kernel-source-and-EFI-files-in-digest-list-building.patch +Patch4: check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch Patch9002: openEuler-remove-fexceptions.patch @@ -112,6 +113,9 @@ mkdir -p %{buildroot}%{_fileattrsdir} %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Fri Nov 03 2023 fuanan - 30-20 +- check if the file is a symbolic link in brp-digest-list + * Mon Oct 16 2023 xiasenlin - 30-19 - fix build failed, bare words are no longer supported