From dc53689cf6e23c1055e7e0a1299f421161baf33f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 9 Mar 2012 07:56:57 +0100 Subject: qemux86: Add identical qemux86copy variant for tests Signed-off-by: Martin Jansa --- meta/conf/machine/qemux86copy.conf | 28 +++++++++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto_3.10.bb | 6 +++++- meta/recipes-kernel/linux/linux-yocto_3.14.bb | 6 +++++- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 6 +++++- 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 meta/conf/machine/qemux86copy.conf 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.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb index 89263d98b9..a42a09391d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb @@ -2,12 +2,14 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" +KMACHINE_qemux86copy = "qemux86" # board specific branches KBRANCH_qemuarm = "standard/arm-versatile-926ejs" 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" @@ -15,6 +17,7 @@ SRCREV_machine_qemuarm ?= "7b466aae62395490769f96635bd077ee8f313f18" SRCREV_machine_qemumips ?= "cc5059ae360e0586375bbd1ed46e1e6f3e267dea" SRCREV_machine_qemuppc ?= "663a3068c9756137a84bbfb3a76eeae7cb4373e1" SRCREV_machine_qemux86 ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4" +SRCREV_machine_qemux86copy ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4" SRCREV_machine_qemux86-64 ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4" SRCREV_machine_qemumips64 ?= "a1491c3b367a75c7003b2fb58706e3631413b337" SRCREV_machine ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4" @@ -28,11 +31,12 @@ PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" +COMPATIBLE_MACHINE = "qemuarm|qemux86|qemux86copy|qemuppc|qemumips|qemumips64|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)}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index 14647e9c45..04fc0a6d10 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb @@ -1,12 +1,14 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH = "standard/base" +KMACHINE_qemux86copy = "qemux86" # board specific branches KBRANCH_qemuarm = "standard/arm-versatile-926ejs" 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" @@ -14,6 +16,7 @@ SRCREV_machine_qemuarm ?= "9882294294f307dc52c29e5dbb24d7f9a2f5a635" SRCREV_machine_qemumips ?= "94e2f8429bcc953cb0df499446b847ba67a0f334" SRCREV_machine_qemuppc ?= "2795a4d16724b41fbcd62c2f9f56c427d1ce3797" SRCREV_machine_qemux86 ?= "4aa41764bf8dba2044ff9fae806d61cac7cdd9de" +SRCREV_machine_qemux86copy ?= "4aa41764bf8dba2044ff9fae806d61cac7cdd9de" SRCREV_machine_qemux86-64 ?= "cb22733185cd9db3e8945dadb899d9eb3831b9ad" SRCREV_machine_qemumips64 ?= "342ccacd4e28d1cc7e30277ee4ac6caa3086ff2f" SRCREV_machine ?= "cb22733185cd9db3e8945dadb899d9eb3831b9ad" @@ -27,11 +30,12 @@ PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" +COMPATIBLE_MACHINE = "qemuarm|qemux86|qemux86copy|qemuppc|qemumips|qemumips64|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 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.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 3a2ff2f504..0e16a3de39 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb @@ -2,12 +2,14 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" +KMACHINE_qemux86copy = "qemux86" # board specific branches KBRANCH_qemuarm = "standard/arm-versatile-926ejs" 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" @@ -15,6 +17,7 @@ SRCREV_machine_qemuarm ?= "64f9a290683b1ab08136ef5d54d1845a961a6940" SRCREV_machine_qemumips ?= "ad7aa3ecf8ab00055d31c3f7b059c8b8a8633e19" SRCREV_machine_qemuppc ?= "7aaa5a4debe4b1987d2d11707313e682b185e876" SRCREV_machine_qemux86 ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e" +SRCREV_machine_qemux86copy ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e" SRCREV_machine_qemux86-64 ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e" SRCREV_machine ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e" SRCREV_meta ?= "7c9e1e0117e7ca1f7451870dad5db50adc21732e" @@ -28,11 +31,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)}" -- cgit 1.2.3-korg