openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File f.patch of Package python-uswid (Revision 4025c967128075ec9b8dde70976e220d)

Currently displaying revision 4025c967128075ec9b8dde70976e220d , Show latest

From 87ba253afa61f752b7f3a78b56feed437317ef3c Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Wed, 27 Sep 2023 13:10:27 +0100
Subject: [PATCH 1/2] Add version argument

Makes feature detection easier, especially as meson will understand
through find_program()

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 setup.py     | 7 ++++++-
 uswid/cli.py | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 59e77d4..713409b 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,12 @@
         "uswid",
     ],
     include_package_data=True,
-    install_requires=["cbor2", "lxml", "pefile"],
+    install_requires=[
+        "cbor2",
+        "lxml",
+        "pefile",
+        "importlib-metadata >= 1.0 ; python_version < '3.8'"
+    ],
     entry_points={
         "console_scripts": [
             "uswid = uswid.cli:main",
diff --git a/uswid/cli.py b/uswid/cli.py
index 7483040..15baf3b 100755
--- a/uswid/cli.py
+++ b/uswid/cli.py
@@ -20,6 +20,11 @@
 import uuid
 import string
 
+if sys.version_info >= (3, 8):
+    from importlib import metadata as importlib_metadata
+else:
+    import importlib_metadata
+
 import pefile
 
 sys.path.append(os.path.realpath("."))
@@ -206,7 +211,8 @@ def _type_for_fmt(
 
 
 def main():
-    parser = argparse.ArgumentParser(description="Generate CoSWID metadata")
+    parser = argparse.ArgumentParser(prog="uswid", description="Generate CoSWID metadata")
+    parser.add_argument("--version", action="version", version="%(prog)s " + importlib_metadata.version("uswid"))
     parser.add_argument("--cc", default="gcc", help="Compiler to use for empty object")
     parser.add_argument("--binfile", default=None, help=argparse.SUPPRESS)
     parser.add_argument("--rawfile", default=None, help=argparse.SUPPRESS)

From 747b2f9200281c5d67deb23c0f3b67d8b20ad1b5 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Wed, 27 Sep 2023 13:16:20 +0100
Subject: [PATCH 2/2] Add cflags argument

Allows setting object file cflags to change metadata to prevent warnings (on
ARM32 etc.)

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 uswid/cli.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/uswid/cli.py b/uswid/cli.py
index 15baf3b..689218e 100755
--- a/uswid/cli.py
+++ b/uswid/cli.py
@@ -115,7 +115,7 @@ def _save_efi_pefile(identity: uSwidIdentity, filepath: str) -> None:
 
 
 def _save_efi_objcopy(
-    identity: uSwidIdentity, filepath: str, cc: Optional[str], objcopy: str
+    identity: uSwidIdentity, filepath: str, cc: Optional[str], cflags: str, objcopy: str
 ) -> None:
     """modify EFI file using objcopy"""
     objcopy_full = shutil.which(objcopy)
@@ -125,7 +125,7 @@ def _save_efi_objcopy(
     if not os.path.exists(filepath):
         if not cc:
             raise NotSupportedError("compiler is required for missing section")
-        subprocess.run([cc, "-x", "c", "-c", "-o", filepath, "/dev/null"], check=True)
+        subprocess.run([cc, "-x", "c", "-c", "-o", filepath, "/dev/null"] + cflags.split(" "), check=True)
 
     # save to file?
     try:
@@ -214,6 +214,7 @@ def main():
     parser = argparse.ArgumentParser(prog="uswid", description="Generate CoSWID metadata")
     parser.add_argument("--version", action="version", version="%(prog)s " + importlib_metadata.version("uswid"))
     parser.add_argument("--cc", default="gcc", help="Compiler to use for empty object")
+    parser.add_argument("--cflags", default="", help="C compiler flags to be used by CC")
     parser.add_argument("--binfile", default=None, help=argparse.SUPPRESS)
     parser.add_argument("--rawfile", default=None, help=argparse.SUPPRESS)
     parser.add_argument("--inifile", default=None, help=argparse.SUPPRESS)
@@ -377,7 +378,7 @@ def main():
                     print("cannot save PE when no default identity")
                     sys.exit(1)
                 if args.objcopy:
-                    _save_efi_objcopy(identity_pe, filepath, args.cc, args.objcopy)
+                    _save_efi_objcopy(identity_pe, filepath, args.cc, args.cflags, args.objcopy)
                 else:
                     _save_efi_pefile(identity_pe, filepath)
             elif fmt in [

Places

File f.patch of Package python-uswid (Revision 4025c967128075ec9b8dde70976e220d)

Places