13 files changed, 34 insertions(+), 9 deletions(-)

M .gitmodules
M CMakeLists.txt
M module-services/service-desktop/CMakeLists.txt
D module-services/service-desktop/endpoints/CMakeLists.txt
M module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp
M module-utils/CMakeLists.txt
M module-utils/Utils.cpp
M module-utils/bootconfig/CMakeLists.txt
M module-utils/bootconfig/src/bootconfig.cpp
D module-utils/crc32
A third-party/CMakeLists.txt
A third-party/crc32/CMakeLists.txt
A third-party/crc32/src

@@ 9,7 9,7 @@
 	path = module-utils/segger
 	url = ../segger-utils.git
 [submodule "module-utils/crc32"]
-	path = module-utils/crc32
+	path = third-party/crc32/src
 	url = ../crc32
 [submodule "module-utils/re2"]
 	path = module-utils/re2

@@ 192,6 192,8 @@ add_subdirectory(module-bluetooth)
 message("${PROJECT_NAME}: add_subdirectory module-lwip")
 add_subdirectory(module-lwip)
 
+add_subdirectory(third-party)
+
 add_subdirectory(image)
 
 set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SUFFIX ".elf")

@@ 58,6 58,7 @@ target_link_libraries(${PROJECT_NAME}
         service-evtmgr
         module-utils
         module-cellular
+        crc32
 )
 
 if (${ENABLE_TESTS})

@@ 6,7 6,7 @@
 #include <service-desktop/DesktopMessages.hpp>
 
 #include <SystemManager/SystemManager.hpp>
-#include <crc32/crc32.h>
+#include <crc32.h>
 #include <json/json11.hpp>
 #include <log/log.hpp>
 #include <microtar/src/microtar.hpp>

@@ 29,7 29,6 @@ set (SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/ucs2/UCS2.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/time/time_date_validation.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/microtar/src/microtar.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/crc32/crc32.c
         ${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/NumberHolderMatcher.hpp


@@ 68,6 67,8 @@ set( TAGLIB_INCLUDE_DIRS
 	 PARENT_SCOPE
 )
 
+target_link_libraries(${PROJECT_NAME} PRIVATE crc32 )
+
 # link against tinyexpr
 target_link_libraries (${PROJECT_NAME} PUBLIC ${TINYEXPR_TARGET})
 

@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Utils.hpp"
 #include <filesystem>
-#include <crc32/crc32.h>
+#include <crc32.h>
 
 namespace utils::filesystem
 {

@@ 15,4 15,10 @@ set( INCLUDES
 add_library( ${PROJECT_NAME} STATIC ${SOURCES} )
 
 target_include_directories( ${PROJECT_NAME} PUBLIC ${INCLUDES} )
-target_link_libraries( ${PROJECT_NAME} PRIVATE module-utils module-vfs)
+
+target_link_libraries( ${PROJECT_NAME}
+   PRIVATE
+      module-utils
+      module-vfs
+      crc32
+)

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 #include <boot/bootconfig.hpp>
 #include <boot/bootconstants.hpp>


@@ 11,7 11,7 @@
 #include <ticks.hpp>
 #include <cstdio>
 #include <log/log.hpp>
-#include <crc32/crc32.h>
+#include <crc32.h>
 #include <array>
 #include <Utils.hpp>
 

@@ 1,1 0,0 @@
-Subproject commit f38cbc9267a4cc24aeb92c04452d9ade803d168c

@@ 0,0 1,2 @@
+
+add_subdirectory(crc32)

@@ 0,0 1,13 @@
+
+add_library(crc32)
+target_sources(crc32
+   PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}/src/crc32.c
+      ${CMAKE_CURRENT_SOURCE_DIR}/src/crc32.h
+)
+
+target_include_directories(crc32
+   PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+)
+

@@ 0,0 1,1 @@
+Subproject commit f38cbc9267a4cc24aeb92c04452d9ade803d168c