Skip to content

Commit

Permalink
Remove BUILD_DEB option
Browse files Browse the repository at this point in the history
This feature allows building a Debian package that can run on a desktop machine
as a kind of simulation mode. I'm not aware of anyone using this: real usages
build using Yocto or run locally in development. Remove this feature.
  • Loading branch information
cajun-rat committed Nov 27, 2024
1 parent 3d58e75 commit 09c0b0d
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 124 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Expand Down
6 changes: 0 additions & 6 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 0 additions & 20 deletions config/CMakeLists.txt

This file was deleted.

13 changes: 0 additions & 13 deletions config/systemd/aktualizr-ubuntu.service

This file was deleted.

7 changes: 0 additions & 7 deletions config/systemd/debian-control/postinst

This file was deleted.

20 changes: 0 additions & 20 deletions config/systemd/debian-control/postrm

This file was deleted.

9 changes: 0 additions & 9 deletions config/systemd/debian-control/prerm

This file was deleted.

1 change: 0 additions & 1 deletion docs/ota-client-guide/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
44 changes: 0 additions & 44 deletions docs/ota-client-guide/modules/ROOT/pages/deb-package-install.adoc

This file was deleted.

2 changes: 0 additions & 2 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit 09c0b0d

Please sign in to comment.