uefi: Merge plugin_uefi and plugin_uefi_labels configure options

contrib/ci/centos.sh

@@ -8,7 +8,6 @@ cd build
 meson .. \
 	--werror \
 	-Dplugin_uefi=false \
-	-Dplugin_uefi_labels=false \
 	-Dplugin_dell=false \
 	-Dplugin_synaptics=true \
 	-Dintrospection=true \

contrib/ci/debian_s390x.sh

@@ -11,7 +11,6 @@ meson .. \
 	--cross-file s390x_cross.txt \
 	--werror \
 	-Dplugin_uefi=false \
-	-Dplugin_uefi_labels=false \
 	-Dplugin_dell=false \
 	-Dplugin_synaptics=false \
 	-Dintrospection=false \

contrib/fwupd.spec.in

@@ -140,10 +140,8 @@ Data files for installed tests.
     -Dplugin_thunderbolt=true \
 %if 0%{?have_uefi}
     -Dplugin_uefi=true \
-    -Dplugin_uefi_labels=true \
 %else
     -Dplugin_uefi=false \
-    -Dplugin_uefi_labels=false \
 %endif
 %if 0%{?have_dell}
     -Dplugin_dell=true \

contrib/org.freedesktop.fwupd.json

@@ -188,7 +188,6 @@
                             "-Dintrospection=false",
                             "-Dman=false",
                             "-Dpkcs7=false",
-                            "-Dplugin_uefi_labels=false",
                             "-Dsystemd=false",
                             "-Dtests=false",
                             "-Defi-includedir=/app/include/efi",

contrib/snap/snapcraft-master.yaml

@@ -171,6 +171,23 @@ parts:
     prime:
       - -usr/include/
       - -usr/lib
+  #fetch the latest version of the signed bootloader
+  #this might not match our fwupx64.efi, but it's better than nothing
+  fwup-efi-signed:
+    plugin: make
+    source: contrib/snap/fwup-efi-signed
+  #needed for UEFI plugin to build UX labels
+  build-introspection:
+    plugin: nil
+    stage-packages:
+      - python3-gi
+      - python3-gi-cairo
+      - python3-pil
+    prime:
+      - -etc
+      - -usr
+      - -lib
+      - -var
   fwupd:
     plugin: meson
     meson-parameters: [--prefix=/usr,
@@ -181,7 +198,6 @@ parts:
                        -Dtests=false,
                        -Ddaemon=false,
                        -Dgtkdoc=false,
-                       -Dplugin_uefi_labels=false,
                        -Dintrospection=false,
                        -Dsystemd=false,
                        -Dman=false,
@@ -250,7 +266,7 @@ parts:
       - -usr/share/upstart
       - -usr/lib/*/glib-2.0
       - -usr/lib/*/pkgconfig
-    after: [appstream-glib-dev, gudev, gusb, gnu-efi, libsmbios, libefivar-fixpkgconfig]
+    after: [appstream-glib-dev, gudev, gusb, gnu-efi, libefivar-fixpkgconfig, libsmbios, build-introspection]
   fix-bash-completion:
     plugin: make
     source: contrib/snap/fix-bash-completion

contrib/snap/snapcraft-stable.yaml

@@ -171,6 +171,18 @@ parts:
   fwup-efi-signed:
     plugin: make
     source: contrib/snap/fwup-efi-signed
+  #needed for UEFI plugin to build UX labels
+  build-introspection:
+    plugin: nil
+    stage-packages:
+      - python3-gi
+      - python3-gi-cairo
+      - python3-pil
+    prime:
+      - -etc
+      - -usr
+      - -lib
+      - -var
   fwupd:
     plugin: meson
     meson-parameters: [--prefix=/usr,
@@ -181,7 +193,6 @@ parts:
                        -Dtests=false,
                        -Ddaemon=false,
                        -Dgtkdoc=false,
-                       -Dplugin_uefi_labels=false,
                        -Dintrospection=false,
                        -Dsystemd=false,
                        -Dman=false,
@@ -250,7 +261,7 @@ parts:
       - -usr/share/upstart
       - -usr/lib/*/glib-2.0
       - -usr/lib/*/pkgconfig
-    after: [appstream-glib-dev, gudev, gusb, gnu-efi, libefivar-fixpkgconfig, libsmbios]
+    after: [appstream-glib-dev, gudev, gusb, gnu-efi, libefivar-fixpkgconfig, libsmbios, build-introspection]
   fix-bash-completion:
     plugin: make
     source: contrib/snap/fix-bash-completion

meson.build

@@ -191,16 +191,6 @@ endif
 gcab = find_program('gcab', required : true)
 bashcomp = dependency('bash-completion', required: false)
 
-if get_option('plugin_uefi_labels')
-  cairo = dependency('cairo')
-  fontconfig = cc.find_library('fontconfig')
-  freetype = cc.find_library('freetype')
-  r = run_command('po/test-deps')
-  if r.returncode() != 0
-    error(r.stdout())
-  endif
-endif
-
 if valgrind.found()
   conf.set('HAVE_VALGRIND', '1')
 endif
@@ -210,6 +200,9 @@ if get_option('plugin_altos')
 endif
 
 if get_option('plugin_uefi')
+  cairo = dependency('cairo')
+  fontconfig = cc.find_library('fontconfig')
+  freetype = cc.find_library('freetype')
   efivar = dependency('efivar', version : '>= 33')
   conf.set_quoted('EFIVAR_LIBRARY_VERSION', efivar.version())
   efiboot = dependency('efiboot')
@@ -237,6 +230,10 @@ if get_option('plugin_uefi')
           gnu_efi_arch = ''
   endif
   conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
+  r = run_command('po/test-deps')
+  if r.returncode() != 0
+    error(r.stdout())
+  endif
 endif
 
 if get_option('plugin_dell')

meson_options.txt

@@ -12,7 +12,6 @@ option('plugin_dell', type : 'boolean', value : true, description : 'enable Dell
 option('plugin_dummy', type : 'boolean', value : false, description : 'enable the dummy device')
 option('plugin_synaptics', type: 'boolean', value: true, description : 'enable Synaptics MST hub support')
 option('plugin_thunderbolt', type : 'boolean', value : true, description : 'enable Thunderbolt support')
-option('plugin_uefi_labels', type : 'boolean', value : true, description : 'enable UEFI labels support')
 option('plugin_uefi', type : 'boolean', value : true, description : 'enable UEFI support')
 option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
 option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')

po/meson.build

@@ -5,6 +5,6 @@ i18n.gettext(meson.project_name(),
   ]
 )
 
-if get_option('plugin_uefi_labels')
+if get_option('plugin_uefi')
 meson.add_install_script('make-images.sh')
 endif