From b0b2efe4e4d81f5740c43a472e32886c71739aef Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 2 Apr 2025 15:45:42 +0800 Subject: minizip: Make rconflicts with minizip-ng Fixes: Error: Transaction test error: file /usr/bin/minizip conflicts between attempted installs of minizip-1.3.1-r0.riscv64 and minizip-ng-4.0.8-r0.riscv64 file /usr/lib/libminizip.so.1 conflicts between attempted installs of minizip-1.3.1-r0.riscv64 and minizip-ng-4.0.8-r0.riscv64 Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- meta-oe/recipes-core/minizip/minizip_1.3.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-core/minizip/minizip_1.3.1.bb b/meta-oe/recipes-core/minizip/minizip_1.3.1.bb index c9c92ad6bd..0d36ffbcf6 100644 --- a/meta-oe/recipes-core/minizip/minizip_1.3.1.bb +++ b/meta-oe/recipes-core/minizip/minizip_1.3.1.bb @@ -16,6 +16,8 @@ SRC_URI[sha256sum] = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b PACKAGECONFIG ??= "demos" PACKAGECONFIG[demos] = "--enable-demos=yes,,," +RCONFLICTS:${PN} += "minizip-ng" + DEPENDS = "zlib" inherit autotools -- cgit v1.2.3-54-g00ecf