Patchwork [v2,1/1] meta-skeleton: linux-yocto-custom.bb: use machine overrides

login
register
mail settings
Submitter Nitin A Kamble
Date April 11, 2014, 5:59 p.m.
Message ID <12b191e0f58ed7954477dab64bb89d7e94b95039.1397238371.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/70533/
State New
Headers show

Comments

Nitin A Kamble - April 11, 2014, 5:59 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

Use machine overrides for variables for this skeleton kernel recipe
so that people following skeleton do it right at the beginning.

The machine overrides for the variables reduces  variable name-space
pollution and avoids unintentional influences on other layers.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
Darren Hart - April 11, 2014, 6:16 p.m.
On 4/11/14, 10:59, "Kamble, Nitin A" <nitin.a.kamble@intel.com> wrote:

>From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
>Use machine overrides for variables for this skeleton kernel recipe
>so that people following skeleton do it right at the beginning.
>
>The machine overrides for the variables reduces  variable name-space
>pollution and avoids unintentional influences on other layers.
>
>Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>

Acked-by: Darren Hart <dvhart@linux.intel.com>

Thanks Nitin,
Richard Purdie - April 13, 2014, 3:38 p.m.
On Fri, 2014-04-11 at 10:59 -0700, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
> 
> Use machine overrides for variables for this skeleton kernel recipe
> so that people following skeleton do it right at the beginning.
> 
> The machine overrides for the variables reduces  variable name-space
> pollution and avoids unintentional influences on other layers.
> 
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>  meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> index c329106..16db4a3 100644
> --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> @@ -44,21 +44,23 @@
>  inherit kernel
>  require recipes-kernel/linux/linux-yocto.inc
>  
> +#Note: Replace the yourmachine string with your actual machine name here
> +
>  # Override SRC_URI in a bbappend file to point at a different source
>  # tree if you do not want to build from Linus' tree.
> -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
> +SRC_URI_yourmachine = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=yourmachine"
>  
> -LINUX_VERSION ?= "3.4"
> -LINUX_VERSION_EXTENSION ?= "-custom"
> +LINUX_VERSION_yourmachine ?= "3.4"
> +LINUX_VERSION_EXTENSION_yourmachine ?= "-custom"
>  
>  # Override SRCREV to point to a different commit in a bbappend file to
>  # build a different release of the Linux kernel.
>  # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
> -SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
> +SRCREV_yourmachine="76e10d158efb6d4516018846f60c2ab5501900bc"
>  
>  PR = "r1"
>  PV = "${LINUX_VERSION}+git${SRCPV}"
>  
> -# Override COMPATIBLE_MACHINE to include your machine in a bbappend
> -# file. Leaving it empty here ensures an early explicit build failure.
> -COMPATIBLE_MACHINE = "(^$)"
> +# Override COMPATIBLE_MACHINE to include your yourmachine in a bbappend
> +# file.
> +COMPATIBLE_MACHINE_yourmachine = "yourmachine"

This breaks the autobuilder:

http://autobuilder.yoctoproject.org/main/builders/nightly-qa-skeleton/builds/43/steps/BuildImages/logs/stdio

Cheers,

Richard
Darren Hart - April 13, 2014, 3:43 p.m.
Indeed, because the SRCURI was made machine specific. In the case of Linux Yocto custom... Their is no namespace pollution to worry about, as there is with Linux Yocto... Should we perhaps drop all the overrides and provide comented examples instead?

On Apr 13, 2014 8:39 AM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
On Fri, 2014-04-11 at 10:59 -0700, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> Use machine overrides for variables for this skeleton kernel recipe
> so that people following skeleton do it right at the beginning.
>
> The machine overrides for the variables reduces  variable name-space
> pollution and avoids unintentional influences on other layers.
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>  meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> index c329106..16db4a3 100644
> --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> @@ -44,21 +44,23 @@
>  inherit kernel
>  require recipes-kernel/linux/linux-yocto.inc
>
> +#Note: Replace the yourmachine string with your actual machine name here
> +
>  # Override SRC_URI in a bbappend file to point at a different source
>  # tree if you do not want to build from Linus' tree.
> -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
> +SRC_URI_yourmachine = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=yourmachine"
>
> -LINUX_VERSION ?= "3.4"
> -LINUX_VERSION_EXTENSION ?= "-custom"
> +LINUX_VERSION_yourmachine ?= "3.4"
> +LINUX_VERSION_EXTENSION_yourmachine ?= "-custom"
>
>  # Override SRCREV to point to a different commit in a bbappend file to
>  # build a different release of the Linux kernel.
>  # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
> -SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
> +SRCREV_yourmachine="76e10d158efb6d4516018846f60c2ab5501900bc"
>
>  PR = "r1"
>  PV = "${LINUX_VERSION}+git${SRCPV}"
>
> -# Override COMPATIBLE_MACHINE to include your machine in a bbappend
> -# file. Leaving it empty here ensures an early explicit build failure.
> -COMPATIBLE_MACHINE = "(^$)"
> +# Override COMPATIBLE_MACHINE to include your yourmachine in a bbappend
> +# file.
> +COMPATIBLE_MACHINE_yourmachine = "yourmachine"

This breaks the autobuilder:

http://autobuilder.yoctoproject.org/main/builders/nightly-qa-skeleton/builds/43/steps/BuildImages/logs/stdio

Cheers,

Richard
Richard Purdie - April 13, 2014, 6:51 p.m.
On Sun, 2014-04-13 at 15:43 +0000, Hart, Darren wrote:
> Indeed, because the SRCURI was made machine specific. In the case of
> Linux Yocto custom... Their is no namespace pollution to worry about,
> as there is with Linux Yocto... Should we perhaps drop all the
> overrides and provide comented examples instead?

That, or we ask Beth to mask out this recipe in the nightly-qa-skeleton
build...

Cheers,

Richard

> 
> On Apr 13, 2014 8:39 AM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2014-04-11 at 10:59 -0700, nitin.a.kamble@intel.com wrote:
> > From: Nitin A Kamble <nitin.a.kamble@intel.com>
> >
> > Use machine overrides for variables for this skeleton kernel recipe
> > so that people following skeleton do it right at the beginning.
> >
> > The machine overrides for the variables reduces  variable name-space
> > pollution and avoids unintentional influences on other layers.
> >
> > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> > ---
> >  meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 16 +++++++++-------
> >  1 file changed, 9 insertions(+), 7 deletions(-)
> >
> > diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> > index c329106..16db4a3 100644
> > --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> > +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> > @@ -44,21 +44,23 @@
> >  inherit kernel
> >  require recipes-kernel/linux/linux-yocto.inc
> >
> > +#Note: Replace the yourmachine string with your actual machine name here
> > +
> >  # Override SRC_URI in a bbappend file to point at a different source
> >  # tree if you do not want to build from Linus' tree.
> > -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
> > +SRC_URI_yourmachine = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=yourmachine"
> >
> > -LINUX_VERSION ?= "3.4"
> > -LINUX_VERSION_EXTENSION ?= "-custom"
> > +LINUX_VERSION_yourmachine ?= "3.4"
> > +LINUX_VERSION_EXTENSION_yourmachine ?= "-custom"
> >
> >  # Override SRCREV to point to a different commit in a bbappend file to
> >  # build a different release of the Linux kernel.
> >  # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
> > -SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
> > +SRCREV_yourmachine="76e10d158efb6d4516018846f60c2ab5501900bc"
> >
> >  PR = "r1"
> >  PV = "${LINUX_VERSION}+git${SRCPV}"
> >
> > -# Override COMPATIBLE_MACHINE to include your machine in a bbappend
> > -# file. Leaving it empty here ensures an early explicit build failure.
> > -COMPATIBLE_MACHINE = "(^$)"
> > +# Override COMPATIBLE_MACHINE to include your yourmachine in a bbappend
> > +# file.
> > +COMPATIBLE_MACHINE_yourmachine = "yourmachine"
> 
> This breaks the autobuilder:
> 
> http://autobuilder.yoctoproject.org/main/builders/nightly-qa-skeleton/builds/43/steps/BuildImages/logs/stdio
> 
> Cheers,
> 
> Richard
> 
>

Patch

diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
index c329106..16db4a3 100644
--- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
+++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
@@ -44,21 +44,23 @@ 
 inherit kernel
 require recipes-kernel/linux/linux-yocto.inc
 
+#Note: Replace the yourmachine string with your actual machine name here
+
 # Override SRC_URI in a bbappend file to point at a different source
 # tree if you do not want to build from Linus' tree.
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
+SRC_URI_yourmachine = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=yourmachine"
 
-LINUX_VERSION ?= "3.4"
-LINUX_VERSION_EXTENSION ?= "-custom"
+LINUX_VERSION_yourmachine ?= "3.4"
+LINUX_VERSION_EXTENSION_yourmachine ?= "-custom"
 
 # Override SRCREV to point to a different commit in a bbappend file to
 # build a different release of the Linux kernel.
 # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
-SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
+SRCREV_yourmachine="76e10d158efb6d4516018846f60c2ab5501900bc"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-# Override COMPATIBLE_MACHINE to include your machine in a bbappend
-# file. Leaving it empty here ensures an early explicit build failure.
-COMPATIBLE_MACHINE = "(^$)"
+# Override COMPATIBLE_MACHINE to include your yourmachine in a bbappend
+# file.
+COMPATIBLE_MACHINE_yourmachine = "yourmachine"