Files
poky/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
Bruce Ashfield 28fff2f69d 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

(From OE-Core rev: 09e7b0535f8f2f287da670aabd1d6db76b90686f)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-15 11:13:13 +01:00

47 lines
1.6 KiB
BlitzBasic

inherit kernel
require linux-yocto.inc
KMACHINE = "yocto/standard/base"
KMACHINE_qemux86 = "yocto/standard/common-pc/base"
KMACHINE_qemux86-64 = "yocto/standard/common-pc-64/base"
KMACHINE_qemuppc = "yocto/standard/qemu-ppc32"
KMACHINE_qemumips = "yocto/standard/mti-malta32-be"
KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs"
KBRANCH = ${KMACHINE}
KMETA = meta
LINUX_VERSION ?= "2.6.37"
LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
SRCREV_machine_qemuarm = "2070a54dbde57d2987c832a016b05949f7e6e086"
SRCREV_machine_qemumips = "bd9eab8e382e11dc08a5de8b010570f03de949e5"
SRCREV_machine_qemuppc = "704497b3a48c0882078f6167277d65d932292535"
SRCREV_machine_qemux86 = "c1a74a7872fdd1152265087aa7e59b96a8f2f42a"
SRCREV_machine_qemux86-64 = "1950ea205407d8950475a37404173572d55fd27f"
SRCREV_machine = "697d84759be192403a8a87ab269196c67a0c2c88"
SRCREV_meta = "46a1be20b01e50d5d0646e5622e9dd06433238c2"
PR = "r18"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV_FORMAT = "meta_machine"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
# Functionality flags
KERNEL_REVISION_CHECKING ?= "t"
KERNEL_FEATURES="features/netfilter"
KERNEL_FEATURES_append_qemux86=" cfg/sound"
KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
YOCTO_KERNEL_META_DATA=t
# extra tasks
addtask kernel_link_vmlinux after do_compile before do_install
addtask validate_branches before do_patch after do_kernel_checkout
addtask kernel_configcheck after do_configure before do_compile
require linux-tools.inc