remove secure compilation options rpath

(cherry picked from commit 1f60f738cd972c85b9766750c240eb3d85a83c71)
This commit is contained in:
jiangheng 2022-09-13 11:15:43 +08:00 committed by openeuler-sync-bot
parent 7998d6978b
commit 9b9b3ff181
2 changed files with 51 additions and 2 deletions

View File

@ -0,0 +1,38 @@
From 620b54f7d1c4bbf99d894ac3c8ddf3e73c29071f Mon Sep 17 00:00:00 2001
From: wu-changsheng <wuchangsheng2@huawei.com>
Date: Tue, 13 Sep 2022 22:33:48 +0800
Subject: [PATCH] delete rpath
---
app/meson.build | 1 -
app/test/meson.build | 2 --
2 files changed, 3 deletions(-)
diff --git a/app/meson.build b/app/meson.build
index 885dfe3..d1c6b25 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -74,7 +74,6 @@ foreach app:apps
link_whole: link_libs,
dependencies: ext_deps + dep_objs,
include_directories: includes,
- install_rpath: join_paths(get_option('prefix'), driver_install_path),
install: true)
endforeach
diff --git a/app/test/meson.build b/app/test/meson.build
index 2b480ad..51d09ec 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -488,8 +488,6 @@ dpdk_test = executable('dpdk-test',
link_whole: link_libs,
dependencies: test_dep_objs + ext_deps,
c_args: cflags,
- install_rpath: join_paths(get_option('prefix'),
- driver_install_path),
install: true)
has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'
--
2.23.0

View File

@ -1,6 +1,6 @@
Name: dpdk
Version: 21.11
Release: 16
Release: 17
Packager: packaging@6wind.com
URL: http://dpdk.org
%global source_version 21.11
@ -128,6 +128,7 @@ Patch9119: 0119-net-hns3-fix-TM-capability-incorrectly-defined.patch
Patch9120: 0120-app-testpmd-add-help-messages-for-multi-process.patch
Patch9121: 0121-app-testpmd-fix-use-of-indirect-action-after-port-cl.patch
Patch9122: 0122-app-testpmd-fix-bonding-slave-devices-not-released.patch
Patch9123: 0123-secure-complilation-options-rpath.patch
Patch6001: CVE-2021-3839.patch
Patch6002: CVE-2022-0669.patch
@ -184,11 +185,18 @@ This package contains the pdump tool for capture the dpdk network packets.
%build
export CFLAGS="%{optflags}"
meson build -Dexamples=l3fwd-power,ethtool,l3fwd,kni,dma,ptpclient
ninja -C build
ninja -C build -v
%install
DESTDIR=$RPM_BUILD_ROOT/ ninja install -C build
chrpath -d ./build/examples/dpdk-l3fwd
chrpath -d ./build/examples/dpdk-l3fwd-power
chrpath -d ./build/examples/dpdk-ethtool
chrpath -d ./build/examples/dpdk-kni
chrpath -d ./build/examples/dpdk-dma
chrpath -d ./build/examples/dpdk-ptpclient
cp ./build/examples/dpdk-l3fwd $RPM_BUILD_ROOT/usr/local/bin
cp ./build/examples/dpdk-l3fwd-power $RPM_BUILD_ROOT/usr/local/bin
cp ./build/examples/dpdk-ethtool $RPM_BUILD_ROOT/usr/local/bin
@ -255,6 +263,9 @@ strip -g $RPM_BUILD_ROOT/lib/modules/%{kern_devel_ver}/extra/dpdk/igb_uio.ko
/usr/sbin/depmod
%changelog
* Tue Sep 13 2022 jiangheng <jiangheng14@huawei.com> - 21.11-17
- remove secure compilation options rpath
* Fri Sep 09 2022 jiangheng <jiangheng14@huawei.com> - 21.11-16
- fix CVE-2022-28199