From 5e90d40ce82d748423c45c26c60ae060d59d2a62 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 18 May 2026 12:29:19 +0100 Subject: [PATCH] mesa: drop symmetric CONFLICTS between libteflon-rocket and libteflon-etnaviv Make the CONFLICTS declaration asymmetric: only libteflon-rocket declares CONFLICTS:=libteflon-etnaviv. That single side is sufficient to force the mutual exclusion at Kconfig time (selecting either disables the other) while breaking the cycle that the symmetric form created. Signed-off-by: Daniel Golle --- libs/mesa/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/mesa/Makefile b/libs/mesa/Makefile index 2d289eb..80a1bdb 100644 --- a/libs/mesa/Makefile +++ b/libs/mesa/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mesa PKG_VERSION:=26.0.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://archive.mesa3d.org/ @@ -475,7 +475,6 @@ $(call Package/mesa/Default) TITLE+= TFLite delegate for VeriSilicon NPU (etnaviv) DEPENDS+=+libdrm-etnaviv +libexpat +libzstd +zlib @aarch64 VARIANT:=teflon-etnaviv - CONFLICTS:=libteflon-rocket endef define Package/libteflon-etnaviv/description