diff options
Diffstat (limited to 'templates/feature')
8 files changed, 16 insertions, 20 deletions
diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc index 8d56baa23..af1724adb 100644 --- a/templates/feature/agl-ci/99_local.conf.inc +++ b/templates/feature/agl-ci/99_local.conf.inc @@ -1,4 +1,4 @@ -DISTRO_FEATURES:append = " AGLCI" +AGL_FEATURES:append = " AGLCI" # opencv seems to have a parallel make bug # ...contrib/modules/xfeatures2d/test/test_features2d.cpp:51:10: fatal error: features2d/test/test_detectors_regression.impl.hpp: No such file or directory PARALLEL_MAKE:pn-opencv = "-j 1" @@ -21,12 +21,17 @@ INHERIT += "buildstats" INHERIT += "buildstats-summary" # setup for PRSERV and HASHSERV -AGL_HOST_PRSERV ?= "10.30.72.18" -AGL_HOST_HASHSERV ?= "10.30.72.18" +#AGL_HOST_PRSERV ?= "10.30.72.18" +#AGL_HOST_HASHSERV ?= "10.30.72.18" -BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383" -BB_SIGNATURE_HANDLER = "OEEquivHash" +# r/w hashserv +#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8787" +#BB_SIGNATURE_HANDLER = "OEEquivHash" -PRSERV_HOST = "${AGL_HOST_PRSERV}:8181" +# r/w prserv +#PRSERV_HOST = "${AGL_HOST_PRSERV}:8585" IMAGE_INSTALL:append = " curl" + +# remote .rootfs suffix +IMAGE_NAME_SUFFIX = "" diff --git a/templates/feature/agl-netboot/50_bblayers.conf.inc b/templates/feature/agl-netboot/50_bblayers.conf.inc index 7cbff1662..94e784a1a 100644 --- a/templates/feature/agl-netboot/50_bblayers.conf.inc +++ b/templates/feature/agl-netboot/50_bblayers.conf.inc @@ -2,6 +2,6 @@ BBLAYERS =+ " ${METADIR}/meta-agl/meta-netboot \ " # Indirection to avoid duplicate inclusions of the same folder into BBLAYERS -# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base +# the evaluation is in the bblayers.conf.sample in meta-agl/meta-agl-core/conf/templates/base AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" diff --git a/templates/feature/agl-ptest/90_local.conf.inc b/templates/feature/agl-ptest/90_local.conf.inc index 6341b012a..dcaf72ab3 100644 --- a/templates/feature/agl-ptest/90_local.conf.inc +++ b/templates/feature/agl-ptest/90_local.conf.inc @@ -1,7 +1,7 @@ # Enabling ptest in image ... -OVERRIDES .= ":agl-ptest" +OVERRIDES:append = ":agl-ptest" DISTRO_FEATURES:append = " ptest" EXTRA_IMAGE_FEATURES:append = " ptest-pkgs" IMAGE_INSTALL:append = " lua-ptest xmlsec1-ptest libxml2-ptest" diff --git a/templates/feature/agl-selinux/50_bblayers.conf.inc b/templates/feature/agl-selinux/50_bblayers.conf.inc index b17e292e9..392b70099 100644 --- a/templates/feature/agl-selinux/50_bblayers.conf.inc +++ b/templates/feature/agl-selinux/50_bblayers.conf.inc @@ -1,5 +1,8 @@ AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" +# Needed to satisfy uutils-coreutils DEPENDS when using SELinux +AGL_META_CLANG = "${METADIR}/external/meta-clang" + BBLAYERS =+ " \ ${METADIR}/external/meta-selinux \ " diff --git a/templates/feature/agl-weston-remoting/included.dep b/templates/feature/agl-weston-remoting/included.dep deleted file mode 100644 index 82639da07..000000000 --- a/templates/feature/agl-weston-remoting/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-demo diff --git a/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc b/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc deleted file mode 100644 index d965eae6f..000000000 --- a/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc +++ /dev/null @@ -1 +0,0 @@ -AGL_FEATURES:append = " waltham-remoting" diff --git a/templates/feature/agl-weston-waltham-remoting/README_feature_agl-weston-waltham-remoting.md b/templates/feature/agl-weston-waltham-remoting/README_feature_agl-weston-waltham-remoting.md deleted file mode 100644 index 416ff3f26..000000000 --- a/templates/feature/agl-weston-waltham-remoting/README_feature_agl-weston-waltham-remoting.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-weston-waltham-remoting -authors: Marius Vlad <marius.vlad@collabora.com> ---- - -### Feature agl-weston-waltham-remoting - -Enables remote display configuration using libWeston's remoting plug-in -for remote output and remote input using waltham-transmitter-plug-in. diff --git a/templates/feature/agl-weston-waltham-remoting/included.dep b/templates/feature/agl-weston-waltham-remoting/included.dep deleted file mode 100644 index 82639da07..000000000 --- a/templates/feature/agl-weston-waltham-remoting/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-demo |