Skip to content

Commit 02a0a3a

Browse files
authored
Update ICT baseline to bc18a5 (#111)
Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>
1 parent 0268c08 commit 02a0a3a

3 files changed

Lines changed: 93 additions & 121 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ ICT_PATCH := $(ICT_DIR)/generic-handheld-os-template.patch
238238
ICT_FINAL := $(ICT_DIR)/generic-handheld-os-template.yml
239239
ICT_UPSTREAM_REPO := open-edge-platform/image-composer-tool
240240
ICT_UPSTREAM_PATH := image-templates/ubuntu24-x86_64-minimal-ptl-pv-raw.yml
241-
ICT_UPSTREAM_SHA := b21499751a1e50677bbf2b4ea4517adcb67da7d8
241+
ICT_UPSTREAM_SHA := bc18a5b45f1ac7423156dd307b83318cdf2dcc77
242242
ICT_UPSTREAM_RAW_URL := https://raw.githubusercontent.com/$(ICT_UPSTREAM_REPO)/$(ICT_UPSTREAM_SHA)/$(ICT_UPSTREAM_PATH)
243243

244244
ict-refresh-upstream:

infrastructure/host-os/ict/generic-handheld-os-template.patch

Lines changed: 58 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SPDX-FileCopyrightText: (C) 2026 Intel Corporation
22
SPDX-License-Identifier: Apache-2.0
33

4-
--- a/ubuntu24-x86_64-minimal-ptl-pv-raw.yml (upstream @ b21499751a1e50677bbf2b4ea4517adcb67da7d8)
4+
--- a/ubuntu24-x86_64-minimal-ptl-pv-raw.yml (upstream @ bc18a5b45f1ac7423156dd307b83318cdf2dcc77)
55
+++ b/generic-handheld-os-template.yml
66
@@ -1,23 +1,8 @@
77
-# AI-searchable metadata for template discovery
@@ -47,7 +47,15 @@ SPDX-License-Identifier: Apache-2.0
4747
# Intel overlay repository (aligned with installer script)
4848
- codename: "noble"
4949
url: "https://download.01.org/intel-linux-overlay/ubuntu"
50-
@@ -281,17 +267,54 @@
50+
@@ -88,6 +74,7 @@
51+
allowPackages:
52+
- libigfxcmrt-dev
53+
- libigfxcmrt7
54+
+ - curl
55+
- gir1.2-gst-plugins-bad-1.0
56+
- gir1.2-gst-plugins-base-1.0
57+
- gir1.2-gstreamer-1.0
58+
@@ -189,17 +176,57 @@
5159
# additional PTL packages
5260
- xdp-tools
5361
- rpc-go
@@ -58,6 +66,9 @@ SPDX-License-Identifier: Apache-2.0
5866
- libxdp1
5967
- intel-media-va-driver-non-free
6068
- spice-client-gtk
69+
+ # Power and Thermal daemons for power and perfromance management
70+
+ - intel-lpmd
71+
+ - thermald
6172
+ # ----- OpenVINO -----
6273
+ - codename: "ubuntu24"
6374
+ url: "https://apt.repos.intel.com/openvino/2025"
@@ -104,15 +115,20 @@ SPDX-License-Identifier: Apache-2.0
104115
bootloader:
105116
bootType: efi
106117
provider: grub
107-
@@ -360,6 +383,7 @@
118+
@@ -274,10 +301,12 @@
119+
- efibootmgr
120+
# PTL network stack
121+
- libbpf1
122+
+ - curl
123+
- wget
108124
- cron
109125
- ethtool
110126
- iproute2
111127
+ - network-manager
112128
- libtbb12
113129
# PTL packages
114130
- libigfxcmrt-dev
115-
@@ -485,7 +509,12 @@
131+
@@ -400,7 +429,12 @@
116132
- build-essential
117133
- apt-transport-https
118134
- default-jre
@@ -126,7 +142,7 @@ SPDX-License-Identifier: Apache-2.0
126142
- ffmpeg
127143
- git-lfs
128144
- gnuplot
129-
@@ -530,20 +559,56 @@
145+
@@ -445,36 +479,67 @@
130146
- mesa-vulkan-drivers
131147
- xdp-tools
132148
- rpc-go
@@ -137,23 +153,37 @@ SPDX-License-Identifier: Apache-2.0
137153
- libxdp1
138154
- intel-media-va-driver-non-free
139155
- spice-client-gtk
156+
- # linux-tools dependencies (must be installed before dpkg -i of linux-tools packages)
157+
- - libtraceevent1
158+
- - libtracefs1
140159
+ - firefox
141160
+ - firmware-sof-signed
142-
- libdrm-tests
143-
-
144161
+ - cloud-init
145162
+ - chrony
146163
+ - sg3-utils
147164
+ - util-linux-extra
148165
+ # -- Performance & Profiling Tools ------------------------------------------
149166
+ # Runtime deps for the Intel mainline-tracking 6.18 kernel tooling .debs
150167
+ # (linux-perf, linux-kbuild, linux-misc-tools, rtla)
151-
+ - pahole
152-
+ - libconfig9
153-
+ - libbabeltrace1
168+
- pahole
169+
- libconfig9
170+
- libbabeltrace1
154171
+ - libdebuginfod1t64
155-
+ - libopencsd1
172+
- libopencsd1
156173
+ - libtracefs1
174+
+ # Additional linux-tools runtime deps (from upstream 2026.1 refresh)
175+
+ - libtraceevent1
176+
- libnuma1
177+
- libslang2
178+
- libpython3.12t64
179+
- - libdebuginfod1t64
180+
- libdw1t64
181+
- libnl-3-200
182+
- libnl-genl-3-200
183+
- libpci3
184+
- - firmware-sof-signed
185+
- - network-manager
186+
-
157187
+ # Intel Performance Counter Monitor - CPU/uncore/PCIe counters
158188
+ - pcm
159189
+ # Multi-purpose CPU / memory / I/O benchmark
@@ -178,6 +208,9 @@ SPDX-License-Identifier: Apache-2.0
178208
+ - librealsense2-utils
179209
+ - librealsense2-dev
180210
+ - librealsense2-gl
211+
+ # Power and Thermal daamons for power and perfromance management
212+
+ - intel-lpmd
213+
+ - thermald
181214

182215
additionalFiles:
183216
- local: ../additionalfiles/ptl/01-network-manager-all.yaml
@@ -187,9 +220,9 @@ SPDX-License-Identifier: Apache-2.0
187220

188221
kernel:
189222
version: "260427t075939z-r2"
190-
@@ -553,7 +618,25 @@
191-
- linux-image-6.18-intel_260427t075939z-r2
223+
@@ -485,7 +550,25 @@
192224
- linux-headers-6.18-intel_260427t075939z-r2
225+
193226

194227
+ users:
195228
+ - name: user
@@ -213,22 +246,27 @@ SPDX-License-Identifier: Apache-2.0
213246
# Install Intel Graphics Compiler and compute runtime packages for PTL
214247
- cmd: "mkdir -p /tmp/gpu-packages"
215248
- cmd: "wget -q https://github.com/intel/intel-graphics-compiler/releases/download/v2.28.4/intel-igc-core-2_2.28.4+20760_amd64.deb -O /tmp/gpu-packages/intel-igc-core-2_2.28.4+20760_amd64.deb"
216-
@@ -563,7 +646,7 @@
249+
@@ -495,7 +578,7 @@
217250
- cmd: "wget -q https://github.com/intel/compute-runtime/releases/download/26.05.37020.3/libze-intel-gpu1_26.05.37020.3-0_amd64.deb -O /tmp/gpu-packages/libze-intel-gpu1_26.05.37020.3-0_amd64.deb"
218251
- cmd: "wget -q https://github.com/oneapi-src/level-zero/releases/download/v1.22.4/level-zero_1.22.4+u24.04_amd64.deb -O /tmp/gpu-packages/level-zero_1.22.4+u24.04_amd64.deb"
219252
- cmd: "wget -q https://github.com/oneapi-src/level-zero/releases/download/v1.22.4/level-zero-devel_1.22.4+u24.04_amd64.deb -O /tmp/gpu-packages/level-zero-devel_1.22.4+u24.04_amd64.deb"
220253
-
221254
+
222-
- cmd: "find /tmp/gpu-packages -maxdepth 1 -type f -name '*.deb' | xargs -r dpkg -i; apt-get install -y --fix-broken || true"
255+
- cmd: "find /tmp/gpu-packages -maxdepth 1 -type f -name '*.deb' | xargs -r dpkg -i; apt-get install -y --fix-broken -o Dpkg::Options::=\"--force-overwrite\" || true"
223256
# Install NPU driver for PTL
224-
- cmd: "dpkg --purge --force-remove-reinstreq intel-driver-compiler-npu intel-fw-npu intel-level-zero-npu intel-level-zero-npu-dbgsym 2>/dev/null || true"
225-
@@ -586,4 +669,24 @@
257+
- cmd: "dpkg --purge --force-remove-reinstreq intel-driver-compiler-npu intel-fw-npu intel-level-zero-npu intel-level-zero-npu-dbgsym 2>/dev/null "
258+
@@ -519,6 +602,7 @@
226259
- cmd: "wget -q https://download.01.org/intel-linux-overlay/ubuntu/linux-tools/linux-perf_6.18.23-intel+260427T075939Z_amd64.deb -O /tmp/linux-tools/linux-perf.deb"
227260
- cmd: "wget -q https://download.01.org/intel-linux-overlay/ubuntu/linux-tools/rtla_6.18.23-intel+260427T075939Z_amd64.deb -O /tmp/linux-tools/rtla.deb"
228261
- cmd: "wget -q https://download.01.org/intel-linux-overlay/ubuntu/linux-tools/usbip_2.0+6.18.23-intel+260427T075939Z_amd64.deb -O /tmp/linux-tools/usbip.deb"
229-
- - cmd: "find /tmp/linux-tools -maxdepth 1 -type f -name '*.deb' | xargs -r dpkg -i; apt-get install -y --fix-broken || true"
230-
\ No newline at end of file
231-
+ - cmd: "find /tmp/linux-tools -maxdepth 1 -type f -name '*.deb' | xargs -r dpkg -i; apt-get install -y --fix-broken -o Dpkg::Options::=\"--force-overwrite\""
262+
+ # Install libcpupower1 first — required by other linux-tools debs
263+
- cmd: "dpkg -i /tmp/linux-tools/libcpupower1.deb"
264+
- cmd: "find /tmp/linux-tools -maxdepth 1 -type f -name '*.deb' | xargs -r dpkg -i; apt-get install -y --fix-broken -o Dpkg::Options::=\"--force-overwrite\" || true"
265+
# Pin linux-tools packages to prevent apt from downgrading or removing them
266+
@@ -526,3 +610,23 @@
267+
# Fix broken deps but ignore systemd-boot EFI variable error (not accessible in chroot)
268+
- cmd: "apt-get install -y --fix-broken -o Dpkg::Options::=\"--force-overwrite\" || true"
269+
- cmd: "dpkg --configure -a --force-configure-any || true"
232270
+ # ----------------------------------------------------------------------------------
233271
+ # Pre-install K3s and Docker CE (both disabled by default)
234272
+ # On first boot, cloud-init reads host_type from /etc/cloud/config-file and

0 commit comments

Comments
 (0)