From 4d64a20ff67d8b99c6f1f73e06c328173b0502dc Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 30 Sep 2024 15:42:32 +0800 Subject: nanopb: upgrade 0.4.8 -> 0.4.9 Changelog: ========== - Fix problems with enum intsize introduced in 0.4.8 - Fix Python pkg_resources deprecation - Add option to discard deprecated fields - Use fallback_type when breaking circular dependencies - Discard autogenerated map entry types if the field is skipped - Use pb_byte_t = uint8_t when available - Add enum_validate option - Add check_return attribute for IAR compiler - Add label_override field option - Add Zephyr module specification - Add Apple privacy manifest - Bazel rule improvements, including bzlmod migration - CMake build rule improvements - Improve C++ descriptors - Test case improvements - Update dependency package versions - Documentation improvements Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-devtools/nanopb/nanopb-generator_0.4.8.bb | 14 -------------- .../recipes-devtools/nanopb/nanopb-generator_0.4.9.bb | 14 ++++++++++++++ .../recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb | 17 ----------------- .../recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb | 17 +++++++++++++++++ .../meta-python/recipes-devtools/nanopb/nanopb.inc | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.bb delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb (limited to 'meta-oe') diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb deleted file mode 100644 index c86750f8b6..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb +++ /dev/null @@ -1,14 +0,0 @@ -require nanopb.inc - -inherit python3-dir - -DEPENDS = "protobuf-native" -RDEPENDS:${PN} += "python3-protobuf" - -EXTRA_OECMAKE += " \ - -Dnanopb_PYTHON_INSTDIR_OVERRIDE=${PYTHON_SITEPACKAGES_DIR} \ - -Dnanopb_BUILD_RUNTIME=OFF \ - -Dnanopb_BUILD_GENERATOR=ON \ - " - -FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.bb new file mode 100644 index 0000000000..c86750f8b6 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.bb @@ -0,0 +1,14 @@ +require nanopb.inc + +inherit python3-dir + +DEPENDS = "protobuf-native" +RDEPENDS:${PN} += "python3-protobuf" + +EXTRA_OECMAKE += " \ + -Dnanopb_PYTHON_INSTDIR_OVERRIDE=${PYTHON_SITEPACKAGES_DIR} \ + -Dnanopb_BUILD_RUNTIME=OFF \ + -Dnanopb_BUILD_GENERATOR=ON \ + " + +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb deleted file mode 100644 index e43931a4ec..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb +++ /dev/null @@ -1,17 +0,0 @@ -require nanopb.inc - -EXTRA_OECMAKE += " \ - -Dnanopb_PROTOC_PATH=/bin/false \ - -DBUILD_SHARED_LIBS=ON \ - -Dnanopb_BUILD_RUNTIME=ON \ - -Dnanopb_BUILD_GENERATOR=OFF \ - " - -# Maintain compatability with old header locations for packages -# which haven't yet migrated to `nanopb/pb*.h` -do_install:append() { - for hdr in ${D}${includedir}/nanopb/*; do - ln -sv nanopb/$(basename "$hdr") ${D}${includedir}/ - done -} - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb new file mode 100644 index 0000000000..e43931a4ec --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb @@ -0,0 +1,17 @@ +require nanopb.inc + +EXTRA_OECMAKE += " \ + -Dnanopb_PROTOC_PATH=/bin/false \ + -DBUILD_SHARED_LIBS=ON \ + -Dnanopb_BUILD_RUNTIME=ON \ + -Dnanopb_BUILD_GENERATOR=OFF \ + " + +# Maintain compatability with old header locations for packages +# which haven't yet migrated to `nanopb/pb*.h` +do_install:append() { + for hdr in ${D}${includedir}/nanopb/*; do + ln -sv nanopb/$(basename "$hdr") ${D}${includedir}/ + done +} + diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc index 87dbc73e63..7c2e553c70 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc @@ -3,7 +3,7 @@ LICENSE="Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https" -SRCREV = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e" +SRCREV = "98bf4db69897b53434f3d0ba72e0a3ab1a902824" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf