aboutsummaryrefslogtreecommitdiffstats
path: root/extras/rpm
diff options
context:
space:
mode:
authorBenoît Ganne <bganne@cisco.com>2019-05-14 11:11:16 +0200
committerBenoît Ganne <bganne@cisco.com>2019-05-23 16:31:27 +0200
commitf0917bd5a7483aad270c4c17f097f84617aa20f3 (patch)
tree9d70c49d9b1ee93f0b3e2b3bb6d746e6dc1f6292 /extras/rpm
parent9febbcdc885880d716991ffaf581ff484cdd8731 (diff)
rpm: VPP-1674: exclude external headers from rpm
External libraries headers such as DPDK, libibverb, quicly, etc. should not be packaged in vpp-dev RPM. Only package headers from vpp/ and vom/ subdirs. Change-Id: Ief1454bd1261c8cf4dcd3b105e28f6852439e896 Signed-off-by: Benoît Ganne <bganne@cisco.com>
Diffstat (limited to 'extras/rpm')
-rw-r--r--extras/rpm/vpp-suse.spec2
-rw-r--r--extras/rpm/vpp.spec2
2 files changed, 2 insertions, 2 deletions
diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec
index cbe68607eb8..042e17a0b49 100644
--- a/extras/rpm/vpp-suse.spec
+++ b/extras/rpm/vpp-suse.spec
@@ -223,7 +223,7 @@ chmod -x %{buildroot}%{python_sitelib}/vpp_papi/*.txt
#
# devel
#
-for dir in $(find %{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
+for dir in %{_vpp_install_dir}/{vom,vpp}/include/
do
for subdir in $(cd ${dir} && find . -type d -print)
do
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 6d2732cf958..8b8f10e774a 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -228,7 +228,7 @@ install -m 0644 $MODULES \
#
# devel
#
-for dir in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
+for dir in %{_mu_build_dir}/%{_vpp_install_dir}/{vom,vpp}/include/
do
for subdir in $(cd ${dir} && find . -type d -print)
do