[PATCH] qemu arm/x86: drop linux-yocto preferred version

[PATCH] qemu arm/x86: drop linux-yocto preferred version

[Bruce Ashfield]

We don't make a linux-yocto version available unless it boots
on all qemu targets, hence there is no reason to specify a
specific version .. the latest is always fine.

Also, the other qemu machines don't have this specification, so
this makes x86 and ARM consistent.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/conf/machine/include/x86-base.inc | 1 -
 meta/conf/machine/qemuarm.conf         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc
index 40d59577fdb5..82e0cf6a5f36 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -20,7 +20,6 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
 # kernel-related variables
 #
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ??= "4.8%"
 
 #
 # XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index f9d6dd7e364e..b9b640f974f3 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -16,5 +16,4 @@ QB_MACHINE = "-machine versatilepb"
 QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
 # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
 QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
-PREFERRED_VERSION_linux-yocto ??= "4.8%"
 QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
-- 
2.5.0

Re: [PATCH] qemu arm/x86: drop linux-yocto preferred version

[Richard Purdie]

On Wed, 2017-04-05 at 08:39 -0400, Bruce Ashfield wrote:
> We don't make a linux-yocto version available unless it boots
> on all qemu targets, hence there is no reason to specify a
> specific version .. the latest is always fine.
> 
> Also, the other qemu machines don't have this specification, so
> this makes x86 and ARM consistent.
> 
> 
> diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
> index f9d6dd7e364e..b9b640f974f3 100644
> --- a/meta/conf/machine/qemuarm.conf
> +++ b/meta/conf/machine/qemuarm.conf
> @@ -16,5 +16,4 @@ QB_MACHINE = "-machine versatilepb"
>  QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
>  # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
>  QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
> -PREFERRED_VERSION_linux-yocto ??= "4.8%"
>  QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"

Note the line below the line you're removing here. This is why we need
this one...

Cheers,

Richard

Re: [PATCH] qemu arm/x86: drop linux-yocto preferred version

[Bruce Ashfield]

[-- Attachment #1: Type: text/plain, Size: 1778 bytes --]

On Wed, Apr 5, 2017 at 3:21 PM, Richard Purdie <richard.purdie@
linuxfoundation.org> wrote:

> On Wed, 2017-04-05 at 08:39 -0400, Bruce Ashfield wrote:
> > We don't make a linux-yocto version available unless it boots
> > on all qemu targets, hence there is no reason to specify a
> > specific version .. the latest is always fine.
> >
> > Also, the other qemu machines don't have this specification, so
> > this makes x86 and ARM consistent.
> >
> >
> > diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/
> qemuarm.conf
> > index f9d6dd7e364e..b9b640f974f3 100644
> > --- a/meta/conf/machine/qemuarm.conf
> > +++ b/meta/conf/machine/qemuarm.conf
> > @@ -16,5 +16,4 @@ QB_MACHINE = "-machine versatilepb"
> >  QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
> >  # Add the 'virtio-rng-pci' device otherwise the guest may run out of
> entropy
> >  QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device
> virtio-rng-pci"
> > -PREFERRED_VERSION_linux-yocto ??= "4.8%"
> >  QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto',
> '4.7', '', 'zImage-versatile-pb.dtb', d)}"
>
> Note the line below the line you're removing here. This is why we   need
> this one...
>

I had noticed that, but since the newest version is well above that, I
figured it
would be ok.

I can spin another patch that leaves it in place for ARM, but drops it for
x86.

Bruce


>
> Cheers,
>
> Richard
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"

[-- Attachment #2: Type: text/html, Size: 3109 bytes --]

Re: [PATCH] qemu arm/x86: drop linux-yocto preferred version

[Richard Purdie]

On Thu, 2017-04-06 at 00:33 +0200, Bruce Ashfield wrote:
> On Wed, Apr 5, 2017 at 3:21 PM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > 
> > > @@ -16,5 +16,4 @@ QB_MACHINE = "-machine versatilepb"
> > >  QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
> > >  # Add the 'virtio-rng-pci' device otherwise the guest may run
> > out of entropy
> > >  QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device
> > virtio-rng-pci"
> > > -PREFERRED_VERSION_linux-yocto ??= "4.8%"
> > >  QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux
> > -yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
> > 
> > Note the line below the line you're removing here. This is why we  
> > need
> > this one...
> I had noticed that, but since the newest version is well above that,
> I figured it would be ok.

An unset variable returns "None", not sure
what base_version_less_or_equal makes of that...

> I can spin another patch that leaves it in place for ARM, but drops
> it for x86.

I took Martin's patch moving things to 4.10, quite happy to take a
second one removing the x86 version. Removing the arm one too would be
nice but I'm not sure we can yet.

Cheers,

Richard

Re: [PATCH] qemu arm/x86: drop linux-yocto preferred version

[Bruce Ashfield]

[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]

On Thu, Apr 6, 2017 at 12:41 AM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Thu, 2017-04-06 at 00:33 +0200, Bruce Ashfield wrote:
> > On Wed, Apr 5, 2017 at 3:21 PM, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > >
> > > > @@ -16,5 +16,4 @@ QB_MACHINE = "-machine versatilepb"
> > > >  QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
> > > >  # Add the 'virtio-rng-pci' device otherwise the guest may run
> > > out of entropy
> > > >  QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device
> > > virtio-rng-pci"
> > > > -PREFERRED_VERSION_linux-yocto ??= "4.8%"
> > > >  QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux
> > > -yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
> > >
> > > Note the line below the line you're removing here. This is why we
> > > need
> > > this one...
> > I had noticed that, but since the newest version is well above that,
> > I figured it would be ok.
>
> An unset variable returns "None", not sure
> what base_version_less_or_equal makes of that...
>
> > I can spin another patch that leaves it in place for ARM, but drops
> > it for x86.
>
> I took Martin's patch moving things to 4.10, quite happy to take a
> second one removing the x86 version. Removing the arm one too would be
> nice but I'm not sure we can yet.
>

Sounds good. I'll rebase onto those changes and follow up.

Bruce


>
> Cheers,
>
> Richard
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"

[-- Attachment #2: Type: text/html, Size: 2614 bytes --]