kernel.bbclass: Stop bundle_initramfs thwarting sstate cache and fix race
The new do_bundle_initramfs task introduced in 609d5a9ab9e58bb1c2bcc2145399fbc8b701b85a defeats using the sstate cache. The kernel is resurrected from the sstate cache but ends up being built again since do_bundle_initramfs depends on do_compile. The task is no longer nostamp to avoid causing unnecessary rebuilds. The sstate checksum stamps should know when to rebuild. The task now runs before do_deploy and part of the work has been moved to do_deploy where it now writes to ${DEPLOYDIR} rather than ${DEPLOY_DIR_IMAGE} so that the files end up in sstate. The task can also race against do_install since both call into the kernel build system. This is fixed by making do_bundle_initramfs run after do_install (which therefore also fixes the problem that 3baa63b4d588c3262254528b406ede265dd117bf was addressing.) (From OE-Core master rev: 55989cb509340bd265d0ce0d8bfe849681be4616) (From OE-Core rev: e64d2a6d408ac542bdaa42680d10d0fb05b92a60) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
3c9d11bf7f
commit
97af6e46da
|
@ -134,25 +134,14 @@ do_bundle_initramfs () {
|
||||||
echo "There is kernel image bundled with initramfs: ${B}/${KERNEL_OUTPUT}.initramfs"
|
echo "There is kernel image bundled with initramfs: ${B}/${KERNEL_OUTPUT}.initramfs"
|
||||||
install -m 0644 ${B}/${KERNEL_OUTPUT}.initramfs ${D}/boot/${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin
|
install -m 0644 ${B}/${KERNEL_OUTPUT}.initramfs ${D}/boot/${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin
|
||||||
echo "${B}/${KERNEL_OUTPUT}.initramfs"
|
echo "${B}/${KERNEL_OUTPUT}.initramfs"
|
||||||
cd ${B}
|
|
||||||
# Update deploy directory
|
|
||||||
if [ -e "${KERNEL_OUTPUT}.initramfs" ]; then
|
|
||||||
echo "Copying deploy kernel-initramfs image and setting up links..."
|
|
||||||
initramfs_base_name=${INITRAMFS_BASE_NAME}
|
|
||||||
initramfs_symlink_name=${KERNEL_IMAGETYPE}-initramfs-${MACHINE}
|
|
||||||
install -m 0644 ${KERNEL_OUTPUT}.initramfs ${DEPLOY_DIR_IMAGE}/${initramfs_base_name}.bin
|
|
||||||
cd ${DEPLOY_DIR_IMAGE}
|
|
||||||
ln -sf ${initramfs_base_name}.bin ${initramfs_symlink_name}.bin
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
do_bundle_initramfs[nostamp] = "1"
|
|
||||||
|
|
||||||
python do_devshell_prepend () {
|
python do_devshell_prepend () {
|
||||||
os.environ["LDFLAGS"] = ''
|
os.environ["LDFLAGS"] = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
addtask bundle_initramfs after do_compile before do_build
|
addtask bundle_initramfs after do_install before do_deploy
|
||||||
|
|
||||||
kernel_do_compile() {
|
kernel_do_compile() {
|
||||||
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
|
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
|
||||||
|
@ -464,6 +453,17 @@ kernel_do_deploy() {
|
||||||
ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGETYPE}
|
ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGETYPE}
|
||||||
|
|
||||||
cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
|
cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
|
||||||
|
|
||||||
|
cd ${B}
|
||||||
|
# Update deploy directory
|
||||||
|
if [ -e "${KERNEL_OUTPUT}.initramfs" ]; then
|
||||||
|
echo "Copying deploy kernel-initramfs image and setting up links..."
|
||||||
|
initramfs_base_name=${INITRAMFS_BASE_NAME}
|
||||||
|
initramfs_symlink_name=${KERNEL_IMAGETYPE}-initramfs-${MACHINE}
|
||||||
|
install -m 0644 ${KERNEL_OUTPUT}.initramfs ${DEPLOYDIR}/${initramfs_base_name}.bin
|
||||||
|
cd ${DEPLOYDIR}
|
||||||
|
ln -sf ${initramfs_base_name}.bin ${initramfs_symlink_name}.bin
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
|
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
|
||||||
do_deploy[prefuncs] += "package_get_auto_pr"
|
do_deploy[prefuncs] += "package_get_auto_pr"
|
||||||
|
|
Loading…
Reference in New Issue