fix rpm build strip error for oe2203

This commit is contained in:
wangdi 2022-04-20 18:22:15 +08:00
parent ff60993db2
commit 09360ab149

View File

@ -1,6 +1,12 @@
# since strip in binutils fails to strip bpf objects in this package
# use eu-strip of elfutils instead
%global __strip /usr/bin/eu-strip
# eu-strip cannot strip static libs
# use strip for static libs
%global __brp_strip_static_archive %{_rpmconfigdir}/brp-strip-static-archive /usr/bin/strip
Name: xdp-tools Name: xdp-tools
Version: 1.0.1 Version: 1.0.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Utilities and example programs for use with XDP Summary: Utilities and example programs for use with XDP
%global _soversion 1.0.0 %global _soversion 1.0.0
@ -20,6 +26,7 @@ BuildRequires: pkgconfig
BuildRequires: m4 BuildRequires: m4
BuildRequires: emacs-nox BuildRequires: emacs-nox
BuildRequires: wireshark-cli BuildRequires: wireshark-cli
BuildRequires: elfutils
# Always keep xdp-tools and libxdp packages in sync # Always keep xdp-tools and libxdp packages in sync
Requires: libxdp = %{version}-%{release} Requires: libxdp = %{version}-%{release}
@ -82,8 +89,6 @@ export MANDIR='%{_mandir}'
export DATADIR='%{_datadir}' export DATADIR='%{_datadir}'
export HDRDIR='%{_includedir}/xdp' export HDRDIR='%{_includedir}/xdp'
make install V=1 make install V=1
strip %{buildroot}%{_libdir}/{libxdp.so,libxdp.so.1.0.0}
strip %{buildroot}%{_sbindir}/{xdpdump,xdp-loader,xdp-filter}
%files %files
%{_sbindir}/xdp-filter %{_sbindir}/xdp-filter
@ -110,6 +115,9 @@ strip %{buildroot}%{_sbindir}/{xdpdump,xdp-loader,xdp-filter}
%{_libdir}/pkgconfig/libxdp.pc %{_libdir}/pkgconfig/libxdp.pc
%changelog %changelog
* Wed Apr 20 2022 Di Wang <wangdi@kylinos.cn> 1.0.1-2
- workaround for stripping failure of bpf objects by binutils
* Fri Sep 10 2021 Pengju Jiang <jiangpengju2@huawei.com> 1.0.1-1 * Fri Sep 10 2021 Pengju Jiang <jiangpengju2@huawei.com> 1.0.1-1
- solve the strip problem of dark conversion compilation - solve the strip problem of dark conversion compilation