openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision fd699b6c0a24a412e345d172986871fd , Show latest

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

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

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

diff --git a/uswid/cli.py b/uswid/cli.py
index 7483040..d6587eb 100755
--- a/uswid/cli.py
+++ b/uswid/cli.py
@@ -206,7 +206,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 0.4.3")
     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 ca984681f83391e944cd72c7cada9eecb940e863 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Wed, 27 Sep 2023 13:16:20 +0100
Subject: [PATCH] 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 d6587eb..7b39a37 100755
--- a/uswid/cli.py
+++ b/uswid/cli.py
@@ -110,7 +110,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)
@@ -120,7 +120,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:
@@ -209,6 +209,7 @@ def main():
     parser = argparse.ArgumentParser(prog="uswid", description="Generate CoSWID metadata")
     parser.add_argument("--version", action="version", version="%(prog)s 0.4.3")
     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)
@@ -372,7 +373,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 fd699b6c0a24a412e345d172986871fd)

Places