* [PATCH] qemuboot-x86.inc: remove it and move content to corresponding conf
@ 2019-07-31 3:06 changqing.li
2019-07-31 3:31 ` ✗ patchtest: failure for " Patchwork
0 siblings, 1 reply; 7+ messages in thread
From: changqing.li @ 2019-07-31 3:06 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
Configrations:
MACHINE: qemux86-64
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
Reproduce steps:
bitbake lib32-core-image-minimal
runqemu qemux86-64 nographic lib32-core-image-minimal
Errors:
qemu cannot bootup since:
Booting from ROM...
This kernel requires an x86-64 CPU, but only detected an i686 CPU.
Unable to boot - please use a kernel appropriate for your CPU.
QEMU: Terminated
For lib32 image, override has x86, so the qemubin set to qemu-system-i386,
fix by move qemuboot parameters to corresponding conf, don't use the override
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
meta-yocto-bsp/conf/machine/genericx86-64.conf | 16 ++++++++++++++++
meta-yocto-bsp/conf/machine/genericx86.conf | 16 ++++++++++++++++
.../conf/machine/include/genericx86-common.inc | 1 -
meta/conf/machine/include/qemuboot-x86.inc | 18 ------------------
meta/conf/machine/qemux86-64.conf | 17 ++++++++++++++++-
meta/conf/machine/qemux86.conf | 17 ++++++++++++++++-
6 files changed, 64 insertions(+), 21 deletions(-)
delete mode 100644 meta/conf/machine/include/qemuboot-x86.inc
diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf
index c489462..bf85af0 100644
--- a/meta-yocto-bsp/conf/machine/genericx86-64.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf
@@ -7,3 +7,19 @@ require conf/machine/include/tune-core2.inc
require conf/machine/include/genericx86-common.inc
SERIAL_CONSOLES_CHECK = "ttyS0"
+
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+
+QB_SYSTEM_NAME = "qemu-system-x86_64"
+QB_CPU = "-cpu core2duo"
+QB_CPU_KVM = "-cpu core2duo"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
+# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
+QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+
+UVESA_MODE ?= "640x480-32"
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
index 9929d27..d8a573e 100644
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86.conf
@@ -7,3 +7,19 @@ require conf/machine/include/tune-core2.inc
require conf/machine/include/genericx86-common.inc
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
+
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+
+QB_SYSTEM_NAME = "qemu-system-i386"
+QB_CPU = "-cpu core2duo"
+QB_CPU_KVM = "-cpu core2duo"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
+# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
+QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+
+UVESA_MODE ?= "640x480-32"
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index f83ce5c..75db054 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -1,5 +1,4 @@
include conf/machine/include/x86-base.inc
-require conf/machine/include/qemuboot-x86.inc
MACHINE_FEATURES += "wifi efi pcbios"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
deleted file mode 100644
index 82ce46d..0000000
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# For runqemu
-IMAGE_CLASSES += "qemuboot"
-QB_SYSTEM_NAME_x86 = "qemu-system-i386"
-QB_CPU_x86 = "-cpu core2duo"
-QB_CPU_KVM_x86 = "-cpu core2duo"
-
-QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
-QB_CPU_x86-64 = "-cpu core2duo"
-QB_CPU_KVM_x86-64 = "-cpu core2duo"
-
-QB_AUDIO_DRV = "alsa"
-QB_AUDIO_OPT = "-soundhw ac97,es1370"
-QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
-QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
-# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
-QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
-
-UVESA_MODE ?= "640x480-32"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 383e3bd..c39f72d 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -10,7 +10,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
require conf/machine/include/qemu.inc
DEFAULTTUNE ?= "core2-64"
require conf/machine/include/tune-core2.inc
-require conf/machine/include/qemuboot-x86.inc
UBOOT_MACHINE ?= "qemu-x86_64_defconfig"
@@ -39,3 +38,19 @@ module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
WKS_FILE ?= "qemux86-directdisk.wks"
do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+
+QB_SYSTEM_NAME = "qemu-system-x86_64"
+QB_CPU = "-cpu core2duo"
+QB_CPU_KVM = "-cpu core2duo"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
+# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
+QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+
+UVESA_MODE ?= "640x480-32"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 272ad1e..cce87b6 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -10,7 +10,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
require conf/machine/include/qemu.inc
DEFAULTTUNE ?= "core2-32"
require conf/machine/include/tune-corei7.inc
-require conf/machine/include/qemuboot-x86.inc
UBOOT_MACHINE ?= "qemu-x86_defconfig"
@@ -39,3 +38,19 @@ module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
WKS_FILE ?= "qemux86-directdisk.wks"
do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+
+QB_SYSTEM_NAME = "qemu-system-i386"
+QB_CPU = "-cpu core2duo"
+QB_CPU_KVM = "-cpu core2duo"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
+# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
+QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+
+UVESA_MODE ?= "640x480-32"
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* ✗ patchtest: failure for qemuboot-x86.inc: remove it and move content to corresponding conf
2019-07-31 3:06 [PATCH] qemuboot-x86.inc: remove it and move content to corresponding conf changqing.li
@ 2019-07-31 3:31 ` Patchwork
0 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-07-31 3:31 UTC (permalink / raw)
To: changqing.li; +Cc: openembedded-core
== Series Details ==
Series: qemuboot-x86.inc: remove it and move content to corresponding conf
Revision: 1
URL : https://patchwork.openembedded.org/series/18978/
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 sent to the wrong mailing list or some patches from the series correspond to different mailing lists [test_target_mailing_list]
Suggested fix Send the series again to the correct mailing list (ML)
Suggested ML poky@yoctoproject.org [http://git.yoctoproject.org/cgit/cgit.cgi/poky/]
Patch's path: meta-yocto-bsp/conf/machine/genericx86-64.conf
* 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 a62d60fc37)
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] qemuboot-x86.inc: remove it and move content to corresponding conf
2019-07-31 10:20 ` richard.purdie
@ 2019-08-01 0:58 ` Changqing Li
0 siblings, 0 replies; 7+ messages in thread
From: Changqing Li @ 2019-08-01 0:58 UTC (permalink / raw)
To: richard.purdie, poky
On 7/31/19 6:20 PM, richard.purdie@linuxfoundation.org wrote:
> On Wed, 2019-07-31 at 17:38 +0800, Changqing Li wrote:
>> On 7/31/19 5:00 PM, Richard Purdie wrote:
>>> On Wed, 2019-07-31 at 11:40 +0800, changqing.li@windriver.com
>>> wrote:
>>>> From: Changqing Li <changqing.li@windriver.com>
>>>>
>>>> Configrations:
>>>> MACHINE: qemux86-64
>>>> require conf/multilib.conf
>>>> MULTILIBS = "multilib:lib32"
>>>> DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
>>>>
>>>> Reproduce steps:
>>>> bitbake lib32-core-image-minimal
>>>> runqemu qemux86-64 nographic lib32-core-image-minimal
>>>>
>>>> Errors:
>>>> qemu cannot bootup since:
>>>> Booting from ROM...
>>>> This kernel requires an x86-64 CPU, but only detected an i686
>>>> CPU.
>>>> Unable to boot - please use a kernel appropriate for your CPU.
>>>> QEMU: Terminated
>>>>
>>>> For lib32 image, override has x86, so the qemubin set to qemu-
>>>> system-
>>>> i386,
>>>> fix by move qemuboot parameters to corresponding conf, don't use
>>>> the
>>>> override
>>> Why remove/move the whole file when its just QB_SYSTEM_NAME that is
>>> the
>>> issue and that alone could be moved?
>> I think maybe put qemuboot related parameter together in one file is
>> better
>>
>> than some config is here and some config is there. So I move the
>> whole content
> I would prefer not to duplicate this kind of configuration if we can
> help it...
OK, I will send a V2 and only move QB_SYSTEM_NAME out
>
> Cheers,
>
> Richard
>
>
--
BRs
Sandy(Li Changqing)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] qemuboot-x86.inc: remove it and move content to corresponding conf
2019-07-31 9:38 ` Changqing Li
@ 2019-07-31 10:20 ` richard.purdie
2019-08-01 0:58 ` Changqing Li
0 siblings, 1 reply; 7+ messages in thread
From: richard.purdie @ 2019-07-31 10:20 UTC (permalink / raw)
To: Changqing Li, poky
On Wed, 2019-07-31 at 17:38 +0800, Changqing Li wrote:
> On 7/31/19 5:00 PM, Richard Purdie wrote:
> > On Wed, 2019-07-31 at 11:40 +0800, changqing.li@windriver.com
> > wrote:
> > > From: Changqing Li <changqing.li@windriver.com>
> > >
> > > Configrations:
> > > MACHINE: qemux86-64
> > > require conf/multilib.conf
> > > MULTILIBS = "multilib:lib32"
> > > DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
> > >
> > > Reproduce steps:
> > > bitbake lib32-core-image-minimal
> > > runqemu qemux86-64 nographic lib32-core-image-minimal
> > >
> > > Errors:
> > > qemu cannot bootup since:
> > > Booting from ROM...
> > > This kernel requires an x86-64 CPU, but only detected an i686
> > > CPU.
> > > Unable to boot - please use a kernel appropriate for your CPU.
> > > QEMU: Terminated
> > >
> > > For lib32 image, override has x86, so the qemubin set to qemu-
> > > system-
> > > i386,
> > > fix by move qemuboot parameters to corresponding conf, don't use
> > > the
> > > override
> > Why remove/move the whole file when its just QB_SYSTEM_NAME that is
> > the
> > issue and that alone could be moved?
>
> I think maybe put qemuboot related parameter together in one file is
> better
>
> than some config is here and some config is there. So I move the
> whole content
I would prefer not to duplicate this kind of configuration if we can
help it...
Cheers,
Richard
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] qemuboot-x86.inc: remove it and move content to corresponding conf
2019-07-31 9:00 ` Richard Purdie
@ 2019-07-31 9:38 ` Changqing Li
2019-07-31 10:20 ` richard.purdie
0 siblings, 1 reply; 7+ messages in thread
From: Changqing Li @ 2019-07-31 9:38 UTC (permalink / raw)
To: Richard Purdie, poky
On 7/31/19 5:00 PM, Richard Purdie wrote:
> On Wed, 2019-07-31 at 11:40 +0800, changqing.li@windriver.com wrote:
>> From: Changqing Li <changqing.li@windriver.com>
>>
>> Configrations:
>> MACHINE: qemux86-64
>> require conf/multilib.conf
>> MULTILIBS = "multilib:lib32"
>> DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
>>
>> Reproduce steps:
>> bitbake lib32-core-image-minimal
>> runqemu qemux86-64 nographic lib32-core-image-minimal
>>
>> Errors:
>> qemu cannot bootup since:
>> Booting from ROM...
>> This kernel requires an x86-64 CPU, but only detected an i686 CPU.
>> Unable to boot - please use a kernel appropriate for your CPU.
>> QEMU: Terminated
>>
>> For lib32 image, override has x86, so the qemubin set to qemu-system-
>> i386,
>> fix by move qemuboot parameters to corresponding conf, don't use the
>> override
> Why remove/move the whole file when its just QB_SYSTEM_NAME that is the
> issue and that alone could be moved?
I think maybe put qemuboot related parameter together in one file is better
than some config is here and some config is there. So I move the whole
content
>
> Cheers,
>
> Richard
>
>
--
BRs
Sandy(Li Changqing)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] qemuboot-x86.inc: remove it and move content to corresponding conf
2019-07-31 3:40 [PATCH] " changqing.li
@ 2019-07-31 9:00 ` Richard Purdie
2019-07-31 9:38 ` Changqing Li
0 siblings, 1 reply; 7+ messages in thread
From: Richard Purdie @ 2019-07-31 9:00 UTC (permalink / raw)
To: changqing.li, poky
On Wed, 2019-07-31 at 11:40 +0800, changqing.li@windriver.com wrote:
> From: Changqing Li <changqing.li@windriver.com>
>
> Configrations:
> MACHINE: qemux86-64
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32"
> DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
>
> Reproduce steps:
> bitbake lib32-core-image-minimal
> runqemu qemux86-64 nographic lib32-core-image-minimal
>
> Errors:
> qemu cannot bootup since:
> Booting from ROM...
> This kernel requires an x86-64 CPU, but only detected an i686 CPU.
> Unable to boot - please use a kernel appropriate for your CPU.
> QEMU: Terminated
>
> For lib32 image, override has x86, so the qemubin set to qemu-system-
> i386,
> fix by move qemuboot parameters to corresponding conf, don't use the
> override
Why remove/move the whole file when its just QB_SYSTEM_NAME that is the
issue and that alone could be moved?
Cheers,
Richard
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] qemuboot-x86.inc: remove it and move content to corresponding conf
@ 2019-07-31 3:40 changqing.li
2019-07-31 9:00 ` Richard Purdie
0 siblings, 1 reply; 7+ messages in thread
From: changqing.li @ 2019-07-31 3:40 UTC (permalink / raw)
To: poky
From: Changqing Li <changqing.li@windriver.com>
Configrations:
MACHINE: qemux86-64
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
Reproduce steps:
bitbake lib32-core-image-minimal
runqemu qemux86-64 nographic lib32-core-image-minimal
Errors:
qemu cannot bootup since:
Booting from ROM...
This kernel requires an x86-64 CPU, but only detected an i686 CPU.
Unable to boot - please use a kernel appropriate for your CPU.
QEMU: Terminated
For lib32 image, override has x86, so the qemubin set to qemu-system-i386,
fix by move qemuboot parameters to corresponding conf, don't use the override
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
meta-yocto-bsp/conf/machine/genericx86-64.conf | 16 ++++++++++++++++
meta-yocto-bsp/conf/machine/genericx86.conf | 16 ++++++++++++++++
.../conf/machine/include/genericx86-common.inc | 1 -
meta/conf/machine/include/qemuboot-x86.inc | 18 ------------------
meta/conf/machine/qemux86-64.conf | 17 ++++++++++++++++-
meta/conf/machine/qemux86.conf | 17 ++++++++++++++++-
6 files changed, 64 insertions(+), 21 deletions(-)
delete mode 100644 meta/conf/machine/include/qemuboot-x86.inc
diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf
index c489462..bf85af0 100644
--- a/meta-yocto-bsp/conf/machine/genericx86-64.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf
@@ -7,3 +7,19 @@ require conf/machine/include/tune-core2.inc
require conf/machine/include/genericx86-common.inc
SERIAL_CONSOLES_CHECK = "ttyS0"
+
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+
+QB_SYSTEM_NAME = "qemu-system-x86_64"
+QB_CPU = "-cpu core2duo"
+QB_CPU_KVM = "-cpu core2duo"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
+# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
+QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+
+UVESA_MODE ?= "640x480-32"
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
index 9929d27..d8a573e 100644
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86.conf
@@ -7,3 +7,19 @@ require conf/machine/include/tune-core2.inc
require conf/machine/include/genericx86-common.inc
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
+
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+
+QB_SYSTEM_NAME = "qemu-system-i386"
+QB_CPU = "-cpu core2duo"
+QB_CPU_KVM = "-cpu core2duo"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
+# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
+QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+
+UVESA_MODE ?= "640x480-32"
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index f83ce5c..75db054 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -1,5 +1,4 @@
include conf/machine/include/x86-base.inc
-require conf/machine/include/qemuboot-x86.inc
MACHINE_FEATURES += "wifi efi pcbios"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
deleted file mode 100644
index 82ce46d..0000000
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# For runqemu
-IMAGE_CLASSES += "qemuboot"
-QB_SYSTEM_NAME_x86 = "qemu-system-i386"
-QB_CPU_x86 = "-cpu core2duo"
-QB_CPU_KVM_x86 = "-cpu core2duo"
-
-QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
-QB_CPU_x86-64 = "-cpu core2duo"
-QB_CPU_KVM_x86-64 = "-cpu core2duo"
-
-QB_AUDIO_DRV = "alsa"
-QB_AUDIO_OPT = "-soundhw ac97,es1370"
-QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
-QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
-# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
-QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
-
-UVESA_MODE ?= "640x480-32"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 383e3bd..c39f72d 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -10,7 +10,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
require conf/machine/include/qemu.inc
DEFAULTTUNE ?= "core2-64"
require conf/machine/include/tune-core2.inc
-require conf/machine/include/qemuboot-x86.inc
UBOOT_MACHINE ?= "qemu-x86_64_defconfig"
@@ -39,3 +38,19 @@ module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
WKS_FILE ?= "qemux86-directdisk.wks"
do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+
+QB_SYSTEM_NAME = "qemu-system-x86_64"
+QB_CPU = "-cpu core2duo"
+QB_CPU_KVM = "-cpu core2duo"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
+# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
+QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+
+UVESA_MODE ?= "640x480-32"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 272ad1e..cce87b6 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -10,7 +10,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
require conf/machine/include/qemu.inc
DEFAULTTUNE ?= "core2-32"
require conf/machine/include/tune-corei7.inc
-require conf/machine/include/qemuboot-x86.inc
UBOOT_MACHINE ?= "qemu-x86_defconfig"
@@ -39,3 +38,19 @@ module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
WKS_FILE ?= "qemux86-directdisk.wks"
do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+
+QB_SYSTEM_NAME = "qemu-system-i386"
+QB_CPU = "-cpu core2duo"
+QB_CPU_KVM = "-cpu core2duo"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1"
+QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet"
+# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
+QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
+
+UVESA_MODE ?= "640x480-32"
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-08-01 0:58 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-31 3:06 [PATCH] qemuboot-x86.inc: remove it and move content to corresponding conf changqing.li
2019-07-31 3:31 ` ✗ patchtest: failure for " Patchwork
2019-07-31 3:40 [PATCH] " changqing.li
2019-07-31 9:00 ` Richard Purdie
2019-07-31 9:38 ` Changqing Li
2019-07-31 10:20 ` richard.purdie
2019-08-01 0:58 ` Changqing Li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.