custom/rpm-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!150 kmodtool: use tmp.$$ instand of tmp.txt

Browse Source 
From: @yang_yanchao 
Reviewed-by: @xujing99 
Signed-off-by: @xujing99
This commit is contained in:
openeuler-ci-bot 2023-11-03 06:06:37 +00:00 committed by Gitee
commit 4da686657f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backport-kmp-feature.patch
View File

@ -399,7 +399,7 @@ diff --git a/macros.kmp b/macros.kmp
index d46aa04..8440e26 100644 index d46aa04..8440e26 100644
--- a/macros.kmp --- a/macros.kmp
+++ b/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). -# Use these macros to differentiate between __vendor and other KMP implementation(s).
- -
-kernel_module_package_release 1 -kernel_module_package_release 1
@ -462,7 +462,8 @@ index d46aa04..8440e26 100644
+ flavors_to_build="%*" \ + flavors_to_build="%*" \
+ else \ + else \
+ flavors_to_build=" $flavors "\ + flavors_to_build=" $flavors "\
+ echo "[$flavors_to_build]" >/tmp/tmp.txt + rm -rf /tmp/tmp.$$ \
+ echo "[$flavors_to_build]" >/tmp/tmp.$$ \
+ for i in %* \ + for i in %* \
+ do \ + do \
+ flavors_to_build=${flavors_to_build//$i /} + flavors_to_build=${flavors_to_build//$i /}

5
openEuler-rpm-config.spec
View File

@ -3,7 +3,7 @@
Name: %{vendor}-rpm-config Name: %{vendor}-rpm-config
Version: 30 Version: 30
Release: 43 Release: 44
License: GPL+ License: GPL+
Summary: specific rpm configuration files Summary: specific rpm configuration files
URL: https://gitee.com/openeuler/openEuler-rpm-config 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 %{rpmvdir}/find-requires.ksyms
%changelog %changelog
* Thu Nov 2 2023 Yang Yanchao <yangyanchao6@huawei.com> - 30-44
- kmodtool: use tmp.$$ instand of tmp.txt
* Mon Aug 28 2023 liyunfei <liyunfei33@huawei.com> - 30-43 * Mon Aug 28 2023 liyunfei <liyunfei33@huawei.com> - 30-43
- Revert backport toolchain selecting and %%auto_set_build_flags patches - Revert backport toolchain selecting and %%auto_set_build_flags patches