[04/12] qemu: build target variant with gtk+, and nativesdk variant without sdl

Submitted by Alexander Kanavin on Feb. 8, 2019, 2:45 p.m. | Patch ID: 158609

Details

Message ID a85aa0f19d694bd828ddde75c92d96bd7bbf4778.1549637121.git.alex.kanavin@gmail.com
State New
Headers show

Commit Message

Alexander Kanavin Feb. 8, 2019, 2:45 p.m.
As sdl is deprecated in favor of gtk+, it should not be the default.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/qemu/qemu.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 95e9e0ede77..07f78058e7b 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -71,11 +71,11 @@  do_install_append() {
 # END of qemu-mips workaround
 
 PACKAGECONFIG ??= " \
-    fdt sdl kvm \
+    fdt gtk+ kvm \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
 "
 PACKAGECONFIG_class-native ??= "fdt alsa kvm virglrenderer glx"
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer glx"
+PACKAGECONFIG_class-nativesdk ??= "fdt kvm virglrenderer glx"
 
 # Handle distros such as CentOS 5 32-bit that do not have kvm support
 PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"

Comments

Mark Hatle Feb. 8, 2019, 3:31 p.m.
I may be nitpicking slightly, but this patch 4 and 3 should probably be
combined.. I looked at '3' and went "this looks wrong, I have no idea why"..
then saw '4' and it became clear.  Since they're both tied together (same
purpose) it may make sense to combine them...

On 2/8/19 8:45 AM, Alexander Kanavin wrote:
> As sdl is deprecated in favor of gtk+, it should not be the default.

At a minimum the commit message above should be included in 3/12.

--Mark

> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/recipes-devtools/qemu/qemu.inc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
> index 95e9e0ede77..07f78058e7b 100644
> --- a/meta/recipes-devtools/qemu/qemu.inc
> +++ b/meta/recipes-devtools/qemu/qemu.inc
> @@ -71,11 +71,11 @@ do_install_append() {
>  # END of qemu-mips workaround
>  
>  PACKAGECONFIG ??= " \
> -    fdt sdl kvm \
> +    fdt gtk+ kvm \
>      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
>  "
>  PACKAGECONFIG_class-native ??= "fdt alsa kvm virglrenderer glx"
> -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer glx"
> +PACKAGECONFIG_class-nativesdk ??= "fdt kvm virglrenderer glx"
>  
>  # Handle distros such as CentOS 5 32-bit that do not have kvm support
>  PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
>
Alexander Kanavin Feb. 8, 2019, 3:43 p.m.
Patch 3 changes things in meta-poky/, and patch 4 changes things in
meta/, so they cannot be combined unfortunately. I can however swap
their order, so that there is less confusion.

Alex

On Fri, 8 Feb 2019 at 16:31, Mark Hatle <mark.hatle@windriver.com> wrote:
>
> I may be nitpicking slightly, but this patch 4 and 3 should probably be
> combined.. I looked at '3' and went "this looks wrong, I have no idea why"..
> then saw '4' and it became clear.  Since they're both tied together (same
> purpose) it may make sense to combine them...
>
> On 2/8/19 8:45 AM, Alexander Kanavin wrote:
> > As sdl is deprecated in favor of gtk+, it should not be the default.
>
> At a minimum the commit message above should be included in 3/12.
>
> --Mark
>
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> >  meta/recipes-devtools/qemu/qemu.inc | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
> > index 95e9e0ede77..07f78058e7b 100644
> > --- a/meta/recipes-devtools/qemu/qemu.inc
> > +++ b/meta/recipes-devtools/qemu/qemu.inc
> > @@ -71,11 +71,11 @@ do_install_append() {
> >  # END of qemu-mips workaround
> >
> >  PACKAGECONFIG ??= " \
> > -    fdt sdl kvm \
> > +    fdt gtk+ kvm \
> >      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
> >  "
> >  PACKAGECONFIG_class-native ??= "fdt alsa kvm virglrenderer glx"
> > -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer glx"
> > +PACKAGECONFIG_class-nativesdk ??= "fdt kvm virglrenderer glx"
> >
> >  # Handle distros such as CentOS 5 32-bit that do not have kvm support
> >  PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
> >
>
Mark Hatle Feb. 8, 2019, 3:55 p.m.
On 2/8/19 9:43 AM, Alexander Kanavin wrote:
> Patch 3 changes things in meta-poky/, and patch 4 changes things in
> meta/, so they cannot be combined unfortunately. I can however swap
> their order, so that there is less confusion.

Swap the order and add a copy of the commit message (from 4 to 3) then.  That
should lesson anyone's questions if they need to figure out why it changed in
the future.

Thanks!
--Mark

> Alex
> 
> On Fri, 8 Feb 2019 at 16:31, Mark Hatle <mark.hatle@windriver.com> wrote:
>>
>> I may be nitpicking slightly, but this patch 4 and 3 should probably be
>> combined.. I looked at '3' and went "this looks wrong, I have no idea why"..
>> then saw '4' and it became clear.  Since they're both tied together (same
>> purpose) it may make sense to combine them...
>>
>> On 2/8/19 8:45 AM, Alexander Kanavin wrote:
>>> As sdl is deprecated in favor of gtk+, it should not be the default.
>>
>> At a minimum the commit message above should be included in 3/12.
>>
>> --Mark
>>
>>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>>> ---
>>>  meta/recipes-devtools/qemu/qemu.inc | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
>>> index 95e9e0ede77..07f78058e7b 100644
>>> --- a/meta/recipes-devtools/qemu/qemu.inc
>>> +++ b/meta/recipes-devtools/qemu/qemu.inc
>>> @@ -71,11 +71,11 @@ do_install_append() {
>>>  # END of qemu-mips workaround
>>>
>>>  PACKAGECONFIG ??= " \
>>> -    fdt sdl kvm \
>>> +    fdt gtk+ kvm \
>>>      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
>>>  "
>>>  PACKAGECONFIG_class-native ??= "fdt alsa kvm virglrenderer glx"
>>> -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer glx"
>>> +PACKAGECONFIG_class-nativesdk ??= "fdt kvm virglrenderer glx"
>>>
>>>  # Handle distros such as CentOS 5 32-bit that do not have kvm support
>>>  PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
>>>
>>
Alexander Kanavin Feb. 8, 2019, 3:58 p.m.
On Fri, 8 Feb 2019 at 16:56, Mark Hatle <mark.hatle@windriver.com> wrote:
> > Patch 3 changes things in meta-poky/, and patch 4 changes things in
> > meta/, so they cannot be combined unfortunately. I can however swap
> > their order, so that there is less confusion.
>
> Swap the order and add a copy of the commit message (from 4 to 3) then.  That
> should lesson anyone's questions if they need to figure out why it changed in
> the future.

Currently the commits are:

commit 341ab87cf326dc1f1d7a3b83d624cde04047f43e
Author: Alexander Kanavin <alex.kanavin@gmail.com>
Date:   Thu Dec 27 15:17:26 2018 +0100

    local.conf.sample: adjust the qemu config to enable gtk+ instead of sdl

    Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>

commit 1170d353029dfb3f1a5ed9bab567e353bd034dfa
Author: Alexander Kanavin <alex.kanavin@gmail.com>
Date:   Thu Dec 27 15:33:27 2018 +0100

    qemu: build target variant with gtk+, and nativesdk variant without sdl

    As sdl is deprecated in favor of gtk+, it should not be the default.

    Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>

I'm confused, what should go where?

Alex
Mark Hatle Feb. 12, 2019, 10:20 a.m.
On 2/8/19 9:58 AM, Alexander Kanavin wrote:
> On Fri, 8 Feb 2019 at 16:56, Mark Hatle <mark.hatle@windriver.com> wrote:
>>> Patch 3 changes things in meta-poky/, and patch 4 changes things in
>>> meta/, so they cannot be combined unfortunately. I can however swap
>>> their order, so that there is less confusion.
>>
>> Swap the order and add a copy of the commit message (from 4 to 3) then.  That
>> should lesson anyone's questions if they need to figure out why it changed in
>> the future.
> 
> Currently the commits are:
> 
> commit 341ab87cf326dc1f1d7a3b83d624cde04047f43e
> Author: Alexander Kanavin <alex.kanavin@gmail.com>
> Date:   Thu Dec 27 15:17:26 2018 +0100
> 
>     local.conf.sample: adjust the qemu config to enable gtk+ instead of sdl

Reading the above, I didn't know why you changed the qemu config to enable gtk+.

The commit below has the magic line:

'As sdl is deprecated in favor of gtk+, it should not be the default.'

Once you add that, it's clear to me why the change was made if I ever look at
the local.conf.sample (using git log or git blame).

(Sorry my reply had been delayed, I missed this earlier.)

--Mark

>     Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 
> commit 1170d353029dfb3f1a5ed9bab567e353bd034dfa
> Author: Alexander Kanavin <alex.kanavin@gmail.com>
> Date:   Thu Dec 27 15:33:27 2018 +0100
> 
>     qemu: build target variant with gtk+, and nativesdk variant without sdl
> 
>     As sdl is deprecated in favor of gtk+, it should not be the default.
> 
>     Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 
> I'm confused, what should go where?
> 
> Alex
>
Alexander Kanavin Feb. 12, 2019, 10:58 a.m.
On Tue, 12 Feb 2019 at 11:20, Mark Hatle <mark.hatle@windriver.com> wrote:
> Reading the above, I didn't know why you changed the qemu config to enable gtk+.
>
> The commit below has the magic line:
>
> 'As sdl is deprecated in favor of gtk+, it should not be the default.'
>
> Once you add that, it's clear to me why the change was made if I ever look at
> the local.conf.sample (using git log or git blame).
>
> (Sorry my reply had been delayed, I missed this earlier.)

Thanks, I fixed this now.

Alex