scarthgap

jhnc-oss · Oct 11, 2024 · 932e0bc · 932e0bc
1 parent f110a02
commit 932e0bc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -13,4 +13,4 @@ BBFILE_PRIORITY_protos = "10"
 
 LAYERDEPENDS_protos = "core"
 LAYERVERSION_protos = "1"
-LAYERSERIES_COMPAT_protos = "dunfell kirkstone"
+LAYERSERIES_COMPAT_protos = "dunfell kirkstone scarthgap"
diff --git a/conf/distro/protos.conf → meta-protos/conf/distro/protos.conf b/conf/distro/protos.conf → meta-protos/conf/distro/protos.conf
diff --git a/meta-protos/conf/layer.conf b/meta-protos/conf/layer.conf
@@ -0,0 +1,16 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "meta-protos"
+BBFILE_PATTERN_meta-protos = "^${LAYERDIR}/"
+
+# enforce precedence over any other layer
+BBFILE_PRIORITY_meta-protos = "8"
+
+LAYERDEPENDS_meta-protos = "core"
+LAYERVERSION_meta-protos = "1"
+LAYERSERIES_COMPAT_meta-protos = "dunfell kirkstone"
diff --git a/conf/templates/bblayers.conf.sample → ...nf/templates/default/bblayers.conf.sample b/conf/templates/bblayers.conf.sample → ...nf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
     ${TOPDIR}/../meta-clang \
-    ${TOPDIR}/../meta-kf5 \
     ${TOPDIR}/../meta-kf6 \
     ${TOPDIR}/../meta-mingw \
     ${TOPDIR}/../meta-oe/meta-filesystems \
@@ -20,15 +19,15 @@ BBLAYERS ?= " \
     ${TOPDIR}/../meta-oe/meta-python \
     ${TOPDIR}/../meta-oe/meta-webserver \
     ${TOPDIR}/../meta-oe/meta-xfce \
-    ${TOPDIR}/../meta-protos \
-    ${TOPDIR}/../meta-protos/meta \
-    ${TOPDIR}/../meta-protos/meta-oe \
-    ${TOPDIR}/../meta-protos/meta-python \
     ${TOPDIR}/../meta-qt5 \
     ${TOPDIR}/../meta-qt6 \
     ${TOPDIR}/../meta-selinux \
     ${TOPDIR}/../poky/meta \
     ${TOPDIR}/../poky/meta-poky \
     ${TOPDIR}/../poky/meta-yocto-bsp \
     ${TOPDIR}/../protos \
+    ${TOPDIR}/../protos/meta-protos \
+    ${TOPDIR}/../protos/meta-protos/meta \
+    ${TOPDIR}/../protos/meta-protos/meta-oe \
+    ${TOPDIR}/../protos/meta-protos/meta-python \
 "
diff --git a/conf/templates/conf-notes.txt → ...tos/conf/templates/default/conf-notes.txt b/conf/templates/conf-notes.txt → ...tos/conf/templates/default/conf-notes.txt
diff --git a/conf/templates/local.conf.sample → .../conf/templates/default/local.conf.sample b/conf/templates/local.conf.sample → .../conf/templates/default/local.conf.sample