summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-08-22 14:31:21 +0200
committerJosef Schlehofer <pepe.schlehofer@gmail.com>2022-08-24 08:25:54 +0200
commite2885b9ddd09879b439c0af5c9716e371d5ae8a3 (patch)
tree056f84d5e05325a4be19bdd803ccd8b6bd491847
parentca195ccafa92414c1eb0e324b5b49f878ba72ff9 (diff)
vim: variants conflict with each other
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čí <cynerd@email.cz> Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com> [add commit message] (cherry picked from commit 46c058468aeaf7747c2e94e579020aa7f595c649)
-rw-r--r--utils/vim/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index 5d9b21c73..9789e833a 100644
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -46,12 +46,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