aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-02-04 16:24:52 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-02-07 14:22:05 +0000
commit1e713e0e0823965615caa8956d490018f8efea74 (patch)
tree4883a9c923e5e0b022f82b01d40e873d7fcc6bcb
parent00b91477d5d3aaedaa2d35ed96fffdf42a6ea14b (diff)
Update inclusion in agl-demo-platform-crosssdk for openssh changemarlin_12.92.0marlin/12.92.012.92.0
The sdk build did not catch the change to openssh as it used the wrong include file. Fix it by icluding the right file. Bug-AGL: SPEC-4243 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Ief802f0212f2a464157f9dfc962686a479170715
-rw-r--r--recipes-platform/images/agl-image-ivi.bb2
-rw-r--r--recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb6
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-image-ivi.bb
index 0a21a344b..2b083be00 100644
--- a/recipes-platform/images/agl-image-ivi.bb
+++ b/recipes-platform/images/agl-image-ivi.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Basic image for baseline of AGL Distribution for IVI profile."
LICENSE = "MIT"
-require recipes-platform/images/agl-image-minimal.inc
+require recipes-platform/images/agl-image-weston.inc
IMAGE_INSTALL:append = "\
packagegroup-agl-image-ivi \
diff --git a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb b/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
index 490047635..45db0e308 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
@@ -5,6 +5,8 @@ It includes the full meta-toolchain, plus developement headers and libraries \
to form a standalone cross SDK."
+require agl-image-ivi.bb
+
# add packages for demo platform (include demo apps) here
IMAGE_INSTALL:append = " \
packagegroup-agl-demo-platform \
@@ -12,8 +14,6 @@ IMAGE_INSTALL:append = " \
LICENSE = "MIT"
-#require agl-image-graphical-qt5-crosssdk.inc
-require recipes-platform/images/agl-image-weston.inc
require recipes-platform/images/agl-image-minimal-crosssdk.inc
# Add wayland-scanner to SDK (SPEC-945)
@@ -56,4 +56,4 @@ TOOLCHAIN_HOST_TASK += " \
TOOLCHAIN_TARGET_TASK += " \
lua-dev \
lua-staticdev \
- " \ No newline at end of file
+ "