misc: deprecate elftool
Type: make
Change-Id: I34fec1c40ef660177c266517eaf41d60827609f4
Signed-off-by: Damjan Marion <damarion@cisco.com>
diff --git a/docs/gettingstarted/developers/buildsystem/cmakeandninja.rst b/docs/gettingstarted/developers/buildsystem/cmakeandninja.rst
index b6d83f2..580d261 100644
--- a/docs/gettingstarted/developers/buildsystem/cmakeandninja.rst
+++ b/docs/gettingstarted/developers/buildsystem/cmakeandninja.rst
@@ -34,7 +34,7 @@
find_package(OpenSSL REQUIRED)
set(SUBDIRS
vppinfra svm vlib vlibmemory vlibapi vnet vpp vat vcl plugins
- vpp-api tools/vppapigen tools/g2 tools/elftool tools/perftool)
+ vpp-api tools/vppapigen tools/g2 tools/perftool)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
set(SUBDIRS vppinfra)
else()
diff --git a/src/tools/elftool/CMakeLists.txt b/extras/deprecated/elftool/CMakeLists.txt
similarity index 100%
rename from src/tools/elftool/CMakeLists.txt
rename to extras/deprecated/elftool/CMakeLists.txt
diff --git a/src/tools/elftool/dir.dox b/extras/deprecated/elftool/dir.dox
similarity index 100%
rename from src/tools/elftool/dir.dox
rename to extras/deprecated/elftool/dir.dox
diff --git a/src/tools/elftool/elftool.c b/extras/deprecated/elftool/elftool.c
similarity index 100%
rename from src/tools/elftool/elftool.c
rename to extras/deprecated/elftool/elftool.c
diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec
index 042e17a..4bb354c 100644
--- a/extras/rpm/vpp-suse.spec
+++ b/extras/rpm/vpp-suse.spec
@@ -289,7 +289,6 @@
%{_unitdir}/vpp.service
%{_bindir}/vpp*
%{_bindir}/svm*
-%{_bindir}/elftool
%dir %{_sysconfdir}/vpp
%config %{_sysconfdir}/sysctl.d/80-vpp.conf
%config %{_sysconfdir}/vpp/startup.conf
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index f2de430..538c071 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -375,7 +375,6 @@
%{_unitdir}/vpp.service
/usr/bin/vpp*
/usr/bin/svm*
-/usr/bin/elftool
%config(noreplace) /etc/sysctl.d/80-vpp.conf
%config(noreplace) /etc/vpp/startup.conf
/usr/share/vpp/api/*
diff --git a/extras/selinux/vpp-custom.fc b/extras/selinux/vpp-custom.fc
index 4b4428e..166166e 100644
--- a/extras/selinux/vpp-custom.fc
+++ b/extras/selinux/vpp-custom.fc
@@ -1,6 +1,5 @@
/etc/vpp(/.*)? gen_context(system_u:object_r:vpp_config_rw_t,s0)
-/usr/bin/elftool -- gen_context(system_u:object_r:vpp_exec_t,s0)
/usr/bin/svmdbtool -- gen_context(system_u:object_r:vpp_exec_t,s0)
/usr/bin/svmtool -- gen_context(system_u:object_r:vpp_exec_t,s0)
/usr/bin/vpp -- gen_context(system_u:object_r:vpp_exec_t,s0)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1564fd0..2e3cf6b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -143,7 +143,7 @@
find_package(OpenSSL REQUIRED)
set(SUBDIRS
vppinfra svm vlib vlibmemory vlibapi vnet vpp vat vcl plugins
- vpp-api tools/vppapigen tools/g2 tools/elftool tools/perftool cmake pkg
+ vpp-api tools/vppapigen tools/g2 tools/perftool cmake pkg
tools/appimage
)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")