summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/fs-uuid.bbclass2
-rw-r--r--meta/classes/systemd-boot.bbclass4
-rw-r--r--meta/conf/distro/include/distro_alias.inc2
-rw-r--r--meta/lib/oeqa/controllers/masterimage.py4
-rw-r--r--meta/recipes-bsp/systemd-boot/systemd-boot_232.bb2
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh12
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh12
7 files changed, 18 insertions, 20 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.
19def replace_rootfs_uuid(d, string): 19def 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)
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index a59265a21e..489f5ea63d 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -135,7 +135,7 @@ DISTRO_PN_ALIAS_pn-gtk-doc = "Fedora=gtk-doc Ubuntu=gtk-doc"
135DISTRO_PN_ALIAS_pn-gtk-engines = "Fedora=gtk2-engines OpenSuSE=gtk2-engines Ubuntu=gtk2-engines Mandriva=gtk-engines2 Debian=gtk2-engines" 135DISTRO_PN_ALIAS_pn-gtk-engines = "Fedora=gtk2-engines OpenSuSE=gtk2-engines Ubuntu=gtk2-engines Mandriva=gtk-engines2 Debian=gtk2-engines"
136DISTRO_PN_ALIAS_pn-gtk-sato-engine = "OpenedHand" 136DISTRO_PN_ALIAS_pn-gtk-sato-engine = "OpenedHand"
137DISTRO_PN_ALIAS_pn-gtk-icon-utils-native = "OSPDT" 137DISTRO_PN_ALIAS_pn-gtk-icon-utils-native = "OSPDT"
138DISTRO_PN_ALIAS_pn-gummiboot = "Debian=gummiboot Fedora=gummiboot" 138DISTRO_PN_ALIAS_pn-systemd-boot = "Ubuntu=systemd-boot Fedora=systemd-boot"
139DISTRO_PN_ALIAS_pn-hello-mod = "OE-Core" 139DISTRO_PN_ALIAS_pn-hello-mod = "OE-Core"
140DISTRO_PN_ALIAS_pn-hostap-conf = "OE-Core" 140DISTRO_PN_ALIAS_pn-hostap-conf = "OE-Core"
141DISTRO_PN_ALIAS_pn-hwlatdetect = "OSPDT" 141DISTRO_PN_ALIAS_pn-hwlatdetect = "OSPDT"
diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py
index d796fc3c30..07418fcda1 100644
--- a/meta/lib/oeqa/controllers/masterimage.py
+++ b/meta/lib/oeqa/controllers/masterimage.py
@@ -159,10 +159,10 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta
159 self.power_cycle(self.connection) 159 self.power_cycle(self.connection)
160 160
161 161
162class GummibootTarget(MasterImageHardwareTarget): 162class SystemdbootTarget(MasterImageHardwareTarget):
163 163
164 def __init__(self, d): 164 def __init__(self, d):
165 super(GummibootTarget, self).__init__(d) 165 super(SystemdbootTarget, self).__init__(d)
166 # this the value we need to set in the LoaderEntryOneShot EFI variable 166 # this the value we need to set in the LoaderEntryOneShot EFI variable
167 # so the system boots the 'test' bootloader label and not the default 167 # so the system boots the 'test' bootloader label and not the default
168 # The first four bytes are EFI bits, and the rest is an utf-16le string 168 # The first four bytes are EFI bits, and the rest is an utf-16le string
diff --git a/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb b/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
index 70366643c6..602052ca13 100644
--- a/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
+++ b/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
@@ -15,7 +15,7 @@ EXTRA_OECONF = " --enable-gnuefi \
15 --disable-manpages \ 15 --disable-manpages \
16 " 16 "
17 17
18# Imported from gummiboot recipe 18# Imported from the old gummiboot recipe
19TUNE_CCARGS_remove = "-mfpmath=sse" 19TUNE_CCARGS_remove = "-mfpmath=sse"
20COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" 20COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
21 21
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
index b562109157..9c4b263d54 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
@@ -171,19 +171,19 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
171fi 171fi
172 172
173if [ -d /run/media/$1/loader ]; then 173if [ -d /run/media/$1/loader ]; then
174 GUMMIBOOT_CFGS="/ssd/loader/entries/*.conf" 174 SYSTEMDBOOT_CFGS="/ssd/loader/entries/*.conf"
175 # copy config files for gummiboot 175 # copy config files for systemd-boot
176 cp -dr /run/media/$1/loader /ssd 176 cp -dr /run/media/$1/loader /ssd
177 # delete the install entry 177 # delete the install entry
178 rm -f /ssd/loader/entries/install.conf 178 rm -f /ssd/loader/entries/install.conf
179 # delete the initrd lines 179 # delete the initrd lines
180 sed -i "/initrd /d" $GUMMIBOOT_CFGS 180 sed -i "/initrd /d" $SYSTEMDBOOT_CFGS
181 # delete any LABEL= strings 181 # delete any LABEL= strings
182 sed -i "s/ LABEL=[^ ]*/ /" $GUMMIBOOT_CFGS 182 sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS
183 # delete any root= strings 183 # delete any root= strings
184 sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS 184 sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS
185 # add the root= and other standard boot options 185 # add the root= and other standard boot options
186 sed -i "s@options *@options root=$rootfs rw $rootwait quiet @" $GUMMIBOOT_CFGS 186 sed -i "s@options *@options root=$rootfs rw $rootwait quiet @" $SYSTEMDBOOT_CFGS
187 # Add the test label 187 # Add the test label
188 echo -ne "title test\nlinux /test-kernel\noptions root=$testfs rw $rootwait quiet\n" > /ssd/loader/entries/test.conf 188 echo -ne "title test\nlinux /test-kernel\noptions root=$testfs rw $rootwait quiet\n" > /ssd/loader/entries/test.conf
189fi 189fi
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index ffb709c1ce..5ad3a60c05 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -245,19 +245,19 @@ fi
245 245
246if [ -d /run/media/$1/loader ]; then 246if [ -d /run/media/$1/loader ]; then
247 rootuuid=$(blkid -o value -s PARTUUID ${rootfs}) 247 rootuuid=$(blkid -o value -s PARTUUID ${rootfs})
248 GUMMIBOOT_CFGS="/boot/loader/entries/*.conf" 248 SYSTEMDBOOT_CFGS="/boot/loader/entries/*.conf"
249 # copy config files for gummiboot 249 # copy config files for systemd-boot
250 cp -dr /run/media/$1/loader /boot 250 cp -dr /run/media/$1/loader /boot
251 # delete the install entry 251 # delete the install entry
252 rm -f /boot/loader/entries/install.conf 252 rm -f /boot/loader/entries/install.conf
253 # delete the initrd lines 253 # delete the initrd lines
254 sed -i "/initrd /d" $GUMMIBOOT_CFGS 254 sed -i "/initrd /d" $SYSTEMDBOOT_CFGS
255 # delete any LABEL= strings 255 # delete any LABEL= strings
256 sed -i "s/ LABEL=[^ ]*/ /" $GUMMIBOOT_CFGS 256 sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS
257 # delete any root= strings 257 # delete any root= strings
258 sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS 258 sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS
259 # add the root= and other standard boot options 259 # add the root= and other standard boot options
260 sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $GUMMIBOOT_CFGS 260 sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $SYSTEMDBOOT_CFGS
261fi 261fi
262 262
263umount /tgt_root 263umount /tgt_root