aboutsummaryrefslogtreecommitdiffstats
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-15 18:25:02 +0200
commitad62a0e91b3659b4b546f9b6e62a319572c9b116 (patch)
tree16bdb2d0b1546782e568447245888a7fe461f47c
parentfcbc0c64f39fac5ef0184d946ad53d8baf7f8e33 (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>
-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 b216c2a242b..b5002a26ec4 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -235,7 +235,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