[meta-cgl][PATCH 0/2] poky-cgl: avoid the linux bbappend adding cfgs for other distro

[meta-cgl][PATCH 0/2] poky-cgl: avoid the linux bbappend adding cfgs for other distro

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

--
The following changes since commit 73d32950c45cc8d8d468e584be68c54c6e6574b9:

  kernel: Fix config warning for CONFIG_I2C_ALGOBIT (2017-10-03 10:15:47 +0200)

are available in the git repository at:

  https://github.com/jackiehjm/meta-cgl.git jhuang0/d_poky-cgl-kernel_171010_0
  https://github.com//tree/jhuang0/d_poky-cgl-kernel_171010_0

Jackie Huang (2):
  poky-cgl.conf: add poky-cgl into DISTROOVERRIDES
  cgl-common.inc: append SRC_URI for poky-cgl only

 meta-cgl-common/conf/distro/poky-cgl.conf           | 1 +
 meta-cgl-common/recipes-kernel/linux/cgl-common.inc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.11.0

[meta-cgl][PATCH 1/2] poky-cgl.conf: add poky-cgl into DISTROOVERRIDES

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Add poky-cgl into DISTROOVERRIDES, otherwise it's
"poky:linuxstdbase" since it requires poky-lsb.conf.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta-cgl-common/conf/distro/poky-cgl.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-cgl-common/conf/distro/poky-cgl.conf b/meta-cgl-common/conf/distro/poky-cgl.conf
index 92c2ac8..269ce49 100644
--- a/meta-cgl-common/conf/distro/poky-cgl.conf
+++ b/meta-cgl-common/conf/distro/poky-cgl.conf
@@ -1,6 +1,7 @@
 require conf/distro/poky-lsb.conf
 
 DISTRO = "poky-cgl"
+DISTROOVERRIDES .= ":poky-cgl"
 
 DISTRO_FEATURES_append = " selinux ptest argp ext2 xattr nfs pci ipv4 ipv6"
 
-- 
2.11.0

[meta-cgl][PATCH 2/2] cgl-common.inc: append SRC_URI for poky-cgl only

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Someone may want to add meta-cgl-common layer into their
distro and only use some of the packages, but these kernel
features will be also added by the bbappend and may cause
unexpected issue, so change to append the SRC_URI for poky-cgl
distro only.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta-cgl-common/recipes-kernel/linux/cgl-common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-cgl-common/recipes-kernel/linux/cgl-common.inc b/meta-cgl-common/recipes-kernel/linux/cgl-common.inc
index 52cf773..362a7c4 100644
--- a/meta-cgl-common/recipes-kernel/linux/cgl-common.inc
+++ b/meta-cgl-common/recipes-kernel/linux/cgl-common.inc
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRC_URI += "file://cfg/00001-systemtap.cfg \
+SRC_URI_append_poky-cgl = "file://cfg/00001-systemtap.cfg \
             file://cfg/00002-oprofile.cfg \
             file://cfg/00003-lttng.cfg \
             file://cfg/00004-kgdb.cfg \
-- 
2.11.0

Re: [meta-cgl][PATCH 2/2] cgl-common.inc: append SRC_URI for poky-cgl only

[Andre McCurdy]

On Mon, Oct 9, 2017 at 8:30 PM,  <jackie.huang@windriver.com> wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> Someone may want to add meta-cgl-common layer into their
> distro and only use some of the packages, but these kernel
> features will be also added by the bbappend and may cause
> unexpected issue, so change to append the SRC_URI for poky-cgl
> distro only.
>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>  meta-cgl-common/recipes-kernel/linux/cgl-common.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-cgl-common/recipes-kernel/linux/cgl-common.inc b/meta-cgl-common/recipes-kernel/linux/cgl-common.inc
> index 52cf773..362a7c4 100644
> --- a/meta-cgl-common/recipes-kernel/linux/cgl-common.inc
> +++ b/meta-cgl-common/recipes-kernel/linux/cgl-common.inc
> @@ -1,6 +1,6 @@
>  FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
>
> -SRC_URI += "file://cfg/00001-systemtap.cfg \
> +SRC_URI_append_poky-cgl = "file://cfg/00001-systemtap.cfg \

Needs a leading space.

>              file://cfg/00002-oprofile.cfg \
>              file://cfg/00003-lttng.cfg \
>              file://cfg/00004-kgdb.cfg \
> --
> 2.11.0
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

Re: [meta-cgl][PATCH 2/2] cgl-common.inc: append SRC_URI for poky-cgl only

[Huang, Jie (Jackie)]

> -----Original Message-----
> From: Andre McCurdy [mailto:armccurdy@gmail.com]
> Sent: Thursday, October 12, 2017 06:51
> To: Huang, Jie (Jackie)
> Cc: Yocto discussion list
> Subject: Re: [yocto] [meta-cgl][PATCH 2/2] cgl-common.inc: append SRC_URI
> for poky-cgl only
> 
> On Mon, Oct 9, 2017 at 8:30 PM,  <jackie.huang@windriver.com> wrote:
> > From: Jackie Huang <jackie.huang@windriver.com>
> >
> > Someone may want to add meta-cgl-common layer into their
> > distro and only use some of the packages, but these kernel
> > features will be also added by the bbappend and may cause
> > unexpected issue, so change to append the SRC_URI for poky-cgl
> > distro only.
> >
> > Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> > ---
> >  meta-cgl-common/recipes-kernel/linux/cgl-common.inc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-cgl-common/recipes-kernel/linux/cgl-common.inc b/meta-
> cgl-common/recipes-kernel/linux/cgl-common.inc
> > index 52cf773..362a7c4 100644
> > --- a/meta-cgl-common/recipes-kernel/linux/cgl-common.inc
> > +++ b/meta-cgl-common/recipes-kernel/linux/cgl-common.inc
> > @@ -1,6 +1,6 @@
> >  FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
> >
> > -SRC_URI += "file://cfg/00001-systemtap.cfg \
> > +SRC_URI_append_poky-cgl = "file://cfg/00001-systemtap.cfg \
> 
> Needs a leading space.

Fixed and sent v2.

Thanks,
Jackie

> 
> >              file://cfg/00002-oprofile.cfg \
> >              file://cfg/00003-lttng.cfg \
> >              file://cfg/00004-kgdb.cfg \
> > --
> > 2.11.0
> >
> > --
> > _______________________________________________
> > yocto mailing list
> > yocto@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/yocto