!27 清理spec文件
From: @zcfsite Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
e6a5fda80e
@ -1,39 +1,29 @@
|
|||||||
Name: gcc_secure
|
Name: gcc_secure
|
||||||
Summary: Build with gcov
|
Summary: Enforcing secure compile options for abuild
|
||||||
License: GPL
|
License: NA
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
Version: 1.0
|
Version: 1.0
|
||||||
Release: 0.10
|
Release: 0.11
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}
|
BuildRoot: %{_tmppath}/%{name}-%{version}
|
||||||
#Source: %{name}-%{version}.tar.bz2
|
|
||||||
|
|
||||||
BuildRequires: util-linux coreutils
|
BuildRequires: util-linux coreutils
|
||||||
BuildRequires: -custom_build_tool-nocheck
|
|
||||||
BuildRequires: -obs-env
|
|
||||||
BuildRequires: -gcc_secure
|
|
||||||
BuildRequires: -custom_build_tool-sign
|
|
||||||
BuildRequires: -bep-env
|
|
||||||
|
|
||||||
Requires: util-linux rpm grep binutils gcc coreutils rpm-build
|
Requires: util-linux rpm grep binutils gcc coreutils rpm-build
|
||||||
#expect grep sudo kernel-default kernel-default-base openssh
|
|
||||||
%description
|
%description
|
||||||
Build with gcov
|
Enforcing secure compile option for abuild
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
#%setup -cT
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}/opt/needgcov
|
|
||||||
|
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
|
|
||||||
%post
|
%post
|
||||||
echo -e '*cc1_options:\n+ %{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs:%{!fno-stack-protector:%{!fstack-protector-all:-fstack-protector-strong}}}}}' >/tmp/gcc-specs-fs-cc1
|
echo -e '*cc1_options:\n+ %{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs:%{!fno-stack-protector:%{!fstack-protector-all:-fstack-protector-strong}}}}}' >/opt/gcc-specs-fs-cc1
|
||||||
|
|
||||||
echo -e '*cc1_options:\n+ %{!r:%{!D__KERNEL__:%{!pie:%{!fpic:%{!fPIC:%{!fpie:%{!fPIE:%{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE:%{!shared:%{!static:%{!nostdlib:%{!nostartfiles:-fPIE}}}}}}}}}}}}}}}' >/tmp/gcc-specs-pie-cc1
|
echo -e '*cc1_options:\n+ %{!r:%{!D__KERNEL__:%{!pie:%{!fpic:%{!fPIC:%{!fpie:%{!fPIE:%{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE:%{!shared:%{!static:%{!nostdlib:%{!nostartfiles:-fPIE}}}}}}}}}}}}}}}' >/opt/gcc-specs-pie-cc1
|
||||||
|
|
||||||
echo -e '*self_spec:\n+ %{!D__KERNEL__:%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r:%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}}' >/tmp/gcc-specs-pie-ld
|
echo -e '*self_spec:\n+ %{!D__KERNEL__:%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r:%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}}' >/opt/gcc-specs-pie-ld
|
||||||
|
|
||||||
old_gcc=/usr/bin/gcc
|
old_gcc=/usr/bin/gcc
|
||||||
mv $old_gcc $old_gcc"_old"
|
mv $old_gcc $old_gcc"_old"
|
||||||
@ -68,9 +58,9 @@ if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then
|
|||||||
|
|
||||||
if [[ x\$rpm_name = "xglibc" ]] || [[ x\$rpm_name = "xcompat-glibc" ]];then
|
if [[ x\$rpm_name = "xglibc" ]] || [[ x\$rpm_name = "xcompat-glibc" ]];then
|
||||||
#glibc supply fs define, can not add fs for glibc self
|
#glibc supply fs define, can not add fs for glibc self
|
||||||
/usr/bin/gcc_old \$sec_opt "\$@" \$fs_opt --specs=/tmp/gcc-specs-pie-cc1 --specs=/tmp/gcc-specs-pie-ld
|
/usr/bin/gcc_old \$sec_opt "\$@" \$fs_opt --specs=/opt/gcc-specs-pie-cc1 --specs=/opt/gcc-specs-pie-ld
|
||||||
else
|
else
|
||||||
/usr/bin/gcc_old \$sec_opt "\$@" \$fs_opt --specs=/tmp/gcc-specs-pie-cc1 --specs=/tmp/gcc-specs-pie-ld --specs=/tmp/gcc-specs-fs-cc1
|
/usr/bin/gcc_old \$sec_opt "\$@" \$fs_opt --specs=/opt/gcc-specs-pie-cc1 --specs=/opt/gcc-specs-pie-ld --specs=/opt/gcc-specs-fs-cc1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
@ -110,7 +100,7 @@ if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then
|
|||||||
#libtool use g++ -v for test compile env,if add Wl opt, it will make g++ -v fail
|
#libtool use g++ -v for test compile env,if add Wl opt, it will make g++ -v fail
|
||||||
$old_gplus"_old" "\$@"
|
$old_gplus"_old" "\$@"
|
||||||
else
|
else
|
||||||
/usr/bin/g++_old \$sec_opt "\$@" \$fs_opt --specs=/tmp/gcc-specs-pie-cc1 --specs=/tmp/gcc-specs-pie-ld --specs=/tmp/gcc-specs-fs-cc1
|
/usr/bin/g++_old \$sec_opt "\$@" \$fs_opt --specs=/opt/gcc-specs-pie-cc1 --specs=/opt/gcc-specs-pie-ld --specs=/opt/gcc-specs-fs-cc1
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
$old_gplus"_old" "\$@"
|
$old_gplus"_old" "\$@"
|
||||||
@ -146,7 +136,7 @@ if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then
|
|||||||
fs_opt=\`cat \$configfile| grep fs_opt| awk -F: '{print \$NF}'\`
|
fs_opt=\`cat \$configfile| grep fs_opt| awk -F: '{print \$NF}'\`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/bin/c++_old \$sec_opt "\$@" \$fs_opt --specs=/tmp/gcc-specs-pie-cc1 --specs=/tmp/gcc-specs-pie-ld --specs=/tmp/gcc-specs-fs-cc1
|
/usr/bin/c++_old \$sec_opt "\$@" \$fs_opt --specs=/opt/gcc-specs-pie-cc1 --specs=/opt/gcc-specs-pie-ld --specs=/opt/gcc-specs-fs-cc1
|
||||||
|
|
||||||
else
|
else
|
||||||
$old_cpp"_old" "\$@"
|
$old_cpp"_old" "\$@"
|
||||||
@ -162,9 +152,6 @@ fi
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%dir /opt/needgcov
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT/*
|
rm -rf $RPM_BUILD_ROOT/*
|
||||||
@ -172,6 +159,12 @@ rm -rf %{_tmppath}/%{name}-%{version}
|
|||||||
rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 28 2022 zhangchenfeng<zhangchenfeng1@huawei.com> - 1.0-0.11
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: clean spec
|
||||||
|
|
||||||
* Wed Dec 29 2021 wangjie <wangjie375@huawei.com> - 1.0-0.10
|
* Wed Dec 29 2021 wangjie <wangjie375@huawei.com> - 1.0-0.10
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user