diff --git a/openEuler-replace-openEuler-with-_vendor-macro.patch b/openEuler-change-openEuler-to-vendor-for-changing-vendor.patch similarity index 89% rename from openEuler-replace-openEuler-with-_vendor-macro.patch rename to openEuler-change-openEuler-to-vendor-for-changing-vendor.patch index 7b02ccba0661984e60b80a75184cc46ada5be26d..691fe2e4a39088cc938b87fa0cc05575d0ca65e6 100644 --- a/openEuler-replace-openEuler-with-_vendor-macro.patch +++ b/openEuler-change-openEuler-to-vendor-for-changing-vendor.patch @@ -1,7 +1,7 @@ -From 9ddbf9dcb6de021ad796876282796dc409cdb268 Mon Sep 17 00:00:00 2001 +From 4fd642e952e8f870b63755d12832f30cabb5499c Mon Sep 17 00:00:00 2001 From: Yangyang Shen -Date: Thu, 7 Jan 2021 21:19:58 +0800 -Subject: [PATCH] replace openEuler with %{_vendor} macro +Date: Fri, 26 Mar 2021 16:44:48 +0800 +Subject: [PATCH] change openEuler to vendor for changing vendor --- macros | 14 +++++++------- @@ -9,7 +9,7 @@ Subject: [PATCH] replace openEuler with %{_vendor} macro 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/macros b/macros -index b06faea..678136a 100644 +index b59d614..678136a 100644 --- a/macros +++ b/macros @@ -52,7 +52,7 @@ @@ -34,8 +34,8 @@ index b06faea..678136a 100644 # secure options for rpmbuild # # #hardened options --%_hardening_cflags -specs=/usr/lib/rpm/%{_vendor}/openEuler-hardened-cc1 --%_hardening_ldflags -Wl,-z,now -specs=/usr/lib/rpm/%{_vendor}/openEuler-hardened-ld +-%_hardening_cflags -specs=/usr/lib/rpm/openEuler/openEuler-hardened-cc1 +-%_hardening_ldflags -Wl,-z,now -specs=/usr/lib/rpm/openEuler/openEuler-hardened-ld +%_hardening_cflags -specs=/usr/lib/rpm/%{_vendor}/%{_vendor}-hardened-cc1 +%_hardening_ldflags -Wl,-z,now -specs=/usr/lib/rpm/%{_vendor}/%{_vendor}-hardened-ld # Use "%undefine _hardened_build" to disable. diff --git a/openEuler-change-vendor-to-openEuler-and-preparing-for-changin.patch b/openEuler-change-vendor-to-openEuler-and-preparing-for-changin.patch new file mode 100644 index 0000000000000000000000000000000000000000..39ee27c116d66669cdee22f0d75ad65a6b81779f --- /dev/null +++ b/openEuler-change-vendor-to-openEuler-and-preparing-for-changin.patch @@ -0,0 +1,27 @@ +From 5440442bbcd7e3c250880b9db94061a440ead6b4 Mon Sep 17 00:00:00 2001 +From: Yangyang Shen +Date: Fri, 26 Mar 2021 16:28:47 +0800 +Subject: [PATCH] change vendor to openEuler and preparing for changing vendor + +--- + macros | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/macros b/macros +index b06faea..b59d614 100644 +--- a/macros ++++ b/macros +@@ -144,8 +144,8 @@ + # secure options for rpmbuild + # + # #hardened options +-%_hardening_cflags -specs=/usr/lib/rpm/%{_vendor}/openEuler-hardened-cc1 +-%_hardening_ldflags -Wl,-z,now -specs=/usr/lib/rpm/%{_vendor}/openEuler-hardened-ld ++%_hardening_cflags -specs=/usr/lib/rpm/openEuler/openEuler-hardened-cc1 ++%_hardening_ldflags -Wl,-z,now -specs=/usr/lib/rpm/openEuler/openEuler-hardened-ld + # Use "%undefine _hardened_build" to disable. + %_hardened_build 1 + %_hardened_cflags %{?_hardened_build:%{_hardening_cflags}} +-- +2.23.0 + diff --git a/openEuler-fix-brp-ldconfig.patch b/openEuler-fix-brp-ldconfig.patch deleted file mode 100644 index fb9d564a488857d07c0fc7ee687633ffe18861a2..0000000000000000000000000000000000000000 --- a/openEuler-fix-brp-ldconfig.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 13fba7b02178c0196061965155c01061fce004fc Mon Sep 17 00:00:00 2001 -From: orange-snn -Date: Thu, 28 Jan 2021 16:35:20 +0800 -Subject: [PATCH] fix brp ldconfig - ---- - macros | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/macros b/macros -index 678136a..7ef0539 100644 ---- a/macros -+++ b/macros -@@ -89,7 +89,7 @@ - - # Build root policy macros. Standard naming: - # convert all '-' in basename to '_', add two leading underscores. --%__brp_ldconfig /usr/lib/rpm/%{_vendor}/brp-ldconfig -+%__brp_ldconfig /usr/lib/rpm/euleros/brp-ldconfig - %__brp_compress /usr/lib/rpm/brp-compress - %__brp_strip /usr/lib/rpm/brp-strip %{__strip} - %__brp_strip_comment_note /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} --- -2.27.0 - diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index f3b7f3ec29556b0590589dce15083aca532d854f..e82976c198dbb94ad3f23734e2f11012ce500398 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -1,15 +1,9 @@ %global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} %global rpmvdir /usr/lib/rpm/%{vendor} -# the _change_vendor macro should be defined in the project config of obs -# or just in this spec if you want to change openEuler to other vendor. -# If the _change_vendor is 1, it means that it is the first building round for all. -# rpm packages, so we need both openEuler and the vendor as an transistion. -# And the others value of _change_vendor indicates that we don't need openEuler anymore. -%global change_vendor %{?_change_vendor:%{_change_vendor}}%{!?_change_vendor:0} Name: %{vendor}-rpm-config Version: 30 -Release: 15 +Release: 17 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -19,9 +13,9 @@ Source0: https://gitee.com/openeuler/openEuler-rpm-config/repository/arch Patch0: fix-error-message-for-kmodtool.patch Patch1: Fix-a-typo-in-brp-digest-list.patch -Patch9000: openEuler-replace-openEuler-with-_vendor-macro.patch -%if %{vendor} != openEuler && %{change_vendor} == 1 -Patch9001: openEuler-fix-brp-ldconfig.patch +Patch9000: openEuler-change-vendor-to-openEuler-and-preparing-for-changin.patch +%if %{vendor} != openEuler +Patch9001: openEuler-change-openEuler-to-vendor-for-changing-vendor.patch %endif Patch9002: openEuler-remove-fexceptions.patch @@ -110,19 +104,6 @@ mv openEuler-hardened-ld %{vendor}-hardened-ld mv openEuler-pie-cc1 %{vendor}-pie-cc1 mv openEuler-pie-ld %{vendor}-pie-ld popd - -%if %{change_vendor} == 1 -pushd %{buildroot}%{rpmvdir}/../ -cp -a %{vendor} openEuler -popd - -pushd %{buildroot}/usr/lib/rpm/openEuler -mv %{vendor}-hardened-cc1 openEuler-hardened-cc1 -mv %{vendor}-hardened-ld openEuler-hardened-ld -mv %{vendor}-pie-cc1 openEuler-pie-cc1 -mv %{vendor}-pie-ld openEuler-pie-ld -popd -%endif %endif %files @@ -131,10 +112,6 @@ popd %{rpmvdir}/rpmrc %{rpmvdir}/brp-* %{rpmvdir}/config.* -%if %{vendor} != openEuler && %{change_vendor} == 1 -%exclude %{_prefix}/lib/rpm/openEuler/kmodtool.py -%{_prefix}/lib/rpm/openEuler/* -%endif %{rpmvdir}/%{vendor}-* %{_fileattrsdir}/ %{_rpmconfigdir}/macros.d/ @@ -143,12 +120,15 @@ popd %files -n kernel-rpm-macros %exclude %{_prefix}/lib/rpm/*/__pycache__/* %{rpmvdir}/kmodtool.py -%if %{vendor} != openEuler && %{change_vendor} == 1 -%{_prefix}/lib/rpm/openEuler/kmodtool.py -%endif %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Fri Mar 26 2021 shenyangyang - 30-17 +- Bump release for bigger than LTS SP1 + +* Thu Mar 25 2021 shenyangyang - 30-16 +- Modify support for change vendor with better method + * Fri Mar 19 2021 shenyangyang - 30-15 - Change the name of spec to openEuler-rpm-spec and fix few bugs