]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
linux-yocto: update meta branch SRCREV
authorBruce Ashfield <bruce.ashfield@windriver.com>
Wed, 15 Jun 2011 03:56:32 +0000 (23:56 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 15 Jun 2011 09:35:05 +0000 (10:35 +0100)
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

index 1d43e1e38135ecce727a7cc3519a65135a846a7e..f6abc9e3ab839b8a68bb8b28a834f0ee0e57d0d6 100644 (file)
@@ -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}"