diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-03-09 07:56:57 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-13 11:51:21 +0200 |
| commit | 1fc66748285550629b6916992424cf19c3165cb7 (patch) | |
| tree | d9327d6b03e29618cc0de2c2df76df142fa48baa | |
| parent | 511ea0fcc9c238ad8e3b3089ec2bcf82bb1ecc77 (diff) | |
| download | openembedded-core-contrib-1fc66748285550629b6916992424cf19c3165cb7.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.14.bb | 5 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.19.bb | 4 |
3 files changed, 35 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.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index b71aea2b18..fdacce596d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb @@ -8,6 +8,7 @@ KBRANCH_qemuarm64 ?= "standard/qemuarm64" KBRANCH_qemumips ?= "standard/mti-malta32" KBRANCH_qemuppc ?= "standard/qemuppc" KBRANCH_qemux86 ?= "standard/common-pc/base" +KBRANCH_qemux86copy ?= "standard/common-pc/base" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" @@ -30,11 +31,13 @@ PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" KCONF_BSP_AUDIT_LEVEL = "2" -COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" +COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemux86copy|qemuppc|qemumips|qemumips64|qemux86-64" +SRCREV_machine_qemux86copy = "${SRCREV_machine_qemux86}" # 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 cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb index 9b19eb299b..9087a0f1a7 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb @@ -30,11 +30,13 @@ PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" KCONF_BSP_AUDIT_LEVEL = "2" -COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" +COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemux86copy|qemuppc|qemumips|qemumips64|qemux86-64" +SRCREV_machine_qemux86copy = "${SRCREV_machine_qemux86}" # 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 cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" |