boot-directdisk: fix the support of vmdk
PATCH 1/1 boot-directdisk: fix the support of vmdk
Previous change (086ce22b88f5ef5f75a83119a32c8b3fdcfa296d) broke the creating of vmdk images. This protects shell expansion variables and let dd generate the image to be transformed to vmdk by image-vmdk.class.
--- meta/classes/boot-directdisk.bbclass | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
meta/classes/boot-directdisk.bbclass +6 -10
@@ -88,10 +88,10 @@ build_boot_dd() { grubefi_hddimg_populate $HDDDIR fi - if [ ${IMAGE_FSTYPE} = "vmdk" ]; then - if [ x${AUTO_SYSLINUXMENU} = x1 ] ; then + if [ "${IMAGE_FSTYPES}" = "vmdk" ]; then + if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32 - if [ x${SYSLINUX_SPLASH} != x ] ; then + if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss fi fi
@@ -129,9 +129,7 @@ build_boot_dd() { parted $IMAGE unit B mkpart primary ext2 ${END2}B ${END3}B parted $IMAGE set 1 boot on - if [ ${IMAGE_FSTYPE} != "vmdk" ]; then - parted $IMAGE print - fi + parted $IMAGE print awk "BEGIN { printf \"$(echo ${DISK_SIGNATURE} | fold -w 2 | tac | paste -sd '' | sed 's/\(..\)/\\x&/g')\" }" | \ dd of=$IMAGE bs=1 seek=440 conv=notrunc
@@ -141,10 +139,8 @@ build_boot_dd() { dd if=${STAGING_DATADIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc fi - if [ ${IMAGE_FSTYPE} != "vmdk" ]; then - dd if=$HDDIMG of=$IMAGE conv=notrunc seek=1 bs=512 - dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 - fi + dd if=$HDDIMG of=$IMAGE conv=notrunc seek=1 bs=512 + dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 cd ${DEPLOY_DIR_IMAGE} rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect
Signature · 1 line
1.8.3.2
Quoted 12 lines · Joao Henrique Ferreira de Freitas
Previous change (
086ce22b88f5ef5f75a83119a32c8b3fdcfa296d) broke the creating of vmdk images. This protects shell expansion variables and let dd generate the image to be transformed to vmdk by image-vmdk.class.--- meta/classes/boot-directdisk.bbclass | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)meta/classes/boot-directdisk.bbclass +0
-0
meta/classes/boot-directdisk.bbclass build_boot_dd() { · line 92
Quoted 7 lines
meta/classes/boot-directdisk.bbclass +2
-2@@ -88,10 +88,10 @@ build_boot_dd() { grubefi_hddimg_populate $HDDDIR fi - if [ ${IMAGE_FSTYPE} = "vmdk" ]; then - if [ x${AUTO_SYSLINUXMENU} = x1 ] ; then + if [ "${IMAGE_FSTYPES}" = "vmdk" ]; then + if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then
IMAGE_FSTYPE looks really as typo, but what if there are multiple entries in IMAGE_FSTYPES?
OE @ ~/openembedded-core $ git grep IMAGE_FSTYPE | grep -v IMAGE_FSTYPES
meta/classes/boot-directdisk.bbclass: if [ ${IMAGE_FSTYPE} = "vmdk" ]; then
meta/classes/boot-directdisk.bbclass: if [ ${IMAGE_FSTYPE} != "vmdk" ]; then
meta/classes/boot-directdisk.bbclass: if [ ${IMAGE_FSTYPE} != "vmdk" ]; thenMaybe you can use this variable instead:
meta/classes/image.bbclass:IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "", d)}'
Quoted 37 lines
meta/classes/boot-directdisk.bbclass +4
-8install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32 - if [ x${SYSLINUX_SPLASH} != x ] ; then + if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss fi fi@@ -129,9 +129,7 @@ build_boot_dd() { parted $IMAGE unit B mkpart primary ext2 ${END2}B ${END3}B parted $IMAGE set 1 boot on - if [ ${IMAGE_FSTYPE} != "vmdk" ]; then - parted $IMAGE print - fi + parted $IMAGE print awk "BEGIN { printf \"$(echo ${DISK_SIGNATURE} | fold -w 2 | tac | paste -sd '' | sed 's/\(..\)/\\x&/g')\" }" | \ dd of=$IMAGE bs=1 seek=440 conv=notrunc@@ -141,10 +139,8 @@ build_boot_dd() { dd if=${STAGING_DATADIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc fi - if [ ${IMAGE_FSTYPE} != "vmdk" ]; then - dd if=$HDDIMG of=$IMAGE conv=notrunc seek=1 bs=512 - dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 - fi + dd if=$HDDIMG of=$IMAGE conv=notrunc seek=1 bs=512 + dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 cd ${DEPLOY_DIR_IMAGE} rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirectSignature · 6 lines
1.8.3.2 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 34 lines · On Friday 20 December 2013 12:32:38 Martin Jansa wrote:
Quoted 13 lines · Joao Henrique Ferreira de Freitas
Previous change (
086ce22b88f5ef5f75a83119a32c8b3fdcfa296d) broke the creating of vmdk images. This protects shell expansion variables and let dd generate the image to be transformed to vmdk by image-vmdk.class. ---meta/classes/boot-directdisk.bbclass | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)(quoted diff) +0
-0b/meta/classes/boot-directdisk.bbclass index 3277666..4f26f47 100644
meta/classes/boot-directdisk.bbclass build_boot_dd() { · line 94
Quoted 9 lines
meta/classes/boot-directdisk.bbclass +2
-2@@ -88,10 +88,10 @@ build_boot_dd() { grubefi_hddimg_populate $HDDDIR fi - if [ ${IMAGE_FSTYPE} = "vmdk" ]; then - if [ x${AUTO_SYSLINUXMENU} = x1 ] ; then + if [ "${IMAGE_FSTYPES}" = "vmdk" ]; then + if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then
IMAGE_FSTYPElooks really as typo, but what if there are multiple entries inIMAGE_FSTYPES?OE @ ~/openembedded-core $ git grep
IMAGE_FSTYPE| grep -vIMAGE_FSTYPES
meta/classes/boot-directdisk.bbclass: if [ ${IMAGE_FSTYPE} = "vmdk" ];
then meta/classes/boot-directdisk.bbclass: if [ ${IMAGE_FSTYPE} != "vmdk"
]; then meta/classes/boot-directdisk.bbclass: if [ ${IMAGE_FSTYPE} !=
"vmdk" ]; then
Quoted 3 lines
Maybe you can use this variable instead:
meta/classes/image.bbclass:IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "", d)}'
I'd suggest not using that variable as it's an internal implementation detail of image.bbclass - just use a similar base_contains() statement.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre