Merge pull request #958 from advancedtelematic/refactor/remove-legacy…

…-secondaries Refactor/remove legacy secondaries
advancedtelematic · Oct 5, 2018 · 6b0114e · 6b0114e
2 parents 74bfd23 + 792130e
commit 6b0114e
Show file tree

Hide file tree

Showing 33 changed files with 40 additions and 1,357 deletions.
diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
@@ -795,7 +795,6 @@ INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/../CONTRIBUTING.md \
                          @CMAKE_CURRENT_SOURCE_DIR@/../src/aktualizr_repo \
                          @CMAKE_CURRENT_SOURCE_DIR@/../src/aktualizr_secondary \
                          @CMAKE_CURRENT_SOURCE_DIR@/../src/cert_provider \
-                         @CMAKE_CURRENT_SOURCE_DIR@/../src/external_secondaries \
                          @CMAKE_CURRENT_SOURCE_DIR@/../src/hmi_stub \
                          @CMAKE_CURRENT_SOURCE_DIR@/../src/implicit_writer \
                          @CMAKE_CURRENT_SOURCE_DIR@/../src/libaktualizr \

diff --git a/docs/README.adoc b/docs/README.adoc
@@ -16,8 +16,6 @@ link:./hsm-provisioning.adoc[hsm-provisioning.adoc] - An explanation of aktualiz
 
 link:./implicit-provisioning.adoc[implicit-provisioning.adoc] - Implicit provisioning an alternative to automatic provisioning. It's distinct from automatic provisioning in that it requires each image to have some unique credentials side-loaded.
 
-link:./legacysecondary.adoc[legacysecondary.adoc] - Aktualizr is designed for automotive use cases, including sending updates to secondary ECUs that don't have their own internet connection.
-
 link:./linux-secondaries.adoc[linux-secondaries.adoc] - A quick how-to demonstrating aktualizr on a secondary ECU, using two QEMU devices.
 
 link:./opcua-bridge.adoc[opcua-bridge.adoc] - Some basic documentation on getting OPC-UA working. OPC-UA is a protocol for in-vehicle inter-ECU communication.

diff --git a/docs/configuration.adoc b/docs/configuration.adoc
@@ -101,7 +101,6 @@ Options for Uptane.
 | `repo_server`             |              | Image repository server URL. If empty, set to `tls.server` with `/repo` appended.
 | `key_source`              | `"file"`     | Where to read the device's private key from. Options: `"file"`, `"pkcs11"`.
 | `key_type`                | `"RSA2048"`  | Type of cryptographic keys to use. Options: `"ED25519"`, `"RSA2048"`, `"RSA3072"` or `"RSA4096"`.
-| `legacy_interface`        |              | Path to an executable interface for communicating with legacy secondary ECUs. See link:{aktualizr-github-url}/docs/legacysecondary.adoc[] for more information.
 |==========================================================================================
 
 == `discovery`

diff --git a/docs/legacysecondary.adoc b/docs/legacysecondary.adoc
diff --git a/docs/secondaries.svg b/docs/secondaries.svg
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -14,6 +14,4 @@ add_subdirectory("cert_provider")
 add_subdirectory("implicit_writer")
 add_subdirectory("hmi_stub")
 
-add_subdirectory("external_secondaries")
-
 add_subdirectory("load_tests")
diff --git a/src/aktualizr_primary/main.cc b/src/aktualizr_primary/main.cc
@@ -42,10 +42,7 @@ bpo::variables_map parse_options(int argc, char *argv[]) {
       ("primary-ecu-serial", bpo::value<std::string>(), "serial number of primary ecu")
       ("primary-ecu-hardware-id", bpo::value<std::string>(), "hardware ID of primary ecu")
       ("secondary-config", bpo::value<std::vector<boost::filesystem::path> >()->composing(), "secondary ECU json configuration file")
-      ("legacy-interface", bpo::value<boost::filesystem::path>(), "path to legacy secondary ECU interface program")
-      ("campaign-id", bpo::value<std::string>(), "id of the campaign to act on")
-      ("disable-keyid-validation", "deprecated")
-      ("gateway-socket", bpo::value<bool>(), "deprecated");
+      ("campaign-id", bpo::value<std::string>(), "id of the campaign to act on");
   // clang-format on
 
   // consider the first positional argument as the aktualizr running mode