From 33a5517bc7be919bc87f5cbba8a813fdad6338f8 Mon Sep 17 00:00:00 2001 From: lixiaoyong Date: Tue, 30 Nov 2021 14:56:55 +0800 Subject: [PATCH 1/3] iSulad upgrade to 2.0.10 Signed-off-by: lixiaoyong --- .../recipes-core/iSulad/{iSulad_2.0.9.bb => iSulad_2.0.10.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-openeuler/recipes-core/iSulad/{iSulad_2.0.9.bb => iSulad_2.0.10.bb} (97%) diff --git a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb similarity index 97% rename from meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb rename to meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb index 80267cbbb35..ae99d9a91fa 100644 --- a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.9.bb +++ b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.10.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI = "file://iSulad/v2.0.9.tar.gz \ +SRC_URI = "file://iSulad/v${PV}.tar.gz \ file://0001-fix-bug-disable-selinux-not-selinux-label-file.patch \ file://0002-delete-call-setlocale.patch \ file://0003-modify-printf-to-arm32.patch \ -- Gitee From d1b54ea3545075becd90cd84057da298fb9ef109 Mon Sep 17 00:00:00 2001 From: lixiaoyong Date: Tue, 30 Nov 2021 18:55:29 +0800 Subject: [PATCH 2/3] add recipe for libtirpc Signed-off-by: lixiaoyong --- .../recipes-core/libtirpc/libtirpc_1.3.1.bb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 meta-openeuler/recipes-core/libtirpc/libtirpc_1.3.1.bb diff --git a/meta-openeuler/recipes-core/libtirpc/libtirpc_1.3.1.bb b/meta-openeuler/recipes-core/libtirpc/libtirpc_1.3.1.bb new file mode 100644 index 00000000000..57922642505 --- /dev/null +++ b/meta-openeuler/recipes-core/libtirpc/libtirpc_1.3.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "Transport-Independent RPC library" +DESCRIPTION = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux" +SECTION = "libs/network" +HOMEPAGE = "http://sourceforge.net/projects/libtirpc/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ + file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" + +PROVIDES = "virtual/librpc" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" +SRC_URI[sha256sum] = "245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gssapi" + +do_install_append() { + chown root:root ${D}${sysconfdir}/netconfig +} + +BBCLASSEXTEND = "native nativesdk" -- Gitee From acc6f28be30cb6450218d2c357678f34d50e580d Mon Sep 17 00:00:00 2001 From: lixiaoyong Date: Thu, 2 Dec 2021 10:37:44 +0800 Subject: [PATCH 3/3] add recipe for expat Signed-off-by: lixiaoyong --- .../expat/expat/libtool-tag.patch | 30 +++++++++++++++++++ .../recipes-core/expat/expat/run-ptest | 23 ++++++++++++++ .../recipes-core/expat/expat_2.4.1.bb | 28 +++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 meta-openeuler/recipes-core/expat/expat/libtool-tag.patch create mode 100644 meta-openeuler/recipes-core/expat/expat/run-ptest create mode 100644 meta-openeuler/recipes-core/expat/expat_2.4.1.bb diff --git a/meta-openeuler/recipes-core/expat/expat/libtool-tag.patch b/meta-openeuler/recipes-core/expat/expat/libtool-tag.patch new file mode 100644 index 00000000000..0a0aed23e5d --- /dev/null +++ b/meta-openeuler/recipes-core/expat/expat/libtool-tag.patch @@ -0,0 +1,30 @@ +From 10342e6b600858b091bc7771e454d9e06af06410 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 2 Nov 2017 18:20:57 +0800 +Subject: [PATCH] Add CC tag to build + +Add CC tag to build + +Upstream-Status: Pending +Signed-off-by: Khem Raj +Signed-off-by: Dengke Du +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 9560a95..d444bd6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -319,7 +319,7 @@ LIBCURRENT = @LIBCURRENT@ + LIBOBJS = @LIBOBJS@ + LIBREVISION = @LIBREVISION@ + LIBS = @LIBS@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = @LIBTOOL@ --tag CC + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +-- +2.7.4 + diff --git a/meta-openeuler/recipes-core/expat/expat/run-ptest b/meta-openeuler/recipes-core/expat/expat/run-ptest new file mode 100644 index 00000000000..1b39cec8e5e --- /dev/null +++ b/meta-openeuler/recipes-core/expat/expat/run-ptest @@ -0,0 +1,23 @@ +#!/bin/bash + +output=${1:-"expat_tests.log"} # default log file + +# logging function +function testCheck() { + testExec="$1" + shift + echo && echo ${testExec} && ./${testExec} "$@" + error=$? + result=$([[ ${error} -eq 0 ]] && echo "PASS" || echo "FAIL") + echo "${result}: ${testExec}" && echo "============================" +} + +export output +export -f testCheck +TIME=$(which time) + +echo "Architecture: $(uname -m)" > ${output} +echo "Image: $(uname -sr)" >> ${output} +${TIME} -f 'Execution time: %e s' bash -c "testCheck runtests -vv" |& tee -a ${output} +${TIME} -f 'Execution time: %e s' bash -c "testCheck runtestspp -vv" |& tee -a ${output} +echo diff --git a/meta-openeuler/recipes-core/expat/expat_2.4.1.bb b/meta-openeuler/recipes-core/expat/expat_2.4.1.bb new file mode 100644 index 00000000000..39ca029da68 --- /dev/null +++ b/meta-openeuler/recipes-core/expat/expat_2.4.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "A stream-oriented XML parser library" +DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)" +HOMEPAGE = "http://expat.sourceforge.net/" +SECTION = "libs" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9" + +SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ + file://libtool-tag.patch \ + file://run-ptest \ + " + +SRC_URI[sha256sum] = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40" + +EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF" + +RDEPENDS_${PN}-ptest += "bash" + +inherit cmake lib_package ptest + +do_install_ptest_class-target() { + install -m 755 ${B}/tests/* ${D}${PTEST_PATH} +} + +BBCLASSEXTEND += "native nativesdk" + +CVE_PRODUCT = "expat libexpat" -- Gitee