diff --git a/CMakeLists.txt b/CMakeLists.txt index 99a4a2fa6..7d8942f9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,6 @@ option(WARNING_AS_ERROR "Treat warnings as errors" ON) option(PEDANTIC_WARNINGS "Compile with pedantic warnings" OFF) option(BUILD_WITH_CODE_COVERAGE "Enable gcov code coverage" OFF) option(BUILD_OSTREE "Set to ON to compile with OSTree support" OFF) -option(BUILD_DEB "Set to ON to compile with debian packages support" OFF) option(BUILD_P11 "Support for key storage in a HSM via PKCS#11" OFF) option(BUILD_SOTA_TOOLS "Set to ON to build SOTA tools" OFF) option(FAULT_INJECTION "Set to ON to enable fault injection" OFF) @@ -398,7 +397,6 @@ set_source_files_properties(${PROJECT_BINARY_DIR}/jsoncpp/jsoncpp.cc PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-float-equal -Wno-switch-default -Wno-deprecated-declarations -Wno-unneeded-internal-declaration") add_library(jsoncpp OBJECT ${PROJECT_BINARY_DIR}/jsoncpp/jsoncpp.cc) -add_subdirectory("config") add_subdirectory("src") add_subdirectory("tests" EXCLUDE_FROM_ALL) add_subdirectory("docs/doxygen") diff --git a/README.adoc b/README.adoc index a24bca7fc..9a809cc69 100644 --- a/README.adoc +++ b/README.adoc @@ -145,12 +145,6 @@ You can then build the project from the `build` directory using Make: make ---- -You can also create a link:docs/ota-client-guide/modules/ROOT/pages/deb-package-install.adoc[debian package]: - ----- -make package ----- - To use CMake's link:https://ninja-build.org/[Ninja] backend, add `-G Ninja` to the first CMake invocation. It has the advantage of running all targets in parallel by default and is recommended for local development. === Running tests diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt deleted file mode 100644 index b9a582060..000000000 --- a/config/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -if(BUILD_DEB) - install(FILES systemd/aktualizr-ubuntu.service - DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system - RENAME aktualizr.service - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - COMPONENT aktualizr) - - install(FILES sota-local.toml - DESTINATION ${CMAKE_INSTALL_LIBDIR}/sota/conf.d - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - COMPONENT aktualizr) - - install(FILES secondary/virtualsec.json - DESTINATION ${CMAKE_INSTALL_LIBDIR}/sota/secondaries - RENAME demo_secondary.json - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - COMPONENT aktualizr) -endif(BUILD_DEB) - -install(DIRECTORY DESTINATION ${CMAKE_INSTALL_LIBDIR}/sota/conf.d COMPONENT aktualizr) diff --git a/config/systemd/aktualizr-ubuntu.service b/config/systemd/aktualizr-ubuntu.service deleted file mode 100644 index a347a6a16..000000000 --- a/config/systemd/aktualizr-ubuntu.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Aktualizr SOTA Client -Wants=network-online.target -After=network.target network-online.target -Requires=network-online.target - -[Service] -RestartSec=10 -Restart=always -ExecStart=/usr/bin/aktualizr - -[Install] -WantedBy=multi-user.target diff --git a/config/systemd/debian-control/postinst b/config/systemd/debian-control/postinst deleted file mode 100755 index 5df3330c3..000000000 --- a/config/systemd/debian-control/postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then - deb-systemd-helper unmask 'aktualizr.service' >/dev/null || true - deb-systemd-helper update-state 'aktualizr.service' >/dev/null || true -fi - diff --git a/config/systemd/debian-control/postrm b/config/systemd/debian-control/postrm deleted file mode 100755 index 03d73d033..000000000 --- a/config/systemd/debian-control/postrm +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -e - -if [ -d /run/systemd/system ]; then - systemctl --system daemon-reload > /dev/null || true -fi - -if [ "$1" = "remove" ]; then - if [ -x "/usr/bin/deb-systemd-helper" ]; then - deb-systemd-helper mask 'aktualizr.service' >/dev/null || true - fi -fi - -if [ "$1" = "purge" ]; then - if [ -x "/usr/bin/deb-systemd-helper" ]; then - deb-systemd-helper purge 'aktualizr.service' >/dev/null || true - deb-systemd-helper unmask 'aktualizr.service' >/dev/null || true - fi -fi diff --git a/config/systemd/debian-control/prerm b/config/systemd/debian-control/prerm deleted file mode 100755 index 3ed04f8d2..000000000 --- a/config/systemd/debian-control/prerm +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -e - -if [ "$1" = "remove" ]; then - if [ -x "/usr/bin/deb-systemd-helper" ]; then - deb-systemd-helper stop 'aktualizr.service' >/dev/null || true - fi -fi diff --git a/docs/ota-client-guide/modules/ROOT/nav.adoc b/docs/ota-client-guide/modules/ROOT/nav.adoc index 8bf83517d..bcff42ed9 100644 --- a/docs/ota-client-guide/modules/ROOT/nav.adoc +++ b/docs/ota-client-guide/modules/ROOT/nav.adoc @@ -87,7 +87,6 @@ ifndef::env-github[:pageroot:] * xref:{pageroot}use-your-own-deviceid.adoc[Configure your own device IDs] * xref:{pageroot}build-only-ostree.adoc[Build only the OSTree part] * xref:{pageroot}rollback.adoc[Set up rollback behavior] -* xref:{pageroot}deb-package-install.adoc[Install the client from a deb package] * xref:{pageroot}upload-large-binary.adoc[Upload a binary file] * xref:{pageroot}remove-sw-version.adoc[Remove a software version] * xref:{pageroot}push-images-with-bitbake.adoc[Upload Yocto images using offline credentials] diff --git a/docs/ota-client-guide/modules/ROOT/pages/deb-package-install.adoc b/docs/ota-client-guide/modules/ROOT/pages/deb-package-install.adoc deleted file mode 100644 index cd38793cf..000000000 --- a/docs/ota-client-guide/modules/ROOT/pages/deb-package-install.adoc +++ /dev/null @@ -1,44 +0,0 @@ -= Installing aktualizr via debian package -ifdef::env-github[] - -[NOTE] -==== -We recommend that you link:https://docs.ota.here.com/ota-client/latest/{docname}.html[view this article in our documentation portal]. Not all of our articles render correctly in GitHub. -==== -endif::[] - - -Aktualizr makes .deb packages available via the https://github.com/advancedtelematic/aktualizr/releases[GitHub releases page]. Download and install the .deb package, for example: - ----- -sudo apt install ./aktualizr.deb ----- - -== Setting up aktualizr - -The debian package will install, enable, and start an `aktualizr` systemd service immediately after it's installed. However, there are some configuration steps that should be taken before the service starts. To use aktualizr with a server (i.e. https://github.com/advancedtelematic/ota-community-edition/[OTA Community Edition] or https://docs.ota.here.com[HERE OTA Connect]), you will need to download the provisioning credentials file provided by the server and place it at `/var/sota/sota_provisioning_credentials.zip`. - -You can pass any other command-line arguments in this file, as well. - -For security reasons, we recommend creating the `/usr/lib/sota/sota.env` file even if you aren't going to use it. The file should be owned by root, with `600` permissions. - -== Secondary ECUs - -The debian package ships with a default Secondary ECU configured. This acts like a dummy device, dropping whatever file you send it into `/tmp/demo-virtual-secondary/firmware.bin`. - -== Building the debian package - -After following the main build setup steps, just `make package` instead of `make` to create a debian package from your current branch, for example: - ----- -git clone --recursive https://github.com/advancedtelematic/aktualizr -cd aktualizr -mkdir build -cd build -cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_DEB=ON .. -make package ----- - -== Making a Release on github - -The process for releasing a new version of aktualizr and updating the documentation is described xref:release-process.adoc[here]. diff --git a/scripts/test.sh b/scripts/test.sh index facd2e73a..3d39d3556 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -15,7 +15,6 @@ TEST_WITH_COVERAGE=${TEST_WITH_COVERAGE:-0} TEST_WITH_SOTA_TOOLS=${TEST_WITH_SOTA_TOOLS:-1} TEST_WITH_P11=${TEST_WITH_P11:-0} TEST_WITH_OSTREE=${TEST_WITH_OSTREE:-1} -TEST_WITH_DEB=${TEST_WITH_DEB:-1} TEST_WITH_FAULT_INJECTION=${TEST_WITH_FAULT_INJECTION:-0} TEST_CC=${TEST_CC:-gcc} @@ -43,7 +42,6 @@ if [[ $TEST_WITH_P11 = 1 ]]; then CMAKE_ARGS+=("-DTEST_PKCS11_MODULE_PATH=${TEST_PKCS11_MODULE_PATH}") fi if [[ $TEST_WITH_OSTREE = 1 ]]; then CMAKE_ARGS+=("-DBUILD_OSTREE=ON"); fi -if [[ $TEST_WITH_DEB = 1 ]]; then CMAKE_ARGS+=("-DBUILD_DEB=ON"); fi if [[ $TEST_WITH_FAULT_INJECTION = 1 ]]; then CMAKE_ARGS+=("-DFAULT_INJECTION=ON"); fi if [[ -n $TEST_SOTA_PACKED_CREDENTIALS ]]; then CMAKE_ARGS+=("-DSOTA_PACKED_CREDENTIALS=$TEST_SOTA_PACKED_CREDENTIALS");