From ff434fb5123d4d59c760694c79baefe48a9f55cc Mon Sep 17 00:00:00 2001 From: panwentao Date: Fri, 12 Apr 2024 10:00:41 +0800 Subject: [PATCH 1/3] 24.03: sync pkg version to openEuler-24.03-LTS * add new recipes: python3-typing-extensions 4.10.0 because python3-setuptools-scm 7.0.1 depends * bbappend recipes: nativesdk-qtbase python3-importlib-metadata python3-iniparse python3-jinja2 python3-lxml python3-mako python3-packaging python3-pbr python3-pip python3-setuptools python3-setuptools-scm python3-smmap python3-zipp qtbase-native qtbase re2 rpcsvc-proto Signed-off-by: panwentao --- .../python/python3-lxml_%.bbappend | 7 ++-- .../recipes-support/re2/re2_%.bbappend | 38 +++++++++++++++++-- .../qt5/nativesdk-qtbase_%.bbappend | 9 ++++- .../recipes-qt/qt5/qtbase-native_%.bbappend | 9 ++++- .../recipes-qt/qt5/qtbase_%.bbappend | 7 +++- .../python3-importlib-metadata_%.bbappend | 6 +-- .../python/python3-iniparse_%.bbappend | 2 + .../python/python3-jinja2_%.bbappend | 8 +++- .../python/python3-mako_%.bbappend | 4 +- .../python/python3-packaging_%.bbappend | 4 +- .../python/python3-pbr_%.bbappend | 4 +- .../python/python3-pip_%.bbappend | 30 +++++++++++++-- .../python/python3-setuptools-scm_%.bbappend | 15 +++++++- .../python/python3-setuptools_%.bbappend | 2 + .../python/python3-smmap_%.bbappend | 2 +- .../python3-typing-extensions_%.bbappend | 3 ++ .../python3-typing-extensions_4.10.0.bb | 24 ++++++++++++ .../python/python3-zipp_%.bbappend | 9 +++-- .../rpcsvc-proto/rpcsvc-proto.bbappend | 7 +++- 19 files changed, 160 insertions(+), 30 deletions(-) create mode 100644 meta-openeuler/recipes-devtools/python/python3-typing-extensions_%.bbappend create mode 100644 meta-openeuler/recipes-devtools/python/python3-typing-extensions_4.10.0.bb diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-lxml_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-lxml_%.bbappend index e6bfd77627d..4935211091c 100644 --- a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-lxml_%.bbappend +++ b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-lxml_%.bbappend @@ -1,12 +1,11 @@ -PV = "4.9.3" +PV = "5.1.0" require pypi-src-openeuler.inc SRC_URI:remove = "file://CVE-2022-2309.patch" # apply openeuler's patches SRC_URI:append = " \ - file://Make-the-validation-of-ISO-Schematron-files-optional.patch \ - file://380.patch \ file://Skip-failing-test_iterparse_utf16_bom.patch \ - file://backport-Change-HTML-prefix-handling-in-ElementPath-to-let-el.patch \ " + +SRC_URI[sha256sum] = "3eea6ed6e6c918e468e693c41ef07f3c3acc310b70ddd9cc72d9ef84bc9564ca" diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/re2/re2_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/re2/re2_%.bbappend index f0602bfd17e..510d712bca4 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/re2/re2_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/re2/re2_%.bbappend @@ -1,8 +1,10 @@ # main bbfile: yocto-meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb # version in openEuler -PV = "2021.11.01" -S = "${WORKDIR}/re2-2021-11-01" +PV = "2024.02.01" +S = "${WORKDIR}/re2-2024-02-01" + +SRCREV = "2d866a3d0753f4f4fce93cccc6c59c4b052d7db4" # sync with high version of oe config: # ignore .so in /usr/lib64 @@ -10,7 +12,35 @@ INSANE_SKIP:${PN} += "dev-so" # files, patches that come from openeuler SRC_URI:prepend = " \ - file://2021-11-01.tar.gz \ - file://backport-fix-64-to-32-bit-clang-conversion-warning.patch \ + file://2024-02-01.tar.gz \ file://add-some-testcases-for-abnormal-branches.patch \ " + +DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebenchmark', '', d)}" + +inherit ptest + +RDEPENDS:${PN}-ptest += "cmake sed" +RDEPENDS:${PN} += "abseil-cpp-dev" + +INSANE_SKIP:${PN} += "dev-deps" + +EXTRA_OECMAKE:remove = "\ + -DRE2_BUILD_TESTING=OFF \ +" + +EXTRA_OECMAKE += "\ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ +" + +do_install_ptest () { + cp -r ${B}/*_test ${D}${PTEST_PATH} + cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} + sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + # ERROR: re2-2024.03.01-r0 do_package_qa: QA Issue: /usr/lib64/re2/ptest/string_generator_test contained in package re2-ptest requires libtesting.so()(64bit), but no providers found in RDEPENDS:re2-ptest? [file-rdeps] + cp -r ${B}/libtesting.so ${D}${PTEST_PATH} +} + +# ignore .so in /usr/lib64 +INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/nativesdk-qtbase_%.bbappend index f8026a5e386..b6c71cebeba 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/nativesdk-qtbase_%.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/nativesdk-qtbase_%.bbappend @@ -22,7 +22,7 @@ SRC_URI:prepend = "file://qtbase-everywhere-src-5.15.6-private_api_warning.patch file://qtbase-opensource-src-5.9.0-mysql.patch \ file://qtbase-use-wayland-on-gnome.patch \ file://qt5-qtbase-gcc11.patch \ - file://kde-5.15-rollup-20230613.patch.gz \ + file://kde-5.15-rollup-20230613.patch \ file://qtbase-5.15.10-fix-missing-qtsan-include.patch \ file://qtbase-QTBUG-111994.patch \ file://qtbase-QTBUG-112136.patch \ @@ -31,4 +31,9 @@ SRC_URI:prepend = "file://qtbase-everywhere-src-5.15.6-private_api_warning.patch file://add-loongarch64-support.patch \ file://Fix-lupdate-command-error-on-loongarch64.patch \ file://CVE-2023-37369.patch \ - " + file://qtbase5.15.10-CVE-2023-38197.patch \ + file://qtbase5.15.10-CVE-2023-43114.patch \ + file://fix-build-error-of-libxkbcommon-1.6.0.patch \ + file://qtbase-multilib_optflags.patch \ + file://qtbase5.15-CVE-2023-51714.patch \ + " \ No newline at end of file diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase-native_%.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase-native_%.bbappend index f8026a5e386..b6c71cebeba 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase-native_%.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase-native_%.bbappend @@ -22,7 +22,7 @@ SRC_URI:prepend = "file://qtbase-everywhere-src-5.15.6-private_api_warning.patch file://qtbase-opensource-src-5.9.0-mysql.patch \ file://qtbase-use-wayland-on-gnome.patch \ file://qt5-qtbase-gcc11.patch \ - file://kde-5.15-rollup-20230613.patch.gz \ + file://kde-5.15-rollup-20230613.patch \ file://qtbase-5.15.10-fix-missing-qtsan-include.patch \ file://qtbase-QTBUG-111994.patch \ file://qtbase-QTBUG-112136.patch \ @@ -31,4 +31,9 @@ SRC_URI:prepend = "file://qtbase-everywhere-src-5.15.6-private_api_warning.patch file://add-loongarch64-support.patch \ file://Fix-lupdate-command-error-on-loongarch64.patch \ file://CVE-2023-37369.patch \ - " + file://qtbase5.15.10-CVE-2023-38197.patch \ + file://qtbase5.15.10-CVE-2023-43114.patch \ + file://fix-build-error-of-libxkbcommon-1.6.0.patch \ + file://qtbase-multilib_optflags.patch \ + file://qtbase5.15-CVE-2023-51714.patch \ + " \ No newline at end of file diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 8454caa2f89..6e3a5c0f337 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -27,7 +27,7 @@ SRC_URI:prepend = "file://qtbase-everywhere-src-5.15.6-private_api_warning.patch file://qtbase-opensource-src-5.9.0-mysql.patch \ file://qtbase-use-wayland-on-gnome.patch \ file://qt5-qtbase-gcc11.patch \ - file://kde-5.15-rollup-20230613.patch.gz \ + file://kde-5.15-rollup-20230613.patch \ file://qtbase-5.15.10-fix-missing-qtsan-include.patch \ file://qtbase-QTBUG-111994.patch \ file://qtbase-QTBUG-112136.patch \ @@ -36,6 +36,11 @@ SRC_URI:prepend = "file://qtbase-everywhere-src-5.15.6-private_api_warning.patch file://add-loongarch64-support.patch \ file://Fix-lupdate-command-error-on-loongarch64.patch \ file://CVE-2023-37369.patch \ + file://qtbase5.15.10-CVE-2023-38197.patch \ + file://qtbase5.15.10-CVE-2023-43114.patch \ + file://fix-build-error-of-libxkbcommon-1.6.0.patch \ + file://qtbase-multilib_optflags.patch \ + file://qtbase5.15-CVE-2023-51714.patch \ " # openeuler configuration: diff --git a/meta-openeuler/recipes-devtools/python/python3-importlib-metadata_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-importlib-metadata_%.bbappend index c1fa39a0d2c..45de806f32e 100644 --- a/meta-openeuler/recipes-devtools/python/python3-importlib-metadata_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-importlib-metadata_%.bbappend @@ -1,6 +1,6 @@ -PV = "6.1.0" +PV = "7.0.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[md5sum] = "c92d5a03615c6ef97d283d71fb92cf1b" -SRC_URI[sha256sum] = "43ce9281e097583d758c2c708c4376371261a02c34682491a8e98352365aad20" +SRC_URI[sha256sum] = "f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc" + require pypi-src-openeuler.inc OPENEULER_REPO_NAME = "python-importlib-metadata" diff --git a/meta-openeuler/recipes-devtools/python/python3-iniparse_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-iniparse_%.bbappend index 1bd728c2aeb..e7eb9721aa2 100644 --- a/meta-openeuler/recipes-devtools/python/python3-iniparse_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-iniparse_%.bbappend @@ -7,5 +7,7 @@ SRC_URI[sha256sum] = "932e5239d526e7acb504017bb707be67019ac428a6932368e685169109 # delete useless patch for version 0.4 SRC_URI:remove = "file://0001-Add-python-3-compatibility.patch " +SRC_URI:prepend = "file://backport-fix-bug-in-classifiers.patch " + # fix ModuleNotFoundError: No module named 'setuptools' inherit setuptools3 diff --git a/meta-openeuler/recipes-devtools/python/python3-jinja2_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-jinja2_%.bbappend index 4c5feabafca..1581ede7459 100644 --- a/meta-openeuler/recipes-devtools/python/python3-jinja2_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-jinja2_%.bbappend @@ -1,4 +1,10 @@ -PV = "3.1.2" +PV = "3.1.3" + +SRC_URI[sha256sum] = "ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90" require pypi-src-openeuler.inc OPENEULER_REPO_NAME = "python-jinja2" + +RDEPENDS:${PN}-ptest += " \ + python3-unittest-automake-output \ +" diff --git a/meta-openeuler/recipes-devtools/python/python3-mako_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-mako_%.bbappend index 3e680253b65..0733fb55ed1 100644 --- a/meta-openeuler/recipes-devtools/python/python3-mako_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-mako_%.bbappend @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ad08dd28df88e64b35bcac27c822ee34" SRC_URI:remove = "file://CVE-2022-40023.patch" +SRC_URI[sha256sum] = "d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34" + RDEPENDS:${PN} += "${PYTHON_PN}-markupsafe \ ${PYTHON_PN}-pygments \ - " \ No newline at end of file +" diff --git a/meta-openeuler/recipes-devtools/python/python3-packaging_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-packaging_%.bbappend index 41219553783..431d4c96330 100644 --- a/meta-openeuler/recipes-devtools/python/python3-packaging_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-packaging_%.bbappend @@ -1,4 +1,4 @@ -PV = "23.1" +PV = "23.2" require pypi-src-openeuler.inc # We don't have support for python_flit_core.bbclass, so replace the do_compile @@ -6,3 +6,5 @@ do_compile:class-native () { cd ${PEP517_SOURCE_PATH} nativepython3 -m flit_core.wheel --outdir ${PEP517_WHEEL_PATH} . } + +SRC_URI[sha256sum] = "048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5" diff --git a/meta-openeuler/recipes-devtools/python/python3-pbr_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-pbr_%.bbappend index c4b47e8dd05..0ad89af48cd 100644 --- a/meta-openeuler/recipes-devtools/python/python3-pbr_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-pbr_%.bbappend @@ -1,4 +1,6 @@ -PV = "5.8.1" +PV = "6.0.0" require pypi-src-openeuler.inc OPENEULER_REPO_NAME = "python-pbr" + +SRC_URI[sha256sum] = "d1377122a5a00e2f940ee482999518efe16d745d423a670c27773dfbc3c9a7d9" diff --git a/meta-openeuler/recipes-devtools/python/python3-pip_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-pip_%.bbappend index 9438ea7c3dc..40834d755ba 100644 --- a/meta-openeuler/recipes-devtools/python/python3-pip_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-pip_%.bbappend @@ -1,7 +1,29 @@ -PV = "22.3.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030" -SRC_URI[md5sum] = "996f58a94fe0b8b82b6795c42bd171ba" -SRC_URI[sha256sum] = "65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38" +PV = "23.3.1" +LIC_FILES_CHKSUM:remove = "\ + file://src/pip/_vendor/certifi/LICENSE;md5=67da0714c3f9471067b729eca6c9fbe8 \ + file://src/pip/_vendor/chardet/LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://src/pip/_vendor/distro.LICENSE;md5=d2794c0df5b907fdace235a619d80314 \ + file://src/pip/_vendor/pkg_resources/LICENSE;md5=9a33897f1bca1160d7aad3835152e158 \ + file://src/pip/_vendor/platformdirs/LICENSE.txt;md5=282c970bb844954c8535dd6e9733db7f \ + file://src/pip/_vendor/pygments/LICENSE;md5=98419e351433ac106a24e3ad435930bc \ + file://src/pip/_vendor/typing_extensions.LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f \ + file://src/pip/_vendor/html5lib/LICENSE;md5=1ba5ada9e6fead1fdc32f43c9f10ba7c \ + file://src/pip/_vendor/pep517/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \ + file://src/pip/_vendor/progress/LICENSE;md5=00ab78a4113b09aacf63d762a7bb9644 \ +" + +LIC_FILES_CHKSUM:prepend = "\ + file://src/pip/_vendor/certifi/LICENSE;md5=3c2b7404369c587c3559afb604fce2f2 \ + file://src/pip/_vendor/chardet/LICENSE;md5=4fbd65380cdd255951079008b364516c \ + file://src/pip/_vendor/distro/LICENSE;md5=d2794c0df5b907fdace235a619d80314 \ + file://src/pip/_vendor/pkg_resources/LICENSE;md5=141643e11c48898150daa83802dbc65f \ + file://src/pip/_vendor/platformdirs/LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a \ + file://src/pip/_vendor/pygments/LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592 \ + file://src/pip/_vendor/pyproject_hooks/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \ + file://src/pip/_vendor/typing_extensions.LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2 \ +" + +SRC_URI[sha256sum] = "1fcaa041308d01f14575f6d0d2ea4b75a3e2871fe4f9c694976f908768e14174" require pypi-src-openeuler.inc # remove poky conflict patches diff --git a/meta-openeuler/recipes-devtools/python/python3-setuptools-scm_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-setuptools-scm_%.bbappend index 741689c9e82..51683dc721e 100644 --- a/meta-openeuler/recipes-devtools/python/python3-setuptools-scm_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-setuptools-scm_%.bbappend @@ -1,2 +1,15 @@ -PV = "6.0.0" +PV = "7.1.0" require pypi-src-openeuler.inc + +SRC_URI[sha256sum] = "6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27" + +OPENEULER_REPO_NAME = "python-setuptools_scm" + +UPSTREAM_CHECK_REGEX = "scm-(?P.*)\.tar" + +DEPENDS += "python3-tomli-native python3-packaging-native python3-typing-extensions-native" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-pip \ + ${PYTHON_PN}-typing-extensions \ +" diff --git a/meta-openeuler/recipes-devtools/python/python3-setuptools_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-setuptools_%.bbappend index 7bea83b3584..4718c419d4c 100644 --- a/meta-openeuler/recipes-devtools/python/python3-setuptools_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-setuptools_%.bbappend @@ -12,6 +12,8 @@ SRC_URI:remove = " \ file://0001-Limit-the-amount-of-whitespace-to-search-backtrack.-.patch \ " +SRC_URI[sha256sum] = "baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235" + # the upstream patch # SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" SRC_URI:append = " file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" diff --git a/meta-openeuler/recipes-devtools/python/python3-smmap_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-smmap_%.bbappend index 9bd6fb1e2de..4bf6cbd2581 100644 --- a/meta-openeuler/recipes-devtools/python/python3-smmap_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-smmap_%.bbappend @@ -1,4 +1,4 @@ -PV = "5.0.0" +PV = "5.0.1" require pypi-src-openeuler.inc OPENEULER_REPO_NAME = "python-smmap" diff --git a/meta-openeuler/recipes-devtools/python/python3-typing-extensions_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-typing-extensions_%.bbappend new file mode 100644 index 00000000000..0c6dcb1765e --- /dev/null +++ b/meta-openeuler/recipes-devtools/python/python3-typing-extensions_%.bbappend @@ -0,0 +1,3 @@ +PV = "4.10.0" +require pypi-src-openeuler.inc +OPENEULER_REPO_NAME = "python-typing-extensions" diff --git a/meta-openeuler/recipes-devtools/python/python3-typing-extensions_4.10.0.bb b/meta-openeuler/recipes-devtools/python/python3-typing-extensions_4.10.0.bb new file mode 100644 index 00000000000..8698a80cc52 --- /dev/null +++ b/meta-openeuler/recipes-devtools/python/python3-typing-extensions_4.10.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Backported and Experimental Type Hints for Python 3.7+" +DESCRIPTION = "The typing_extensions module serves two related purposes:\ +\ +* Enable use of new type system features on older Python versions. For \ + example, typing.TypeGuard is new in Python 3.10, but typing_extensions \ + allows users on previous Python versions to use it too.\ +* Enable experimentation with new type system PEPs before they are accepted \ + and added to the typing module." +HOMEPAGE = "https://github.com/python/typing_extensions" +BUGTRACKER = "https://github.com/python/typing_extensions/issues" +SECTIONS = "libs" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2" + +# The name on PyPi is slightly different. +PYPI_PACKAGE = "typing_extensions" + +SRC_URI[sha256sum] = "b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb" + +inherit pypi python_flit_core + +UPSTREAM_CHECK_REGEX = "/typing-extensions/(?P(\d+[\.\-_]*)+)/" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openeuler/recipes-devtools/python/python3-zipp_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-zipp_%.bbappend index 2d5af3321d4..1f10b0f6e5f 100644 --- a/meta-openeuler/recipes-devtools/python/python3-zipp_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-zipp_%.bbappend @@ -1,4 +1,7 @@ -PV = "3.15.0" -SRC_URI[md5sum] = "6e06bc2894588451a9787b9f22f9b0ba" -SRC_URI[sha256sum] = "112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b" +PV = "3.17.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" + +SRC_URI[sha256sum] = "84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0" + require pypi-src-openeuler.inc diff --git a/meta-openeuler/recipes-extended/rpcsvc-proto/rpcsvc-proto.bbappend b/meta-openeuler/recipes-extended/rpcsvc-proto/rpcsvc-proto.bbappend index ec2848787f3..59a67bdc956 100644 --- a/meta-openeuler/recipes-extended/rpcsvc-proto/rpcsvc-proto.bbappend +++ b/meta-openeuler/recipes-extended/rpcsvc-proto/rpcsvc-proto.bbappend @@ -1,8 +1,13 @@ -PV = "1.4.3" +PV = "1.4.4" + +SRCREV = "c65926005e50da02a4da3e26abc42eded36cd19d" # openeuler source SRC_URI:prepend = "file://${BP}.tar.xz \ " +SRC_URI:remove = "file://0001-Use-cross-compiled-rpcgen.patch \ +" + S = "${WORKDIR}/${BP}" -- Gitee From 1cd48be972b0b8c573af5ee53f2fd837e774d5ed Mon Sep 17 00:00:00 2001 From: panwentao Date: Fri, 12 Apr 2024 10:07:26 +0800 Subject: [PATCH 2/3] 24.03: update baseline in manifest.yaml * update baseline in manifest.yaml Signed-off-by: panwentao --- .oebuild/manifest.yaml | 45 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index be8749c3e1d..976506e78c8 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -1163,22 +1163,22 @@ manifest_list: version: df7e953678ea5767a50f454923c78096dd6ccaf9 python-importlib-metadata: remote_url: https://gitee.com/src-openeuler/python-importlib-metadata.git - version: e2fdcc977d699c76365364692a72f149fe1ae4f3 + version: 840b49a1fa7d20225f9cc55ca641be635a68ada2 python-iniparse: remote_url: https://gitee.com/src-openeuler/python-iniparse.git - version: 43fbb21ccfd87c8aef44d6fee9c987ebd21efe4d + version: 7f933373d44b7df49933236aa77939542e95ce39 python-jinja2: remote_url: https://gitee.com/src-openeuler/python-jinja2.git - version: 9470cd522d3131e3b5294971ba5fffc100a2778a + version: 058d08c490cabb442bbabee6625c8b3053cc5686 python-lark-parser: remote_url: https://gitee.com/src-openeuler/python-lark-parser.git version: f7dc722c6e96f98dd0069fc708868d3c276157d9 python-lxml: remote_url: https://gitee.com/src-openeuler/python-lxml.git - version: 9e2af30e4037334cf70167b848bb40fb40330b10 + version: f01faf4c208a5afc3ceaa94720468ba43decff0a python-mako: remote_url: https://gitee.com/src-openeuler/python-mako.git - version: abb18b0a18c8455d4d3181efd76167bb7b916b39 + version: 0cb8cdfaa6f531fc805ee16cb9b47d482a768d6d python-markupsafe: remote_url: https://gitee.com/src-openeuler/python-markupsafe.git version: 52c229d76b3cdf88cec7ff767251a17b43372508 @@ -1196,19 +1196,19 @@ manifest_list: version: 1aba8efda29a28c4b502a6d5789fb76d847d54bb python-packaging: remote_url: https://gitee.com/src-openeuler/python-packaging.git - version: 1588bf8803abf11bd9ad49cc5c39ae7cf189a5d0 + version: 4a4b9a651a8ef089d519b390a7a435cd73702e2e python-pathlib2: remote_url: https://gitee.com/src-openeuler/python-pathlib2.git version: 678955fa7a0433bd52acb1b5f85c4d625ef6e453 python-pbr: remote_url: https://gitee.com/src-openeuler/python-pbr.git - version: 1afce88c876b6881b3df1c5e65a2754b86ae8e82 + version: 70cd76dce9121a5d0bae8742ba7cdfd49fee4871 python-pep8: remote_url: https://gitee.com/src-openeuler/python-pep8.git version: a3ae17fd37d420597e4ddbb28d9e92ef47a5036a python-pip: remote_url: https://gitee.com/src-openeuler/python-pip.git - version: c70dbd6adc9e9a0d66febb4fad648c0bebe86713 + version: 3d5605263294430f8b044aee19a51bfa6eba5c14 python-prettytable: remote_url: https://gitee.com/src-openeuler/python-prettytable.git version: f7acfcc543ed569c4951b6fdbd8b85388c589dd7 @@ -1226,16 +1226,19 @@ manifest_list: version: cb041fe487585defd152683ca01d5cbc4823b3b1 python-setuptools: remote_url: https://gitee.com/src-openeuler/python-setuptools.git - version: 7993277c2e89f65524566a6eb246e3235b1126ff + version: a041fc69f9de97aa412e78c2ba861bda3c28e312 python-setuptools_scm: remote_url: https://gitee.com/src-openeuler/python-setuptools_scm.git - version: a0a7f860f9a33c31a0ec8e4f7990e7afce043d9a + version: 27aab7c17915d7351642b5dadd589ea835461d96 + python-typing-extensions: + remote_url: https://gitee.com/src-openeuler/python-typing-extensions.git + version: f6f3841a51608783cfdd61135abaa75999ca8126 python-six: remote_url: https://gitee.com/src-openeuler/python-six.git version: 4dce1378930ca6dca3440c0dd0349811eeadf22e python-smmap: remote_url: https://gitee.com/src-openeuler/python-smmap.git - version: f60ca368f035e1c61cd6cdc6d76f5ff8a5ffce0c + version: 07946c93f0e32c048238db5d72603e8eee0c262f python-testtools: remote_url: https://gitee.com/src-openeuler/python-testtools.git version: abd5fd03668461e4a65296969f00fb8cd336e9b1 @@ -1250,7 +1253,7 @@ manifest_list: version: 5cc2c1414d969c99d1dfad9e7d1db67e23c3f486 python-zipp: remote_url: https://gitee.com/src-openeuler/python-zipp.git - version: a480935762b8e4f7641c0b3c1bb256caf8892349 + version: 7d8105d5513d068611affaeef34586253d896d1b python3: remote_url: https://gitee.com/src-openeuler/python3.git version: 5f848e0a95c52a971c1d11e6a4910905320ae73e @@ -1262,7 +1265,7 @@ manifest_list: version: ebd3dd9a2e0646c89ab83ffa7a42867a5870d751 python3-pyyaml: remote_url: https://gitee.com/src-openeuler/PyYAML.git - version: 95ffb105581d827bdf2f76d05be02ca9271ab4e0 + version: 0f956d5359bc0b815f20cd63037b4d2efd6eb5c5 python3-rosdistro: remote_url: https://gitee.com/src-openeuler/python-rosdistro.git version: db7a012f63acb195cecfcccf78a889db2fe07842 @@ -1280,22 +1283,22 @@ manifest_list: version: fd68b6921ec7a67f618b316387d5c1de13214c68 qtbase: remote_url: https://gitee.com/src-openeuler/qt5-qtbase.git - version: d194a977754867e4bd186b1106e684d467aa44d1 + version: f166bc423f9dbb9eb5fd568340f84107df5ff543 qtdeclarative: remote_url: https://gitee.com/src-openeuler/qt5-qtdeclarative.git - version: 1fe867cd677f9c2caa99ead832583034dff1b28c + version: 66743a3316a22017ad87fe76b267acbdd9ee41a1 qtsensors: remote_url: https://gitee.com/src-openeuler/qt5-qtsensors.git - version: 21e67cbda5f8626e18ec0159f37275eb0b00e12e + version: d441b19fc208e4fb8cb8435682a9cfb246652aa6 qttools: remote_url: https://gitee.com/src-openeuler/qt5-qttools.git - version: b0b7890c9cc3a4eff0c0d9bfdbd8820a040b624c + version: 3e7d6a146e0abd5a1c1f05af21404a95b37a48a8 qtwayland: remote_url: https://gitee.com/src-openeuler/qt5-qtwayland.git - version: 059209e8f545db723dd42fed073c86d8f3694989 + version: 8621767c323727c18a2dde4588b9b11de6882d96 qtxmlpatterns: remote_url: https://gitee.com/src-openeuler/qt5-qtxmlpatterns.git - version: 0f6677a1d60b91d5b4520805f1b407d53f94a0ba + version: d203186ba7d93ae7dced52ff4ffb8f7dc9cdf8c4 quilt: remote_url: https://gitee.com/src-openeuler/quilt.git version: e7982134da4045463d63a3f94ccc685abc5028a3 @@ -1331,7 +1334,7 @@ manifest_list: version: 654055b79d69ae1378326b79e0cb01b35e50c01c re2: remote_url: https://gitee.com/src-openeuler/re2.git - version: 003fdb3a1967f8c798b6a2ea927ef66d8a4907a3 + version: 535f8a63152ce307582e98e4163d8e05870dd06b re2c: remote_url: https://gitee.com/src-openeuler/re2c.git version: 0d0596ef4d8c6bed74ef9fd743be9b3412a6fc8a @@ -1424,7 +1427,7 @@ manifest_list: version: 6a34adaa73768dfddf22ff6a00dc343f712fe80c rpcsvc-proto: remote_url: https://gitee.com/src-openeuler/rpcsvc-proto.git - version: f4e7be6f1d4b96f51af15a339ee54bd2cc430660 + version: 30d4b6d37d5eb19d658bef47ba4265a031c842d2 rpm: remote_url: https://gitee.com/src-openeuler/rpm.git version: 351bb6d9599f957a4db958963a28faeaa260b7a2 -- Gitee From d287deaa631bca8900ff0591ee435d1497dc659a Mon Sep 17 00:00:00 2001 From: panwentao Date: Fri, 12 Apr 2024 10:20:15 +0800 Subject: [PATCH 3/3] 24.03: update baseline in manifest.yaml * update baseline in manifest.yaml Signed-off-by: panwentao --- .oebuild/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 976506e78c8..6333b47efd0 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -1325,7 +1325,7 @@ manifest_list: version: d5249a62739a60017da7db4d5c489675b92b7ea5 rclpy: remote_url: https://gitee.com/src-openeuler/rclpy.git - version: 776e0ab9850935006078d8d31b8d006e484c01bf + version: 860977c811a6fc1d09674993578793d857e8b83f rcpputils: remote_url: https://gitee.com/src-openeuler/rcpputils.git version: 568e3af236d589658a106a143b592f1193afce35 -- Gitee