[oe-commits] Hongxu Jia : kernel-grub.bbclass: support /boot area within root partition

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 53d342db9f9995564573715f28c3e4c9c8c68bf9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=53d342db9f9995564573715f28c3e4c9c8c68bf9

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Mon Nov 11 19:56:54 2013 +0800

kernel-grub.bbclass: support /boot area within root partition

Previously, it supported the situation that /boot area with separate boot
partition:
...
menuentry "Update bzImage-3.10.10-WR6.0.0.0_standard-3.10" {
    set root=(hd0,1)
    linux /bzImage-3.10.10-WR6.0.0.0_standard root=/dev/sdb1 rw ip=dhcp
}
...

But didn't consider the situation that /boot within root partition:
...
menuentry "Update bzImage-3.10.10-WR6.0.0.0_standard-3.10" {
    set root=(hd0,1)
    linux /boot/bzImage-3.10.10-WR6.0.0.0_standard root=/dev/sdb1 rw ip=dhcp
}
...

This fix supported them both.
[YOCTO #5514]

Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/kernel-grub.bbclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/classes/kernel-grub.bbclass b/meta/classes/kernel-grub.bbclass
index 70564f0..85721ff 100644
--- a/meta/classes/kernel-grub.bbclass
+++ b/meta/classes/kernel-grub.bbclass
@@ -40,10 +40,11 @@ pkg_preinst_kernel-image_append () {
 pkg_postinst_kernel-image_prepend () {
 	get_new_grub_cfg() {
 		grubcfg="$1"
+		old_image="$2"
 		title="Update ${KERNEL_IMAGETYPE}-${KERNEL_VERSION}-${PV}"
 		if [ "${grubcfg##*/}" = "grub.cfg" ]; then
 			rootfs=`grep " *linux \+[^ ]\+ \+root=" $grubcfg -m 1 | \
-				 sed "s# *linux \+[^ ]\+ \+root=#    linux /${KERNEL_IMAGETYPE}-${KERNEL_VERSION} root=#"`
+				 sed "s#${old_image}#${old_image%/*}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}#"`
 
 			echo "menuentry \"$title\" {"
 			echo "    set root=(hd0,1)"
@@ -51,7 +52,7 @@ pkg_postinst_kernel-image_prepend () {
 			echo "}"
 		elif [ "${grubcfg##*/}" = "menu.list" ]; then
 			rootfs=`grep "kernel \+[^ ]\+ \+root=" $grubcfg -m 1 | \
-				 sed "s#kernel \+[^ ]\+ \+root=#kernel /${KERNEL_IMAGETYPE}-${KERNEL_VERSION} root=#"`
+				 sed "s#${old_image}#${old_image%/*}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}#"`
 
 			echo "default 0"
 			echo "timeout 30"
@@ -79,9 +80,9 @@ pkg_postinst_kernel-image_prepend () {
 	fi
 
 	# Don't update grubcfg at first install while old bzImage doesn't exist.
-	if [ -f "$D/boot/$old_image" ]; then
+	if [ -f "$D/boot/${old_image##*/}" ]; then
 		grubcfgtmp="$grubcfg.tmp"
-		get_new_grub_cfg "$grubcfg"  > $grubcfgtmp
+		get_new_grub_cfg "$grubcfg" "$old_image"  > $grubcfgtmp
 		get_old_grub_cfg "$grubcfg" >> $grubcfgtmp
 		mv $grubcfgtmp $grubcfg
 		echo "Caution! Update kernel may affect kernel-module!"