diff options
| author | Mingli Yu <mingli.yu@windriver.com> | 2025-04-02 15:45:42 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-04-02 07:27:48 -0700 |
| commit | b0b2efe4e4d81f5740c43a472e32886c71739aef (patch) | |
| tree | 814f2508252a92479efff47ce1e5c2f3a37123b0 /meta-oe/recipes-core | |
| parent | aea21d5a39e4d46fb88c8075692517a98a35f46a (diff) | |
| download | meta-openembedded-b0b2efe4e4d81f5740c43a472e32886c71739aef.tar.gz | |
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 <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core')
| -rw-r--r-- | meta-oe/recipes-core/minizip/minizip_1.3.1.bb | 2 |
1 files changed, 2 insertions, 0 deletions
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 | |||
| 16 | PACKAGECONFIG ??= "demos" | 16 | PACKAGECONFIG ??= "demos" |
| 17 | PACKAGECONFIG[demos] = "--enable-demos=yes,,," | 17 | PACKAGECONFIG[demos] = "--enable-demos=yes,,," |
| 18 | 18 | ||
| 19 | RCONFLICTS:${PN} += "minizip-ng" | ||
| 20 | |||
| 19 | DEPENDS = "zlib" | 21 | DEPENDS = "zlib" |
| 20 | 22 | ||
| 21 | inherit autotools | 23 | inherit autotools |