From patchwork Wed Apr 2 07:45:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mingli.yu@eng.windriver.com X-Patchwork-Id: 60569 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5493AC36014 for ; Wed, 2 Apr 2025 07:45:48 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.2552.1743579944954535105 for ; Wed, 02 Apr 2025 00:45:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=6187dfc01b=mingli.yu@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53269YGZ010857 for ; Wed, 2 Apr 2025 00:45:44 -0700 Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45rtc9rfhg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 02 Apr 2025 00:45:44 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Wed, 2 Apr 2025 00:45:43 -0700 Received: from pek-lpg-core4.wrs.com (128.224.153.44) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Wed, 2 Apr 2025 00:45:43 -0700 From: To: Subject: [meta-oe][PATCH v3 1/3] minizip-ng: Add new recipe Date: Wed, 2 Apr 2025 15:45:40 +0800 Message-ID: <20250402074542.2842980-1-mingli.yu@eng.windriver.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 2g-Q7mfcEQ6fDGFe4YfDCI-sKEp8YEH3 X-Authority-Analysis: v=2.4 cv=Tb2WtQQh c=1 sm=1 tr=0 ts=67eceb28 cx=c_pps a=/ZJR302f846pc/tyiSlYyQ==:117 a=/ZJR302f846pc/tyiSlYyQ==:17 a=XR8D0OoHHMoA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=tRVMadOLXIa04o2Br9gA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: 2g-Q7mfcEQ6fDGFe4YfDCI-sKEp8YEH3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-02_02,2025-04-01_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 adultscore=0 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504020048 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Apr 2025 07:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116509 From: Mingli Yu minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux. minizip-ng has new features and bug fixes compared to the original library minizip [1] which had not been maintained for a long period of time. [1] https://github.com/madler/zlib/tree/master/contrib/minizip Signed-off-by: Mingli Yu --- ...0001-crypt.h-Remove-register-keyword.patch | 35 ++++++++++++++++++ .../minizip-ng/minizip-ng_4.0.8.bb | 36 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch create mode 100644 meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch b/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch new file mode 100644 index 0000000000..c471b098d4 --- /dev/null +++ b/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch @@ -0,0 +1,35 @@ +From 469beab0747549599959a30188deb3b27df3a346 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 2 Apr 2025 11:19:54 +0800 +Subject: [PATCH] crypt.h: Remove register keyword + +Fixes: + | In file included from /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/test/test_compat.cc:17: + | /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/compat/crypt.h:62:9: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] + | 62 | register int keyshift = (int)((*(pkeys + 1)) >> 24); + | | ^~~~~~~~ + | 1 error generated. + +Upstream-Status: Submitted [https://github.com/zlib-ng/minizip-ng/pull/853] + +Signed-off-by: Mingli Yu +--- + compat/crypt.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compat/crypt.h b/compat/crypt.h +index 41c6454..ccdd83a 100644 +--- a/compat/crypt.h ++++ b/compat/crypt.h +@@ -59,7 +59,7 @@ static int update_keys(unsigned long *pkeys, const z_crc_t *pcrc_32_tab, int c) + (*(pkeys + 1)) += (*(pkeys + 0)) & 0xff; + (*(pkeys + 1)) = (*(pkeys + 1)) * 134775813L + 1; + { +- register int keyshift = (int)((*(pkeys + 1)) >> 24); ++ int keyshift = (int)((*(pkeys + 1)) >> 24); + (*(pkeys + 2)) = CRC32((*(pkeys + 2)), keyshift); + } + return c; +-- +2.34.1 + diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb new file mode 100644 index 0000000000..14363d2278 --- /dev/null +++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb @@ -0,0 +1,36 @@ +SUMMARY = "Zlib manipulation Library" +DESCRIPTION = "minizip-ng is a zip manipulation library written in C that is supported \ +on Windows, macOS, and Linux." +HOMEPAGE = "https://github.com/zlib-ng/minizip-ng" +SECTION = "libs" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f" + +SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \ + file://0001-crypt.h-Remove-register-keyword.patch \ +" + +SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de" + +S = "${WORKDIR}/git" + +RCONFLICTS:${PN} += "minizip" + +DEPENDS = "xz openssl bzip2" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = "-DMZ_FORCE_FETCH_LIBS=OFF \ + -DBUILD_SHARED_LIBS=ON \ +" + +PACKAGECONFIG ??= "zlib" +PACKAGECONFIG[zlib] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib" +PACKAGECONFIG[zlib-ng] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib-ng" + + +do_install:append () { + # remove absolute paths + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip.cmake +} + From patchwork Wed Apr 2 07:45:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mingli.yu@eng.windriver.com X-Patchwork-Id: 60570 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E263C3601B for ; Wed, 2 Apr 2025 07:45:48 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.2553.1743579946958437204 for ; Wed, 02 Apr 2025 00:45:47 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=6187dfc01b=mingli.yu@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5324ZpxG009091 for ; Wed, 2 Apr 2025 07:45:46 GMT Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45rtfn0eyt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 02 Apr 2025 07:45:45 +0000 (GMT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Wed, 2 Apr 2025 00:45:44 -0700 Received: from pek-lpg-core4.wrs.com (128.224.153.44) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Wed, 2 Apr 2025 00:45:44 -0700 From: To: Subject: [meta-oe][PATCH v3 2/3] minizip-ng: Add ptest support Date: Wed, 2 Apr 2025 15:45:41 +0800 Message-ID: <20250402074542.2842980-2-mingli.yu@eng.windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250402074542.2842980-1-mingli.yu@eng.windriver.com> References: <20250402074542.2842980-1-mingli.yu@eng.windriver.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=eZo9f6EH c=1 sm=1 tr=0 ts=67eceb2a cx=c_pps a=/ZJR302f846pc/tyiSlYyQ==:117 a=/ZJR302f846pc/tyiSlYyQ==:17 a=XR8D0OoHHMoA:10 a=t7CeM3EgAAAA:8 a=NEAV23lmAAAA:8 a=aePMmNEoZ3WNHdLW-AgA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: KkLpeJ1JwG9tKH38-UdbIBwaCD01HLgL X-Proofpoint-ORIG-GUID: KkLpeJ1JwG9tKH38-UdbIBwaCD01HLgL X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-02_02,2025-04-01_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 phishscore=0 malwarescore=0 clxscore=1015 impostorscore=0 adultscore=0 bulkscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504020048 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Apr 2025 07:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116510 From: Mingli Yu # ./run-ptest [==========] Running 55 tests from 6 test suites. [----------] Global test environment set-up. [----------] 22 tests from crypt PASS: crypt.rand PASS: crypt.sha1 PASS: crypt.sha224 PASS: crypt.sha256 PASS: crypt.sha384 PASS: crypt.sha512 PASS: crypt.aes128 PASS: crypt.aes128_cbc PASS: crypt.aes128_gcm PASS: crypt.aes194 PASS: crypt.aes256 PASS: crypt.hmac_sha1 PASS: crypt.hmac_sha1_short_password PASS: crypt.hmac_sha256 PASS: crypt.pbkdf2 PASS: crypt.pbkdf2_long_odd_password PASS: crypt.pbkdf2_short_password PASS: crypt.pbkdf2_rfc6070_v1 PASS: crypt.pbkdf2_rfc6070_v2 PASS: crypt.pbkdf2_rfc6070_v3 PASS: crypt.pbkdf2_rfc6070_v4 PASS: crypt.pbkdf2_rfc6070_v5 [----------] 1 test from os PASS: os.utf8_unicode_string [----------] 2 tests from encrypt PASS: encrypt.pkcrypt PASS: encrypt.aes [----------] 2 tests from stream bzip compressed from 877 to 505 bzip uncompressed from 505 to 877 PASS: stream.bzip lzma compressed from 877 to 526 lzma uncompressed from 526 to 877 PASS: stream.lzma [----------] 20 tests from os/path_resolve PASS: os/path_resolve.os/0 PASS: os/path_resolve.os/1 PASS: os/path_resolve.os/2 PASS: os/path_resolve.os/3 PASS: os/path_resolve.os/4 PASS: os/path_resolve.os/5 PASS: os/path_resolve.os/6 PASS: os/path_resolve.os/7 PASS: os/path_resolve.os/8 PASS: os/path_resolve.os/9 PASS: os/path_resolve.os/10 PASS: os/path_resolve.os/11 PASS: os/path_resolve.os/12 PASS: os/path_resolve.os/13 PASS: os/path_resolve.os/14 PASS: os/path_resolve.os/15 PASS: os/path_resolve.os/16 PASS: os/path_resolve.os/17 PASS: os/path_resolve.os/18 PASS: os/path_resolve.os/19 [----------] 8 tests from stream/stream_find PASS: stream/stream_find.find/0 PASS: stream/stream_find.find/1 PASS: stream/stream_find.find/2 PASS: stream/stream_find.find/3 PASS: stream/stream_find.find/4 PASS: stream/stream_find.find/5 PASS: stream/stream_find.find/6 PASS: stream/stream_find.find/7 [----------] Global test environment tear-down [==========] 55 tests from 6 test suites ran. [ PASSED ] 55 tests. Signed-off-by: Mingli Yu --- meta-oe/conf/include/ptest-packagelists-meta-oe.inc | 1 + .../recipes-core/minizip-ng/minizip-ng/run-ptest | 3 +++ meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb | 13 +++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 380c6dd3f6..77bf47d90c 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -31,6 +31,7 @@ PTESTS_FAST_META_OE = "\ lmdb \ microsoft-gsl \ minicoredumper \ + minizip-ng \ neon \ nlohmann-json \ nodejs \ diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest b/meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest new file mode 100644 index 0000000000..9c2dc81e35 --- /dev/null +++ b/meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +cd tests && ./gtest_minizip --gtest_print_time=0 | sed -E '/^\[ RUN/d ; s/\[ OK \]/PASS: / ; s/\[ DISABLED \]/SKIP: / ; s/\[ FAILED \]/FAIL: /' diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb index 14363d2278..a013d99ba1 100644 --- a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb +++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f" SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \ file://0001-crypt.h-Remove-register-keyword.patch \ + file://run-ptest \ " SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de" @@ -18,15 +19,16 @@ RCONFLICTS:${PN} += "minizip" DEPENDS = "xz openssl bzip2" -inherit cmake pkgconfig +inherit cmake pkgconfig ptest EXTRA_OECMAKE = "-DMZ_FORCE_FETCH_LIBS=OFF \ -DBUILD_SHARED_LIBS=ON \ " -PACKAGECONFIG ??= "zlib" +PACKAGECONFIG ??= "zlib ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test', '', d)}" PACKAGECONFIG[zlib] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib" PACKAGECONFIG[zlib-ng] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib-ng" +PACKAGECONFIG[test] = "-DMZ_BUILD_TESTS=ON -DMZ_BUILD_UNIT_TESTS=ON, -DMZ_BUILD_TESTS=OFF -DMZ_BUILD_UNIT_TESTS=OFF, googletest" do_install:append () { @@ -34,3 +36,10 @@ do_install:append () { sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip.cmake } +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp ${B}/test/gtest_minizip ${D}${PTEST_PATH}/tests + # encrypt and stream test need the LICENSE file + cp ${S}/LICENSE ${D}${PTEST_PATH}/tests +} + From patchwork Wed Apr 2 07:45:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mingli.yu@eng.windriver.com X-Patchwork-Id: 60568 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53879C28B20 for ; Wed, 2 Apr 2025 07:45:48 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.2620.1743579947912371778 for ; Wed, 02 Apr 2025 00:45:48 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=6187dfc01b=mingli.yu@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5324ZpxI009091 for ; Wed, 2 Apr 2025 07:45:47 GMT Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45rtfn0eyt-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 02 Apr 2025 07:45:47 +0000 (GMT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Wed, 2 Apr 2025 00:45:45 -0700 Received: from pek-lpg-core4.wrs.com (128.224.153.44) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Wed, 2 Apr 2025 00:45:45 -0700 From: To: Subject: [meta-oe][PATCH v3 3/3] minizip: Make rconflicts with minizip-ng Date: Wed, 2 Apr 2025 15:45:42 +0800 Message-ID: <20250402074542.2842980-3-mingli.yu@eng.windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250402074542.2842980-1-mingli.yu@eng.windriver.com> References: <20250402074542.2842980-1-mingli.yu@eng.windriver.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=eZo9f6EH c=1 sm=1 tr=0 ts=67eceb2b cx=c_pps a=/ZJR302f846pc/tyiSlYyQ==:117 a=/ZJR302f846pc/tyiSlYyQ==:17 a=XR8D0OoHHMoA:10 a=t7CeM3EgAAAA:8 a=nTNid8njqjJ2sKw7KzwA:9 a=zgiPjhLxNE0A:10 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: 6jQHqJ379NRrriy_UN57NY5OSwt-WnOO X-Proofpoint-ORIG-GUID: 6jQHqJ379NRrriy_UN57NY5OSwt-WnOO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-02_02,2025-04-01_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=821 suspectscore=0 spamscore=0 phishscore=0 malwarescore=0 clxscore=1015 impostorscore=0 adultscore=0 bulkscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504020048 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Apr 2025 07:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116511 From: Mingli Yu 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 --- 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