From: Benoît Ganne <bganne@cisco.com>
Date: Tue, 14 May 2019 09:11:16 +0000 (+0200)
Subject: rpm: VPP-1674: exclude external headers from rpm
X-Git-Tag: v20.01-rc0~568
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F19792%2F1;p=vpp.git

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>
---

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