| Submitter | Khem Raj |
|---|---|
| Date | May 3, 2012, 3:35 a.m. |
| Message ID | <fb85f4acd897466f053198dd9606143b90c14c66.1336015963.git.raj.khem@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/26947/ |
| State | New |
| Headers | show |
Comments
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 \
On Thu, May 3, 2012 at 7:35 AM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > We probably want to keep the weak setting but do it by fixing the > ordering so this happens before the include of qemu.inc... > Thanks. I have revised the patch > Cheers, > > Richard >
On Thu, May 3, 2012 at 7:46 AM, Khem Raj <raj.khem@gmail.com> wrote: > On Thu, May 3, 2012 at 7:35 AM, Richard Purdie > <richard.purdie@linuxfoundation.org> wrote: >> >> We probably want to keep the weak setting but do it by fixing the >> ordering so this happens before the include of qemu.inc... >> > > Thanks. I have revised the patch ??= may be of use here (though I haven't looked at the files in particular, it seems appropriate)
On Thu, May 3, 2012 at 9:47 AM, Chris Larson <clarson@kergoth.com> wrote: > ??= may be of use here (though I haven't looked at the files in > particular, it seems appropriate) I tried that and it started to build kdrive for qemuarm
On Thu, May 3, 2012 at 10:03 AM, Khem Raj <raj.khem@gmail.com> wrote: > On Thu, May 3, 2012 at 9:47 AM, Chris Larson <clarson@kergoth.com> wrote: >> ??= may be of use here (though I haven't looked at the files in >> particular, it seems appropriate) > > I tried that and it started to build kdrive for qemuarm I have now made it to use ??= which simplified the patches I have updated the pull request http://git.openembedded.org/openembedded-core-contrib kraj/qemu-xserver-xorg Please consider.
Patch
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 \
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(-)