[PATCH 0/2] config changes due to xorg upgrades

[PATCH 0/2] config changes due to xorg upgrades

[Laurentiu Palcu]

Hi,

With the xserver-xorg upgrade, some of the packages dissapreared as
some extensions were moved to the xserver core, so the config files have to
be changed accordingly.

Thanks,
Laurentiu

Laurentiu Palcu (2):
  yocto-bsp: update configs after xorg upgrade
  yocto-bsp: upgdate configs after xf86-video-omapfb changed name

 meta-yocto-bsp/conf/machine/atom-pc.conf           |    3 ---
 meta-yocto-bsp/conf/machine/beagleboard.conf       |    2 +-
 meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf      |    1 -
 meta-yocto-bsp/conf/machine/routerstationpro.conf  |    1 -
 .../target/arch/arm/conf/machine/{{=machine}}.conf |    2 +-
 .../arch/powerpc/conf/machine/{{=machine}}.conf    |    1 -
 6 files changed, 2 insertions(+), 8 deletions(-)

-- 
1.7.9.5

[PATCH 1/2] yocto-bsp: update configs after xorg upgrade

[Laurentiu Palcu]

There were some changes in the xserver-xorg upstream project that need
to be reflected here too:
 * extmod module was removed completely as it became empty;
 * DRI1, DRI2, DBE (among others) were made built-in;

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta-yocto-bsp/conf/machine/atom-pc.conf           |    3 ---
 meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf      |    1 -
 meta-yocto-bsp/conf/machine/routerstationpro.conf  |    1 -
 .../arch/powerpc/conf/machine/{{=machine}}.conf    |    1 -
 4 files changed, 6 deletions(-)

diff --git a/meta-yocto-bsp/conf/machine/atom-pc.conf b/meta-yocto-bsp/conf/machine/atom-pc.conf
index 46bc71b..77dd7fb 100644
--- a/meta-yocto-bsp/conf/machine/atom-pc.conf
+++ b/meta-yocto-bsp/conf/machine/atom-pc.conf
@@ -13,10 +13,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
-           xserver-xorg-extension-dri2 \
            xserver-xorg-extension-glx \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
index 7aa498d..252f4cc 100644
--- a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
@@ -19,7 +19,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
-            xserver-xorg-extension-extmod \
             xf86-input-evdev \
             xf86-video-fbdev"
 
diff --git a/meta-yocto-bsp/conf/machine/routerstationpro.conf b/meta-yocto-bsp/conf/machine/routerstationpro.conf
index feaa26e..e5e4d1a 100644
--- a/meta-yocto-bsp/conf/machine/routerstationpro.conf
+++ b/meta-yocto-bsp/conf/machine/routerstationpro.conf
@@ -14,7 +14,6 @@ PREFERRED_VERSION_linux-yocto ?= "3.4%"
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
-            xserver-xorg-extension-extmod \
             xf86-input-evdev \
             xf86-video-fbdev"
 
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf
index cbf3c32..1d6143a 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf
@@ -43,7 +43,6 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
 {{ if xserver == "y": }}
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
-           xserver-xorg-extension-extmod \
            xf86-input-evdev \
            xf86-video-fbdev"
 
-- 
1.7.9.5

[PATCH 2/2] yocto-bsp: upgdate configs after xf86-video-omapfb changed name

[Laurentiu Palcu]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta-yocto-bsp/conf/machine/beagleboard.conf       |    2 +-
 .../target/arch/arm/conf/machine/{{=machine}}.conf |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf b/meta-yocto-bsp/conf/machine/beagleboard.conf
index 6633880..204be95 100644
--- a/meta-yocto-bsp/conf/machine/beagleboard.conf
+++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
@@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
-           xf86-video-omapfb \
+           xf86-video-omap \
            xf86-input-keyboard"
 
 # Ship all kernel modules by default
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
index a3e2970..1990ef6 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
@@ -9,7 +9,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
-           xf86-video-omapfb \
+           xf86-video-omap \
            xf86-input-keyboard"
 
 # Ship all kernel modules by default
-- 
1.7.9.5

Re: [PATCH 1/2] yocto-bsp: update configs after xorg upgrade

[Burton, Ross]

On 14 November 2012 09:48, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> There were some changes in the xserver-xorg upstream project that need
> to be reflected here too:
>  * extmod module was removed completely as it became empty;
>  * DRI1, DRI2, DBE (among others) were made built-in;
>
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>

Acked-By: Ross Burton <ross.burton@intel.com>

Ross