Skip to content

Commit 45e9daf

Browse files
committed
mesa-vpu: move Mesa runtime + diagnostics package list to configng mid tier
Second phase of the mesa-vpu → configng migration (first phase: Hook 1 overlay + Hook 3 browser, commit deb764d). The package list in post_install_kernel_debs__3d (libgl1-mesa-dri, libglx-mesa0, mesa-utils, mesa-vulkan-drivers, vulkan-tools, and the four glmark2-{,es2-}{wayland,x11} flavours) is DE-agnostic desktop GPU-runtime content. Moving it to armbian-configng's common.yaml mid tier (configng commit f175558d) means every mid-tier desktop install gets the same set, whether it's an image-build going through module_desktops mode=build or a runtime install on an already-booted minimal image via armbian-config. Three phantom entries from the original list were dropped on the configng side and also removed from this hook: mesa-utils-extra — no such binary package in any Debian/Ubuntu release (archive dropped it years ago) glmark2 — source package only; only the -{wayland,es2-wayland,x11,es2-x11} binaries ship glmark2-es2 — same, no binary package ships under that name apt has been silently skipping them on every mesa-vpu run with 'E: Unable to locate package', cluttering logs without affecting the build outcome. What remains in post_install_kernel_debs__3d after this trim is genuinely build-framework-only territory — things configng (RELEASE × ARCH keyed) can't express because they need LINUXFAMILY × BRANCH awareness: - rockchip-rk3588 / rk35xx + noble + vendor conditional rockchip multimedia PPA (liujianfeng1994/rockchip-multimedia), with its rockchip-multimedia-config / libv4l-rkmpp / gstreamer1.0-rockchip / libwidevinecdm0 payload - libv4l-0 pre-req install (precedes rockchip-multimedia) - KDE Neon base-files hold/unhold workaround - noble/oracular arm libdav1d7 hold/unhold - final dist-upgrade pass (to pick up whatever the PPAs shift) The install call is now gated on `pkgs` being non-empty so non-rk3588 boards don't invoke apt with zero package names.
1 parent 65cfe7e commit 45e9daf

1 file changed

Lines changed: 16 additions & 20 deletions

File tree

extensions/mesa-vpu.sh

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,16 @@ function post_install_kernel_debs__3d() {
1818
# some desktops doesn't support wayland
1919
[[ "${DESKTOP_ENVIRONMENT}" == "xfce" || "${DESKTOP_ENVIRONMENT}" == "i3-wm" ]] && return 0
2020

21-
# Packages that are going to be installed, always, both for cli and desktop
22-
declare -a pkgs=("libgl1-mesa-dri")
23-
24-
if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
25-
pkgs+=("libglx-mesa0") # Mesa OpenGL extension library for X11
26-
pkgs+=("mesa-utils") # Mesa utilities for OpenGL information and testing
27-
pkgs+=("mesa-utils-extra") # Additional Mesa demonstration programs
28-
pkgs+=("glmark2") # OpenGL 2.0/3.0 benchmark suite
29-
pkgs+=("glmark2-wayland") # Glmark2 Wayland backend for benchmarking
30-
pkgs+=("glmark2-es2-wayland") # Glmark2 OpenGL ES 2.0 Wayland backend
31-
pkgs+=("glmark2-es2") # Glmark2 OpenGL ES 2.0 benchmark support
32-
pkgs+=("glmark2-x11") # Glmark2 X11 backend for benchmarking
33-
pkgs+=("glmark2-es2-x11") # Glmark2 OpenGL ES 2.0 X11 backend
34-
pkgs+=("vulkan-tools") # Vulkan utilities for testing and debugging (vulkaninfo, etc.)
35-
pkgs+=("mesa-vulkan-drivers") # Vulkan drivers for Mesa GPUs (Panfrost, Lima, Radeon, Intel, etc.)
36-
fi
37-
38-
if [[ "${BUILD_DESKTOP}" == "yes" ]]; then # if desktop, add amazingfated's multimedia PPAs and rockchip-multimedia-config utility, chromium, gstreamer, etc
21+
# Mesa runtime + Vulkan drivers + glmark2/vulkan-tools moved to
22+
# armbian-configng's common.yaml mid tier — configng installs
23+
# them as part of `module_desktops install mode=build` before
24+
# this extension hook runs. The list remaining here is just
25+
# the board-conditional rockchip-multimedia stack that configng
26+
# can't express (configng only knows RELEASE × ARCH, not
27+
# LINUXFAMILY × BRANCH).
28+
declare -a pkgs=()
29+
30+
if [[ "${BUILD_DESKTOP}" == "yes" ]]; then # if desktop, add amazingfated's multimedia PPAs and rockchip-multimedia-config utility, gstreamer, etc
3931
if [[ "${LINUXFAMILY}" =~ ^(rockchip-rk3588|rk35xx)$ && "${RELEASE}" =~ ^(noble)$ && "${BRANCH}" =~ ^(vendor)$ ]]; then
4032
pkgs+=("rockchip-multimedia-config" "libv4l-rkmpp" "gstreamer1.0-rockchip" "libwidevinecdm0")
4133
display_alert "Adding amazingfated's multimedia PPAs" "${EXTENSION}" "info"
@@ -59,8 +51,12 @@ function post_install_kernel_debs__3d() {
5951
do_with_retries 3 chroot_sdcard_apt_get_install libv4l-0
6052
fi
6153

62-
display_alert "Installing 3D extension packages" "${EXTENSION}" "info"
63-
do_with_retries 3 chroot_sdcard_apt_get_install "${pkgs[@]}"
54+
# Install only runs when we collected rockchip-specific packages above.
55+
# Mesa/vulkan/glmark2/mesa-utils moved to configng common.yaml mid tier.
56+
if [[ "${#pkgs[@]}" -gt 0 ]]; then
57+
display_alert "Installing rockchip multimedia packages" "${EXTENSION}" "info"
58+
do_with_retries 3 chroot_sdcard_apt_get_install "${pkgs[@]}"
59+
fi
6460

6561
# This library gets downgraded
6662
if [[ "${BUILD_DESKTOP}" == "yes" ]]; then

0 commit comments

Comments
 (0)