diff options
| -rw-r--r-- | docs/gettingstarted/developers/buildsystem/cmakeandninja.rst | 2 | ||||
| -rw-r--r-- | extras/deprecated/elftool/CMakeLists.txt (renamed from src/tools/elftool/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | extras/deprecated/elftool/dir.dox (renamed from src/tools/elftool/dir.dox) | 0 | ||||
| -rw-r--r-- | extras/deprecated/elftool/elftool.c (renamed from src/tools/elftool/elftool.c) | 0 | ||||
| -rw-r--r-- | extras/rpm/vpp-suse.spec | 1 | ||||
| -rw-r--r-- | extras/rpm/vpp.spec | 1 | ||||
| -rw-r--r-- | extras/selinux/vpp-custom.fc | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
8 files changed, 2 insertions, 5 deletions
diff --git a/docs/gettingstarted/developers/buildsystem/cmakeandninja.rst b/docs/gettingstarted/developers/buildsystem/cmakeandninja.rst index b6d83f225ce..580d261bdac 100644 --- a/docs/gettingstarted/developers/buildsystem/cmakeandninja.rst +++ b/docs/gettingstarted/developers/buildsystem/cmakeandninja.rst @@ -34,7 +34,7 @@ of files: rule/function definitions, and target lists. 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 index d85c2b56c59..d85c2b56c59 100644 --- a/src/tools/elftool/CMakeLists.txt +++ b/extras/deprecated/elftool/CMakeLists.txt diff --git a/src/tools/elftool/dir.dox b/extras/deprecated/elftool/dir.dox index 40426e04df7..40426e04df7 100644 --- a/src/tools/elftool/dir.dox +++ b/extras/deprecated/elftool/dir.dox diff --git a/src/tools/elftool/elftool.c b/extras/deprecated/elftool/elftool.c index e808c619da8..e808c619da8 100644 --- a/src/tools/elftool/elftool.c +++ b/extras/deprecated/elftool/elftool.c diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec index 042e17a0b49..4bb354cda90 100644 --- a/extras/rpm/vpp-suse.spec +++ b/extras/rpm/vpp-suse.spec @@ -289,7 +289,6 @@ export NO_BRP_CHECK_RPATH=true %{_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 f2de430d670..538c071caea 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -375,7 +375,6 @@ fi %{_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 4b4428e7150..166166e7f6e 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 1564fd0ad8c..2e3cf6b1d68 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -143,7 +143,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") 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") |