Fix rhel8 build, add os overwrite option

configs/base/rhel8.json

@@ -58,6 +58,7 @@
             "rpm": [
                 "https://vault.centos.org/8-stream/AppStream/x86_64/os/Packages/ocl-icd-2.2.12-1.el8.x86_64.rpm"
             ]
-        }
+        },
+        "intel-level-zero-npu": {}
     }
 }

configs/base/ubuntu20.json

@@ -38,6 +38,13 @@
                 "https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.12037.1/intel-igc-opencl_1.0.12037.1_amd64.deb"
             ]
         },
-        "intel-level-zero-npu": {}
+        "intel-level-zero-npu": {},
+        "python": {
+            "_comment": [
+                "pinning this package helps speeding up installation",
+                "it keeps pip from trying multiple versions of different libraries"
+            ],
+            "pin_packages": ["typing_extensions~=4.12"]
+        }
     }
 }

configs/releases/2024.4/ubuntu20.json

@@ -4,11 +4,5 @@
     "package": {
         "url": "https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.4/linux/l_openvino_toolkit_ubuntu20_2024.4.0.16579.c3152d32c9c_x86_64.tgz",
         "version": "2024.4.0"
-    },
-    "components": {
-        "python": {
-            "_comment": "pinning this package helps speeding up installation and keep nvidia cuda libraries from downloading multiple times",
-            "pin_packages": ["typing_extensions~=4.12"]
-        }
     }
 }

docker_openvino.py

@@ -57,6 +57,8 @@ def log_run(command):
 ]
 if args.wheels_url:
     command.extend(["--wheels-url", args.wheels_url])
+if args.os:
+    command.extend(["--os", args.os])
 log_run(command)
 
 image_info = json.load(open("image_data.json"))

generate.py

@@ -14,6 +14,7 @@
 parser.add_argument("--config", help="Use pre-existing config to generate Dockerfile.")
 parser.add_argument("--package_url", "--package-url", help="Generate config for given package url.")
 parser.add_argument("--wheels_url", "--wheels-url", help="Also specify wheels url when generating the config.")
+parser.add_argument("--os", help="Overwrite OS if package-url is given")
 parser.add_argument("-p", "--preset", default="runtime", help="preset to build, e.g. 'dev' or 'runtime'")
 parser.add_argument("--include-components",
     help="list of components to forcefully enable (separated by comma)")
@@ -43,7 +44,7 @@
         # this is a pre-release then add extra version
         package_version += "." + package_info["version_extra"]
     config_data = {
-        "_based_on": package_info["os"],
+        "_based_on": args.os or package_info["os"],
         "_template": "Dockerfile_default.j2",
         "package": {
             "url": args.package_url,