Replaces 'boot-img' and 'kernel_android' classes with abootimg, mkboot and mkbootimg

classes/abootimg.bbclass

+#
+# This class is used to create Android device compatible boot.img files with kernel and initrd using abootimg
+#
+
+ABOOTIMG_ARGS ?= ""
+
+do_compile[depends] += "initramfs-android-image:do_rootfs"
+DEPENDS += "abootimg-native"
+
+do_compile_append() {
+    abootimg --create ${B}/boot.img \
+             -k ${B}/${KERNEL_OUTPUT} \
+             -r ${DEPLOY_DIR_IMAGE}/initramfs-android-image-${MACHINE}.cpio.gz \
+             ${ABOOTIMG_ARGS}
+}
+
+do_deploy_append() {
+    cp ${B}/boot.img ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.fastboot
+    ln -sf ${KERNEL_IMAGE_BASE_NAME}.fastboot ${DEPLOYDIR}/${KERNEL_IMAGE_SYMLINK_NAME}.fastboot
+}
+
+# Update mechanism
+
+do_install_append() {
+    install -d ${D}/${KERNEL_IMAGEDEST}
+    install -m 0644 ${B}/boot.img ${D}/${KERNEL_IMAGEDEST}
+}
+
+pkg_postinst_kernel-image_append () {
+    if [ x"$D" = "x" ] ; then
+        if [ ! -e /boot/boot.img ] ; then
+            # if the boot image is not available here something went wrong and we don't
+            # continue with anything that can be dangerous
+            exit 1
+        fi
+
+        BOOT_PARTITION_NAMES="LNX boot KERNEL"
+        for i in $BOOT_PARTITION_NAMES; do
+            path=$(find /dev -name "*$i*"|grep disk| head -n 1)
+            [ -n "$path" ] && break
+        done
+
+        if [ -z "$path" ] ; then
+            echo "Boot partition does not exist!"
+            exit 1
+        fi
+
+        echo "Flashing the new kernel /boot/boot.img to $path"
+        dd if=/boot/boot.img of=$path
+    else
+        exit 1
+    fi
+}
+
+FILES_kernel-image += "/${KERNEL_IMAGEDEST}/boot.img"

classes/boot-img.bbclass → classes/mkboot.bbclass

 #
-# This class is used to create Android device compatible boot.img files with kernel and initrd
-# It differs from meta-android/classes/kernel_android.bbclass because it uses mkboot
+# This class is used to create Android device compatible boot.img files with kernel and initrd using mkboot
 #
 
 do_compile[depends] += "initramfs-android-image:do_rootfs"
@@ -14,16 +13,18 @@ do_compile_append() {
     mkboot . boot.img
 }
 
-do_install_append() {
-    install -d ${D}/${KERNEL_IMAGEDEST}
-    install -m 0644 ${B}/boot.img ${D}/${KERNEL_IMAGEDEST}
-}
-
 do_deploy_append() {
     cp ${B}/boot.img ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.fastboot
     ln -sf ${KERNEL_IMAGE_BASE_NAME}.fastboot ${DEPLOYDIR}/${KERNEL_IMAGE_SYMLINK_NAME}.fastboot
 }
 
+# Update mechanism
+
+do_install_append() {
+    install -d ${D}/${KERNEL_IMAGEDEST}
+    install -m 0644 ${B}/boot.img ${D}/${KERNEL_IMAGEDEST}
+}
+
 pkg_postinst_kernel-image_append () {
     if [ x"$D" = "x" ] ; then
         if [ ! -e /boot/boot.img ] ; then
@@ -51,4 +52,3 @@ pkg_postinst_kernel-image_append () {
 }
 
 FILES_kernel-image += "/${KERNEL_IMAGEDEST}/boot.img"
-

classes/mkbootimg.bbclass

+#
+# This class is used to create Android device compatible boot.img files with kernel and initrd using mkbootimg
+#
+
+MKBOOTIMG_ARGS ?= ""
+
+do_compile[depends] += "initramfs-android-image:do_rootfs"
+DEPENDS += "mkbootimg-tools-native"
+
+do_compile_append() {
+    mkbootimg -o ${B}/boot.img \
+              --kernel ${KERNEL_OUTPUT}  \
+              --ramdisk ${DEPLOY_DIR_IMAGE}/initramfs-android-image-${MACHINE}.cpio.gz \
+              ${MKBOOTIMG_ARGS}
+}
+
+do_deploy_append() {
+    cp ${B}/boot.img ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.fastboot
+    ln -sf ${KERNEL_IMAGE_BASE_NAME}.fastboot ${DEPLOYDIR}/${KERNEL_IMAGE_SYMLINK_NAME}.fastboot
+}
+
+# Update mechanism
+
+do_install_append() {
+    install -d ${D}/${KERNEL_IMAGEDEST}
+    install -m 0644 ${B}/boot.img ${D}/${KERNEL_IMAGEDEST}
+}
+
+pkg_postinst_kernel-image_append () {
+    if [ x"$D" = "x" ] ; then
+        if [ ! -e /boot/boot.img ] ; then
+            # if the boot image is not available here something went wrong and we don't
+            # continue with anything that can be dangerous
+            exit 1
+        fi
+
+        BOOT_PARTITION_NAMES="LNX boot KERNEL"
+        for i in $BOOT_PARTITION_NAMES; do
+            path=$(find /dev -name "*$i*"|grep disk| head -n 1)
+            [ -n "$path" ] && break
+        done
+
+        if [ -z "$path" ] ; then
+            echo "Boot partition does not exist!"
+            exit 1
+        fi
+
+        echo "Flashing the new kernel /boot/boot.img to $path"
+        dd if=/boot/boot.img of=$path
+    else
+        exit 1
+    fi
+}
+
+FILES_kernel-image += "/${KERNEL_IMAGEDEST}/boot.img"