!95 change openeuler to vendor

From: @yangmingtaip Reviewed-by: @overweight Signed-off-by: @overweight
2022-12-01 02:11:28 +00:00 · 2022-12-01 02:11:28 +00:00 · b53b30f88c
commit b53b30f88c
parent 9d1a1a0ea5 84ce424fb5
6 changed files with 43 additions and 15 deletions
--- a/Give-a-warning-when-using-kabi-outside-our-stablelis.patch
+++ b/Give-a-warning-when-using-kabi-outside-our-stablelis.patch
@ -56,8 +56,8 @@ index 0000000..b7cd825
 +    fi
 +done
 +
-+[ -x /usr/lib/rpm/openEuler/find-requires.ksyms ] && [ "$is_kmod" ] &&
-+    printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/openEuler/find-requires.ksyms
+[ -x /usr/lib/rpm/__vendor/find-requires.ksyms ] && [ "$is_kmod" ] &&
+    printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/__vendor/find-requires.ksyms
 +
 +exit 0
 diff --git a/find-requires.ksyms b/find-requires.ksyms
@ -184,7 +184,7 @@ index 0000000..15cc729
 +            printf "\t$symbol\n" >&2
 +        done
 +        echo "" >&2
-+        echo "openEuler recommends that you consider using only official kernel ABI symbols" >&2
+        echo "__vendor recommends that you consider using only official kernel ABI symbols" >&2
 +        echo "where possible. Requests for additions to the kernel ABI can be filed with" >&2
 +        echo "your partner or customer representative (component: driver-update-program)." >&2
 +        echo "" >&2
@ -227,11 +227,11 @@ index 5207045..df7e41e 100644
 +++ b/macros.kmp
@@ -1,7 +1,8 @@
 -# Use these macros to differentiate between RH and other KMP implementation(s).
-+# Use these macros to differentiate between openEuler and other KMP implementation(s).
+# Use these macros to differentiate between __vendor and other KMP implementation(s).
 
 kernel_module_package_release	1
 
-+__find_requires        /usr/lib/rpm/openEuler/find-requires
+__find_requires        /usr/lib/rpm/__vendor/find-requires
 
 
 #kernel_module_package [ -n name ] [ -v version ] [ -r release ] 
--- a/add-brp-scripts-to-delete-rpath.patch
+++ b/add-brp-scripts-to-delete-rpath.patch
@ -134,7 +134,7 @@ index 7cde63f..ee0c126 100644
     %{?__brp_strip_static_archive} \
     %{?py_auto_byte_compile:%{?__brp_python_bytecompile}} \
     %{?__brp_python_hardlink} \
-+    %{?openEuler_delete_rpath:%{?__brp_chrpath}} \
+    %{?__vendor_delete_rpath:%{?__brp_chrpath}} \
 %{nil}
 
 %__spec_install_post\
--- a/change-the-openEuler-to-generic-for-common-use.patch
+++ b/change-the-openEuler-to-generic-for-common-use.patch
@ -1,15 +1,16 @@
 From e9f486a8d9af5b01dcadf8432a449e434cd6886b Mon Sep 17 00:00:00 2001
 From: Yangyang Shen <shenyangyang4@huawei.com>
 Date: Sat, 27 Mar 2021 14:18:56 +0800
-Subject: [PATCH] change the openEuler to generic for common use
+Subject: [PATCH] change the vendor to generic for common use

 ---
 openEuler-hardened-cc1 => generic-hardened-cc1 |  0
 openEuler-hardened-ld => generic-hardened-ld   |  0
 openEuler-pie-cc1 => generic-pie-cc1           |  0
 openEuler-pie-ld => generic-pie-ld             |  0
- macros                                         | 14 +++++++-------
- 5 files changed, 7 insertions(+), 7 deletions(-)
+ macros                                         | 16 ++++++++--------
+ macros.kmp                                     |  2 +-
+ 6 files changed, 9 insertions(+), 9 deletions(-)
 rename openEuler-hardened-cc1 => generic-hardened-cc1 (100%)
 rename openEuler-hardened-ld => generic-hardened-ld (100%)
 rename openEuler-pie-cc1 => generic-pie-cc1 (100%)
@ -32,9 +33,17 @@ similarity index 100%
 rename from openEuler-pie-ld
 rename to generic-pie-ld
 diff --git a/macros b/macros
-index b06faea..ce7cf5c 100644
+index b06faea..def87a7 100644
 --- a/macros
 +++ b/macros
+@@ -1,6 +1,6 @@
+ # Per-platform rpm configuration file.
+ 
+-%_vendor 		openEuler
+%_vendor 		__vendor
+ %_os			linux
+ %_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
+ 
@@ -52,7 +52,7 @@
 %configure \
   %{set_build_flags}; \
@ -82,6 +91,19 @@ index b06faea..ce7cf5c 100644
 %_fs_cflags        %{?_fs_build:%{_fs_pre_cflags}}
 
 
+diff --git a/macros.kmp b/macros.kmp
+index be66e64..b9ebbe8 100644
+--- a/macros.kmp
+++ b/macros.kmp
+@@ -12,7 +12,7 @@ kernel_module_package_release	1
+ 					kernel-devel
+ 
+ %kernel_module_package(n:v:r:f:) %{expand:%( \
+-	%define kmodtool /usr/lib/rpm/openEuler/kmodtool.py\
+	%define kmodtool /usr/lib/rpm/__vendor/kmodtool.py\
+ 	%define latest_kernel $(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel` | head -n 1) \
+ 	%{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \
+ 	%global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \
 -- 
-2.23.0
+2.33.0

--- a/fixed-a-bug-that-missing_-p-in-macros.kmp.patch
+++ b/fixed-a-bug-that-missing_-p-in-macros.kmp.patch
@ -24,7 +24,7 @@ index be66e64..5207045 100644
 
 -%kernel_module_package(n:v:r:f:) %{expand:%( \
 +%kernel_module_package(n:v:r:f:p) %{expand:%( \
- 	%define kmodtool /usr/lib/rpm/openEuler/kmodtool.py\
+ 	%define kmodtool /usr/lib/rpm/__vendor/kmodtool.py\
 	%define latest_kernel $(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel` | head -n 1) \
 	%{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \
 	%global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \
--- a/openEuler-rpm-config.spec
+++ b/openEuler-rpm-config.spec
@ -3,7 +3,7 @@

 Name:		%{vendor}-rpm-config
 Version:	30
-Release:	29
+Release:	30
 License:	GPL+
 Summary:	specific rpm configuration files
 URL:		https://gitee.com/openeuler/openEuler-rpm-config
@ -13,8 +13,8 @@ Source0:        https://gitee.com/openeuler/openEuler-rpm-config/repository/arch
 Patch0:         fix-error-message-for-kmodtool.patch
 Patch1:         0001-1-Add-riscv64-to-golang_arches.patch
 Patch2:         Fix-a-typo-in-brp-digest-list.patch
-Patch3:         change-the-openEuler-to-generic-for-common-use.patch
-Patch4:         openEuler-remove-fexceptions.patch
+Patch3:         change-the-vendor-to-generic-for-common-use.patch
+Patch4:         remove-fexceptions.patch
 Patch5:         exclude-kernel-source-and-EFI-files-in-digest-list-building.patch
 Patch6:         add-brp-scripts-to-delete-rpath.patch
 Patch7:         add-common-script.patch
@ -107,6 +107,9 @@ mkdir -p %{buildroot}%{_fileattrsdir}
 mkdir -p %{buildroot}%{_rpmluadir}/%{_vendor}/{rpm,srpm}
 install -p -m 644 -t %{buildroot}%{_rpmluadir}/%{_vendor} common.lua

+# Adaptive according to vendor
+sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir}`
+
 %files
 %dir %{rpmvdir}
 %{rpmvdir}/macros
@ -127,6 +130,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/%{_vendor} common.lua
 %{rpmvdir}/find-requires.ksyms

 %changelog
+* Wed Nov 30 2022 yangmingtai <yangmingtai@huawei.com> - 30-30
+- support Adaptive according to vendor
+
 * Mon Nov 21 2022 huajingyun <huajingyun@loongson.cn> - 30-29
 - add loongarch64 support

--- a/openEuler-remove-fexceptions.patch
+++ b/openEuler-remove-fexceptions.patch