summaryrefslogtreecommitdiffstats
path: root/templates/feature
diff options
context:
space:
mode:
Diffstat (limited to 'templates/feature')
-rw-r--r--templates/feature/agl-app-framework/50_bblayers.conf.inc4
-rw-r--r--templates/feature/agl-app-framework/50_local.conf.inc2
-rw-r--r--templates/feature/agl-ci/99_local.conf.inc17
-rw-r--r--templates/feature/agl-ci/included.dep1
-rw-r--r--templates/feature/agl-create-spdx/50_local.conf.inc2
-rw-r--r--templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md7
-rw-r--r--templates/feature/agl-gplv2/50_bblayers.conf.inc1
-rw-r--r--templates/feature/agl-gplv2/50_local.conf.inc2
-rw-r--r--templates/feature/agl-gplv2/README_feature_agl-gplv2.md9
-rw-r--r--templates/feature/agl-netboot/50_bblayers.conf.inc2
-rw-r--r--templates/feature/agl-ptest/90_local.conf.inc2
-rw-r--r--templates/feature/agl-selinux/50_bblayers.conf.inc8
-rw-r--r--templates/feature/agl-selinux/50_local.conf.inc2
-rw-r--r--templates/feature/agl-selinux/README_feature_agl-selinux.md9
-rw-r--r--templates/feature/agl-weston-remoting/included.dep1
-rw-r--r--templates/feature/agl-weston-waltham-remoting/50_local.conf.inc1
-rw-r--r--templates/feature/agl-weston-waltham-remoting/README_feature_agl-weston-waltham-remoting.md9
-rw-r--r--templates/feature/agl-weston-waltham-remoting/included.dep1
18 files changed, 48 insertions, 32 deletions
diff --git a/templates/feature/agl-app-framework/50_bblayers.conf.inc b/templates/feature/agl-app-framework/50_bblayers.conf.inc
new file mode 100644
index 000000000..e6eacd9d8
--- /dev/null
+++ b/templates/feature/agl-app-framework/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+
+BBLAYERS =+ " \
+ ${METADIR}/meta-agl/meta-app-framework \
+ "
diff --git a/templates/feature/agl-app-framework/50_local.conf.inc b/templates/feature/agl-app-framework/50_local.conf.inc
new file mode 100644
index 000000000..ce541a7b0
--- /dev/null
+++ b/templates/feature/agl-app-framework/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-app-framework/conf/include/agl-app-framework.inc
+require conf/include/agl-app-framework.inc
diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc
index 3083c0168..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}:8686"
-BB_SIGNATURE_HANDLER = "OEEquivHash"
+# r/w hashserv
+#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8787"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
-PRSERV_HOST = "${AGL_HOST_PRSERV}:8585"
+# 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-ci/included.dep b/templates/feature/agl-ci/included.dep
new file mode 100644
index 000000000..21543697b
--- /dev/null
+++ b/templates/feature/agl-ci/included.dep
@@ -0,0 +1 @@
+agl-create-spdx
diff --git a/templates/feature/agl-create-spdx/50_local.conf.inc b/templates/feature/agl-create-spdx/50_local.conf.inc
new file mode 100644
index 000000000..2dd5314f3
--- /dev/null
+++ b/templates/feature/agl-create-spdx/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-devel.inc
+require conf/include/agl-create-spdx.inc
diff --git a/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md b/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md
new file mode 100644
index 000000000..332a9dbd5
--- /dev/null
+++ b/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md
@@ -0,0 +1,7 @@
+---
+description: Feature agl-create-spdx
+authors: Jan-Simon Moeller <jsmoeller@linuxfoundation.rg>
+---
+
+### Feature agl-create-spdx
+Activation of the create-spdx class in oe-core.
diff --git a/templates/feature/agl-gplv2/50_bblayers.conf.inc b/templates/feature/agl-gplv2/50_bblayers.conf.inc
deleted file mode 100644
index a0f26980d..000000000
--- a/templates/feature/agl-gplv2/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/external/meta-gplv2"
diff --git a/templates/feature/agl-gplv2/50_local.conf.inc b/templates/feature/agl-gplv2/50_local.conf.inc
deleted file mode 100644
index 8e0d5df74..000000000
--- a/templates/feature/agl-gplv2/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl/meta-agl/conf/include/agl-gplv2.inc
-require conf/include/agl-gplv2.inc
diff --git a/templates/feature/agl-gplv2/README_feature_agl-gplv2.md b/templates/feature/agl-gplv2/README_feature_agl-gplv2.md
deleted file mode 100644
index ffbe331b8..000000000
--- a/templates/feature/agl-gplv2/README_feature_agl-gplv2.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-gplv2
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com>
----
-
-### Feature agl-gplv2
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-gplv2/README_feature_agl-gplv2.md*
-
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
new file mode 100644
index 000000000..392b70099
--- /dev/null
+++ b/templates/feature/agl-selinux/50_bblayers.conf.inc
@@ -0,0 +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-selinux/50_local.conf.inc b/templates/feature/agl-selinux/50_local.conf.inc
new file mode 100644
index 000000000..4aaac2d14
--- /dev/null
+++ b/templates/feature/agl-selinux/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-selinux.inc
+require conf/include/agl-selinux.inc
diff --git a/templates/feature/agl-selinux/README_feature_agl-selinux.md b/templates/feature/agl-selinux/README_feature_agl-selinux.md
new file mode 100644
index 000000000..c48ce06b0
--- /dev/null
+++ b/templates/feature/agl-selinux/README_feature_agl-selinux.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-selinux
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Feature agl-selinux
+
+Enables building with SELinux enabled, with the default mode
+being permissive.
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