<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugzilla.yoctoproject.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.6"
          urlbase="https://bugzilla.yoctoproject.org/"
          
          maintainer="it-coreprojects-helpdesk@linuxfoundation.org"
>

    <bug>
          <bug_id>11549</bug_id>
          
          <creation_ts>2017-05-19 19:28:07 +0000</creation_ts>
          <short_desc>cannot select systemd-boot for UEFI</short_desc>
          <delta_ts>2017-05-24 23:17:00 +0000</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>7</classification_id>
          <classification>Build System, Metadata &amp; Runtime</classification>
          <product>BSPs</product>
          <component>bsps-meta-intel</component>
          <version>2.3</version>
          <rep_platform>x86</rep_platform>
          <op_sys>Multiple</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>Medium+</priority>
          <bug_severity>normal</bug_severity>
          <target_milestone>2.3 M4</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Patrick Ohly">patrick.ohly</reporter>
          <assigned_to name="California Sullivan">california.l.sullivan</assigned_to>
          
          
          
          <cf_os>---</cf_os>
          <cf_regression_type>---</cf_regression_type>
          
          <cf_docchange>No (bug/feature does not impact docs)</cf_docchange>

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>73387</commentid>
    <comment_count>0</comment_count>
    <who name="Patrick Ohly">patrick.ohly</who>
    <bug_when>2017-05-19 19:28:07 +0000</bug_when>
    <thetext>commit 7169c2a5008bd57d68f62340c602449c5dbe7667
...
Date:   Fri May 12 17:36:27 2017 -0700

    conf/machine/intel-core*: change WKS_FILE based on EFI_PROVIDER
    
    If someone changes their EFI_PROVIDER to grub-efi, we shouldn&apos;t be
    building a systemd-boot based wic image. Use bb.utils.contains to
    be default to mkefidisk.wks if we aren&apos;t using a systemd-boot based
    EFI_PROVIDER.
    
...
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index cca45c7..f28478f 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -34,5 +34,5 @@ APPEND += &quot;rootwait console=ttyS0,115200 console=tty0&quot;
 PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = &quot; linux-firmware-i915&quot;
 
 IMAGE_FSTYPES += &quot;wic&quot;
-WKS_FILE ?= &quot;systemd-bootdisk.wks&quot;
+WKS_FILE ?= &quot;${@bb.utils.contains(&quot;EFI_PROVIDER&quot;, &quot;systemd-boot rmc-boot&quot;, &quot;systemd-bootdisk.wks&quot;, &quot;mkefidisk.wks&quot;, d)}&quot;
 do_image_wic[depends] += &quot;gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot&quot;

This is most likely incorrect, because bb.utils.contains() only selects systemd-bootdisk.wks when EFI_PROVIDES contains *both* systemd-boot *and* rmc-boot.

You want bb.utils.contains_any().

But I haven&apos;t tried this, I only stumbled over this line and don&apos;t want this to get forgotten, hence this bug report.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>73396</commentid>
    <comment_count>1</comment_count>
    <who name="California Sullivan">california.l.sullivan</who>
    <bug_when>2017-05-19 23:25:05 +0000</bug_when>
    <thetext>Yup, I caught this and sent a patch earlier today. This fixes it:

https://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/commit/?id=7e8f98aa326f16edd679a95f7bb2daf4256479f3</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>73495</commentid>
    <comment_count>2</comment_count>
    <who name="California Sullivan">california.l.sullivan</who>
    <bug_when>2017-05-24 23:17:00 +0000</bug_when>
    <thetext>Moving to resolved.</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>