diff options
| -rw-r--r-- | meta/classes/grub-efi.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/license.bbclass | 9 | ||||
| -rw-r--r-- | meta/classes/rm_work.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/systemd-boot.bbclass | 3 | ||||
| -rw-r--r-- | meta/conf/documentation.conf | 1 |
5 files changed, 4 insertions, 12 deletions
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index df7fe18a79..610479b85d 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass @@ -17,7 +17,6 @@ # ${GRUB_ROOT} - grub's root device. do_bootimg[depends] += "${MLPREFIX}grub-efi:do_deploy" -do_bootdirectdisk[depends] += "${MLPREFIX}grub-efi:do_deploy" GRUB_SERIAL ?= "console=ttyS0,115200" GRUB_CFG_VM = "${S}/grub_vm.cfg" diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index d4be478166..4f7842c3db 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -255,14 +255,9 @@ def get_boot_dependencies(d): """ depends = [] - boot_depends_string = "" taskdepdata = d.getVar("BB_TASKDEPDATA", False) - # Only bootimg and bootdirectdisk include the depends flag - boot_tasks = ["do_bootimg", "do_bootdirectdisk",] - - for task in boot_tasks: - boot_depends_string = "%s %s" % (boot_depends_string, - d.getVarFlag(task, "depends") or "") + # Only bootimg includes the depends flag + boot_depends_string = d.getVarFlag("do_bootimg", "depends") or "" boot_depends = [dep.split(":")[0] for dep in boot_depends_string.split() if not dep.split(":")[0].endswith("-native")] diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass index 71c21a0f37..3d7fb52e81 100644 --- a/meta/classes/rm_work.bbclass +++ b/meta/classes/rm_work.bbclass @@ -66,7 +66,7 @@ do_rm_work () { i=dummy break ;; - *do_rootfs*|*do_image*|*do_bootimg*|*do_bootdirectdisk*|*do_vmimg*|*do_write_qemuboot_conf*) + *do_rootfs*|*do_image*|*do_bootimg*|*do_write_qemuboot_conf*) i=dummy break ;; diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass index 9f8f75e06c..937307076f 100644 --- a/meta/classes/systemd-boot.bbclass +++ b/meta/classes/systemd-boot.bbclass @@ -7,10 +7,9 @@ # maintenance. # # Set EFI_PROVIDER = "systemd-boot" to use systemd-boot on your live images instead of grub-efi -# (images built by image-live.bbclass or image-vm.bbclass) +# (images built by image-live.bbclass) do_bootimg[depends] += "${MLPREFIX}systemd-boot:do_deploy" -do_bootdirectdisk[depends] += "${MLPREFIX}systemd-boot:do_deploy" EFIDIR = "/EFI/BOOT" diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 35b9103b4a..a55e2836b5 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -56,7 +56,6 @@ do_testsdk[doc] = "Installs an SDK and performs runtime tests on the tools insta do_uboot_mkimage[doc] = "Creates a uImage file from the kernel for the U-Boot bootloader" do_unpack[doc] = "Unpacks the source code into a working directory" do_validate_branches[doc] = "Ensures that the source/meta branches are on the locations specified by their SRCREV values for a linux-yocto style kernel" -do_vmimg[doc] = "Creates an image for use with VMware or VirtualBox compatible virtual machine hosts (based on IMAGE_FSTYPES either .vmdk or .vdi)" # DESCRIPTIONS FOR VARIABLES # |