Skip to content

Commit 8564632

Browse files
committed
Fix rhel8 build, add os overwrite option
1 parent 36c4a77 commit 8564632

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

configs/base/rhel8.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"rpm": [
5959
"https://vault.centos.org/8-stream/AppStream/x86_64/os/Packages/ocl-icd-2.2.12-1.el8.x86_64.rpm"
6060
]
61-
}
61+
},
62+
"intel-level-zero-npu": {}
6263
}
6364
}

configs/base/ubuntu20.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@
3838
"https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.12037.1/intel-igc-opencl_1.0.12037.1_amd64.deb"
3939
]
4040
},
41-
"intel-level-zero-npu": {}
41+
"intel-level-zero-npu": {},
42+
"python": {
43+
"_comment": [
44+
"pinning this package helps speeding up installation",
45+
"it keeps pip from trying multiple versions of different libraries"
46+
],
47+
"pin_packages": ["typing_extensions~=4.12"]
48+
}
4249
}
4350
}

configs/releases/2024.4/ubuntu20.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,5 @@
44
"package": {
55
"url": "https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.4/linux/l_openvino_toolkit_ubuntu20_2024.4.0.16579.c3152d32c9c_x86_64.tgz",
66
"version": "2024.4.0"
7-
},
8-
"components": {
9-
"python": {
10-
"_comment": "pinning this package helps speeding up installation and keep nvidia cuda libraries from downloading multiple times",
11-
"pin_packages": ["typing_extensions~=4.12"]
12-
}
137
}
148
}

docker_openvino.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ def log_run(command):
5757
]
5858
if args.wheels_url:
5959
command.extend(["--wheels-url", args.wheels_url])
60+
if args.os:
61+
command.extend(["--os", args.os])
6062
log_run(command)
6163

6264
image_info = json.load(open("image_data.json"))

generate.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
parser.add_argument("--config", help="Use pre-existing config to generate Dockerfile.")
1515
parser.add_argument("--package_url", "--package-url", help="Generate config for given package url.")
1616
parser.add_argument("--wheels_url", "--wheels-url", help="Also specify wheels url when generating the config.")
17+
parser.add_argument("--os", help="Overwrite OS if package-url is given")
1718
parser.add_argument("-p", "--preset", default="runtime", help="preset to build, e.g. 'dev' or 'runtime'")
1819
parser.add_argument("--include-components",
1920
help="list of components to forcefully enable (separated by comma)")
@@ -43,7 +44,7 @@
4344
# this is a pre-release then add extra version
4445
package_version += "." + package_info["version_extra"]
4546
config_data = {
46-
"_based_on": package_info["os"],
47+
"_based_on": args.os or package_info["os"],
4748
"_template": "Dockerfile_default.j2",
4849
"package": {
4950
"url": args.package_url,

0 commit comments

Comments
 (0)