public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH] wic-img.bbclass: Do not reset WICVARS
@ 2018-05-15 13:44 Andreas J. Reichel
  2018-05-15 14:23 ` Henning Schild
  2018-05-15 15:33 ` Alexander Smirnov
  0 siblings, 2 replies; 3+ messages in thread
From: Andreas J. Reichel @ 2018-05-15 13:44 UTC (permalink / raw)
  To: isar-users; +Cc: Andreas Reichel

From: Andreas Reichel <andreas.reichel.ext@siemens.com>

In case WICVARS are extended in local.conf, wic-img.bbclass must
not use ?= operator, but += operator to set WICVARS, otherwise a
user can never add variables in local.conf.

Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
---
 meta/classes/wic-img.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index d2ba36c..07c2a9e 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -18,7 +18,7 @@ do_wic_image[stamp-extra-info] = "${DISTRO}-${MACHINE}"
 
 WIC_CREATE_EXTRA_ARGS ?= ""
 
-WICVARS ?= "\
+WICVARS += "\
            BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \
            IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \
            ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH"
-- 
2.17.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] wic-img.bbclass: Do not reset WICVARS
  2018-05-15 13:44 [PATCH] wic-img.bbclass: Do not reset WICVARS Andreas J. Reichel
@ 2018-05-15 14:23 ` Henning Schild
  2018-05-15 15:33 ` Alexander Smirnov
  1 sibling, 0 replies; 3+ messages in thread
From: Henning Schild @ 2018-05-15 14:23 UTC (permalink / raw)
  To: [ext] Andreas J. Reichel; +Cc: isar-users

Looks good!

Am Tue, 15 May 2018 15:44:02 +0200
schrieb "[ext] Andreas J. Reichel" <andreas.reichel.ext@siemens.com>:

> From: Andreas Reichel <andreas.reichel.ext@siemens.com>
> 
> In case WICVARS are extended in local.conf, wic-img.bbclass must
> not use ?= operator, but += operator to set WICVARS, otherwise a
> user can never add variables in local.conf.
> 
> Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
> ---
>  meta/classes/wic-img.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/wic-img.bbclass
> b/meta/classes/wic-img.bbclass index d2ba36c..07c2a9e 100644
> --- a/meta/classes/wic-img.bbclass
> +++ b/meta/classes/wic-img.bbclass
> @@ -18,7 +18,7 @@ do_wic_image[stamp-extra-info] =
> "${DISTRO}-${MACHINE}" 
>  WIC_CREATE_EXTRA_ARGS ?= ""
>  
> -WICVARS ?= "\
> +WICVARS += "\
>             BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD
> IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS
> INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \
> ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS
> TRANSLATED_TARGET_ARCH"


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] wic-img.bbclass: Do not reset WICVARS
  2018-05-15 13:44 [PATCH] wic-img.bbclass: Do not reset WICVARS Andreas J. Reichel
  2018-05-15 14:23 ` Henning Schild
@ 2018-05-15 15:33 ` Alexander Smirnov
  1 sibling, 0 replies; 3+ messages in thread
From: Alexander Smirnov @ 2018-05-15 15:33 UTC (permalink / raw)
  To: Andreas J. Reichel, isar-users

On 05/15/2018 04:44 PM, Andreas J. Reichel wrote:
> From: Andreas Reichel <andreas.reichel.ext@siemens.com>
> 
> In case WICVARS are extended in local.conf, wic-img.bbclass must
> not use ?= operator, but += operator to set WICVARS, otherwise a
> user can never add variables in local.conf.
> 

Applied to next, thanks!

Alex

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-05-15 15:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-15 13:44 [PATCH] wic-img.bbclass: Do not reset WICVARS Andreas J. Reichel
2018-05-15 14:23 ` Henning Schild
2018-05-15 15:33 ` Alexander Smirnov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox