From 46f0153446be2d70067665310b1a61adb831b023 Mon Sep 17 00:00:00 2001 From: Yang Yanchao Date: Thu, 2 Nov 2023 20:38:10 +0800 Subject: [PATCH] kmodtool: use tmp.$$ instand of tmp.txt Signed-off-by: Yang Yanchao --- backport-kmp-feature.patch | 5 +++-- openEuler-rpm-config.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/backport-kmp-feature.patch b/backport-kmp-feature.patch index a80029d..939cf47 100644 --- a/backport-kmp-feature.patch +++ b/backport-kmp-feature.patch @@ -399,7 +399,7 @@ diff --git a/macros.kmp b/macros.kmp index d46aa04..8440e26 100644 --- a/macros.kmp +++ b/macros.kmp -@@ -1,22 +1,63 @@ +@@ -1,22 +1,64 @@ -# Use these macros to differentiate between __vendor and other KMP implementation(s). - -kernel_module_package_release 1 @@ -462,7 +462,8 @@ index d46aa04..8440e26 100644 + flavors_to_build="%*" \ + else \ + flavors_to_build=" $flavors "\ -+ echo "[$flavors_to_build]" >/tmp/tmp.txt ++ rm -rf /tmp/tmp.$$ \ ++ echo "[$flavors_to_build]" >/tmp/tmp.$$ \ + for i in %* \ + do \ + flavors_to_build=${flavors_to_build//$i /} diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 13197bd..e33edb2 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 43 +Release: 44 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -142,6 +142,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Thu Nov 2 2023 Yang Yanchao - 30-44 +- kmodtool: use tmp.$$ instand of tmp.txt + * Mon Aug 28 2023 liyunfei - 30-43 - Revert backport toolchain selecting and %%auto_set_build_flags patches