From: Josef Schlehofer <redacted>
Date: Sat, 5 Mar 2022 10:35:40 +0000 (+0100)
Subject: libarchive: add conflict to bsdtar/bsdtar-noopenssl
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=eb8e8ea4db781700d36de9c117077f57f768846c;p=openwrt-packages.git

libarchive: add conflict to bsdtar/bsdtar-noopenssl

Fixes:
Packages 'bsdtar' and 'bsdtar-noopenssl' do not conflict while providing same file: /usr/bin/bsdtar

Signed-off-by: Josef Schlehofer <redacted>
---

diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile
index ff7c5be14..23d6341b1 100644
--- 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