diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-06-14 23:56:32 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-15 10:35:05 +0100 |
| commit | 09e7b0535f8f2f287da670aabd1d6db76b90686f (patch) | |
| tree | 3b7169b6561114a7fb6e6fe981352d47781592f0 /meta/recipes-kernel | |
| parent | 383d94222e8cfc85d0885f60c88c064091866296 (diff) | |
| download | openembedded-core-contrib-09e7b0535f8f2f287da670aabd1d6db76b90686f.tar.gz | |
linux-yocto: update meta branch SRCREV
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>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | 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 1d43e1e381..f6abc9e3ab 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}" |