fix(cross): bake hwdata into the toolchain image for libdisplay-info

libdisplay-info 0.2.0's meson build reads /usr/share/hwdata/pnp.ids on the build
machine to bake the PNP-ID table into the library; without it `meson setup`
fails ("File /usr/share/hwdata/pnp.ids does not exist"). Add hwdata to the image
toolset alongside build-essential. Toolset change re-keys the image tag, so
publish rebuilds it automatically.

Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
This commit is contained in:
Joel Winarske
2026-06-19 18:29:44 -07:00
parent c5509e71b7
commit 52bf5f10e0
3 changed files with 5 additions and 2 deletions
+1
View File
@@ -46,6 +46,7 @@
"libxkbcommon",
"dlopens",
"gstreamer",
"hwdata",
"pipewire",
"sdbus",
"waypp",
+3 -2
View File
@@ -50,10 +50,11 @@ FROM $fromImage
# Build tooling: cmake/ninja/meson/pkg-config + the embedder's host codegen
# (wayland-scanner via libwayland-bin; git/curl for the engine-header fetch).
# build-essential gives meson a native (build-machine) compiler — required to
# configure even a cross build when rebuilding `augment` libs (libdisplay-info).
# configure even a cross build when rebuilding `augment` libs (libdisplay-info,
# which also reads hwdata's /usr/share/hwdata/pnp.ids at build time).
RUN apt-get update \\
&& apt-get install -y --no-install-recommends \\
cmake ninja-build meson build-essential pkg-config \\
cmake ninja-build meson build-essential pkg-config hwdata \\
tar xz-utils rsync ca-certificates libwayland-bin git curl \\
&& rm -rf /var/lib/apt/lists/*
ENV FLUTTER_WORKSPACE=$workspace
@@ -23,6 +23,7 @@ void main() {
expect(df, contains('ninja-build'));
expect(df, contains('meson')); // builds augment libs (libdisplay-info)
expect(df, contains('build-essential')); // native cc for meson configure
expect(df, contains('hwdata')); // libdisplay-info build reads pnp.ids
expect(df, contains('libwayland-bin')); // wayland-scanner for wayland-egl
expect(df, contains('FROM ${ToolchainImage.defaultFrom}'));
expect(df, contains('emb.triple="aarch64-none-linux-gnu"'));