[PATCH] bitbake.conf: move IMAGE_NAME_SUFFIX variable from image_types.bbclass

[PATCH] bitbake.conf: move IMAGE_NAME_SUFFIX variable from image_types.bbclass

[Martin Jansa]

* currently it's used only by image.bbclass, image_types.bbclass and
  meta/recipes-core/images/build-appliance-image_15.0.0.bb
  but if it's needed by some recipe which isn't itself an image, then
  it's useful in bitbake.conf, e.g. we have a recipe for creating
  VirtualBox appliances which combines .wic.vmdk with .ovf file to
  create .zip with appliance, but for that we need the filename of
  .wic.vmdk which now contains IMAGE_NAME_SUFFIX
  https://github.com/webOS-ports/meta-webos-ports/blob/4980ce52a43ac6897657602810313af359f0b839/meta-luneos/recipes-core/images/luneos-emulator-appliance.inc#L24

* we were hardcoding .rootfs suffix where needed, but for quite long
  time it's configurable with IMAGE_NAME_SUFFIX and might not match:

  commit 380ee36811939d947024bf78de907e3c071b834f
  Author: Patrick Ohly <patrick.ohly@intel.com>
  Date:   Mon Mar 7 18:07:52 2016 +0100

    image creation: allow overriding .rootfs suffix

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/image_types.bbclass | 6 ------
 meta/conf/bitbake.conf           | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 00a00d318f..6e301cbeb9 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -1,9 +1,3 @@
-# IMAGE_NAME is the base name for everything produced when building images.
-# The actual image that contains the rootfs has an additional suffix (.rootfs
-# by default) followed by additional suffices which describe the format (.ext4,
-# .ext4.xz, etc.).
-IMAGE_NAME_SUFFIX ??= ".rootfs"
-
 # The default aligment of the size of the rootfs is set to 1KiB. In case
 # you're using the SD card emulation of a QEMU system simulator you may
 # set this value to 2048 (2MiB alignment).
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 017cb163ba..62362eac48 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -450,6 +450,12 @@ IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}"
 IMAGE_LINK_NAME = "${IMAGE_NAME}${IMAGE_VERSION_SUFFIX}"
 
+# IMAGE_NAME is the base name for everything produced when building images.
+# The actual image that contains the rootfs has an additional suffix (.rootfs
+# by default) followed by additional suffices which describe the format (.ext4,
+# .ext4.xz, etc.).
+IMAGE_NAME_SUFFIX ??= ".rootfs"
+
 # This option allows for a percentage overage of the actual image size rather than a
 # fixed extra space, this is space needed for initial startup and basic operations.
 IMAGE_OVERHEAD_FACTOR ?= "1.3"
-- 
2.17.1

✗ patchtest: failure for bitbake.conf: move IMAGE_NAME_SUFFIX variable from image_types.bbclass

[Patchwork]

== Series Details ==

Series: bitbake.conf: move IMAGE_NAME_SUFFIX variable from image_types.bbclass
Revision: 1
URL   : https://patchwork.openembedded.org/series/14313/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 4dad1568f8)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH] bitbake.conf: move IMAGE_NAME_SUFFIX variable from image_types.bbclass

[Richard Purdie]

On Mon, 2018-10-01 at 11:12 +0000, Martin Jansa wrote:
> * currently it's used only by image.bbclass, image_types.bbclass and
>   meta/recipes-core/images/build-appliance-image_15.0.0.bb
>   but if it's needed by some recipe which isn't itself an image, then
>   it's useful in bitbake.conf, e.g. we have a recipe for creating
>   VirtualBox appliances which combines .wic.vmdk with .ovf file to
>   create .zip with appliance, but for that we need the filename of
>   .wic.vmdk which now contains IMAGE_NAME_SUFFIX
>   https://github.com/webOS-ports/meta-webos-ports/blob/4980ce52a43ac6
> 897657602810313af359f0b839/meta-luneos/recipes-core/images/luneos-
> emulator-appliance.inc#L24
> 
> * we were hardcoding .rootfs suffix where needed, but for quite long
>   time it's configurable with IMAGE_NAME_SUFFIX and might not match:
> 
>   commit 380ee36811939d947024bf78de907e3c071b834f
>   Author: Patrick Ohly <patrick.ohly@intel.com>
>   Date:   Mon Mar 7 18:07:52 2016 +0100
> 
>     image creation: allow overriding .rootfs suffix
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/classes/image_types.bbclass | 6 ------
>  meta/conf/bitbake.conf           | 6 ++++++
>  2 files changed, 6 insertions(+), 6 deletions(-)

You could make this argument for many of the class variables, with
other code needing some small piece and we end up importing a ton of
stuff into bitbake.conf and global scope. My worry is this isn't
scalable and leads to code which is hard to disentangle.

How about we create imagevars.conf which the class could include, or
other users could include without pulling in the main class?

Cheers,

Richard

Re: [PATCH] bitbake.conf: move IMAGE_NAME_SUFFIX variable from image_types.bbclass

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1885 bytes --]

Sure, sounds good.

On Mon, Oct 1, 2018 at 2:03 PM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Mon, 2018-10-01 at 11:12 +0000, Martin Jansa wrote:
> > * currently it's used only by image.bbclass, image_types.bbclass and
> >   meta/recipes-core/images/build-appliance-image_15.0.0.bb
> >   but if it's needed by some recipe which isn't itself an image, then
> >   it's useful in bitbake.conf, e.g. we have a recipe for creating
> >   VirtualBox appliances which combines .wic.vmdk with .ovf file to
> >   create .zip with appliance, but for that we need the filename of
> >   .wic.vmdk which now contains IMAGE_NAME_SUFFIX
> >   https://github.com/webOS-ports/meta-webos-ports/blob/4980ce52a43ac6
> > 897657602810313af359f0b839/meta-luneos/recipes-core/images/luneos-
> > emulator-appliance.inc#L24
> >
> > * we were hardcoding .rootfs suffix where needed, but for quite long
> >   time it's configurable with IMAGE_NAME_SUFFIX and might not match:
> >
> >   commit 380ee36811939d947024bf78de907e3c071b834f
> >   Author: Patrick Ohly <patrick.ohly@intel.com>
> >   Date:   Mon Mar 7 18:07:52 2016 +0100
> >
> >     image creation: allow overriding .rootfs suffix
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/classes/image_types.bbclass | 6 ------
> >  meta/conf/bitbake.conf           | 6 ++++++
> >  2 files changed, 6 insertions(+), 6 deletions(-)
>
> You could make this argument for many of the class variables, with
> other code needing some small piece and we end up importing a ton of
> stuff into bitbake.conf and global scope. My worry is this isn't
> scalable and leads to code which is hard to disentangle.
>
> How about we create imagevars.conf which the class could include, or
> other users could include without pulling in the main class?
>
> Cheers,
>
> Richard
>
>
>

[-- Attachment #2: Type: text/html, Size: 2696 bytes --]