From d4cc9475706dd97a2c2725206ff08fdc54d4ff2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 22 Aug 2022 14:31:21 +0200 Subject: [PATCH] vim: variants conflict with each other MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds conflicts between the variants, because they provide the same files, and it should not be possible to install them side by side. Otherwise, it might happen that half files would be from one variant and the other half from the other. Also, adds provides as if you request to install ``vim`` and ``vim-full``, then the request could be satisfied even they collide, because ``vim-full`` provides ``vim`` package. Signed-off-by: Karel Kočí Signed-off-by: Josef Schlehofer [add commit message] (cherry picked from commit 46c058468aeaf7747c2e94e579020aa7f595c649) --- utils/vim/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/vim/Makefile b/utils/vim/Makefile index 1c27a6161..3681142df 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -41,12 +41,16 @@ endef define Package/vim-full $(call Package/vim/Default) TITLE+= (Normal) + PROVIDES:=vim + CONFLICTS:=vim endef define Package/vim-fuller $(call Package/vim/Default) TITLE+= (Big) + PROVIDES:=vim vim-full + CONFLICTS:=vim vim-full endef define Package/vim-runtime