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

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

[Saul Wold]

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 <sgw@linux.intel.com>
---
 meta-skeleton/conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf
index 99830d8..aca1633 100644
--- a/meta-skeleton/conf/layer.conf
+++ b/meta-skeleton/conf/layer.conf
@@ -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}/"
-- 
1.8.1.4

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

[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 <sgw@linux.intel.com>
---
 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

diff --git a/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg b/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
new file mode 100644
index 0000000..42c6730
--- /dev/null
+++ b/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
@@ -0,0 +1 @@
+CONFIG_RFKILL=n
diff --git a/meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend b/meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend
new file mode 100644
index 0000000..641f04a4
--- /dev/null
+++ b/meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+
+SRC_URI += " \
+	    file://no_rfkill.cfg \
+           "
-- 
1.8.1.4

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

[Darren Hart]

On Tue, 2013-08-13 at 09:44 -0700, Saul Wold wrote:
> 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 <sgw@linux.intel.com>
> ---
>  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
> 
> diff --git a/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg b/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
> new file mode 100644
> index 0000000..42c6730
> --- /dev/null
> +++ b/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
> @@ -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.

> diff --git a/meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend b/meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend
> new file mode 100644
> index 0000000..641f04a4
> --- /dev/null
> +++ b/meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend
> @@ -0,0 +1,5 @@
> +FILESEXTRAPATHS := "${THISDIR}/${PN}"
> +
> +SRC_URI += " \
> +	    file://no_rfkill.cfg \
> +           "

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel