diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2016-03-30 00:23:11 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-31 13:22:55 +0100 |
| commit | 4a70cc59a0350f06d4cc48c12c3053a39191ba07 (patch) | |
| tree | 5512696c8906a389ab38b4e275ae1f3bd29d6fc8 /meta/classes/image-vm.bbclass | |
| parent | bfd4d95210b3f841aa2e7c5a06ac89667523438d (diff) | |
| download | openembedded-core-4a70cc59a0350f06d4cc48c12c3053a39191ba07.tar.gz openembedded-core-4a70cc59a0350f06d4cc48c12c3053a39191ba07.tar.bz2 openembedded-core-4a70cc59a0350f06d4cc48c12c3053a39191ba07.zip | |
image-live.bbclass/image-vm.bbclass: remove duplicated code
Move the common code to live_vm_common.bbclass and remove duplicated ones.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image-vm.bbclass')
| -rw-r--r-- | meta/classes/image-vm.bbclass | 53 |
1 files changed, 3 insertions, 50 deletions
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass index ced8eac4d9..66712a62ff 100644 --- a/meta/classes/image-vm.bbclass +++ b/meta/classes/image-vm.bbclass @@ -15,6 +15,8 @@ # We have to push the msdos parition table size > 16MB so fat 16 is used as parted # won't touch fat12 partitions. +inherit live-vm-common + do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \ virtual/kernel:do_deploy \ syslinux:do_populate_sysroot \ @@ -43,63 +45,14 @@ do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE_VM}:do_image_complete' if '${I BOOTDD_VOLUME_ID ?= "boot" BOOTDD_EXTRA_SPACE ?= "16384" -EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}" -EFI_PROVIDER ?= "grub-efi" -EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" - -# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not -# contain "efi". This way legacy is supported by default if neither is -# specified, maintaining the original behavior. -def pcbios(d): - pcbios = bb.utils.contains("MACHINE_FEATURES", "pcbios", "1", "0", d) - if pcbios == "0": - pcbios = bb.utils.contains("MACHINE_FEATURES", "efi", "0", "1", d) - return pcbios - -def pcbios_class(d): - if d.getVar("PCBIOS", True) == "1": - return "syslinux" - return "" - -PCBIOS = "${@pcbios(d)}" -PCBIOS_CLASS = "${@pcbios_class(d)}" - -# Get the build_syslinux_cfg() function from the syslinux class -inherit ${PCBIOS_CLASS} -inherit ${EFI_CLASS} - DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" -boot_direct_populate() { - dest=$1 - install -d $dest - - # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. - if [ -e ${DEPLOY_DIR_IMAGE}/bzImage ]; then - install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage $dest/vmlinuz - fi - - # initrd is made of concatenation of multiple filesystem images - if [ -n "${INITRD}" ]; then - rm -f $dest/initrd - for fs in ${INITRD} - do - if [ -s "${fs}" ]; then - cat ${fs} >> $dest/initrd - else - bbfatal "${fs} is invalid. initrd image creation failed." - fi - done - chmod 0644 $dest/initrd - fi -} - build_boot_dd() { HDDDIR="${S}/hdd/boot" HDDIMG="${S}/hdd.image" IMAGE=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect - boot_direct_populate $HDDDIR + populate_kernel $HDDDIR if [ "${PCBIOS}" = "1" ]; then syslinux_hddimg_populate $HDDDIR |