summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/grub-efi.bbclass1
-rw-r--r--meta/classes/license.bbclass9
-rw-r--r--meta/classes/rm_work.bbclass2
-rw-r--r--meta/classes/systemd-boot.bbclass3
-rw-r--r--meta/conf/documentation.conf1
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 @@
17# ${GRUB_ROOT} - grub's root device. 17# ${GRUB_ROOT} - grub's root device.
18 18
19do_bootimg[depends] += "${MLPREFIX}grub-efi:do_deploy" 19do_bootimg[depends] += "${MLPREFIX}grub-efi:do_deploy"
20do_bootdirectdisk[depends] += "${MLPREFIX}grub-efi:do_deploy"
21 20
22GRUB_SERIAL ?= "console=ttyS0,115200" 21GRUB_SERIAL ?= "console=ttyS0,115200"
23GRUB_CFG_VM = "${S}/grub_vm.cfg" 22GRUB_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):
255 """ 255 """
256 256
257 depends = [] 257 depends = []
258 boot_depends_string = ""
259 taskdepdata = d.getVar("BB_TASKDEPDATA", False) 258 taskdepdata = d.getVar("BB_TASKDEPDATA", False)
260 # Only bootimg and bootdirectdisk include the depends flag 259 # Only bootimg includes the depends flag
261 boot_tasks = ["do_bootimg", "do_bootdirectdisk",] 260 boot_depends_string = d.getVarFlag("do_bootimg", "depends") or ""
262
263 for task in boot_tasks:
264 boot_depends_string = "%s %s" % (boot_depends_string,
265 d.getVarFlag(task, "depends") or "")
266 boot_depends = [dep.split(":")[0] for dep 261 boot_depends = [dep.split(":")[0] for dep
267 in boot_depends_string.split() 262 in boot_depends_string.split()
268 if not dep.split(":")[0].endswith("-native")] 263 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 () {
66 i=dummy 66 i=dummy
67 break 67 break
68 ;; 68 ;;
69 *do_rootfs*|*do_image*|*do_bootimg*|*do_bootdirectdisk*|*do_vmimg*|*do_write_qemuboot_conf*) 69 *do_rootfs*|*do_image*|*do_bootimg*|*do_write_qemuboot_conf*)
70 i=dummy 70 i=dummy
71 break 71 break
72 ;; 72 ;;
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 @@
7# maintenance. 7# maintenance.
8# 8#
9# Set EFI_PROVIDER = "systemd-boot" to use systemd-boot on your live images instead of grub-efi 9# Set EFI_PROVIDER = "systemd-boot" to use systemd-boot on your live images instead of grub-efi
10# (images built by image-live.bbclass or image-vm.bbclass) 10# (images built by image-live.bbclass)
11 11
12do_bootimg[depends] += "${MLPREFIX}systemd-boot:do_deploy" 12do_bootimg[depends] += "${MLPREFIX}systemd-boot:do_deploy"
13do_bootdirectdisk[depends] += "${MLPREFIX}systemd-boot:do_deploy"
14 13
15EFIDIR = "/EFI/BOOT" 14EFIDIR = "/EFI/BOOT"
16 15
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
56do_uboot_mkimage[doc] = "Creates a uImage file from the kernel for the U-Boot bootloader" 56do_uboot_mkimage[doc] = "Creates a uImage file from the kernel for the U-Boot bootloader"
57do_unpack[doc] = "Unpacks the source code into a working directory" 57do_unpack[doc] = "Unpacks the source code into a working directory"
58do_validate_branches[doc] = "Ensures that the source/meta branches are on the locations specified by their SRCREV values for a linux-yocto style kernel" 58do_validate_branches[doc] = "Ensures that the source/meta branches are on the locations specified by their SRCREV values for a linux-yocto style kernel"
59do_vmimg[doc] = "Creates an image for use with VMware or VirtualBox compatible virtual machine hosts (based on IMAGE_FSTYPES either .vmdk or .vdi)"
60 59
61# DESCRIPTIONS FOR VARIABLES # 60# DESCRIPTIONS FOR VARIABLES #
62 61