[morty] qemux86-64: wic: Add MLPREFIX to syslinux

Submitted by Ovidiu Panait on Sept. 13, 2018, 10:48 a.m. | Patch ID: 154852

Details

Message ID 20180913104859.29275-1-ovidiu.panait@windriver.com
State New
Headers show

Commit Message

Ovidiu Panait Sept. 13, 2018, 10:48 a.m.
Fix the following do_image_wic failure for lib32-core-image-minimal:
| DEBUG: Executing python function set_image_size
| DEBUG: Python function set_image_size finished
| DEBUG: Executing shell function do_image_wic
| Error: Please build syslinux first

Test case:
MACHINE ?= "qemux86-64"

require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"

IMAGE_FSTYPES_append = " wic wic.bmap"

$ bitbake lib32-core-image-minimal 

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
 meta/conf/machine/qemux86-64.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 4f30033e51..e093078d9d 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -33,4 +33,4 @@  MACHINE_FEATURES += "x86"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
 WKS_FILE ?= "directdisk.wks"
-do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+do_image_wic[depends] += "${MLPREFIX}syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"

Comments

Martin Jansa Sept. 13, 2018, 11:13 a.m.
The same should IMHO be applied in qemux86.conf as well.

And I don't see this change in pyro, rocko, sumo, master branches, it
should be applied there first (or explained in commit message why newer
branches aren't affected by this).

On Thu, Sep 13, 2018 at 1:01 PM Ovidiu Panait <ovidiu.panait@windriver.com>
wrote:

> Fix the following do_image_wic failure for lib32-core-image-minimal:
> | DEBUG: Executing python function set_image_size
> | DEBUG: Python function set_image_size finished
> | DEBUG: Executing shell function do_image_wic
> | Error: Please build syslinux first
>
> Test case:
> MACHINE ?= "qemux86-64"
>
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32"
> DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
>
> IMAGE_FSTYPES_append = " wic wic.bmap"
>
> $ bitbake lib32-core-image-minimal
>
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> ---
>  meta/conf/machine/qemux86-64.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/conf/machine/qemux86-64.conf
> b/meta/conf/machine/qemux86-64.conf
> index 4f30033e51..e093078d9d 100644
> --- a/meta/conf/machine/qemux86-64.conf
> +++ b/meta/conf/machine/qemux86-64.conf
> @@ -33,4 +33,4 @@ MACHINE_FEATURES += "x86"
>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
>
>  WKS_FILE ?= "directdisk.wks"
> -do_image_wic[depends] += "syslinux:do_build
> syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot
> dosfstools-native:do_populate_sysroot"
> +do_image_wic[depends] += "${MLPREFIX}syslinux:do_build
> syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot
> dosfstools-native:do_populate_sysroot"
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>