diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-04-24 15:15:42 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-04-28 00:29:25 +0200 |
| commit | b1ee9d6cb0f28ba3dc5b35be97cd9507c39ede48 (patch) | |
| tree | 2fe9ee45196c6fa8ee907503dc2bb1495489087c /recipes-graphics/wayland/wayland-ivi-extension | |
| parent | 8885505217f4180eb82ffc3ac8b0b9a24f5036b5 (diff) | |
2nd part of the layer/profile rework [2/2]
Main goal of this is to move the agl-service-* bindings into the core and to
unify common recipes like wayland/weston into meta-agl-profile-graphical.
As a placeholder for recipes is meta-agl-profile-demo which are being reshuffled.
TLDR: remove recipes from meta-agl-demo that were moved to other layers
Bug-AGL: SPEC-145 , SPEC-876 , SPEC-877
v2: moving updated udisks changes to meta-agl
Change-Id: I873107f00adadeb6f3f266cce37b513fe6d44cf2
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-graphics/wayland/wayland-ivi-extension')
| -rw-r--r-- | recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch | 22 | ||||
| -rw-r--r-- | recipes-graphics/wayland/wayland-ivi-extension/test-path.patch | 55 |
2 files changed, 0 insertions, 77 deletions
diff --git a/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch b/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch deleted file mode 100644 index 5371174d..00000000 --- a/recipes-graphics/wayland/wayland-ivi-extension/cmake-find-gtest.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur old/ivi-input-api/test/CMakeLists.txt new/ivi-input-api/test/CMakeLists.txt ---- old/ivi-input-api/test/CMakeLists.txt 2015-10-19 23:31:13.000000000 +1000 -+++ new/ivi-input-api/test/CMakeLists.txt 2015-10-19 23:30:32.000000000 +1000 -@@ -18,6 +18,7 @@ - ############################################################################ - - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules) - - FIND_PACKAGE(gtest) - -diff -Naur old/ivi-layermanagement-api/test/CMakeLists.txt new/ivi-layermanagement-api/test/CMakeLists.txt ---- old/ivi-layermanagement-api/test/CMakeLists.txt 2015-10-19 23:31:20.000000000 +1000 -+++ new/ivi-layermanagement-api/test/CMakeLists.txt 2015-10-19 23:30:48.000000000 +1000 -@@ -18,6 +18,7 @@ - ############################################################################ - - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules) - - FIND_PACKAGE(gtest) - diff --git a/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch b/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch deleted file mode 100644 index 251bc58f..00000000 --- a/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch +++ /dev/null @@ -1,55 +0,0 @@ -From fbe0d0fd35ff79561dc2da853f1b0903bfde428d Mon Sep 17 00:00:00 2001 -From: Changhyeok Bae <changhyeok.bae@gmail.com> -Date: Thu, 1 Jun 2017 07:45:20 +0000 -Subject: [PATCH] test patch - ---- - ivi-input-api/test/CMakeLists.txt | 9 +++++---- - ivi-layermanagement-api/test/CMakeLists.txt | 7 ++++--- - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/ivi-input-api/test/CMakeLists.txt b/ivi-input-api/test/CMakeLists.txt -index db05d0f..db3b745 100644 ---- a/ivi-input-api/test/CMakeLists.txt -+++ b/ivi-input-api/test/CMakeLists.txt -@@ -65,12 +65,13 @@ IF(BUILD_ILM_API_TESTS) - - ADD_DEPENDENCIES(${PROJECT_NAME} ${LIBS}) - -- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -+ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-layermanagement-api) - - # use CTest - ENABLE_TESTING() -- ADD_TEST(ilmCommon ${PROJECT_NAME}) -- ADD_TEST(ilmControl ${PROJECT_NAME}) -- ADD_TEST(ilmInput ${PROJECT_NAME}) -+ ADD_TEST(ilmCommon {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmControl {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmInput {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) - - ENDIF() -diff --git a/ivi-layermanagement-api/test/CMakeLists.txt b/ivi-layermanagement-api/test/CMakeLists.txt -index fe9a0a4..090d734 100644 ---- a/ivi-layermanagement-api/test/CMakeLists.txt -+++ b/ivi-layermanagement-api/test/CMakeLists.txt -@@ -63,11 +63,12 @@ IF(BUILD_ILM_API_TESTS) - - ADD_DEPENDENCIES(${PROJECT_NAME} ${LIBS}) - -- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -+ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-layermanagement-api) - - # use CTest - ENABLE_TESTING() -- ADD_TEST(ilmCommon ${PROJECT_NAME}) -- ADD_TEST(ilmControl ${PROJECT_NAME}) -+ ADD_TEST(ilmCommon ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmControl ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) - - ENDIF() --- -2.7.4 - |