aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2016-02-09 17:04:51 +0000
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2016-02-09 17:04:51 +0000
commitf0b6f6268a20cc49952239058ce9b5df41a22fb7 (patch)
tree19b6a806ecbcd5b3c99d1371cbfe68ca741e8702
parent46dd3324f2f2cc96c7cb84f752f73948fa72bb66 (diff)
parentadb3cbc8226899dc671e0a92b42970298f731a3c (diff)
downloadmeta-qcom-f0b6f6268a20cc49952239058ce9b5df41a22fb7.tar.gz
meta-qcom-f0b6f6268a20cc49952239058ce9b5df41a22fb7.tar.bz2
meta-qcom-f0b6f6268a20cc49952239058ce9b5df41a22fb7.zip
Merge branch 'jethro'
-rw-r--r--conf/layer.conf9
-rw-r--r--recipes-graphics/images/weston-chromium-image.bb18
-rw-r--r--recipes-graphics/images/weston-image.bb18
3 files changed, 9 insertions, 36 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 61a4870..ed3f7af 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,3 +10,12 @@ BBFILE_PATTERN_qcom := "^${LAYERDIR}/"
BBFILE_PRIORITY_qcom = "5"
QCOM_EULA_FILE = "${LAYERDIR}/conf/EULA"
+
+# Let us add layer-specific bbappends which are only applied when that
+# layer is included in our configuration
+# includes customization and/or backports
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+ for layer in BBFILE_COLLECTIONS.split())}"
+# Add layer-specific bb files too
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bb' % layer \
+ for layer in BBFILE_COLLECTIONS.split())}"
diff --git a/recipes-graphics/images/weston-chromium-image.bb b/recipes-graphics/images/weston-chromium-image.bb
deleted file mode 100644
index d7bf4dd..0000000
--- a/recipes-graphics/images/weston-chromium-image.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Basic Wayland image with Chromium/Wayland"
-
-IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs"
-
-LICENSE = "MIT"
-
-inherit core-image distro_features_check extrausers
-
-# let's make sure we have a good image..
-REQUIRED_DISTRO_FEATURES = "wayland pam systemd"
-
-CORE_IMAGE_BASE_INSTALL += "weston weston-examples clutter-1.0-examples \
- e2fsprogs-resize2fs chromium kernel-modules connman"
-
-EXTRA_USERS_PARAMS = "\
-useradd -p '' linaro; \
-usermod -a -G weston-launch linaro; \
-"
diff --git a/recipes-graphics/images/weston-image.bb b/recipes-graphics/images/weston-image.bb
deleted file mode 100644
index a1c033f..0000000
--- a/recipes-graphics/images/weston-image.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Basic Wayland image with Weston"
-
-IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs"
-
-LICENSE = "MIT"
-
-inherit core-image distro_features_check extrausers
-
-# let's make sure we have a good image..
-REQUIRED_DISTRO_FEATURES = "wayland pam systemd"
-
-CORE_IMAGE_BASE_INSTALL += "weston weston-examples clutter-1.0-examples \
- e2fsprogs-resize2fs kernel-modules connman"
-
-EXTRA_USERS_PARAMS = "\
-useradd -p '' linaro; \
-usermod -a -G weston-launch linaro; \
-"