From: Jan-Simon Moeller Date: Fri, 4 Feb 2022 15:24:52 +0000 (+0100) Subject: Update inclusion in agl-demo-platform-crosssdk for openssh change X-Git-Tag: 12.92.0^0 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=1e713e0e0823965615caa8956d490018f8efea74 Update inclusion in agl-demo-platform-crosssdk for openssh change 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 Change-Id: Ief802f0212f2a464157f9dfc962686a479170715 --- 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 + "