From 661734759e73abd86d8184ae1dc4e91ba9cac83d Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Fri, 10 Jul 2015 17:41:03 -0700 Subject: bootimg.bbclass:iso: determine the -iso-level only if there is a rootfs It may be possible that some bootable images do not use a rootfs; this may be the case if the bootable image utilize only an initrd for all its needs. If there is not rootfs, the size calculation will fail. Furthermore, given that the iso9660 conformance level is determined using the size of rootfs, it makes sense to not make the calculation if there is not such rootfs. (From OE-Core rev: 57064ac9ccd8a3783789d11feb5a51351cd924bf) Signed-off-by: Ricardo Neri Signed-off-by: Richard Purdie --- meta/classes/bootimg.bbclass | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index ebc927edc7..5adcacc0f3 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -142,11 +142,14 @@ build_iso() { # when it exceeds 3.8GB, the specification is 4G - 1 bytes, we need # leave a few space for other files. mkisofs_iso_level="" - rootfs_img_size=`stat -c '%s' ${ISODIR}/rootfs.img` - # 4080218931 = 3.8 * 1024 * 1024 * 1024 - if [ $rootfs_img_size -gt 4080218931 ]; then - bbnote "${ISODIR}/rootfs.img execeeds 3.8GB, using '-iso-level 3' for mkisofs" - mkisofs_iso_level="-iso-level 3" + + if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then + rootfs_img_size=`stat -c '%s' ${ISODIR}/rootfs.img` + # 4080218931 = 3.8 * 1024 * 1024 * 1024 + if [ $rootfs_img_size -gt 4080218931 ]; then + bbnote "${ISODIR}/rootfs.img execeeds 3.8GB, using '-iso-level 3' for mkisofs" + mkisofs_iso_level="-iso-level 3" + fi fi if [ "${PCBIOS}" = "1" ] && [ "${EFI}" != "1" ] ; then -- cgit v1.2.3-54-g00ecf