From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 5BED8E0044D for ; Tue, 13 Mar 2012 12:44:49 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 13 Mar 2012 12:44:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="138234708" Received: from unknown (HELO [10.255.15.131]) ([10.255.15.131]) by fmsmga002.fm.intel.com with ESMTP; 13 Mar 2012 12:44:48 -0700 From: Tom Zanussi To: Darren Hart In-Reply-To: <4F5FA04C.7080901@linux.intel.com> References: <86eeec9f1963b57809b988e148ddf43562e2f0bc.1331610171.git.tom.zanussi@intel.com> <4F5FA04C.7080901@linux.intel.com> Date: Tue, 13 Mar 2012 14:44:31 -0500 Message-ID: <1331667871.21321.12.camel@elmorro> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Cc: yocto@yoctoproject.org Subject: Re: [PATCH 1/2] meta-crownbay: switch to linux-yocto-3.2 kernel X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2012 19:44:49 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Tue, 2012-03-13 at 12:30 -0700, Darren Hart wrote: > Hi Tom, > > Some thoughts on this with respect to cleaning up and simplifying the > recipes per our earlier discussions. > > On 03/12/2012 09:37 PM, tom.zanussi@intel.com wrote: > > From: Tom Zanussi > > > > Switch crownbay and crownbay-noemgd to the 3.2 kernel. > > > > Signed-off-by: Tom Zanussi > > --- > > meta-crownbay/conf/machine/crownbay-noemgd.conf | 2 ++ > > meta-crownbay/conf/machine/crownbay.conf | 2 ++ > > .../linux/linux-yocto-rt_3.2.bbappend | 20 ++++++++++++++++++++ > > .../recipes-kernel/linux/linux-yocto_3.2.bbappend | 17 +++++++++++++++++ > > 4 files changed, 41 insertions(+), 0 deletions(-) > > create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend > > create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.2.bbappend > > > > diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf > > index 2c80bd8..af85b00 100644 > > --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf > > +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf > > @@ -4,6 +4,8 @@ > > #@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits > > # i.e. E660 + EG20T > > > > +PREFERRED_VERSION_linux-yocto ?= "3.2%" > > + > > require conf/machine/include/tune-atom.inc > > require conf/machine/include/ia32-base.inc > > > > diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf > > index 2c1ef3d..1458bff 100644 > > --- a/meta-crownbay/conf/machine/crownbay.conf > > +++ b/meta-crownbay/conf/machine/crownbay.conf > > @@ -4,6 +4,8 @@ > > #@DESCRIPTION: Machine configuration for Crown Bay systems > > # i.e. E660 + EG20T > > > > +PREFERRED_VERSION_linux-yocto ?= "3.2%" > > + > > require conf/machine/include/tune-atom.inc > > require conf/machine/include/ia32-base.inc > > > > diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend > > new file mode 100644 > > index 0000000..dee9bce > > --- /dev/null > > +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend > > @@ -0,0 +1,20 @@ > > +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > + > > +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" > > +KMACHINE_crownbay-noemgd = "crownbay" > > + > > +KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" > > I think we start putting cfg/smp.scc in the BSP scc file directly rather > than in the recipe itself. This can be a follow-on patch, or just with > the next kernel release even. But I wanted to point it out. > Yeah, I saw that and agree - I just don't want to spend the time to do all that now. I basically have this week to get them all moved over into a basically functional state and will submit patches to do this and the below as follow-ons once the basics are out of the way. > > + > > +COMPATIBLE_MACHINE_crownbay = "crownbay" > > +KMACHINE_crownbay = "crownbay" > > + > > +KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" > > + > > +# Update the following to use a different BSP branch or meta SRCREV > > +#KBRANCH_crownbay-noemgd = "yocto/standard/preempt-rt/base" > > +#SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX > > +#SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX > > + > > +#KBRANCH_crownbay = "yocto/standard/preempt-rt/base" > > +#SRCREV_machine_pn-linux-yocto-rt_crownbay ?= XXXX > > +#SRCREV_meta_pn-linux-yocto-rt_crownbay ?= XXXX > > diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.2.bbappend > > new file mode 100644 > > index 0000000..3b02076 > > --- /dev/null > > +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.2.bbappend > > @@ -0,0 +1,17 @@ > > +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > + > > +COMPATIBLE_MACHINE_crownbay = "crownbay" > > +KMACHINE_crownbay = "crownbay" > > +KBRANCH_crownbay = "standard/default/crownbay" > > I believe crownbay no longer requires special patches right? Can we just > use the standard/default/base branch here and squash the crownbay branch? > At the moment it doesn't, and I'll probably submit a patch to do that for everything that it make sense for again after things are functional with the simple changes first. > > +KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" > > + > > +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" > > +KMACHINE_crownbay-noemgd = "crownbay" > > +KBRANCH_crownbay-noemgd = "standard/default/crownbay" > > +KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" > > + > > +SRCREV_machine_pn-linux-yocto_crownbay ?= "4471c11c7755727219b673cb887d8a13b8715aba" > > +SRCREV_meta_pn-linux-yocto_crownbay ?= "64840f55ee144e9814278eaa8e3f33dd60da892c" > > + > > +SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "4471c11c7755727219b673cb887d8a13b8715aba" > > +SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "64840f55ee144e9814278eaa8e3f33dd60da892c" > > The meta SRCREV shouldn't be unique from the base linux-yocto_3.2.bb > recipe, so this can be dropped and save the effort of updating it later. > I don't really want to let the meta SRCREV float - I've run into a couple nasty problems in the past letting that happen. i.e. nobody does runtime testing of the BSPs when they change the meta SRCREV in the base recipe. > If we use the standard/default/base branch, the machine SRCREV can also > be dropped. > Agreed, if the machine branch changes to standard/default/base, I'll change that too. Tom >