Change the name of spec to openEuler-rpm-spec and fix few bugs
This commit is contained in:
parent
3d2fca29b0
commit
5ac7de7556
26
Fix-a-typo-in-brp-digest-list.patch
Normal file
26
Fix-a-typo-in-brp-digest-list.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From a82057c590f958d10898c2e5f7211241be3dfd7a Mon Sep 17 00:00:00 2001
|
||||
From: Roberto Sassu <roberto.sassu@huawei.com>
|
||||
Date: Fri, 26 Feb 2021 09:00:06 +0100
|
||||
Subject: [PATCH] Fix a typo in brp-digest-list
|
||||
|
||||
Rename RPM_PACKAGE_NAM to RPM_PACKAGE_NAME.
|
||||
---
|
||||
brp-digest-list | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/brp-digest-list b/brp-digest-list
|
||||
index 435b962..c3b2156 100644
|
||||
--- a/brp-digest-list
|
||||
+++ b/brp-digest-list
|
||||
@@ -86,7 +86,7 @@ if [[ "$(basename $BIN_PKG_FILES)" =~ "digest-list-tools" && \
|
||||
|
||||
export BRP_PESIGN_FILES="$2/etc/ima/digest_lists/*"
|
||||
export RPM_BUILD_ROOT
|
||||
- export RPM_PACKAGE_NAM="digest-list-tools"
|
||||
+ export RPM_PACKAGE_NAME="digest-list-tools"
|
||||
export RPM_SOURCE_DIR="$(rpm --eval %_topdir)/SOURCES"
|
||||
|
||||
if [ -f "/usr/lib/rpm/brp-suse.d/brp-99-pesign" ]; then
|
||||
--
|
||||
2.26.2
|
||||
|
||||
36
openEuler-remove-fexceptions.patch
Normal file
36
openEuler-remove-fexceptions.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 783b74a4778101223da41c8d3eb0457a1f9938f2 Mon Sep 17 00:00:00 2001
|
||||
From: Yangyang Shen <shenyangyang4@huawei.com>
|
||||
Date: Thu, 18 Mar 2021 16:00:27 +0800
|
||||
Subject: [PATCH] openEuler remove fexceptions
|
||||
|
||||
---
|
||||
macros | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/macros b/macros
|
||||
index b06faea..118614d 100644
|
||||
--- a/macros
|
||||
+++ b/macros
|
||||
@@ -27,8 +27,8 @@
|
||||
# ---- compiler flags.
|
||||
|
||||
%build_cflags %{optflags}
|
||||
-%build_cxxflags %{optflags}
|
||||
-%build_fflags %{optflags} -I%{_fmoddir}
|
||||
+%build_cxxflags %{optflags} -fexceptions
|
||||
+%build_fflags %{optflags} -fexceptions -I%{_fmoddir}
|
||||
%build_ldflags -Wl,-z,relro %{_ld_as_needed_flags} %{_ld_symbols_flags} %{_hardened_ldflags}
|
||||
|
||||
%set_build_flags \
|
||||
@@ -177,7 +177,7 @@
|
||||
#%_ld_as_needed 1
|
||||
%_ld_as_needed_flags %{?_ld_as_needed:-Wl,--as-needed}
|
||||
|
||||
-%__global_compiler_flags -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches %{_hardened_cflags}
|
||||
+%__global_compiler_flags -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches %{_hardened_cflags}
|
||||
|
||||
# Automatically trim changelog entries after 2 years
|
||||
%_changelog_trimtime %{lua:print(os.time() - 2 * 365 * 86400)}
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
Name: %{vendor}-rpm-config
|
||||
Version: 30
|
||||
Release: 17
|
||||
Release: 18
|
||||
License: GPL+
|
||||
Summary: specific rpm configuration files
|
||||
URL: https://gitee.com/openeuler/openEuler-rpm-config
|
||||
@ -18,11 +18,13 @@ 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
|
||||
|
||||
Patch9000: openEuler-replace-openEuler-with-_vendor-macro.patch
|
||||
%if %{vendor} != openEuler && %{change_vendor} == 1
|
||||
Patch9001: openEuler-fix-brp-ldconfig.patch
|
||||
%endif
|
||||
Patch9002: openEuler-remove-fexceptions.patch
|
||||
|
||||
Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
@ -148,6 +150,9 @@ popd
|
||||
%{_rpmconfigdir}/macros.d/macros.kmp
|
||||
|
||||
%changelog
|
||||
* Thu Mar 18 2021 shenyangyang <shenyangyang4@huawei.com> - 30-18
|
||||
- Change the name of spec to openEuler-rpm-spec and fix few bugs
|
||||
|
||||
* Thu Mar 11 2021 shenyangyang <shenyangyang4@huawei.com> - 30-17
|
||||
- Add for support for change vendor
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user