diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-12-18 13:45:10 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-20 16:31:55 +0200 |
| commit | fa9fd4d95f6fda55a89097af4b7396f32f35e3cb (patch) | |
| tree | 742cc6067066d721c8670eab1c73956030a9484a | |
| parent | 5e6eea08fece44f46a137be4a9594bbef5009f6b (diff) | |
| download | openembedded-core-contrib-fa9fd4d95f6fda55a89097af4b7396f32f35e3cb.tar.gz | |
qemux86: Add identical qemux86copy variant for tests
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta/conf/machine/qemux86copy.conf | 28 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 5 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.8.bb | 5 |
3 files changed, 36 insertions, 2 deletions
diff --git a/meta/conf/machine/qemux86copy.conf b/meta/conf/machine/qemux86copy.conf new file mode 100644 index 0000000000..ab0d8575f2 --- /dev/null +++ b/meta/conf/machine/qemux86copy.conf @@ -0,0 +1,28 @@ +#@TYPE: Machine +#@NAME: common_pc +#@DESCRIPTION: Machine configuration for running a common x86 + +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-i586.inc + +KERNEL_IMAGETYPE = "bzImage" + +SERIAL_CONSOLE = "115200 ttyS0" + +XSERVER = "xserver-xorg \ + mesa-driver-swrast \ + xf86-input-vmmouse \ + xf86-input-keyboard \ + xf86-input-evdev \ + xf86-video-vmware" + +MACHINE_FEATURES += "x86" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" + +MACHINEOVERRIDES .= ":qemux86" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index e03b293499..3f1d9077d2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb @@ -2,11 +2,13 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" +KMACHINE_qemux86copy = "qemux86" SRCREV_machine_qemuarm ?= "a4026fce19f8b2d28f37ea264693bd70126a7ade" SRCREV_machine_qemumips ?= "372aba9e80c5f86a1f6795a7b2292a05159ef108" SRCREV_machine_qemuppc ?= "c456ec65de4d2ac099312b0ed8e4098b29447929" SRCREV_machine_qemux86 ?= "fff57da7886cf5e99c07adf6649610cb1cd89330" +SRCREV_machine_qemux86copy ?= "fff57da7886cf5e99c07adf6649610cb1cd89330" SRCREV_machine_qemux86-64 ?= "fff57da7886cf5e99c07adf6649610cb1cd89330" SRCREV_machine ?= "fff57da7886cf5e99c07adf6649610cb1cd89330" SRCREV_meta ?= "1bab5bd090948b4cc4c4ed57c834603a3cf9f235" @@ -20,10 +22,11 @@ PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" +COMPATIBLE_MACHINE = "qemuarm|qemux86|qemux86copy|qemuppc|qemumips|qemux86-64" # Functionality flags KERNEL_FEATURES_append = " features/netfilter/netfilter.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc" +KERNEL_FEATURES_append_qemux86copy=" cfg/sound.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb index 2fcadddccf..b2dd261bf2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.8.bb @@ -2,11 +2,13 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" +KMACHINE_qemux86copy = "qemux86" SRCREV_machine_qemuarm ?= "8fb1a478c9a05362e2e4e62fc30f5ef5d6c21f49" SRCREV_machine_qemumips ?= "b8870f2b11f4c948ae90a19886335fa8b7fca487" SRCREV_machine_qemuppc ?= "e4c12f12e61a29b6605c4fcbcfd6dbe18bd7b4e4" SRCREV_machine_qemux86 ?= "dd089cb5ba37ea14e8f90a884bf2a5be64ed817d" +SRCREV_machine_qemux86copy ?= "dd089cb5ba37ea14e8f90a884bf2a5be64ed817d" SRCREV_machine_qemux86-64 ?= "dd089cb5ba37ea14e8f90a884bf2a5be64ed817d" SRCREV_machine ?= "dd089cb5ba37ea14e8f90a884bf2a5be64ed817d" SRCREV_meta ?= "8482dcdf68f9f7501118f4c01fdcb8f851882997" @@ -20,11 +22,12 @@ PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" +COMPATIBLE_MACHINE = "qemuarm|qemux86|qemux86copy|qemuppc|qemumips|qemux86-64" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86copy=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" |