Skip to contentSkip to conversation

meta-skeleton: layer.conf should also have .bbappend in BBFILES

PATCH In review Saul Wold 2 participants 3 messages Aug 13, 2013

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/2 meta-skeleton: layer.conf should also have .bbappend in BBFILES

This will allow for an example recipe with a .bbappend to be found, such as busybox or kernel configure fragments.

Signed-off-by Saul Wold <[email protected]>
---
 meta-skeleton/conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-skeleton/conf/layer.conf +1 -1
index 99830d8..aca1633 100644
@@ -2,7 +2,7 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "skeleton"
 BBFILE_PATTERN_skeleton = "^${LAYERDIR}/"
Signature · 1 line
1.8.1.4
author
#1 lore raw

PATCH 2/2 meta-skeleton: Add busybox config fragment example

This shows an example of the config fragment support that both the linux-yocto and busybox recipes use. This example is specific to busybox.

By adding busybox CONFIG options into a .cfg file and then adding that .cfg file to SRC_URI the merge_config.sh script will correctly handle these CONFIG options during the do_configure task.

Signed-off-by Saul Wold <[email protected]>
---
 meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg   | 1 +
 meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
 create mode 100644 meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend
meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg new file +1 -0
new file mode 100644
index 0000000..42c6730
@@ -0,0 +1 @@
+CONFIG_RFKILL=n
meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend new file +5 -0
new file mode 100644
index 0000000..641f04a4
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+
+SRC_URI += " \
+	    file://no_rfkill.cfg \
+           "
Signature · 1 line
1.8.1.4
#2 lore raw

Re: [PATCH 2/2] meta-skeleton: Add busybox config fragment example

Quoted 22 lines · Saul Wold

This shows an example of the config fragment support that both the linux-yocto and busybox recipes use. This example is specific to busybox.

By adding busybox CONFIG options into a .cfg file and then adding that .cfg file to SRC_URI the merge_config.sh script will correctly handle these CONFIG options during the do_configure task.

Signed-off-by Saul Wold <[email protected]>
---
 meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg   | 1 +
 meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
 create mode 100644 meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend
meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg new file +0 -0
new file mode 100644
index 0000000..42c6730

meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg line 1

Quoted 1 line
meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg new file +1 -0
@@ -0,0 +1 @@
+CONFIG_RFKILL=n

I would have thought "# CONFIG_RFKILL is not set" would have been the correct string here.

Otherwise, thanks for doing this, this is a great use of meta-skeleton.

Quoted 11 lines
meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend new file +5 -0
new file mode 100644
index 0000000..641f04a4
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+
+SRC_URI += " \
+	    file://no_rfkill.cfg \
+           "
Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel