Skip to content

Commit 65cfe7e

Browse files
committed
mesa-vpu: drop Hook 1 (overlay) and Hook 3 (browser) — now covered by armbian-config
Two hooks in extensions/mesa-vpu.sh are now redundant with armbian-config's module_desktops: * extension_prepare_config__3d — appended panthor-gpu to DEFAULT_OVERLAYS on rockchip-rk3588 / rk35xx + BRANCH=vendor. module_desktops now enables the same overlay via _module_desktops_add_3d_overlay (configng commit 8248b497), which delegates to the existing module_devicetree_overlays install path — atomic armbianEnv.txt rewrite, .bak preserved, validates against the discovered .dtbo set, idempotent. Same gating (BOARDFAMILY + BRANCH + release + tier + DE) enforced on the configng side. Covers both image-build (module_desktops install mode=build) and install-on-minimal (runtime armbian-config invocation). * post_armbian_repo_customize_image__browser — installed a browser (google-chrome-stable on amd64, chromium on arm64 / armhf, firefox elsewhere) via chroot_sdcard_apt_get_install AFTER module_desktops had already placed our branded chromium conffiles. That second apt run — without --force-confdef --force-confold — tripped dpkg's 'File on system created by you or by a script' prompt on our /etc/chromium/master_preferences. The hook is also architecturally duplicated: configng's common.yaml 'browser' virtual token resolves to the correct package per (release, arch), more correctly than this hook (this fallback used plain 'firefox' which only exists on Ubuntu — Debian riscv64 needs firefox-esr; Ubuntu riscv64 needs epiphany-browser; configng handles both). Drop the hook. The remaining hook (post_install_kernel_debs__3d) stays — it carries genuine build-framework-only responsibilities: the rk3588-specific rockchip-multimedia PPA + its packages (rockchip-multimedia-config / libv4l-rkmpp / gstreamer1.0-rockchip / libwidevinecdm0), the KDE Neon base-files / libdav1d7 holds, and the final dist-upgrade pass. Those all gate on board / kernel / release combinations that configng (which only knows release × arch, not LINUXFAMILY × BRANCH) can't express today.
1 parent e18dcb6 commit 65cfe7e

1 file changed

Lines changed: 0 additions & 47 deletions

File tree

extensions/mesa-vpu.sh

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,6 @@
55
# Enables 3D and multimedia, 4K VPU with Chromium, acceleration for Ubuntu. Debian only 3D
66
#
77

8-
function extension_prepare_config__3d() {
9-
# Silently deny old releases which are not supported but are still in the system
10-
[[ "${RELEASE}" =~ ^(bookworm|bullseye|buster|focal|jammy)$ ]] && return 0
11-
12-
# Deny on minimal CLI images
13-
if [[ "${BUILD_MINIMAL}" == "yes" ]]; then
14-
display_alert "Extension: ${EXTENSION}" "skip installation in minimal images" "warn"
15-
return 0
16-
fi
17-
18-
# some desktops doesn't support wayland
19-
[[ "${DESKTOP_ENVIRONMENT}" == "xfce" || "${DESKTOP_ENVIRONMENT}" == "i3-wm" ]] && return 0
20-
21-
# This should be enabled on all for rk3588 distributions where mesa and vendor kernel is present
22-
if [[ "${LINUXFAMILY}" =~ ^(rockchip-rk3588|rk35xx)$ && "$BRANCH" == vendor ]]; then
23-
if [[ -n $DEFAULT_OVERLAYS ]]; then
24-
DEFAULT_OVERLAYS+=" panthor-gpu"
25-
else
26-
declare -g DEFAULT_OVERLAYS="panthor-gpu"
27-
fi
28-
fi
29-
30-
}
31-
328
function post_install_kernel_debs__3d() {
339
# Silently deny old releases which are not supported but are still in the system
3410
[[ "${RELEASE}" =~ ^(bookworm|bullseye|buster|focal|jammy)$ ]] && return 0
@@ -108,26 +84,3 @@ function post_install_kernel_debs__3d() {
10884
return 0
10985
}
11086

111-
function post_armbian_repo_customize_image__browser() {
112-
# Silently deny old releases which are not supported but are still in the system
113-
[[ "${RELEASE}" =~ ^(bookworm|bullseye|buster|focal|jammy)$ ]] && return 0
114-
115-
# Add browser if building a desktop - architecture dependent
116-
[[ "${BUILD_DESKTOP}" != "yes" ]] && return 0
117-
118-
if [[ "${ARCH}" == "amd64" ]]; then
119-
# amd64: prefer google-chrome
120-
pkgs=("google-chrome-stable")
121-
elif [[ "${ARCH}" =~ ^(arm64|armhf)$ ]]; then
122-
# arm64/armhf: use chromium
123-
pkgs=("chromium")
124-
else
125-
# other architectures: fallback to firefox
126-
pkgs=("firefox")
127-
fi
128-
129-
display_alert "Installing browser" "${EXTENSION}" "info"
130-
do_with_retries 3 chroot_sdcard_apt_get_install "${pkgs[@]}"
131-
132-
return 0
133-
}

0 commit comments

Comments
 (0)