[PATCH 0/1] linux-yocto: update meta branch SRCREV

[PATCH 0/1] linux-yocto: update meta branch SRCREV

[Bruce Ashfield]

Richard/Saul,

The patch really says it all, so I'm repeating it here:

[    
  Updating the meta SRCREV to fix a bad commit which resulted in the
  tree being dirty after checkpoint, and hence a failure during the
  patch phase. The meta commits never modify code outside the 'meta'
  directory tree, a rule that was broken with this bad commit.

  Without this fix, you may see an error like:

  | [INFO] doing kernel configme
  | [INFO] Finding user(s) of branch "yocto/standard/fsl-mpc8315e-rdb"
  | [INFO] Branch meta-temp used by fsl-mpc8315e-rdb-standard.scc
  | [INFO] collecting configs in ./meta/meta-series
  | [INFO] checking out yocto/standard/fsl-mpc8315e-rdb
  | error: Your local changes to the following files would be overwritten by checkout:
  | 	arch/powerpc/boot/dts/mpc8315erdb.dts
  | Please, commit your changes or stash them before you can switch branches.
  | Aborting
  | [ERROR] Checkout of yocto/standard/fsl-mpc8315e-rdb failed
  | Error running the meta series for collecting config data
  | config of meta-temp (fsl-mpc8315e-rdb-standard.scc) failed
]

The linux-yocto tree was fixed a few days ago, and the dust has settled
enough (I hope) on the recipe renames that this can now go out.

The following changes since commit 7aa7673459376aff911cef820c9417c998d1aa96:
  Bruce Ashfield (1):
        meta-yocto/linux-yocto: update to match the renamed linux-yocto recipes

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: update meta branch SRCREV

 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[PATCH 1/1] linux-yocto: update meta branch SRCREV

[Bruce Ashfield]

Updating the meta SRCREV to fix a bad commit which resulted in the
tree being dirty after checkpoint, and hence a failure during the
patch phase. The meta commits never modify code outside the 'meta'
directory tree, a rule that was broken with this bad commit.

Without this fix, you may see an error like:

| [INFO] doing kernel configme
| [INFO] Finding user(s) of branch "yocto/standard/fsl-mpc8315e-rdb"
| [INFO] Branch meta-temp used by fsl-mpc8315e-rdb-standard.scc
| [INFO] collecting configs in ./meta/meta-series
| [INFO] checking out yocto/standard/fsl-mpc8315e-rdb
| error: Your local changes to the following files would be overwritten by checkout:
| 	arch/powerpc/boot/dts/mpc8315erdb.dts
| Please, commit your changes or stash them before you can switch branches.
| Aborting
| [ERROR] Checkout of yocto/standard/fsl-mpc8315e-rdb failed
| Error running the meta series for collecting config data
| config of meta-temp (fsl-mpc8315e-rdb-standard.scc) failed

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

diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
index 1d43e1e..f6abc9e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
@@ -20,7 +20,7 @@ SRCREV_machine_qemuppc = "704497b3a48c0882078f6167277d65d932292535"
 SRCREV_machine_qemux86 = "c1a74a7872fdd1152265087aa7e59b96a8f2f42a"
 SRCREV_machine_qemux86-64 = "1950ea205407d8950475a37404173572d55fd27f"
 SRCREV_machine = "697d84759be192403a8a87ab269196c67a0c2c88"
-SRCREV_meta = "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26"
+SRCREV_meta = "46a1be20b01e50d5d0646e5622e9dd06433238c2"
 
 PR = "r18"
 PV = "${LINUX_VERSION}+git${SRCPV}"
-- 
1.7.0.4

Re: [PATCH 0/1] linux-yocto: update meta branch SRCREV

[Richard Purdie]

On Wed, 2011-06-15 at 00:05 -0400, Bruce Ashfield wrote:
> Richard/Saul,
> 
> The patch really says it all, so I'm repeating it here:
> 
> [    
>   Updating the meta SRCREV to fix a bad commit which resulted in the
>   tree being dirty after checkpoint, and hence a failure during the
>   patch phase. The meta commits never modify code outside the 'meta'
>   directory tree, a rule that was broken with this bad commit.
> 
>   Without this fix, you may see an error like:
> 
>   | [INFO] doing kernel configme
>   | [INFO] Finding user(s) of branch "yocto/standard/fsl-mpc8315e-rdb"
>   | [INFO] Branch meta-temp used by fsl-mpc8315e-rdb-standard.scc
>   | [INFO] collecting configs in ./meta/meta-series
>   | [INFO] checking out yocto/standard/fsl-mpc8315e-rdb
>   | error: Your local changes to the following files would be overwritten by checkout:
>   | 	arch/powerpc/boot/dts/mpc8315erdb.dts
>   | Please, commit your changes or stash them before you can switch branches.
>   | Aborting
>   | [ERROR] Checkout of yocto/standard/fsl-mpc8315e-rdb failed
>   | Error running the meta series for collecting config data
>   | config of meta-temp (fsl-mpc8315e-rdb-standard.scc) failed
> ]
> 
> The linux-yocto tree was fixed a few days ago, and the dust has settled
> enough (I hope) on the recipe renames that this can now go out.
> 
> The following changes since commit 7aa7673459376aff911cef820c9417c998d1aa96:
>   Bruce Ashfield (1):
>         meta-yocto/linux-yocto: update to match the renamed linux-yocto recipes
> 
> 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: update meta branch SRCREV

Merged to master, thanks.

Richard