onieprom: Create proper package

Author: wkz

board/common/post-image.sh

@@ -2,8 +2,6 @@
 
 # Only for regular builds, not bootloader-only builds
 if [ "$BR2_TARGET_ROOTFS_SQUASHFS" = "y" ]; then
-    cp "$BR2_EXTERNAL_INFIX_PATH/board/common/rootfs/usr/bin/onieprom" "$BINARIES_DIR/"
-
     # Quick intro for beginners, with links to more information
     cp "$BR2_EXTERNAL_INFIX_PATH/board/common/README.txt" "$BINARIES_DIR/"
 fi

board/common/rootfs/usr/libexec/infix/init.d/00-probe

@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
 
-import importlib.machinery
 import json
+import onieprom
 import os
 import shutil
 import struct
 import subprocess
 import sys
 
-onieprom = importlib.machinery.SourceFileLoader("onieprom", "/bin/onieprom").load_module()
 SYSTEM_JSON = "/run/system.json"
 KKIT_IANA_PEM = 61046
 

package/Config.in

@@ -29,6 +29,7 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/lowdown/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/mcd/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/mdns-alias/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/netbrowse/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/package/onieprom/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/podman/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/python-libyang/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/python-statd/Config.in"

package/onieprom/Config.in

@@ -0,0 +1,17 @@
+menuconfig BR2_PACKAGE_ONIEPROM
+	bool "onieprom"
+	default y
+	select BR2_PACKAGE_HOST_PYTHON3
+	select BR2_PACKAGE_DBUS_PYTHON
+	help
+         ONIE EEPROM parser/generator
+
+config BR2_PACKAGE_ONIEPROM_INSTALL_IMAGES
+	bool "install onieprom in images"
+	depends on BR2_PACKAGE_ONIEPROM
+	default y
+	help
+         Install the onieprom script in the images direcory. Useful
+         when the release is destined for someone who will have to
+         create ONIE EEPROM binaries for deployment during
+         manufacturing.

package/onieprom/onieprom

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+PYTHONPATH=$(readlink -f $(dirname $0)/..) \
+   exec python3 -m onieprom "$@"

package/onieprom/onieprom.mk

@@ -0,0 +1,15 @@
+ONIEPROM_VERSION = 1.0
+ONIEPROM_SITE_METHOD = local
+ONIEPROM_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/onieprom
+ONIEPROM_LICENSE = GPLv2
+ONIEPROM_LICENSE_FILES = COPYING
+ONIEPROM_DEPENDENCIES = host-python3 python3 host-python-poetry-core
+ONIEPROM_SETUP_TYPE = pep517 # poetry
+ONIEPROM_INSTALL_IMAGES = $(if $(BR2_PACKAGE_ONIEPROM_INSTALL_IMAGES),YES,NO)
+
+define ONIEPROM_INSTALL_IMAGES_CMDS
+	@cp -a $(@D)/onieprom $(BINARIES_DIR)/onieprom
+	@cp $(ONIEPROM_PKGDIR)/onieprom $(BINARIES_DIR)/onieprom/
+endef
+
+$(eval $(python-package))

src/onieprom/COPYING

@@ -0,0 +1,2 @@
+
+from .tlv import into_tlv, from_tlv

src/onieprom/onieprom/__init__.py

@@ -0,0 +1,38 @@
+def main():
+    import argparse
+    import json
+    import os
+    import sys
+
+    parser = argparse.ArgumentParser(prog='onieprom')
+
+    parser.add_argument("infile", nargs="?", default=sys.stdin, type=argparse.FileType("rb", 0))
+    parser.add_argument("outfile", nargs="?", default=sys.stdout, type=argparse.FileType("wb"))
+
+    parser.add_argument("-e", "--encode", default=False, action="store_true",
+                        help="Encode JSON input to binary output")
+
+    parser.add_argument("-d", "--decode", default=False, action="store_true",
+                        help="Decode binary input to JSON output")
+
+    args = parser.parse_args()
+
+    if (not args.encode) and (not args.decode):
+        c = args.infile.read(1)
+        args.infile.seek(0, 0)
+
+        if c == b"{":
+            args.encode = True
+        elif c == b"T":
+            args.decode = True
+        else:
+            sys.stderr.write("Neither encode nor decode specified, and could not infer operation from input")
+            sys.exit(1)
+
+    if args.encode:
+        args.outfile.buffer.write(into_tlv(json.load(args.infile)))
+    else:
+        args.outfile.write(json.dumps(from_tlv(args.infile)))
+
+if __name__ == "__main__":
+    main()

src/onieprom/onieprom/__main__.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import binascii
 import struct
 
@@ -180,39 +178,3 @@ def unpack_vendor(ext):
         d[info["name"]] = unpack(v)
 
     return d
-
-if __name__ == "__main__":
-    import argparse
-    import json
-    import os
-    import sys
-
-    parser = argparse.ArgumentParser(prog='onieprom')
-
-    parser.add_argument("infile", nargs="?", default=sys.stdin, type=argparse.FileType("rb", 0))
-    parser.add_argument("outfile", nargs="?", default=sys.stdout, type=argparse.FileType("wb"))
-
-    parser.add_argument("-e", "--encode", default=False, action="store_true",
-                        help="Encode JSON input to binary output")
-
-    parser.add_argument("-d", "--decode", default=False, action="store_true",
-                        help="Decode binary input to JSON output")
-
-    args = parser.parse_args()
-
-    if (not args.encode) and (not args.decode):
-        c = args.infile.read(1)
-        args.infile.seek(0, 0)
-
-        if c == b"{":
-            args.encode = True
-        elif c == b"T":
-            args.decode = True
-        else:
-            sys.stderr.write("Neither encode nor decode specified, and could not infer operation from input")
-            sys.exit(1)
-
-    if args.encode:
-        args.outfile.buffer.write(into_tlv(json.load(args.infile)))
-    else:
-        args.outfile.write(json.dumps(from_tlv(args.infile)))