[PATCH master, dylan, danny 0/1] kern-tools: make dash compliant

[PATCH master, dylan, danny 0/1] kern-tools: make dash compliant

[Bruce Ashfield]

Hi all,

Here's an update of merge_config.sh for master, dylan and danny. The
changes to master and danny are identical, but we need two commits
versus one for dylan. As for danny, I ported only the changes that I
needed for dash compliance, and created a kern-tools branch to track
that change. So the patch for danny has a SRCREV update and a switch
to the danny kern-tools branch.

The patches break down like this:
 
  master: zedd/kerntools-master
    [PATCH 1/1] kern-tools: refresh and make dash compliant 

  dylan: zedd/kerntools-dylan
    [PATCH dylan 1/2] kern-tools: anchor and delimit regexs
    [PATCH dylan 2/2] kern-tools: refresh and make dash complian
 
  danny: zedd/kerntools-danny
    [PATCH danny] kern-tools: refresh and make dash compliant

The problem was this:

  The separately packaged merge_config.sh in the kern-tools package was
  missing upstream fixes, and in particular a change that ensures it is
  dash compatible.

  By grabbing that upstream commit and rebasing the existing patches on
  top of the new baseline, we are up to date and working on systems
  where /bin/sh is dash.

I've tested the kernel config on all branches, as well as busy box on
master and dylan. The before and after .configs are the same and we
are dash compliant. But it's worth doing some sanity tests, just in
case I messed up the juggling of the three branches!

cc: "Burton, Ross" <ross.burton@intel.com>
cc: Paul Eggleton <paul.eggleton@linux.intel.com>
cc: Otavio Salvador <otavio@ossystems.com.br>

[YOCTO #4473]

Cheers,

Bruce

The following changes since commit f7afeeb75993b159bb8959e0309bc5eb3978a8fb:

  bitbake: bitbake-layers/tinfoil: Catch up with status -> recpiecache rename (2013-05-12 18:00:46 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kerntools-master
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kerntools-master

Bruce Ashfield (1):
  kern-tools: refresh and make dash compliant

 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.7.10.4

[PATCH 1/1] kern-tools: refresh and make dash compliant

[Bruce Ashfield]

The separately packaged merge_config.sh in the kern-tools package was
missing upstream fixes, and in particular a change that ensures it is
dash compatible.

By grabbing that upstream commit and rebasing the existing patches on
top of the new baseline, we are up to date and working on systems
where /bin/sh is dash.

[YOCTO #4473]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 6620c4b..a86dda3 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "9713c9ef7f6e178a0a2a5f2a9c74e3c123ae48dd"
+SRCREV = "1a3c59526d6abe95662820b9493c8a62dab52d79"
 PR = "r12"
 PV = "0.1+git${SRCPV}"
 
-- 
1.7.10.4

[PATCH dylan 1/2] kern-tools: anchor and delimit regexs

[Bruce Ashfield]

Updating the kern-tools SRCREV with the following fix:

    Updateme is responsible for updating an existing meta-series with new patches,
    configs and tree manipulations. To do this, it first checks for an existing
    board description and generates one if required. It then searches for features
    and fragments to be applied for the tree.

    There were two problems:

     - A top level board description is detected via the presence of "define"
       directives that indicate the board name, the arch and kernel type. The
       test for define would match on patches or fragments with 'define' in their
       name, and would incorrectly use that file as the top level board description.

       This is fixed by ensuring that only defines at the start of a line, or preceded
       by whitepace match.

     - When searching for features that were indicated as 'addon' or 'optional', the
       search would find, and apply, any feature with the passed name as substring
       versus an exact match.

       This is fixed by ensuring that the matched feature name is /<feature name>
       versus <feature name>

(From OE-Core rev: 57ae1e412a35d827f84bf9b1f48747bf703f84b7)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index be58847..6620c4b 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "71ffb08c20022610363e68f9243350b7da020825"
+SRCREV = "9713c9ef7f6e178a0a2a5f2a9c74e3c123ae48dd"
 PR = "r12"
 PV = "0.1+git${SRCPV}"
 
-- 
1.7.10.4

[PATCH dylan 2/2] kern-tools: refresh and make dash compliant

[Bruce Ashfield]

The separately packaged merge_config.sh in the kern-tools package was
missing upstream fixes, and in particular a change that ensures it is
dash compatible.

By grabbing that upstream commit and rebasing the existing patches on
top of the new baseline, we are up to date and working on systems
where /bin/sh is dash.

[YOCTO #4473]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 6620c4b..a86dda3 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "9713c9ef7f6e178a0a2a5f2a9c74e3c123ae48dd"
+SRCREV = "1a3c59526d6abe95662820b9493c8a62dab52d79"
 PR = "r12"
 PV = "0.1+git${SRCPV}"
 
-- 
1.7.10.4

[PATCH danny] kern-tools: refresh and make dash compliant

[Bruce Ashfield]

The separately packaged merge_config.sh in the kern-tools package was
missing upstream fixes, and in particular a change that ensures it is
dash compatible.

By grabbing that upstream commit and rebasing the existing patches on
top of the new baseline, we are up to date and working on systems
where /bin/sh is dash.

[YOCTO #4473]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 1381fd1..1dd0ea2 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "a04138a02644eada0d012196e5ac3db4f516114d"
+SRCREV = "462e7771fa78f6e399e40a9029461d3917c2724f"
 PR = "r12"
 PV = "0.1+git${SRCPV}"
 
 inherit native
 
-SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;protocol=git"
+SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;protocol=git;branch=danny"
 S = "${WORKDIR}"
 
 do_compile() { 
-- 
1.7.10.4