mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

systemd-boot*.bbclass: Don't use vmlinuz

Browse Source 
We can't guarantee vmlinuz anymore. Use KERNEL_IMAGETYPE instead.

(From OE-Core rev: cceb4266f3e70382e171c3a338c10d9730c9dc3f)

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
California Sullivan
2018-02-28 18:15:10 -08:00
committed by Richard Purdie
parent b84b422340
commit 00acdebbed
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/systemd-boot-cfg.bbclass
+5 -1
View File
@@ -1,3 +1,5 @@
KERNEL_IMAGETYPE ??= "bzImage"
SYSTEMD_BOOT_CFG ?= "${S}/loader.conf" SYSTEMD_BOOT_CFG ?= "${S}/loader.conf"
SYSTEMD_BOOT_ENTRIES ?= "" SYSTEMD_BOOT_ENTRIES ?= ""
SYSTEMD_BOOT_TIMEOUT ?= "10" SYSTEMD_BOOT_TIMEOUT ?= "10"
@@ -52,7 +54,9 @@ python build_efi_cfg() {
localdata.setVar('OVERRIDES', label + ':' + overrides) localdata.setVar('OVERRIDES', label + ':' + overrides)
entrycfg.write('title %s\n' % label) entrycfg.write('title %s\n' % label)
entrycfg.write('linux /vmlinuz\n')
kernel = localdata.getVar("KERNEL_IMAGETYPE")
entrycfg.write('linux /%s\n' % kernel)
append = localdata.getVar('APPEND') append = localdata.getVar('APPEND')
initrd = localdata.getVar('INITRD') initrd = localdata.getVar('INITRD')
meta/classes/systemd-boot.bbclass
+1 -1
View File
@@ -45,7 +45,7 @@ efi_iso_populate() {
mkdir -p ${EFIIMGDIR}/${EFIDIR} mkdir -p ${EFIIMGDIR}/${EFIDIR}
cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
cp -r $iso_dir/loader ${EFIIMGDIR} cp -r $iso_dir/loader ${EFIIMGDIR}
cp $iso_dir/vmlinuz ${EFIIMGDIR} cp $iso_dir/${KERNEL_IMAGETYPE} ${EFIIMGDIR}
EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
echo "fs0:${EFIPATH}\\${DEST_EFI_IMAGE}" > ${EFIIMGDIR}/startup.nsh echo "fs0:${EFIPATH}\\${DEST_EFI_IMAGE}" > ${EFIIMGDIR}/startup.nsh
if [ -f "$iso_dir/initrd" ] ; then if [ -f "$iso_dir/initrd" ] ; then