Return-Path: Received: from mail-qa0-f48.google.com (mail-qa0-f48.google.com [209.85.216.48]) by mail.openembedded.org (Postfix) with ESMTP id DE53860F54 for ; Fri, 20 Dec 2013 16:52:45 +0000 (UTC) Received: by mail-qa0-f48.google.com with SMTP id w5so2801635qac.7 for ; Fri, 20 Dec 2013 08:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=mce/b+b6bJkIEI0CVJF8yXLwZPAWx366CVGh04ijjWU=; b=k+MtsYZ7ZOU0/+YM+ylsGyFvryOZ6S3qD6do0yHEJRbMl0C2q47LN7RQL2IIm2o1zu feUchIZXxRLFWBJ6MgJOQtk2uSjS/pqzZkL5ZkTcP2Az5I6LJxx1yP2iOevZLiVzEzLh ssf5Lgu1gaa6yjq4vtb1ixkVpJ8VPkkS0W5KWZRxyUyAAYXC4JkNqFxG6XWYEHDXoQKO q4wIDjkELULbeCF6CU2vDqZRB8MaFfyKrrLSv0sJwOp2t2IrgaTUv+0q2tqAiA8NXQHc 0qxO1kLKnVcNwweMsnwmFWA5NL419QJ4EbFlzS3Ya7wHmVE/z0I1a00kR2AbdmiQ9Q82 WujA== X-Received: by 10.229.97.134 with SMTP id l6mr15753405qcn.11.1387558366834; Fri, 20 Dec 2013 08:52:46 -0800 (PST) Received: from jfreitas.padtec.com.br (apolo.padtec.com.br. [200.228.158.130]) by mx.google.com with ESMTPSA id ki4sm17784986qeb.0.2013.12.20.08.52.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Dec 2013 08:52:46 -0800 (PST) From: Joao Henrique Ferreira de Freitas To: openembedded-core@lists.openembedded.org Date: Fri, 20 Dec 2013 14:52:14 -0200 Message-Id: <1387558334-17814-1-git-send-email-joaohf@gmail.com> X-Mailer: git-send-email 1.8.3.2 Subject: [PATCH v2] boot-directdisk: fix the support of vmdk X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 16:52:46 -0000 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. Signed-off-by: Joao Henrique Ferreira de Freitas --- Using IMAGE_FSTYPE to hold the result of base_contains(). meta/classes/boot-directdisk.bbclass | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index 3277666..d0113ac 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass @@ -61,6 +61,8 @@ DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" SYSLINUX_ROOT ?= "root=/dev/sda2" SYSLINUX_TIMEOUT ?= "10" +IMAGE_FSTYPE = '${@base_contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "", d)}' + boot_direct_populate() { dest=$1 install -d $dest @@ -88,10 +90,10 @@ build_boot_dd() { grubefi_hddimg_populate $HDDDIR fi - if [ ${IMAGE_FSTYPE} = "vmdk" ]; then - if [ x${AUTO_SYSLINUXMENU} = x1 ] ; then + if [ "${IMAGE_FSTYPE}" = "image-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 +131,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 +141,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 -- 1.8.3.2