projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c66639)
libarchive: add conflict to bsdtar/bsdtar-noopenssl
authorJosef Schlehofer <pepe.schlehofer@gmail.com>
Sat, 5 Mar 2022 10:35:40 +0000 (11:35 +0100)
committerRosen Penev <rosenp@gmail.com>
Thu, 17 Mar 2022 02:53:14 +0000 (19:53 -0700)
Fixes:
Packages 'bsdtar' and 'bsdtar-noopenssl' do not conflict while providing same file: /usr/bin/bsdtar

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
libs/libarchive/Makefile patch | blob | history

diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile
index ff7c5be1486e2ba90986baafd18b6edd49bec1c3..23d6341b197f014b62faf345b7c133129f800f57 100644 (file)
--- a/libs/libarchive/Makefile
+++ b/libs/libarchive/Makefile
@@ -53,6 +53,7 @@ endef
 define Package/bsdtar
   $(call Package/bsdtar/Default)
   DEPENDS:= +libarchive
+  CONFLICTS:=bsdtar-noopenssl
 endef
 
 define Package/bsdtar-noopenssl
Mirror of packages feed