From fd1517e2b51a170f2427122c6b95396db251d827 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 10 Aug 2022 14:35:29 +0100 Subject: classes: Update classes to match new bitbake class scope functionality Move classes to classes-global or classes-recipe as appropriate to take advantage of new bitbake functionality to check class scope/usage. (From OE-Core rev: f5c128008365e141082c129417eb72d2751e8045) Signed-off-by: Richard Purdie --- meta/classes/image-live.bbclass | 265 ---------------------------------------- 1 file changed, 265 deletions(-) delete mode 100644 meta/classes/image-live.bbclass (limited to 'meta/classes/image-live.bbclass') diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass deleted file mode 100644 index 1034acc49e..0000000000 --- a/meta/classes/image-live.bbclass +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright (C) 2004, Advanced Micro Devices, Inc. -# -# SPDX-License-Identifier: MIT - -# Creates a bootable image using syslinux, your kernel and an optional -# initrd - -# -# End result is two things: -# -# 1. A .hddimg file which is an msdos filesystem containing syslinux, a kernel, -# an initrd and a rootfs image. These can be written to harddisks directly and -# also booted on USB flash disks (write them there with dd). -# -# 2. A CD .iso image - -# Boot process is that the initrd will boot and process which label was selected -# in syslinux. Actions based on the label are then performed (e.g. installing to -# an hdd) - -# External variables (also used by syslinux.bbclass) -# ${INITRD} - indicates a list of filesystem images to concatenate and use as an initrd (optional) -# ${HDDIMG_ID} - FAT image volume-id -# ${ROOTFS} - indicates a filesystem image to include as the root filesystem (optional) - -inherit live-vm-common image-artifact-names - -do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ - mtools-native:do_populate_sysroot \ - cdrtools-native:do_populate_sysroot \ - virtual/kernel:do_deploy \ - ${MLPREFIX}syslinux:do_populate_sysroot \ - syslinux-native:do_populate_sysroot \ - ${@'%s:do_image_%s' % (d.getVar('PN'), d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')) if d.getVar('ROOTFS') else ''} \ - " - - -LABELS_LIVE ?= "boot install" -ROOT_LIVE ?= "root=/dev/ram0" -INITRD_IMAGE_LIVE ?= "${MLPREFIX}core-image-minimal-initramfs" -INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.${INITRAMFS_FSTYPES}" - -LIVE_ROOTFS_TYPE ?= "ext4" -ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" - -IMAGE_TYPEDEP:live = "${LIVE_ROOTFS_TYPE}" -IMAGE_TYPEDEP:iso = "${LIVE_ROOTFS_TYPE}" -IMAGE_TYPEDEP:hddimg = "${LIVE_ROOTFS_TYPE}" -IMAGE_TYPES_MASKED += "live hddimg iso" - -python() { - image_b = d.getVar('IMAGE_BASENAME') - initrd_i = d.getVar('INITRD_IMAGE_LIVE') - if image_b == initrd_i: - bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i) - bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.') - elif initrd_i: - d.appendVarFlag('do_bootimg', 'depends', ' %s:do_image_complete' % initrd_i) -} - -HDDDIR = "${S}/hddimg" -ISODIR = "${S}/iso" -EFIIMGDIR = "${S}/efi_img" -COMPACT_ISODIR = "${S}/iso.z" - -ISOLINUXDIR ?= "/isolinux" -ISO_BOOTIMG = "isolinux/isolinux.bin" -ISO_BOOTCAT = "isolinux/boot.cat" -MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table" - -BOOTIMG_VOLUME_ID ?= "boot" -BOOTIMG_EXTRA_SPACE ?= "512" - -populate_live() { - populate_kernel $1 - if [ -s "${ROOTFS}" ]; then - install -m 0644 ${ROOTFS} $1/rootfs.img - fi -} - -build_iso() { - # Only create an ISO if we have an INITRD and the live or iso image type was selected - if [ -z "${INITRD}" ] || [ "${@bb.utils.contains_any('IMAGE_FSTYPES', 'live iso', '1', '0', d)}" != "1" ]; then - bbnote "ISO image will not be created." - return - fi - # ${INITRD} is a list of multiple filesystem images - for fs in ${INITRD} - do - if [ ! -s "$fs" ]; then - bbwarn "ISO image will not be created. $fs is invalid." - return - fi - done - - populate_live ${ISODIR} - - if [ "${PCBIOS}" = "1" ]; then - syslinux_iso_populate ${ISODIR} - fi - if [ "${EFI}" = "1" ]; then - efi_iso_populate ${ISODIR} - build_fat_img ${EFIIMGDIR} ${ISODIR}/efi.img - fi - - # EFI only - if [ "${PCBIOS}" != "1" ] && [ "${EFI}" = "1" ] ; then - # Work around bug in isohybrid where it requires isolinux.bin - # In the boot catalog, even though it is not used - mkdir -p ${ISODIR}/${ISOLINUXDIR} - install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} - fi - - # We used to have support for zisofs; this is a relic of that - mkisofs_compress_opts="-r" - - # Check the size of ${ISODIR}/rootfs.img, use mkisofs -iso-level 3 - # when it exceeds 3.8GB, the specification is 4G - 1 bytes, we need - # leave a few space for other files. - mkisofs_iso_level="" - - 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 - # PCBIOS only media - mkisofs -V ${BOOTIMG_VOLUME_ID} \ - -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \ - -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ - $mkisofs_compress_opts \ - ${MKISOFS_OPTIONS} $mkisofs_iso_level ${ISODIR} - else - # EFI only OR EFI+PCBIOS - mkisofs -A ${BOOTIMG_VOLUME_ID} -V ${BOOTIMG_VOLUME_ID} \ - -o ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso \ - -b ${ISO_BOOTIMG} -c ${ISO_BOOTCAT} \ - $mkisofs_compress_opts ${MKISOFS_OPTIONS} $mkisofs_iso_level \ - -eltorito-alt-boot -eltorito-platform efi \ - -b efi.img -no-emul-boot \ - ${ISODIR} - isohybrid_args="-u" - fi - - isohybrid $isohybrid_args ${IMGDEPLOYDIR}/${IMAGE_NAME}.iso -} - -build_fat_img() { - FATSOURCEDIR=$1 - FATIMG=$2 - - # Calculate the size required for the final image including the - # data and filesystem overhead. - # Sectors: 512 bytes - # Blocks: 1024 bytes - - # Determine the sector count just for the data - SECTORS=$(expr $(du --apparent-size -ks ${FATSOURCEDIR} | cut -f 1) \* 2) - - # Account for the filesystem overhead. This includes directory - # entries in the clusters as well as the FAT itself. - # Assumptions: - # FAT32 (12 or 16 may be selected by mkdosfs, but the extra - # padding will be minimal on those smaller images and not - # worth the logic here to caclulate the smaller FAT sizes) - # < 16 entries per directory - # 8.3 filenames only - - # 32 bytes per dir entry - DIR_BYTES=$(expr $(find ${FATSOURCEDIR} | tail -n +2 | wc -l) \* 32) - # 32 bytes for every end-of-directory dir entry - DIR_BYTES=$(expr $DIR_BYTES + $(expr $(find ${FATSOURCEDIR} -type d | tail -n +2 | wc -l) \* 32)) - # 4 bytes per FAT entry per sector of data - FAT_BYTES=$(expr $SECTORS \* 4) - # 4 bytes per FAT entry per end-of-cluster list - FAT_BYTES=$(expr $FAT_BYTES + $(expr $(find ${FATSOURCEDIR} -type d | tail -n +2 | wc -l) \* 4)) - - # Use a ceiling function to determine FS overhead in sectors - DIR_SECTORS=$(expr $(expr $DIR_BYTES + 511) / 512) - # There are two FATs on the image - FAT_SECTORS=$(expr $(expr $(expr $FAT_BYTES + 511) / 512) \* 2) - SECTORS=$(expr $SECTORS + $(expr $DIR_SECTORS + $FAT_SECTORS)) - - # Determine the final size in blocks accounting for some padding - BLOCKS=$(expr $(expr $SECTORS / 2) + ${BOOTIMG_EXTRA_SPACE}) - - # mkdosfs will sometimes use FAT16 when it is not appropriate, - # resulting in a boot failure from SYSLINUX. Use FAT32 for - # images larger than 512MB, otherwise let mkdosfs decide. - if [ $(expr $BLOCKS / 1024) -gt 512 ]; then - FATSIZE="-F 32" - fi - - # mkdosfs will fail if ${FATIMG} exists. Since we are creating an - # new image, it is safe to delete any previous image. - if [ -e ${FATIMG} ]; then - rm ${FATIMG} - fi - - if [ -z "${HDDIMG_ID}" ]; then - mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C ${FATIMG} \ - ${BLOCKS} - else - mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C ${FATIMG} \ - ${BLOCKS} -i ${HDDIMG_ID} - fi - - # Copy FATSOURCEDIR recursively into the image file directly - mcopy -i ${FATIMG} -s ${FATSOURCEDIR}/* ::/ -} - -build_hddimg() { - # Create an HDD image - if [ "${@bb.utils.contains_any('IMAGE_FSTYPES', 'live hddimg', '1', '0', d)}" = "1" ] ; then - populate_live ${HDDDIR} - - if [ "${PCBIOS}" = "1" ]; then - syslinux_hddimg_populate ${HDDDIR} - fi - if [ "${EFI}" = "1" ]; then - efi_hddimg_populate ${HDDDIR} - fi - - # Check the size of ${HDDDIR}/rootfs.img, error out if it - # exceeds 4GB, it is the single file's max size of FAT fs. - if [ -f ${HDDDIR}/rootfs.img ]; then - rootfs_img_size=`stat -c '%s' ${HDDDIR}/rootfs.img` - max_size=`expr 4 \* 1024 \* 1024 \* 1024` - if [ $rootfs_img_size -ge $max_size ]; then - bberror "${HDDDIR}/rootfs.img rootfs size is greather than or equal to 4GB," - bberror "and this doesn't work on a FAT filesystem. You can either:" - bberror "1) Reduce the size of rootfs.img, or," - bbfatal "2) Use wic, vmdk,vhd, vhdx or vdi instead of hddimg\n" - fi - fi - - build_fat_img ${HDDDIR} ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg - - if [ "${PCBIOS}" = "1" ]; then - syslinux_hddimg_install - fi - - chmod 644 ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg - fi -} - -python do_bootimg() { - set_live_vm_vars(d, 'LIVE') - if d.getVar("PCBIOS") == "1": - bb.build.exec_func('build_syslinux_cfg', d) - if d.getVar("EFI") == "1": - bb.build.exec_func('build_efi_cfg', d) - bb.build.exec_func('build_hddimg', d) - bb.build.exec_func('build_iso', d) - bb.build.exec_func('create_symlinks', d) -} -do_bootimg[subimages] = "hddimg iso" -do_bootimg[imgsuffix] = "." - -addtask bootimg before do_image_complete after do_rootfs -- cgit v1.2.3-54-g00ecf