diff options
Diffstat (limited to 'templates')
8 files changed, 28 insertions, 16 deletions
diff --git a/templates/base/00_local.conf.agl.inc b/templates/base/00_local.conf.agl.inc index 1cfd90557..30fc68f7d 100644 --- a/templates/base/00_local.conf.agl.inc +++ b/templates/base/00_local.conf.agl.inc @@ -6,3 +6,6 @@ DISTRO = "poky-agl" #see meta-agl/meta-agl/conf/include/base-agl.inc require conf/include/base-agl.inc + +#see meta-agl/meta-app-framework/conf/include/agl-appfw-smack.inc +require conf/include/agl-appfw-smack.inc diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample index d86954698..0c3114f8c 100644 --- a/templates/base/bblayers.conf.sample +++ b/templates/base/bblayers.conf.sample @@ -24,12 +24,19 @@ YOCTO_LAYERS = " \ # with some automotive tools/libraries #----------------------------------------------------- AGL_CORE_LAYERS = " \ - ${METADIR}/meta-agl/meta-ivi-common \ - ${METADIR}/meta-agl/meta-agl \ + ${METADIR}/meta-agl/meta-agl-profile-core \ ${METADIR}/meta-agl/meta-agl-distro \ ${METADIR}/meta-agl/meta-agl-bsp \ " +AGL_APPFW_LAYERS = " \ + ${METADIR}/meta-security \ + ${METADIR}/meta-openembedded/meta-perl \ + ${METADIR}/meta-agl/meta-security \ + ${METADIR}/meta-agl/meta-app-framework \ + " + + # These are the direct dependencies of the AGL CORE Layers #--------------------------------------------------------- AGL_CORE_DEPENDENCY_LAYERS = " \ @@ -40,18 +47,29 @@ AGL_CORE_DEPENDENCY_LAYERS = " \ ${METADIR}/meta-openembedded/meta-filesystems \ " +# temporary ... to avoid build breakage. To move to upper layers. +AGL_TEMP_GFX_LAYERS = " \ + ${METADIR}/meta-agl/meta-agl-profile-graphical \ + ${METADIR}/meta-agl/meta-agl-profile-demo \ + " + + #################### # Combine the layers BBLAYERS ?= " \ ${AGL_CORE_DEPENDENCY_LAYERS} \ ${AGL_CORE_LAYERS} \ + ${AGL_APPFW_LAYERS} \ + ${AGL_TEMP_GFX_LAYERS} \ ${YOCTO_LAYERS} \ " BBLAYERS_NON_REMOVABLE ?= " \ ${METADIR}/poky/meta \ ${METADIR}/poky/meta-poky \ - ${METADIR}//meta-agl/meta-agl \ + ${METADIR}/meta-agl/meta-agl-profile-core \ + ${METADIR}/meta-agl/meta-agl-distro \ " + diff --git a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc deleted file mode 100644 index 7f5f24eb5..000000000 --- a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc +++ /dev/null @@ -1,7 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/meta-security \ - ${METADIR}/meta-openembedded/meta-perl \ - ${METADIR}/meta-agl/meta-security \ - ${METADIR}/meta-agl/meta-app-framework \ - " - diff --git a/templates/feature/agl-appfw-smack/50_local.conf.inc b/templates/feature/agl-appfw-smack/50_local.conf.inc index 0a11f07c2..e69de29bb 100644 --- a/templates/feature/agl-appfw-smack/50_local.conf.inc +++ b/templates/feature/agl-appfw-smack/50_local.conf.inc @@ -1,2 +0,0 @@ -#see meta-agl/meta-app-framework/conf/include/agl-appfw-smack.inc -require conf/include/agl-appfw-smack.inc diff --git a/templates/feature/agl-ci-change-features-nogfx/included.dep b/templates/feature/agl-ci-change-features-nogfx/included.dep index 49f5dd12d..56b4cd1a9 100644 --- a/templates/feature/agl-ci-change-features-nogfx/included.dep +++ b/templates/feature/agl-ci-change-features-nogfx/included.dep @@ -1 +1 @@ -agl-devel agl-netboot agl-appfw-smack
\ No newline at end of file +agl-devel agl-netboot
\ No newline at end of file diff --git a/templates/feature/agl-ci-change-features/included.dep b/templates/feature/agl-ci-change-features/included.dep index fdd01e6a8..280452454 100644 --- a/templates/feature/agl-ci-change-features/included.dep +++ b/templates/feature/agl-ci-change-features/included.dep @@ -1 +1 @@ -agl-demo agl-devel agl-netboot agl-appfw-smack +agl-demo agl-devel agl-netboot diff --git a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep index 00e77831a..c2e48284f 100644 --- a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep +++ b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep @@ -1 +1 @@ -agl-devel agl-netboot agl-appfw-smack agl-archiver +agl-devel agl-netboot agl-archiver diff --git a/templates/feature/agl-ci-snapshot-features/included.dep b/templates/feature/agl-ci-snapshot-features/included.dep index 219beeec4..c382e609c 100644 --- a/templates/feature/agl-ci-snapshot-features/included.dep +++ b/templates/feature/agl-ci-snapshot-features/included.dep @@ -1 +1 @@ -agl-demo agl-devel agl-netboot agl-appfw-smack agl-archiver +agl-demo agl-devel agl-netboot agl-archiver |