Patchwork image.bbclass: make x11-base a valid image feature

login
register
mail settings
Submitter Andreas Müller
Date April 1, 2014, 2:21 p.m.
Message ID <1396362098-14134-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/69827/
State New
Headers show

Comments

Andreas Müller - April 1, 2014, 2:21 p.m.
make

commit 049f89155b1e80875aad6e53b21808b827c06915
Author: Chen Qi <Qi.Chen@windriver.com>
Date:   Fri Dec 20 10:45:52 2013 +0800

    image.bbclass: add ability to set systemd default target

    Add ability to set the default target for systemd images.

    The default target for system is controlled by SYSTEMD_DEFAULT_TARGET.
    The default value for this variable is derived from checking whether
    IMAGE_FEATURES contains 'x11-base' or not. Each image could override
    this value in its own recipe. For now, we don't need to do any change,
    because all images that support graphical environment has 'x11-base'
    in its IMAGE_FEATURES.

    [YOCTO #3816]

    Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
    Signed-off-by: Saul Wold <sgw@linux.intel.com>

work for users wanting graphical target. Fixes

ERROR: 'x11-base' in IMAGE_FEATURES is not a valid image feature. Valid features: dbg-pkgs debug-tweaks dev-pkgs doc doc-pkgs package-management ptest-pkgs qtcreator-debug read-only-rootfs splash staticdev-pkgs

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Andreas Müller - April 8, 2014, 7:47 a.m.
On Tue, Apr 1, 2014 at 4:21 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> make
>
> commit 049f89155b1e80875aad6e53b21808b827c06915
> Author: Chen Qi <Qi.Chen@windriver.com>
> Date:   Fri Dec 20 10:45:52 2013 +0800
>
>     image.bbclass: add ability to set systemd default target
>
>     Add ability to set the default target for systemd images.
>
>     The default target for system is controlled by SYSTEMD_DEFAULT_TARGET.
>     The default value for this variable is derived from checking whether
>     IMAGE_FEATURES contains 'x11-base' or not. Each image could override
>     this value in its own recipe. For now, we don't need to do any change,
>     because all images that support graphical environment has 'x11-base'
>     in its IMAGE_FEATURES.
>
>     [YOCTO #3816]
>
>     Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>     Signed-off-by: Saul Wold <sgw@linux.intel.com>
>
> work for users wanting graphical target. Fixes
>
> ERROR: 'x11-base' in IMAGE_FEATURES is not a valid image feature. Valid features: dbg-pkgs debug-tweaks dev-pkgs doc doc-pkgs package-management ptest-pkgs qtcreator-debug read-only-rootfs splash staticdev-pkgs
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta/classes/image.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 29309f5..35e8d3b 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -22,7 +22,7 @@ inherit ${TESTIMAGECLASS}
>  # IMAGE_FEATURES may contain any available package group
>  IMAGE_FEATURES ?= ""
>  IMAGE_FEATURES[type] = "list"
> -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs"
> +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs x11-base"
>
>  # rootfs bootstrap install
>  ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}"
> --
> 1.8.3.1
>

ping

Andreas
Paul Eggleton - April 8, 2014, 8:51 a.m.
On Tuesday 08 April 2014 09:47:23 Andreas Müller wrote:
> On Tue, Apr 1, 2014 at 4:21 PM, Andreas Müller
> 
> <schnitzeltony@googlemail.com> wrote:
> > make
> > 
> > commit 049f89155b1e80875aad6e53b21808b827c06915
> > Author: Chen Qi <Qi.Chen@windriver.com>
> > Date:   Fri Dec 20 10:45:52 2013 +0800
> > 
> >     image.bbclass: add ability to set systemd default target
> >     
> >     Add ability to set the default target for systemd images.
> >     
> >     The default target for system is controlled by SYSTEMD_DEFAULT_TARGET.
> >     The default value for this variable is derived from checking whether
> >     IMAGE_FEATURES contains 'x11-base' or not. Each image could override
> >     this value in its own recipe. For now, we don't need to do any change,
> >     because all images that support graphical environment has 'x11-base'
> >     in its IMAGE_FEATURES.
> >     
> >     [YOCTO #3816]
> >     
> >     Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> >     Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > 
> > work for users wanting graphical target. Fixes
> > 
> > ERROR: 'x11-base' in IMAGE_FEATURES is not a valid image feature. Valid
> > features: dbg-pkgs debug-tweaks dev-pkgs doc doc-pkgs package-management
> > ptest-pkgs qtcreator-debug read-only-rootfs splash staticdev-pkgs
> > 
> > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> > ---
> > 
> >  meta/classes/image.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> > index 29309f5..35e8d3b 100644
> > --- a/meta/classes/image.bbclass
> > +++ b/meta/classes/image.bbclass
> > @@ -22,7 +22,7 @@ inherit ${TESTIMAGECLASS}
> > 
> >  # IMAGE_FEATURES may contain any available package group
> >  IMAGE_FEATURES ?= ""
> >  IMAGE_FEATURES[type] = "list"
> > 
> > -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs"
> > +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs x11-base"
> > 
> >  # rootfs bootstrap install
> >  ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES",
> >  "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}"> 

This is not the right fix. At this time, "x11-base" is not a valid feature 
unless you're inheriting the core-image rather than image class. The original 
change is therefore incorrect, unfortunately.

Cheers,
Paul
Andreas Müller - April 8, 2014, 9:29 a.m.
On Tue, Apr 8, 2014 at 10:51 AM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> On Tuesday 08 April 2014 09:47:23 Andreas Müller wrote:
>> On Tue, Apr 1, 2014 at 4:21 PM, Andreas Müller
>>
>> <schnitzeltony@googlemail.com> wrote:
>> > make
>> >
>> > commit 049f89155b1e80875aad6e53b21808b827c06915
>> > Author: Chen Qi <Qi.Chen@windriver.com>
>> > Date:   Fri Dec 20 10:45:52 2013 +0800
>> >
>> >     image.bbclass: add ability to set systemd default target
>> >
>> >     Add ability to set the default target for systemd images.
>> >
>> >     The default target for system is controlled by SYSTEMD_DEFAULT_TARGET.
>> >     The default value for this variable is derived from checking whether
>> >     IMAGE_FEATURES contains 'x11-base' or not. Each image could override
>> >     this value in its own recipe. For now, we don't need to do any change,
>> >     because all images that support graphical environment has 'x11-base'
>> >     in its IMAGE_FEATURES.
>> >
>> >     [YOCTO #3816]
>> >
>> >     Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> >     Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> >
>> > work for users wanting graphical target. Fixes
>> >
>> > ERROR: 'x11-base' in IMAGE_FEATURES is not a valid image feature. Valid
>> > features: dbg-pkgs debug-tweaks dev-pkgs doc doc-pkgs package-management
>> > ptest-pkgs qtcreator-debug read-only-rootfs splash staticdev-pkgs
>> >
>> > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> > ---
>> >
>> >  meta/classes/image.bbclass | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
>> > index 29309f5..35e8d3b 100644
>> > --- a/meta/classes/image.bbclass
>> > +++ b/meta/classes/image.bbclass
>> > @@ -22,7 +22,7 @@ inherit ${TESTIMAGECLASS}
>> >
>> >  # IMAGE_FEATURES may contain any available package group
>> >  IMAGE_FEATURES ?= ""
>> >  IMAGE_FEATURES[type] = "list"
>> >
>> > -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs"
>> > +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs x11-base"
>> >
>> >  # rootfs bootstrap install
>> >  ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES",
>> >  "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}">
>
> This is not the right fix. At this time, "x11-base" is not a valid feature
> unless you're inheriting the core-image rather than image class. The original
> change is therefore incorrect, unfortunately.
>
I can't follow: The patch breaking graphical target introduced the new
image feature x11-base. This cannot be used without the patch I sent.

Andreas
Paul Eggleton - April 8, 2014, 9:48 a.m.
On Tuesday 08 April 2014 11:29:33 Andreas Müller wrote:
> On Tue, Apr 8, 2014 at 10:51 AM, Paul Eggleton
> 
> <paul.eggleton@linux.intel.com> wrote:
> > On Tuesday 08 April 2014 09:47:23 Andreas Müller wrote:
> >> On Tue, Apr 1, 2014 at 4:21 PM, Andreas Müller
> >> 
> >> <schnitzeltony@googlemail.com> wrote:
> >> > make
> >> > 
> >> > commit 049f89155b1e80875aad6e53b21808b827c06915
> >> > Author: Chen Qi <Qi.Chen@windriver.com>
> >> > Date:   Fri Dec 20 10:45:52 2013 +0800
> >> > 
> >> >     image.bbclass: add ability to set systemd default target
> >> >     
> >> >     Add ability to set the default target for systemd images.
> >> >     
> >> >     The default target for system is controlled by
> >> >     SYSTEMD_DEFAULT_TARGET.
> >> >     The default value for this variable is derived from checking
> >> >     whether
> >> >     IMAGE_FEATURES contains 'x11-base' or not. Each image could
> >> >     override
> >> >     this value in its own recipe. For now, we don't need to do any
> >> >     change,
> >> >     because all images that support graphical environment has
> >> >     'x11-base'
> >> >     in its IMAGE_FEATURES.
> >> >     
> >> >     [YOCTO #3816]
> >> >     
> >> >     Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> >> >     Signed-off-by: Saul Wold <sgw@linux.intel.com>
> >> > 
> >> > work for users wanting graphical target. Fixes
> >> > 
> >> > ERROR: 'x11-base' in IMAGE_FEATURES is not a valid image feature. Valid
> >> > features: dbg-pkgs debug-tweaks dev-pkgs doc doc-pkgs
> >> > package-management
> >> > ptest-pkgs qtcreator-debug read-only-rootfs splash staticdev-pkgs
> >> > 
> >> > Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >> > ---
> >> > 
> >> >  meta/classes/image.bbclass | 2 +-
> >> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >> > 
> >> > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> >> > index 29309f5..35e8d3b 100644
> >> > --- a/meta/classes/image.bbclass
> >> > +++ b/meta/classes/image.bbclass
> >> > @@ -22,7 +22,7 @@ inherit ${TESTIMAGECLASS}
> >> > 
> >> >  # IMAGE_FEATURES may contain any available package group
> >> >  IMAGE_FEATURES ?= ""
> >> >  IMAGE_FEATURES[type] = "list"
> >> > 
> >> > -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs"
> >> > +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs x11-base"
> >> > 
> >> >  # rootfs bootstrap install
> >> >  ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES",
> >> >  "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}">
> > 
> > This is not the right fix. At this time, "x11-base" is not a valid feature
> > unless you're inheriting the core-image rather than image class. The
> > original change is therefore incorrect, unfortunately.
> 
> I can't follow: The patch breaking graphical target introduced the new
> image feature x11-base. This cannot be used without the patch I sent.

The patch didn't introduce the x11-base feature itself, that has been in core-
image.bbclass for some time. It broke things because it assumes that x11-base 
is valid for all images and thus it is OK to add it to the IMAGE_FEATURES, 
which is not true for images that inherit image.bbclass. That is what needs to 
be fixed (probably by not using IMAGE_FEATURES at all).

Cheers,
Paul

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 29309f5..35e8d3b 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -22,7 +22,7 @@  inherit ${TESTIMAGECLASS}
 # IMAGE_FEATURES may contain any available package group
 IMAGE_FEATURES ?= ""
 IMAGE_FEATURES[type] = "list"
-IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs"
+IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs x11-base"
 
 # rootfs bootstrap install
 ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}"