[PATCH 0/1] [meta-intel] move Matrox MGA Xorg driver to common

[PATCH 0/1] [meta-intel] move Matrox MGA Xorg driver to common

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

Hi,

This patch is for moving the Matrox MGA Xorg driver from meta-romley
to meta-intel/commmon/recipes-graphics/xorg-xserver location.

This MGA Xorg driver will be used by other ISG meta-intel BSPs. 

Please pull into meta-intel/master.

Thanks
Kishore.

The following changes since commit ff7fdafba88a5b7676f601b3d16a97ce7d48c4a9:

  crownbay: make v3.4 the default kernel (2012-07-31 23:08:05 -0500)

are available in the git repository at:

  git://git.pokylinux.org/meta-intel-contrib kishore/matrox-mga
  http://git.pokylinux.org/cgit.cgi/meta-intel-contrib/log/?h=kishore/matrox-mga

Kishore Bodke (1):
  meta-intel: Move Matrox MGA Xorg driver to common

 .../xorg-xserver}/xf86-video-mga_1.4.13.bb         |    0
 conf/machine/include/ia32-base.inc                 |    4 ++++
 meta-romley/conf/machine/romley.conf               |    3 +--
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename {meta-romley/recipes-graphics/xorg-driver => common/recipes-graphics/xorg-xserver}/xf86-video-mga_1.4.13.bb (100%)

-- 
1.7.9.5

[PATCH 1/1] meta-intel: Move Matrox MGA Xorg driver to common

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

    Matrox MGA Xorg driver is being used by other meta-intel
    BSPs.  So move this to meta-intel/common/recipes-graphics
    and include in the machine.conf

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 .../xorg-xserver}/xf86-video-mga_1.4.13.bb         |    0
 conf/machine/include/ia32-base.inc                 |    4 ++++
 meta-romley/conf/machine/romley.conf               |    3 +--
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename {meta-romley/recipes-graphics/xorg-driver => common/recipes-graphics/xorg-xserver}/xf86-video-mga_1.4.13.bb (100%)

diff --git a/meta-romley/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb b/common/recipes-graphics/xorg-xserver/xf86-video-mga_1.4.13.bb
similarity index 100%
rename from meta-romley/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb
rename to common/recipes-graphics/xorg-xserver/xf86-video-mga_1.4.13.bb
diff --git a/conf/machine/include/ia32-base.inc b/conf/machine/include/ia32-base.inc
index 99ac352..47bd9fb 100644
--- a/conf/machine/include/ia32-base.inc
+++ b/conf/machine/include/ia32-base.inc
@@ -60,3 +60,7 @@ XSERVER_IA32_EMGD = "emgd-driver-bin \
            "
 
 XSERVER_IA32_VESA = "xf86-video-vesa"
+
+XSERVER_IA32_MATROX_MGA = "xserver-xorg-module-xaa \
+		xf86-video-mga \
+		"
diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf
index e6a755b..f7cfa18 100644
--- a/meta-romley/conf/machine/romley.conf
+++ b/meta-romley/conf/machine/romley.conf
@@ -12,6 +12,5 @@ require conf/machine/include/ia32-base.inc
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
-           xserver-xorg-module-xaa \
-	   xf86-video-mga \
+	   ${XSERVER_IA32_MATROX_MGA} \
            "
-- 
1.7.9.5

Re: [PATCH 1/1] meta-intel: Move Matrox MGA Xorg driver to common

[Tom Zanussi]

Hi Kishore,

Could you break this up into 3 patches:

- one moving the mga recipe to common/recipes-graphics/xorg-driver (you
put it in xorg-server)

- one adding the new XSERVER_IA32_MATROX_MGA variable

- one having romley use it.

Thanks,

Tom

On Tue, 2012-08-07 at 16:58 -0700, kishore.k.bodke@intel.com wrote:
> From: Kishore Bodke <kishore.k.bodke@intel.com>
> 
>     Matrox MGA Xorg driver is being used by other meta-intel
>     BSPs.  So move this to meta-intel/common/recipes-graphics
>     and include in the machine.conf
> 
> Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
> ---
>  .../xorg-xserver}/xf86-video-mga_1.4.13.bb         |    0
>  conf/machine/include/ia32-base.inc                 |    4 ++++
>  meta-romley/conf/machine/romley.conf               |    3 +--
>  3 files changed, 5 insertions(+), 2 deletions(-)
>  rename {meta-romley/recipes-graphics/xorg-driver => common/recipes-graphics/xorg-xserver}/xf86-video-mga_1.4.13.bb (100%)
> 
> diff --git a/meta-romley/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb b/common/recipes-graphics/xorg-xserver/xf86-video-mga_1.4.13.bb
> similarity index 100%
> rename from meta-romley/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb
> rename to common/recipes-graphics/xorg-xserver/xf86-video-mga_1.4.13.bb
> diff --git a/conf/machine/include/ia32-base.inc b/conf/machine/include/ia32-base.inc
> index 99ac352..47bd9fb 100644
> --- a/conf/machine/include/ia32-base.inc
> +++ b/conf/machine/include/ia32-base.inc
> @@ -60,3 +60,7 @@ XSERVER_IA32_EMGD = "emgd-driver-bin \
>             "
>  
>  XSERVER_IA32_VESA = "xf86-video-vesa"
> +
> +XSERVER_IA32_MATROX_MGA = "xserver-xorg-module-xaa \
> +		xf86-video-mga \
> +		"
> diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf
> index e6a755b..f7cfa18 100644
> --- a/meta-romley/conf/machine/romley.conf
> +++ b/meta-romley/conf/machine/romley.conf
> @@ -12,6 +12,5 @@ require conf/machine/include/ia32-base.inc
>  
>  XSERVER ?= "${XSERVER_IA32_BASE} \
>             ${XSERVER_IA32_EXT} \
> -           xserver-xorg-module-xaa \
> -	   xf86-video-mga \
> +	   ${XSERVER_IA32_MATROX_MGA} \
>             "