Minor fixup: indentation and avoid VFAT_RESULTS calculation

meta-luv/classes/luv-efi.bbclass

@@ -40,49 +40,49 @@ efi_populate() {
 
     # Install grub2 in EFI directory
     if [ "${TARGET_ARCH}" = "aarch64" ]; then
-		install -m 0644 ${DEPLOY_DIR_IMAGE}/grubaa64.efi ${DEST}${EFIDIR}
-                echo "grubaa64.efi" > ${DEST}${EFIDIR}/startup.nsh
+        install -m 0644 ${DEPLOY_DIR_IMAGE}/grubaa64.efi ${DEST}${EFIDIR}
+        echo "grubaa64.efi" > ${DEST}${EFIDIR}/startup.nsh
 
     # TODO: need conditional signing; e.g., if (DISTRO_FEATURES contains secure_boot)
     else
-                # sign grub2 bootloader
-                sbsign --key ${DEPLOY_DIR_IMAGE}/LUV.key --cert ${DEPLOY_DIR_IMAGE}/LUV.crt \
-                       --output ${DEPLOY_DIR_IMAGE}/grubx64.efi ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}
-
-                # temporarily rename the unsigned grub2 bootloader
-                mv ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE} ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}-unsigned
-                # shim will become our main bootloader
-                mv ${DEPLOY_DIR_IMAGE}/shim.efi  ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}
-
-                # install everything
-                install -m 0644 ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE} ${DEST}${EFIDIR}
-                install -m 0644 ${DEPLOY_DIR_IMAGE}/grubx64.efi ${DEST}${EFIDIR}
-                install -m 0644 ${DEPLOY_DIR_IMAGE}/MokManager.efi ${DEST}${EFIDIR}
-                install -m 0644 ${DEPLOY_DIR_IMAGE}/LUV.cer ${DEST}
-
-                # restore files to leave all in good shape for all the callers of the funciton
-                mv ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE} ${DEPLOY_DIR_IMAGE}/shim.efi
-                mv ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}-unsigned ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}
+        # sign grub2 bootloader
+        sbsign --key ${DEPLOY_DIR_IMAGE}/LUV.key --cert ${DEPLOY_DIR_IMAGE}/LUV.crt \
+            --output ${DEPLOY_DIR_IMAGE}/grubx64.efi ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}
+
+        # temporarily rename the unsigned grub2 bootloader
+        mv ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE} ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}-unsigned
+        # shim will become our main bootloader
+        mv ${DEPLOY_DIR_IMAGE}/shim.efi  ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}
+
+        # install everything
+        install -m 0644 ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE} ${DEST}${EFIDIR}
+        install -m 0644 ${DEPLOY_DIR_IMAGE}/grubx64.efi ${DEST}${EFIDIR}
+        install -m 0644 ${DEPLOY_DIR_IMAGE}/MokManager.efi ${DEST}${EFIDIR}
+        install -m 0644 ${DEPLOY_DIR_IMAGE}/LUV.cer ${DEST}
+
+        # restore files to leave all in good shape for all the callers of the funciton
+        mv ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE} ${DEPLOY_DIR_IMAGE}/shim.efi
+        mv ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}-unsigned ${DEPLOY_DIR_IMAGE}/${EFI_LOADER_IMAGE}
     fi
 
     # Install BITS only for x86_64 architecture
     if [ "${TARGET_ARCH}" = "x86_64" ]; then
-	    cp -r ${DEPLOY_DIR_IMAGE}/bits/boot ${DEST}
-            # TODO: Need condiitional signing based on DISTRO_FEATURES
-            mv ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE} \
-               ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}-unsigned
-
-            sbsign --key ${DEPLOY_DIR_IMAGE}/LUV.key --cert ${DEPLOY_DIR_IMAGE}/LUV.crt \
-                   --output ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE} \
-                   ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}-unsigned
-
-	    install -m 0644 ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE} \
-	        ${DEST}${EFIDIR}/bits/
-
-           # restore files
-           rm ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}
-           mv ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}-unsigned \
-               ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}
+        cp -r ${DEPLOY_DIR_IMAGE}/bits/boot ${DEST}
+        # TODO: Need condiitional signing based on DISTRO_FEATURES
+        mv ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE} \
+            ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}-unsigned
+
+        sbsign --key ${DEPLOY_DIR_IMAGE}/LUV.key --cert ${DEPLOY_DIR_IMAGE}/LUV.crt \
+            --output ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE} \
+            ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}-unsigned
+
+        install -m 0644 ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE} \
+            ${DEST}${EFIDIR}/bits/
+
+        # restore files
+        rm ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}
+        mv ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}-unsigned \
+            ${DEPLOY_DIR_IMAGE}/bits/efi/boot/${EFI_LOADER_IMAGE}
     fi
 
     # Install splash and grub.cfg files into EFI directory.

meta-luv/recipes-core/images/luv-live-image.bb

@@ -32,8 +32,8 @@ build_img() {
     # Blocks: 1024 bytes
     VFAT_RESULTS=${DEPLOY_DIR_IMAGE}/${PN}-results.hddimg
     # 8MB of space for test results
-    VFAT_RESULTS_SPACE=8388608
-    VFAT_RESULTS_BLOCKS=$(expr $VFAT_RESULTS_SPACE / 1024)
+    VFAT_RESULTS_SIZE=8388608
+    VFAT_RESULTS_BLOCKS=8192
     # TODO: do we need to dynamically generate the UUID?
     # For now, every time this UUID changes, the file etc/init.d/luv-test-manager
     # needs to be updated accordingly.
@@ -46,7 +46,6 @@ build_img() {
     dd if=/dev/zero of=$IMG bs=512 count=1
 
     VFAT_SIZE=$(du -L --apparent-size -bs $VFAT | cut -f 1)
-    VFAT_RESULTS_SIZE=$(du -L --apparent-size -bs $VFAT_RESULTS | cut -f 1)
 
     IMG_SIZE=$(expr $VFAT_SIZE + $VFAT_RESULTS_SIZE + 512)
 
@@ -64,7 +63,6 @@ build_img() {
 
     dd conv=notrunc if=${VFAT_RESULTS} of=$IMG seek=1 bs=512
     dd if=${VFAT} of=$IMG seek=$(expr $(expr $VFAT_RESULTS_SIZE / 512) + 1) bs=512
-
 }
 
 python do_create_img() {