From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from song.cn.fujitsu.com (unknown [222.73.24.84]) by mail.openembedded.org (Postfix) with ESMTP id 795306AB80 for ; Mon, 29 Jul 2013 04:04:13 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.89,766,1367942400"; d="scan'208";a="8053404" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 29 Jul 2013 12:01:12 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r6T44CfX001663 for ; Mon, 29 Jul 2013 12:04:13 +0800 Received: from [127.0.0.1] ([10.167.226.190]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013072912020390-200810 ; Mon, 29 Jul 2013 12:02:03 +0800 Message-ID: <51F5E9BE.3050306@cn.fujitsu.com> Date: Mon, 29 Jul 2013 12:04:14 +0800 From: Bian Naimeng User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.2.28) Gecko/20120306 Lightning/1.0b2 Thunderbird/3.1.20 MIME-Version: 1.0 To: openembedded-core@lists.openembedded.org References: <51F5E863.9010406@cn.fujitsu.com> In-Reply-To: <51F5E863.9010406@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/29 12:02:03, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/29 12:02:04, Serialize complete at 2013/07/29 12:02:04 Subject: [RFC][PATCH 2/6]qemuarm.conf: provide a common qemux86-64 machine configuration X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jul 2013 04:04:14 -0000 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=UTF-8 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 --- 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 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 -- 1.7.7