kernel.bbclass: move bundle_initramfs after kernel_link_vmlinux
PATCH v2 1/2 kernel.bbclass: move bundle_initramfs after kernel_link_vmlinux
${KERNEL_OUTPUT} is being renamed/restored in bundle_initramfs task, so we must ensure bundle_initramfs run after kernel_link_vmlinux where the link of vmlinux is created as the bootable image.
--- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/kernel.bbclass +1 -1
@@ -152,7 +152,7 @@ python do_devshell_prepend () { os.environ["LDFLAGS"] = '' } -addtask bundle_initramfs after do_compile before do_build +addtask bundle_initramfs after do_kernel_link_vmlinux before do_build kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
Signature · 1 line
1.8.4.1
PATCH v2 2/2 kernel.bbclass: handles symbolic KERNEL_OUTPUT in bundle_initramfs task
In many cases, KERNEL_OUTPUT is a symbolic link to the real bootable image, but in bundle_initramfs task, it's not considered so that the KERNEL_OUTPUT is being renamed/restored as a regular file, this leads it finally point to a incorrect target, or even worse, break the bundle_initramfs task for KERNEL_OUTPUT is not going to be regenerated in case it is a symbolic link to vmlinux.
--- meta/classes/kernel.bbclass | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
meta/classes/kernel.bbclass +18 -3
@@ -123,13 +123,28 @@ do_bundle_initramfs () { if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then echo "Creating a kernel image with a bundled initramfs..." copy_initramfs - if [ -e ${KERNEL_OUTPUT} ] ; then + # Backuping kernel image relies on its type(regular file or symbolic link) + linkpath="" + realpath="" + if [ -h ${KERNEL_OUTPUT} ] ; then + linkpath=`readlink -n ${KERNEL_OUTPUT}` + realpath=`readlink -fn ${KERNEL_OUTPUT}` + mv -f $realpath $realpath.bak + elif [ -f ${KERNEL_OUTPUT} ]; then mv -f ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}.bak fi use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio kernel_do_compile - mv -f ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}.initramfs - mv -f ${KERNEL_OUTPUT}.bak ${KERNEL_OUTPUT} + # Restoring kernel image + if [ -n $realpath ]; then + mv -f $realpath $realpath.initramfs + mv -f $realpath.bak $realpath + cd ${B}/$(dirname ${KERNEL_OUTPUT}) + ln -sf $linkpath.initramfs + else + mv -f ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}.initramfs + mv -f ${KERNEL_OUTPUT}.bak ${KERNEL_OUTPUT} + fi # Update install area 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
Signature · 1 line
1.8.4.1
Re: [PATCH V2 2/2] kernel.bbclass: handles symbolic KERNEL_OUTPUT in bundle_initramfs task
Quoted 27 lines · Ming Liu
In many cases,
KERNEL_OUTPUTis a symbolic link to the real bootable image, but inbundle_initramfstask, it's not considered so that theKERNEL_OUTPUTis being renamed/restored as a regular file, this leads it finally point to a incorrect target, or even worse, break thebundle_initramfstask forKERNEL_OUTPUTis not going to be regenerated in case it is a symbolic link to vmlinux.Signed-off-by Ming Liu <[email protected]>--- meta/classes/kernel.bbclass | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)meta/classes/kernel.bbclass +6
-1@@ -123,13 +123,28 @@ do_bundle_initramfs () { if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then echo "Creating a kernel image with a bundled initramfs..." copy_initramfs - if [ -e ${KERNEL_OUTPUT} ] ; then + # Backuping kernel image relies on its type(regular file or symbolic link) + linkpath="" + realpath="" + if [ -h ${KERNEL_OUTPUT} ] ; then + linkpath=`readlink -n ${KERNEL_OUTPUT}` + realpath=`readlink -fn ${KERNEL_OUTPUT}`
meta/classes/kernel.bbclass do_bundle_initramfs () { · line 139
Quoted 10 lines
meta/classes/kernel.bbclass +4
-2+ mv -f $realpath $realpath.bak + elif [ -f ${KERNEL_OUTPUT} ]; then mv -f ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}.bak fi use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio kernel_do_compile - mv -f ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}.initramfs - mv -f ${KERNEL_OUTPUT}.bak ${KERNEL_OUTPUT} + # Restoring kernel image + if [ -n $realpath ]; then
I made a mistake here, $realpath need to be quoted, otherwise, it will break the task while $realpath is empty. So I need send a V3.
//Ming Liu
Quoted 11 lines
meta/classes/kernel.bbclass +8
-0+ mv -f $realpath $realpath.initramfs + mv -f $realpath.bak $realpath + cd ${B}/$(dirname ${KERNEL_OUTPUT}) + ln -sf $linkpath.initramfs + else + mv -f ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}.initramfs + mv -f ${KERNEL_OUTPUT}.bak ${KERNEL_OUTPUT} + fi # Update install area 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