rpm/dpdk
SHA256
1
0
Fork 0
forked from pool/dpdk
Code Pull Requests Activity

- also strip meson generated runpaths when installing examples

Browse Source 
manually (bsc#1200620)

OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=139
This commit is contained in:
Dirk Mueller 2022-06-21 13:20:38 +00:00 committed by Git OBS Bridge
parent 97828d5830
commit 53bfa920f5
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dpdk.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 21 13:20:00 UTC 2022 - Dirk Müller <dmueller@suse.com>
- also strip meson generated runpaths when installing examples
manually (bsc#1200620)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 25 10:13:44 UTC 2022 - Jiri Slaby <jslaby@suse.cz> Wed May 25 10:13:44 UTC 2022 - Jiri Slaby <jslaby@suse.cz>

30
dpdk.spec
View File

@ -20,7 +20,6 @@
%define flavor @BUILD_FLAVOR@%{nil} %define flavor @BUILD_FLAVOR@%{nil}
%define aarch64_machine armv8a %define aarch64_machine armv8a
%define exclusive_arch aarch64 x86_64 ppc64le %define exclusive_arch aarch64 x86_64 ppc64le
%define name_tag %{nil} %define name_tag %{nil}
%define summary_tag %{nil} %define summary_tag %{nil}
%if "%{flavor}" == "thunderx" %if "%{flavor}" == "thunderx"
@ -29,7 +28,6 @@
%define aarch64_machine thunderx %define aarch64_machine thunderx
%define exclusive_arch aarch64 %define exclusive_arch aarch64
%endif %endif
# http://doc.dpdk.org/guides-21.11/linux_gsg/build_dpdk.html#adjusting-build-options # http://doc.dpdk.org/guides-21.11/linux_gsg/build_dpdk.html#adjusting-build-options
%define platform generic %define platform generic
%define machine auto %define machine auto
@ -67,6 +65,7 @@ BuildRequires: kernel-syms
BuildRequires: libfdt-devel BuildRequires: libfdt-devel
BuildRequires: meson >= 0.49.2 BuildRequires: meson >= 0.49.2
BuildRequires: modutils BuildRequires: modutils
BuildRequires: patchelf
BuildRequires: pesign-obs-integration BuildRequires: pesign-obs-integration
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3 BuildRequires: python3
@ -214,15 +213,18 @@ done
%install %install
examples="%{?with_examples:all}" examples="%{?with_examples:all}"
for flavor in %{flavors_to_build}; do for flavor in %{flavors_to_build}; do
%meson_install %meson_install
# Also install the example binaries # Also install the example binaries
if [ ! -z "$examples" ]; then if [ ! -z "$examples" ]; then
for f in %{_vpath_builddir}/examples/dpdk-*; do for f in %{_vpath_builddir}/examples/dpdk-*; do
bn=$(basename "$f") bn=$(basename "$f")
[ -f "$f" ] && install -Dm 0755 ${f} "%{buildroot}%{_bindir}/${bn/dpdk-/dpdk_example_}" if [ -f "$f" ] ; then
done install -Dm 0755 ${f} "%{buildroot}%{_bindir}/${bn/dpdk-/dpdk_example_}"
fi patchelf --remove-rpath "%{buildroot}%{_bindir}/${bn/dpdk-/dpdk_example_}"
examples="" fi
done
fi
examples=""
done done
# Fix Kernel modules on Factory (/usr merge) # Fix Kernel modules on Factory (/usr merge)
@ -232,8 +234,8 @@ mv %{buildroot}/lib/modules %{buildroot}%{_prefix}/lib
%endif %endif
# Fix documentation # Fix documentation
mkdir -p %{buildroot}%{docdir} mkdir -p %{buildroot}%docdir
mv %{buildroot}%{_datadir}/doc/dpdk %{buildroot}%{docdir} mv %{buildroot}%{_datadir}/doc/dpdk %{buildroot}%docdir
%if ! %{with tools} %if ! %{with tools}
# Remove tools if not needed # Remove tools if not needed
@ -251,7 +253,7 @@ find %{buildroot} -name "*.py" -exec sed -i 's|python$|python3|' \{\} +
find %{buildroot} -name "*.py" -exec sed -i 's|env python|python|' \{\} + find %{buildroot} -name "*.py" -exec sed -i 's|env python|python|' \{\} +
# Remove duplicates # Remove duplicates
%fdupes %{buildroot}/%{docdir} %fdupes %{buildroot}/%docdir
%fdupes %{buildroot}/%{sdkdir}/examples %fdupes %{buildroot}/%{sdkdir}/examples
# Fix broken symlink (yes with * in its name) # Fix broken symlink (yes with * in its name)