openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File 16.patch of Package fwupd-efi2 (Revision bb2ffd019444b6709b42c9b7684d5587)

Currently displaying revision bb2ffd019444b6709b42c9b7684d5587 , Show latest

From d7fa23bbc1d814b0a3c96782b0b06f17ddecdab9 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 18 Oct 2021 14:31:59 +0100
Subject: [PATCH] trivial: Add SWID metadata to the binary file

---
 efi/generate_binary.py |  2 ++
 efi/meson.build        | 44 ++++++++++++++++++++++++++++++++++++------
 efi/swid.xml.in        | 16 +++++++++++++++
 meson.build            |  6 ++++++
 4 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 efi/swid.xml.in

diff --git a/efi/generate_binary.py b/efi/generate_binary.py
index 7b802e7..bd2d959 100755
--- a/efi/generate_binary.py
+++ b/efi/generate_binary.py
@@ -21,6 +21,8 @@ def _run_objcopy(args):
         "-j",
         ".sbat",
         "-j",
+        ".sbom",
+        "-j",
         ".sdata",
         "-j",
         ".data",
diff --git a/efi/meson.build b/efi/meson.build
index 2bba4f5..979936d 100644
--- a/efi/meson.build
+++ b/efi/meson.build
@@ -1,6 +1,25 @@
 generate_sbat = find_program('generate_sbat.py', native: true)
 generate_binary = find_program('generate_binary.py', native: true)
 
+# get source version, falling back
+git = find_program('git', required : false)
+if git.found()
+  source_version = run_command(git, 'describe', check: false).stdout().strip()
+else
+  source_version = 'unknown'
+endif
+
+if uswid.found()
+  con2 = configuration_data()
+  con2.set('project_version', meson.project_version())
+  con2.set('source_version', source_version)
+  swid_xml = configure_file(
+    input : 'swid.xml.in',
+    output : 'swid.xml',
+    configuration : con2,
+  )
+endif
+
 efi_ldsdir = get_option('efi-ldsdir')
 efi_incdir = get_option('efi-includedir')
 
@@ -175,28 +194,29 @@ endif
 libgcc_file_name = run_command(cc.cmd_array(), '-print-libgcc-file-name').stdout().strip()
 efi_name = 'fwupd@0@.efi'.format(EFI_MACHINE_TYPE_NAME)
 
-o_file1 = custom_target('fwupdate.o',
+o_files = []
+o_files += custom_target('fwupdate.o',
                         input : 'fwupdate.c',
                         output : 'fwupdate.o',
                         command : [cc.cmd_array(), '-c', '@INPUT@', '-o', '@OUTPUT@']
                                   + compile_args)
-o_file2 = custom_target('fwup-debug.o',
+o_files += custom_target('fwup-debug.o',
                         input : 'fwup-debug.c',
                         output : 'fwup-debug.o',
                         command : [cc.cmd_array(), '-c', '@INPUT@', '-o', '@OUTPUT@']
                                   + compile_args)
-o_file3 = custom_target('fwup-efi.o',
+o_files += custom_target('fwup-efi.o',
                         input : 'fwup-efi.c',
                         output : 'fwup-efi.o',
                         command : [cc.cmd_array(), '-c', '@INPUT@', '-o', '@OUTPUT@']
                                   + compile_args)
-o_file4 = custom_target('fwup-common.o',
+o_files += custom_target('fwup-common.o',
                         input : 'fwup-common.c',
                         output : 'fwup-common.o',
                         command : [cc.cmd_array(), '-c', '@INPUT@', '-o', '@OUTPUT@']
                                   + compile_args)
 
-o_file5 = custom_target('fwup-sbat.o',
+o_files += custom_target('fwup-sbat.o',
                         output : 'fwup-sbat.o',
                         command : [
                           generate_sbat,
@@ -216,6 +236,18 @@ o_file5 = custom_target('fwup-sbat.o',
                           '--sbat-distro-url', get_option('efi_sbat_distro_url'),
                         ])
 
+if uswid.found()
+  o_files += custom_target('fwup-sbom.o',
+                          output : 'fwup-sbom.o',
+                          command : [
+                            'uswid',
+                            '--cc', cc.cmd_array()[-1],
+                            '--objcopy', objcopy,
+                            '--load', swid_xml,
+                            '--save', '@OUTPUT@',
+                          ])
+endif
+
 fwupd_so_deps = []
 if efi_crtdir == join_paths(meson.current_build_dir(), 'crt0')
   # A custom crt0 is needed
@@ -224,7 +256,7 @@ if efi_crtdir == join_paths(meson.current_build_dir(), 'crt0')
 endif
 
 so = custom_target('fwup.so',
-                   input : [o_file1, o_file2, o_file3, o_file4, o_file5],
+                   input : o_files,
                    output : 'fwup.so',
                    command : [ld, '-o', '@OUTPUT@'] +
                              efi_ldflags + ['@INPUT@'] +
diff --git a/efi/swid.xml.in b/efi/swid.xml.in
new file mode 100644
index 0000000..81057aa
--- /dev/null
+++ b/efi/swid.xml.in
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SoftwareIdentity name="fwupdx64"
+  tagId="fwupd-efi:fwupdx64"
+  version="@project_version@"
+  versionScheme="semver"
+  xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd"
+  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd
+  swid.xsd">
+  <Meta product="fwupd-efi"/>
+  <Meta summary="EFI helpers to install system firmware"/>
+  <Meta colloquialVersion="@source_version@"/>
+  <Entity name="Richard Hughes" regid="hughsie.com" role="maintainer tagCreator"/>
+  <Link rel="license" href="https://spdx.org/licenses/LGPL-2.0.html" />
+</SoftwareIdentity>
diff --git a/meson.build b/meson.build
index 7ae6f31..bb7dae9 100644
--- a/meson.build
+++ b/meson.build
@@ -57,4 +57,10 @@ pkgg.generate(
 
 fwupd_efi_dep = declare_dependency()
 
+# SBOM support
+uswid = find_program('uswid', required: false)
+if not uswid.found()
+  warning('uswid is unfound, so not embedding uSWID metadata')
+endif
+
 subdir('efi')

Places

File 16.patch of Package fwupd-efi2 (Revision bb2ffd019444b6709b42c9b7684d5587)

Places