Re: [PATCH 3/3] qemux86-64, qemux86: Override XSERVER variable

[Richard Purdie <richard.purdie@linuxfoundation.org>]

On Wed, 2012-05-02 at 20:35 -0700, Khem Raj wrote:
> Now qemu.inc sets a weak definition which is
> not what we want for x86_64 and x86
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/conf/machine/qemux86-64.conf |    2 +-
>  meta/conf/machine/qemux86.conf    |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

We probably want to keep the weak setting but do it by fixing the
ordering so this happens before the include of qemu.inc...

Cheers,

Richard


> diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
> index 129fe9f..b381627 100644
> --- a/meta/conf/machine/qemux86-64.conf
> +++ b/meta/conf/machine/qemux86-64.conf
> @@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
>  SERIAL_CONSOLE = "115200 ttyS0"
>  
>  # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xorg \
> +XSERVER = "xserver-xorg \
>             mesa-dri-driver-swrast \
>             xf86-input-vmmouse \
>             xf86-input-keyboard \
> diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
> index 246d5a0..5b25b2f 100644
> --- a/meta/conf/machine/qemux86.conf
> +++ b/meta/conf/machine/qemux86.conf
> @@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
>  SERIAL_CONSOLE = "115200 ttyS0"
>  
>  # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xorg \
> +XSERVER = "xserver-xorg \
>             mesa-dri-driver-swrast \
>             xf86-input-vmmouse \
>             xf86-input-keyboard \