[PATCH 0/3] linux-yocto: consolidated pull

[PATCH 0/3] linux-yocto: consolidated pull

[Bruce Ashfield]

Richard/Saul,

I've got some -stable updates, -rt updates and other changes
that are almost done, but I wanted to get these smaller patches
out of my queue first.

We have some cleanup patches from Robert P. J. Day and a meta
branch update for EMGD, CONFIG_MTD_NAND_VERIFY_WRITE and kmemcheck.

I've gone ahead and pushed the emgd update from Nitin, if it requires
re-work, we'll just add more commits to the branch. 

Tom/Nitin: speak up if there's a problem with this!

Cheers,

Bruce

cc: Nitin A Kamble <nitin.a.kamble@intel.com>
cc: Tom Zanussi <tom.zanussi@intel.com>
cc: Andrea Adami <andrea.adami@gmail.com>
cc: Robert P. J. Day <rpjday@crashcourse.ca>

The following changes since commit 98a1fd1e734db50380a3a37d35767ccb4cc21f7c:

  documentation: Config fragment sections updated (2012-07-20 12:32:54 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (1):
  linux-yocto/3.4: emgd, mtd nand and kmemcheck fixes

Robert P. J. Day (2):
  kernel-yocto.bbclass: Fix some obvious typoes in comments.
  kernel-yocto.bbclass: Delete superfluous creation of ${S}/.git
    directory

 meta/classes/kernel-yocto.bbclass               |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.4.bb    |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

-- 
1.7.5.4

[PATCH 1/3] kernel-yocto.bbclass: Fix some obvious typoes in comments.

[Bruce Ashfield]

From: "Robert P. J. Day" <rpjday@crashcourse.ca>

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index d914b11..1e08faa 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -147,10 +147,10 @@ do_kernel_checkout() {
 		fi
 	done
 
-	# Create a working tree copy of the kernel by checkout out a branch
+	# Create a working tree copy of the kernel by checking out a branch
 	git show-ref --quiet --verify -- "refs/heads/${KBRANCH}"
 	if [ $? -eq 0 ]; then
-		# checkout and clobber and unimportant files
+		# checkout and clobber any unimportant files
 		git checkout -f ${KBRANCH}
 	else
 		echo "Not checking out ${KBRANCH}, it will be created later"
@@ -200,7 +200,7 @@ python do_kernel_configcheck() {
 }
 
 
-# Ensure that the branches (BSP and meta) are on the locatios specified by
+# Ensure that the branches (BSP and meta) are on the locations specified by
 # their SRCREV values. If they are NOT on the right commits, the branches
 # are reset to the correct commit.
 do_validate_branches() {
-- 
1.7.5.4

[PATCH 2/3] kernel-yocto.bbclass: Delete superfluous creation of ${S}/.git directory

[Bruce Ashfield]

From: "Robert P. J. Day" <rpjday@crashcourse.ca>

In do_kernel_checkout(), replace the creation of ${S}/.git with just
the creation of ${S} since the .git subdirectory is created only a few
lines later using a "mv".  Here's the original code:

  rm -rf ${S}
  mkdir -p ${S}/.git

  echo "WARNING. ${WORKDIR}/git is not a bare clone."
  echo "Ensure that the SRC_URI includes the 'bareclone=1' option."

  # we can fix up the kernel repository, but at the least the meta
  # branch must be present. The machine branch may be created later.
  mv ${WORKDIR}/git/.git ${S}    <-- See?  There it is.

There's no functional change here, it's just less confusing.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 1e08faa..f09d503 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -106,7 +106,7 @@ do_kernel_checkout() {
 	if [ -d "${WORKDIR}/git/" ] && [ -d "${WORKDIR}/git/.git" ]; then
 		# we build out of {S}, so ensure that ${S} is clean and present
 		rm -rf ${S}
-		mkdir -p ${S}/.git
+		mkdir -p ${S}
 
 		echo "WARNING. ${WORKDIR}/git is not a bare clone."
 		echo "Ensure that the SRC_URI includes the 'bareclone=1' option."
-- 
1.7.5.4

[PATCH 3/3] linux-yocto/3.4: emgd, mtd nand and kmemcheck fixes

[Bruce Ashfield]

Updating the 3.4 meta SRCREV for the following fixes:

  949fddd meta: crownbay.scc change emgd branch name
  cd0721a yocto/emgd: emgd 1.14 driver
  c2b5ee3 meta: disable CONFIG_MTD_NAND_VERIFY_WRITE
  004cadb meta: kmemcheck: 'other' configs turning on CONFIG_FUNCTION_TRACER

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.4.bb    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index f30f6dd..97a1a19 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -10,7 +10,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "b25f7c9730e3bd3be1bf7b7982251b7459ad6579"
 SRCREV_machine_qemuppc ?= "2777125ab6f92b624ecaf11d6b1ab604e64497a8"
-SRCREV_meta ?= "a8cf77018b0faa0d29f1483ff4e5a2034dc8edd5"
+SRCREV_meta ?= "949fddda61053cc15e46c015e8f7db17e7b33360"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 39b5cdf..f031e1b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -16,7 +16,7 @@ SRCREV_machine_qemuppc ?= "08732f25bc3cb404e29ae201074bcf5c1661ea83"
 SRCREV_machine_qemux86 ?= "6297e4c1d57e1063bfce297c2e12392348598559"
 SRCREV_machine_qemux86-64 ?= "6297e4c1d57e1063bfce297c2e12392348598559"
 SRCREV_machine ?= "6297e4c1d57e1063bfce297c2e12392348598559"
-SRCREV_meta ?= "a8cf77018b0faa0d29f1483ff4e5a2034dc8edd5"
+SRCREV_meta ?= "949fddda61053cc15e46c015e8f7db17e7b33360"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
 
-- 
1.7.5.4

Re: [PATCH 0/3] linux-yocto: consolidated pull

[Kamble, Nitin A]

> -----Original Message-----
> From: Bruce Ashfield [mailto:bruce.ashfield@windriver.com]
> Sent: Friday, July 20, 2012 8:49 PM
> To: richard.purdie@linuxfoundation.org
> Cc: Wold, Saul; Zanussi, Tom; Kamble, Nitin A; andrea.adami@gmail.com;
> rpjday@crashcourse.ca; openembedded-core@lists.openembedded.org
> Subject: [PATCH 0/3] linux-yocto: consolidated pull
> 
> Richard/Saul,
> 
> I've got some -stable updates, -rt updates and other changes that are almost
> done, but I wanted to get these smaller patches out of my queue first.
> 
> We have some cleanup patches from Robert P. J. Day and a meta branch
> update for EMGD, CONFIG_MTD_NAND_VERIFY_WRITE and kmemcheck.
> 
> I've gone ahead and pushed the emgd update from Nitin, if it requires re-
> work, we'll just add more commits to the branch.
> 
> Tom/Nitin: speak up if there's a problem with this!
> 
Bruce,
   I notice that in the meta branch you also created patches for commits from the emgd-1.14 branch such as meta/cfg/kernel-cache/features/emgd/yocto-emgd-emgd-1.14-driver.patch. So emgd-1.14 support is available by 2 ways now. 1: By enabling these patches & 2: by merging the emgd-1.14 branch. For crownbay it is merging the emgd-1.14 branch, so these patches from meta directory can not be used. 
  I don't see any functional issue with this layout, but I am curious why these patches in meta branch when emgd-1.14 branch can be merged to get the same effect.

Thanks,
Nitin

> Cheers,
> 
> Bruce
> 
> cc: Nitin A Kamble <nitin.a.kamble@intel.com>
> cc: Tom Zanussi <tom.zanussi@intel.com>
> cc: Andrea Adami <andrea.adami@gmail.com>
> cc: Robert P. J. Day <rpjday@crashcourse.ca>
> 
> The following changes since commit
> 98a1fd1e734db50380a3a37d35767ccb4cc21f7c:
> 
>   documentation: Config fragment sections updated (2012-07-20 12:32:54
> +0100)
> 
> are available in the git repository at:
>   git://git.pokylinux.org/poky-contrib zedd/kernel
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
> 
> Bruce Ashfield (1):
>   linux-yocto/3.4: emgd, mtd nand and kmemcheck fixes
> 
> Robert P. J. Day (2):
>   kernel-yocto.bbclass: Fix some obvious typoes in comments.
>   kernel-yocto.bbclass: Delete superfluous creation of ${S}/.git
>     directory
> 
>  meta/classes/kernel-yocto.bbclass               |    8 ++++----
>  meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    2 +-
>  meta/recipes-kernel/linux/linux-yocto_3.4.bb    |    2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> --
> 1.7.5.4

Re: [PATCH 0/3] linux-yocto: consolidated pull

[Bruce Ashfield]

On 12-07-20 11:34 AM, Kamble, Nitin A wrote:
>
>
>> -----Original Message-----
>> From: Bruce Ashfield [mailto:bruce.ashfield@windriver.com]
>> Sent: Friday, July 20, 2012 8:49 PM
>> To: richard.purdie@linuxfoundation.org
>> Cc: Wold, Saul; Zanussi, Tom; Kamble, Nitin A; andrea.adami@gmail.com;
>> rpjday@crashcourse.ca; openembedded-core@lists.openembedded.org
>> Subject: [PATCH 0/3] linux-yocto: consolidated pull
>>
>> Richard/Saul,
>>
>> I've got some -stable updates, -rt updates and other changes that are almost
>> done, but I wanted to get these smaller patches out of my queue first.
>>
>> We have some cleanup patches from Robert P. J. Day and a meta branch
>> update for EMGD, CONFIG_MTD_NAND_VERIFY_WRITE and kmemcheck.
>>
>> I've gone ahead and pushed the emgd update from Nitin, if it requires re-
>> work, we'll just add more commits to the branch.
>>
>> Tom/Nitin: speak up if there's a problem with this!
>>
> Bruce,
>     I notice that in the meta branch you also created patches for commits from the emgd-1.14 branch such as meta/cfg/kernel-cache/features/emgd/yocto-emgd-emgd-1.14-driver.patch. So emgd-1.14 support is available by 2 ways now. 1: By enabling these patches&  2: by merging the emgd-1.14 branch. For crownbay it is merging the emgd-1.14 branch, so these patches from meta directory can not be used.

.. and they aren't supposed to be used, are there any BSPs actively
including the emgd-1.14 feature ? I didn't see any, so I left the
patches in the feature description. If a BSP does a git merge of the
branch, it shouldn't include the feature, since as you mention, that
would push the patches again.

It's just providing options, since merging branches isn't always
possible.

>    I don't see any functional issue with this layout, but I am curious why these patches in meta branch when emgd-1.14 branch can be merged to get the same effect.

The kernel-cache should always have the raw patches that you find
on the branches. Some prefer the patches (and don't want to dump the
from the branches) and they document the commits on the branches.

I for one always use the merge, and prefer the branch only commits, but
my inbox is full from people requesting the raw patches over the years :)

Cheers,

Bruce

>
> Thanks,
> Nitin
>
>> Cheers,
>>
>> Bruce
>>
>> cc: Nitin A Kamble<nitin.a.kamble@intel.com>
>> cc: Tom Zanussi<tom.zanussi@intel.com>
>> cc: Andrea Adami<andrea.adami@gmail.com>
>> cc: Robert P. J. Day<rpjday@crashcourse.ca>
>>
>> The following changes since commit
>> 98a1fd1e734db50380a3a37d35767ccb4cc21f7c:
>>
>>    documentation: Config fragment sections updated (2012-07-20 12:32:54
>> +0100)
>>
>> are available in the git repository at:
>>    git://git.pokylinux.org/poky-contrib zedd/kernel
>>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
>>
>> Bruce Ashfield (1):
>>    linux-yocto/3.4: emgd, mtd nand and kmemcheck fixes
>>
>> Robert P. J. Day (2):
>>    kernel-yocto.bbclass: Fix some obvious typoes in comments.
>>    kernel-yocto.bbclass: Delete superfluous creation of ${S}/.git
>>      directory
>>
>>   meta/classes/kernel-yocto.bbclass               |    8 ++++----
>>   meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    2 +-
>>   meta/recipes-kernel/linux/linux-yocto_3.4.bb    |    2 +-
>>   3 files changed, 6 insertions(+), 6 deletions(-)
>>
>> --
>> 1.7.5.4
>

Re: [PATCH 0/3] linux-yocto: consolidated pull

[Kamble, Nitin A]

> -----Original Message-----
> From: Bruce Ashfield [mailto:bruce.ashfield@windriver.com]
> Sent: Friday, July 20, 2012 9:10 PM
> To: Kamble, Nitin A
> Cc: richard.purdie@linuxfoundation.org; Wold, Saul; Zanussi, Tom;
> andrea.adami@gmail.com; rpjday@crashcourse.ca; openembedded-
> core@lists.openembedded.org
> Subject: Re: [PATCH 0/3] linux-yocto: consolidated pull
> 
> On 12-07-20 11:34 AM, Kamble, Nitin A wrote:
> >
> >
> >> -----Original Message-----
> >> From: Bruce Ashfield [mailto:bruce.ashfield@windriver.com]
> >> Sent: Friday, July 20, 2012 8:49 PM
> >> To: richard.purdie@linuxfoundation.org
> >> Cc: Wold, Saul; Zanussi, Tom; Kamble, Nitin A;
> >> andrea.adami@gmail.com; rpjday@crashcourse.ca;
> >> openembedded-core@lists.openembedded.org
> >> Subject: [PATCH 0/3] linux-yocto: consolidated pull
> >>
> >> Richard/Saul,
> >>
> >> I've got some -stable updates, -rt updates and other changes that are
> >> almost done, but I wanted to get these smaller patches out of my queue
> first.
> >>
> >> We have some cleanup patches from Robert P. J. Day and a meta branch
> >> update for EMGD, CONFIG_MTD_NAND_VERIFY_WRITE and kmemcheck.
> >>
> >> I've gone ahead and pushed the emgd update from Nitin, if it requires
> >> re- work, we'll just add more commits to the branch.
> >>
> >> Tom/Nitin: speak up if there's a problem with this!
> >>
> > Bruce,
> >     I notice that in the meta branch you also created patches for commits
> from the emgd-1.14 branch such as meta/cfg/kernel-
> cache/features/emgd/yocto-emgd-emgd-1.14-driver.patch. So emgd-1.14
> support is available by 2 ways now. 1: By enabling these patches&  2: by
> merging the emgd-1.14 branch. For crownbay it is merging the emgd-1.14
> branch, so these patches from meta directory can not be used.
> 
> .. and they aren't supposed to be used, are there any BSPs actively including
> the emgd-1.14 feature ? I didn't see any, so I left the patches in the feature
> description. If a BSP does a git merge of the branch, it shouldn't include the
> feature, since as you mention, that would push the patches again.
> 
> It's just providing options, since merging branches isn't always possible.
> 
> >    I don't see any functional issue with this layout, but I am curious why
> these patches in meta branch when emgd-1.14 branch can be merged to get
> the same effect.
> 
> The kernel-cache should always have the raw patches that you find on the
> branches. Some prefer the patches (and don't want to dump the from the
> branches) and they document the commits on the branches.
> 
> I for one always use the merge, and prefer the branch only commits, but my
> inbox is full from people requesting the raw patches over the years :)
> 

Bruce,
   Thanks for the clarification. :)
Nitin

> Cheers,
> 
> Bruce
> 
> >
> > Thanks,
> > Nitin
> >
> >> Cheers,
> >>
> >> Bruce
> >>
> >> cc: Nitin A Kamble<nitin.a.kamble@intel.com>
> >> cc: Tom Zanussi<tom.zanussi@intel.com>
> >> cc: Andrea Adami<andrea.adami@gmail.com>
> >> cc: Robert P. J. Day<rpjday@crashcourse.ca>
> >>
> >> The following changes since commit
> >> 98a1fd1e734db50380a3a37d35767ccb4cc21f7c:
> >>
> >>    documentation: Config fragment sections updated (2012-07-20
> >> 12:32:54
> >> +0100)
> >>
> >> are available in the git repository at:
> >>    git://git.pokylinux.org/poky-contrib zedd/kernel
> >>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
> >>
> >> Bruce Ashfield (1):
> >>    linux-yocto/3.4: emgd, mtd nand and kmemcheck fixes
> >>
> >> Robert P. J. Day (2):
> >>    kernel-yocto.bbclass: Fix some obvious typoes in comments.
> >>    kernel-yocto.bbclass: Delete superfluous creation of ${S}/.git
> >>      directory
> >>
> >>   meta/classes/kernel-yocto.bbclass               |    8 ++++----
> >>   meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    2 +-
> >>   meta/recipes-kernel/linux/linux-yocto_3.4.bb    |    2 +-
> >>   3 files changed, 6 insertions(+), 6 deletions(-)
> >>
> >> --
> >> 1.7.5.4
> >

Re: [PATCH 0/3] linux-yocto: consolidated pull

[Saul Wold]

On 07/20/2012 08:19 AM, Bruce Ashfield wrote:
> Richard/Saul,
>
> I've got some -stable updates, -rt updates and other changes
> that are almost done, but I wanted to get these smaller patches
> out of my queue first.
>
> We have some cleanup patches from Robert P. J. Day and a meta
> branch update for EMGD, CONFIG_MTD_NAND_VERIFY_WRITE and kmemcheck.
>
> I've gone ahead and pushed the emgd update from Nitin, if it requires
> re-work, we'll just add more commits to the branch.
>
> Tom/Nitin: speak up if there's a problem with this!
>
> Cheers,
>
> Bruce
>
> cc: Nitin A Kamble <nitin.a.kamble@intel.com>
> cc: Tom Zanussi <tom.zanussi@intel.com>
> cc: Andrea Adami <andrea.adami@gmail.com>
> cc: Robert P. J. Day <rpjday@crashcourse.ca>
>
> The following changes since commit 98a1fd1e734db50380a3a37d35767ccb4cc21f7c:
>
>    documentation: Config fragment sections updated (2012-07-20 12:32:54 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib zedd/kernel
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
>
> Bruce Ashfield (1):
>    linux-yocto/3.4: emgd, mtd nand and kmemcheck fixes
>
> Robert P. J. Day (2):
>    kernel-yocto.bbclass: Fix some obvious typoes in comments.
>    kernel-yocto.bbclass: Delete superfluous creation of ${S}/.git
>      directory
>
>   meta/classes/kernel-yocto.bbclass               |    8 ++++----
>   meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    2 +-
>   meta/recipes-kernel/linux/linux-yocto_3.4.bb    |    2 +-
>   3 files changed, 6 insertions(+), 6 deletions(-)
>


Merged into OE-Core

Thanks
	Sau!