Patchwork [RFC,2/6] qemuarm.conf: provide a common qemux86-64 machine configuration

login
register
mail settings
Submitter Bian Naimeng
Date July 29, 2013, 4:04 a.m.
Message ID <51F5E9BE.3050306@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/54655/
State New
Headers show

Comments

Bian Naimeng - July 29, 2013, 4:04 a.m.
qemux86-64.conf: provide a common qemux86-64 machine configuration, 
so developer/distributor can customize their specific one.

Although, we can modify the meta/conf/machine/qemux86-64.conf to customize our
configuration, but it's uncomfortable for developer/distributor maintaining
their branch.
After applying this patch, developer can tell poky using their machine
configuration by prepending their layer to BBPATH(Of course,
the bblayers.conf should be adapted to it).

Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
---
 meta/conf/machine/include/qemux86-64.inc |   24 ++++++++++++++++++++++++
 meta/conf/machine/qemux86-64.conf        |   23 +----------------------
 2 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 meta/conf/machine/include/qemux86-64.inc

Patch

diff --git a/meta/conf/machine/include/qemux86-64.inc b/meta/conf/machine/include/qemux86-64.inc
new file mode 100644
index 0000000..25d9884
--- /dev/null
+++ b/meta/conf/machine/include/qemux86-64.inc
@@ -0,0 +1,24 @@ 
+#@DESCRIPTION: Common x86-64 machine configuration.
+
+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-x86_64.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"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index ff666af..1ba5e96 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -2,25 +2,4 @@ 
 #@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-x86_64.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"
+require conf/machine/include/qemux86-64.inc