[PATCH] meta-isar: Allow to include isar-image-base from external layers

[PATCH] meta-isar: Allow to include isar-image-base from external layers

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

THISDIR is expanded immediately which makes the including file define
the path rather than the file that contains this variable. Use
FILE_DIRNAME instead which has the required late evaluation property.

This allows to "require recipes-core/images/isar-image-base.bb" from
out-of-tree layers in order to derive an image from the base version.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/recipes-core/images/isar-image-base.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index 66d3cb9..f36fdc4 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -27,10 +27,10 @@ do_rootfs() {
     install -d -m 755 ${WORKDIR}/hooks_multistrap
 
     # Copy config file
-    install -m 644 ${THISDIR}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf
-    install -m 755 ${THISDIR}/files/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh
-    install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR}
-    install -m 755 ${THISDIR}/files/download_dev-random ${WORKDIR}/hooks_multistrap/
+    install -m 644 ${FILE_DIRNAME}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf
+    install -m 755 ${FILE_DIRNAME}/files/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh
+    install -m 755 ${FILE_DIRNAME}/files/setup.sh ${WORKDIR}
+    install -m 755 ${FILE_DIRNAME}/files/download_dev-random ${WORKDIR}/hooks_multistrap/
 
     # Adjust multistrap config
     sed -i 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|' ${WORKDIR}/multistrap.conf
-- 
2.12.3

Re: [PATCH] meta-isar: Allow to include isar-image-base from external layers

[Jan Kiszka]

On 2017-07-06 07:08, [ext] Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> THISDIR is expanded immediately which makes the including file define
> the path rather than the file that contains this variable. Use
> FILE_DIRNAME instead which has the required late evaluation property.
> 
> This allows to "require recipes-core/images/isar-image-base.bb" from
> out-of-tree layers in order to derive an image from the base version.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta-isar/recipes-core/images/isar-image-base.bb | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
> index 66d3cb9..f36fdc4 100644
> --- a/meta-isar/recipes-core/images/isar-image-base.bb
> +++ b/meta-isar/recipes-core/images/isar-image-base.bb
> @@ -27,10 +27,10 @@ do_rootfs() {
>      install -d -m 755 ${WORKDIR}/hooks_multistrap
>  
>      # Copy config file
> -    install -m 644 ${THISDIR}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf
> -    install -m 755 ${THISDIR}/files/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh
> -    install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR}
> -    install -m 755 ${THISDIR}/files/download_dev-random ${WORKDIR}/hooks_multistrap/
> +    install -m 644 ${FILE_DIRNAME}/files/multistrap.conf.in ${WORKDIR}/multistrap.conf
> +    install -m 755 ${FILE_DIRNAME}/files/${DISTRO_CONFIG_SCRIPT} ${WORKDIR}/configscript.sh
> +    install -m 755 ${FILE_DIRNAME}/files/setup.sh ${WORKDIR}
> +    install -m 755 ${FILE_DIRNAME}/files/download_dev-random ${WORKDIR}/hooks_multistrap/
>  
>      # Adjust multistrap config
>      sed -i 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|' ${WORKDIR}/multistrap.conf
> 

Forget this, I was testing the wrong version. We need to define COREBASE
and derive the path from that.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Corporate Competence Center Embedded Linux