From 13169c3265ba75d783eb3723504298a08e768110 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 9 Aug 2022 11:33:17 +0200 Subject: Rename Instrument Cluster Container layer meta-agl-lxc is no longer reflecting the actual content and use of the layer. Rename it to 'meta-agl-ic-container' and the feature to 'agl-ic-container'. Also rename the main image to 'agl-cluster-demo-lxc-host' to match the pattern used by all other images e.g. agl--demo-* . But keep the names of the underlying images as-is. Bug-AGL: SPEC-4464 Signed-off-by: Jan-Simon Moeller Change-Id: I898c786ca884331b302a3be8e150379fcf5bdc9b --- ...ontroller-update-to-weston-7-header-files.patch | 31 ---------- ...-id-agent-update-to-weston-7-header-files.patch | 33 ----------- ...t-update-dependencies-to-build-on-weston-.patch | 31 ---------- ...t-update-dependencies-to-build-on-weston-.patch | 28 --------- .../0005-Fix-buld-error-in-krikston.patch | 68 ---------------------- ...weston-6-support-and-adjust-weston-7-8-10.patch | 31 ---------- 6 files changed, 222 deletions(-) delete mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-ivi-input-controller-update-to-weston-7-header-files.patch delete mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-id-agent-update-to-weston-7-header-files.patch delete mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-id-agent-update-dependencies-to-build-on-weston-.patch delete mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0004-ivi-id-agent-update-dependencies-to-build-on-weston-.patch delete mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0005-Fix-buld-error-in-krikston.patch delete mode 100644 meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0006-Drop-weston-6-support-and-adjust-weston-7-8-10.patch (limited to 'meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension') diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-ivi-input-controller-update-to-weston-7-header-files.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-ivi-input-controller-update-to-weston-7-header-files.patch deleted file mode 100644 index b19243e0..00000000 --- a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0001-ivi-input-controller-update-to-weston-7-header-files.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6432f46f500321518e9a588215d4635ef7466692 Mon Sep 17 00:00:00 2001 -From: Rajendraprasad K J -Date: Mon, 6 Jan 2020 06:41:57 -0500 -Subject: [PATCH 1/6] ivi-input-controller: update to weston 7 header files - -update the header file path. - -Upstream-Status: Submitted [https://github.com/GENIVI/wayland-ivi-extension/pull/110] - -Signed-off-by: Rajendraprasad K J -Signed-off-by: Gowtham Tammana ---- - .../ivi-input-controller/src/ivi-input-controller.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c -index b4d54d1..8974115 100644 ---- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c -+++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c -@@ -31,7 +31,7 @@ - #include - #include - --#include "plugin-registry.h" -+#include - #include "ilm_types.h" - - #include "ivi-input-server-protocol.h" --- -2.17.1 - diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-id-agent-update-to-weston-7-header-files.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-id-agent-update-to-weston-7-header-files.patch deleted file mode 100644 index 87e286ab..00000000 --- a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0002-ivi-id-agent-update-to-weston-7-header-files.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7b7a5e96388f2431e750583a035962d261292b43 Mon Sep 17 00:00:00 2001 -From: Rajendraprasad K J -Date: Mon, 6 Jan 2020 06:45:11 -0500 -Subject: [PATCH 2/6] ivi-id-agent: update to weston 7 header files - -update the header file path. - -Upstream-Status: Submitted [https://github.com/GENIVI/wayland-ivi-extension/pull/110] - -Signed-off-by: Rajendraprasad K J -Signed-off-by: Gowtham Tammana ---- - ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c -index 8f0c199..b80e2a4 100644 ---- a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c -+++ b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c -@@ -26,8 +26,8 @@ - #include - - #include --#include --#include "config-parser.h" -+#include -+#include - #include - - #ifndef INVALID_ID --- -2.17.1 - diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-id-agent-update-dependencies-to-build-on-weston-.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-id-agent-update-dependencies-to-build-on-weston-.patch deleted file mode 100644 index dcb21a1a..00000000 --- a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-id-agent-update-dependencies-to-build-on-weston-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 46ef7140611d684d1dbecd866608333e67a1985e Mon Sep 17 00:00:00 2001 -From: Rajendraprasad K J -Date: Mon, 6 Jan 2020 06:45:54 -0500 -Subject: [PATCH 3/6] ivi-id-agent: update dependencies to build on weston 8 - -upgrade libweston-desktop version. - -Upstream-Status: Submitted [https://github.com/GENIVI/wayland-ivi-extension/pull/110] - -Signed-off-by: Rajendraprasad K J -Signed-off-by: Gowtham Tammana ---- - ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt -index 3e604a5..4f285c2 100644 ---- a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt -+++ b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt -@@ -25,7 +25,7 @@ find_package(PkgConfig REQUIRED) - pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED) - pkg_check_modules(WESTON weston>=6.0.0 REQUIRED) - pkg_check_modules(PIXMAN pixman-1 REQUIRED) --pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-6 REQUIRED) -+pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-8 REQUIRED) - - find_package(Threads REQUIRED) - --- -2.17.1 - diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0004-ivi-id-agent-update-dependencies-to-build-on-weston-.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0004-ivi-id-agent-update-dependencies-to-build-on-weston-.patch deleted file mode 100644 index 509becb6..00000000 --- a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0004-ivi-id-agent-update-dependencies-to-build-on-weston-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7b301a1832c81d814a8475c8679eddd3d43f3487 Mon Sep 17 00:00:00 2001 -From: Naoto Yamaguchi -Date: Thu, 28 Apr 2022 07:18:50 +0900 -Subject: [PATCH 4/6] ivi-id-agent: update dependencies to build on weston 10 - -upgrade libweston-desktop version. - -Signed-off-by: Naoto Yamaguchi ---- - ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt -index 4f285c2..a67ac5a 100644 ---- a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt -+++ b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt -@@ -25,7 +25,7 @@ find_package(PkgConfig REQUIRED) - pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED) - pkg_check_modules(WESTON weston>=6.0.0 REQUIRED) - pkg_check_modules(PIXMAN pixman-1 REQUIRED) --pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-8 REQUIRED) -+pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-10 REQUIRED) - - find_package(Threads REQUIRED) - --- -2.17.1 - diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0005-Fix-buld-error-in-krikston.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0005-Fix-buld-error-in-krikston.patch deleted file mode 100644 index ab9c13f2..00000000 --- a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0005-Fix-buld-error-in-krikston.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c54194acfc807fa3e1f5ce14e83826ebc6966ca7 Mon Sep 17 00:00:00 2001 -From: Naoto Yamaguchi -Date: Thu, 28 Apr 2022 07:26:09 +0900 -Subject: [PATCH 5/6] Fix buld error in krikston - -Signed-off-by: Naoto Yamaguchi ---- - ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h | 2 +- - .../ilmClient/src/ilm_client_wayland_platform.c | 2 ++ - ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h | 2 +- - .../ilmCommon/src/ilm_common_wayland_platform.c | 2 ++ - 4 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h b/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h -index 1fb10af..56368dc 100644 ---- a/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h -+++ b/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h -@@ -35,7 +35,7 @@ typedef struct _ILM_CLIENT_PLATFORM_FUNC - ilmErrorTypes (*destroy)(); - } ILM_CLIENT_PLATFORM_FUNC; - --ILM_CLIENT_PLATFORM_FUNC gIlmClientPlatformFunc; -+extern ILM_CLIENT_PLATFORM_FUNC gIlmClientPlatformFunc; - - void init_ilmClientPlatformTable(); - -diff --git a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c -index 55b1621..8786251 100644 ---- a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c -+++ b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c -@@ -35,6 +35,8 @@ static ilmErrorTypes wayland_surfaceRemove(const t_ilm_surface surfaceId); - static ilmErrorTypes wayland_init(t_ilm_nativedisplay nativedisplay); - static ilmErrorTypes wayland_destroy(void); - -+ILM_CLIENT_PLATFORM_FUNC gIlmClientPlatformFunc; -+ - void init_ilmClientPlatformTable(void) - { - gIlmClientPlatformFunc.surfaceCreate = -diff --git a/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h b/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h -index 4e7b55e..ec49467 100644 ---- a/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h -+++ b/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h -@@ -32,7 +32,7 @@ typedef struct _ILM_COMMON_PLATFORM_FUNC - ilmErrorTypes (*destroy)(); - } ILM_COMMON_PLATFORM_FUNC; - --ILM_COMMON_PLATFORM_FUNC gIlmCommonPlatformFunc; -+extern ILM_COMMON_PLATFORM_FUNC gIlmCommonPlatformFunc; - - void init_ilmCommonPlatformTable(); - -diff --git a/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c b/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c -index 7470d0d..eef842d 100644 ---- a/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c -+++ b/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c -@@ -32,6 +32,8 @@ static t_ilm_nativedisplay wayland_getNativedisplay(void); - static t_ilm_bool wayland_isInitialized(void); - static ilmErrorTypes wayland_destroy(void); - -+ILM_COMMON_PLATFORM_FUNC gIlmCommonPlatformFunc; -+ - void init_ilmCommonPlatformTable(void) - { - gIlmCommonPlatformFunc.init = wayland_init; --- -2.17.1 - diff --git a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0006-Drop-weston-6-support-and-adjust-weston-7-8-10.patch b/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0006-Drop-weston-6-support-and-adjust-weston-7-8-10.patch deleted file mode 100644 index 035e597b..00000000 --- a/meta-agl-lxc/recipes-graphics/wayland/wayland-ivi-extension/0006-Drop-weston-6-support-and-adjust-weston-7-8-10.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d25c266858ffbea51b435190ea8697d4a4511355 Mon Sep 17 00:00:00 2001 -From: Naoto Yamaguchi -Date: Thu, 28 Apr 2022 08:00:07 +0900 -Subject: [PATCH 6/6] Drop weston 6 support and adjust weston 7,8,10 - -Signed-off-by: Naoto Yamaguchi ---- - ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt -index a67ac5a..a4b4e1a 100644 ---- a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt -+++ b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt -@@ -23,9 +23,11 @@ project(ivi-id-agent) - - find_package(PkgConfig REQUIRED) - pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED) --pkg_check_modules(WESTON weston>=6.0.0 REQUIRED) -+pkg_check_modules(WESTON weston>=7.0.0 REQUIRED) - pkg_check_modules(PIXMAN pixman-1 REQUIRED) --pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-10 REQUIRED) -+pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-10) -+pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-8) -+pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-7) - - find_package(Threads REQUIRED) - --- -2.17.1 - -- cgit 1.2.3-korg