diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2016-11-23 16:53:30 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-09 13:39:11 +0000 |
commit | 2dce2648e3d8c7c9d78a56d96be4401deccaa2f2 (patch) | |
tree | 05674a5b65771aa3c310269a58e585f8f3aeaee4 /meta/classes | |
parent | 41137c212cbc47e382dae5ce3de4f8217c2b5c4c (diff) | |
download | poky-2dce2648e3d8c7c9d78a56d96be4401deccaa2f2.tar.gz |
gummiboot: Remove/change gummiboot references with systemd-boot
After systemd-boot was introduced, its been tested for a while with no major
issues being found until now, this patch completely replaces all gummiboot
instances with systemd-boot ones, taking the next step into cleaning
up systemd-boot/gummiboot.
[YOCTO #10332]
(From OE-Core rev: f9a61d3400ad9068a6d83b8eb6aefe3098c58e68)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/fs-uuid.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/systemd-boot.bbclass | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/fs-uuid.bbclass b/meta/classes/fs-uuid.bbclass index 313c5a3597..9b53dfba7a 100644 --- a/meta/classes/fs-uuid.bbclass +++ b/meta/classes/fs-uuid.bbclass | |||
@@ -13,7 +13,7 @@ def get_rootfs_uuid(d): | |||
13 | bb.fatal('Could not determine filesystem UUID of %s' % rootfs) | 13 | bb.fatal('Could not determine filesystem UUID of %s' % rootfs) |
14 | 14 | ||
15 | # Replace the special <<uuid-of-rootfs>> inside a string (like the | 15 | # Replace the special <<uuid-of-rootfs>> inside a string (like the |
16 | # root= APPEND string in a syslinux.cfg or gummiboot entry) with the | 16 | # root= APPEND string in a syslinux.cfg or systemd-boot entry) with the |
17 | # actual UUID of the rootfs. Does nothing if the special string | 17 | # actual UUID of the rootfs. Does nothing if the special string |
18 | # is not used. | 18 | # is not used. |
19 | def replace_rootfs_uuid(d, string): | 19 | def replace_rootfs_uuid(d, string): |
diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass index 60729a756c..6718783367 100644 --- a/meta/classes/systemd-boot.bbclass +++ b/meta/classes/systemd-boot.bbclass | |||
@@ -4,9 +4,7 @@ | |||
4 | 4 | ||
5 | # systemd-boot.bbclass - The "systemd-boot" is essentially the gummiboot merged into systemd. | 5 | # systemd-boot.bbclass - The "systemd-boot" is essentially the gummiboot merged into systemd. |
6 | # The original standalone gummiboot project is dead without any more | 6 | # The original standalone gummiboot project is dead without any more |
7 | # maintenance. As a start point, we replace all gummitboot occurrences | 7 | # maintenance. |
8 | # with systemd-boot in gummiboot.bbclass to have a base version of this | ||
9 | # systemd-boot.bbclass. | ||
10 | # | 8 | # |
11 | # 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 |
12 | # (images built by image-live.bbclass or image-vm.bbclass) | 10 | # (images built by image-live.bbclass or image-vm.bbclass) |