diff options
| author |   Jonathan Aillet <jonathan.aillet@iot.bzh> | 2019-01-21 17:24:21 +0100 |
|---|---|---|
| committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2019-01-28 15:38:58 +0100 |
| commit | 9f6a13d05025bc33c12b6103d9bb960e842270d2 (patch) | |
| tree | d0d54df948d94afa359cddf34fce5596e44cdd16 | |
| parent | 756f8d02b445631df44243d528165fb1fe414487 (diff) | |
Migrate afb-helpers from submodule to library
Change-Id: I1d554d29e11f7bac327ed65b4187dac3572ae0a6
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | 4a-hal-utilities/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | 4a-hal/CMakeLists.txt | 1 | ||||
| m--------- | afb-helpers | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 3 | ||||
| -rw-r--r-- | plugins/lib/bluealsa/CMakeLists.txt | 1 |
6 files changed, 2 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index 91b4a80..1b125e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "app-controller"] path = app-controller url = https://gerrit.automotivelinux.org/gerrit/apps/app-controller-submodule -[submodule "afb-helpers"] - path = afb-helpers - url = https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule diff --git a/4a-hal-utilities/CMakeLists.txt b/4a-hal-utilities/CMakeLists.txt index f5c8eca..f9291ea 100644 --- a/4a-hal-utilities/CMakeLists.txt +++ b/4a-hal-utilities/CMakeLists.txt @@ -30,7 +30,6 @@ PROJECT_TARGET_ADD(4a-hal-utilities) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} - afb-helpers ctl-utilities ${link_libraries} ) diff --git a/4a-hal/CMakeLists.txt b/4a-hal/CMakeLists.txt index 5392075..38cbc29 100644 --- a/4a-hal/CMakeLists.txt +++ b/4a-hal/CMakeLists.txt @@ -43,7 +43,6 @@ PROJECT_TARGET_ADD(4a-hal) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} - afb-helpers ctl-utilities 4a-hal-utilities ${link_libraries} diff --git a/afb-helpers b/afb-helpers deleted file mode 160000 -Subproject f0ce5b665dd33b285d723720c16ac0542cde4e6 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 7fa414c..b771524 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -72,7 +72,8 @@ set (PKG_REQUIRED_LIST afb-daemon>=4.0 libmicrohttpd>=0.9.55 uuid - alsa>=1.1.2 + alsa>=1.1.2 + afb-helpers ) # Prefix path where will be installed the files diff --git a/plugins/lib/bluealsa/CMakeLists.txt b/plugins/lib/bluealsa/CMakeLists.txt index 28a903a..6243200 100644 --- a/plugins/lib/bluealsa/CMakeLists.txt +++ b/plugins/lib/bluealsa/CMakeLists.txt @@ -37,7 +37,6 @@ PROJECT_TARGET_ADD(hal-bluealsa) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} - afb-helpers ctl-utilities 4a-hal-utilities ${BLUEALSA_LIBRARIES} |