From 31323ac64136d8376daf3eaf9031c55fc2d57079 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 17 Dec 2024 17:01:31 +0800 Subject: nanopb-generator(-runtime): upgrade 0.4.9 -> 0.4.9.1 Changelog: ========== - Fix memory not released on error return from pb_decode_ex() - Fix deprecated MakeClass() call in generator - Fix compiler error with enums and --c-style - Fix version conflict with bazel build rules Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-devtools/nanopb/nanopb-generator_0.4.9.1.bb | 14 ++++++++++++++ .../recipes-devtools/nanopb/nanopb-generator_0.4.9.bb | 14 -------------- .../recipes-devtools/nanopb/nanopb-runtime_0.4.9.1.bb | 17 +++++++++++++++++ .../recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb | 17 ----------------- .../meta-python/recipes-devtools/nanopb/nanopb.inc | 4 ++-- 5 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.1.bb delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.bb create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.1.bb delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.1.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.1.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-generator_0.4.9.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.bb deleted file mode 100644 index c86750f8b6..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.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-runtime_0.4.9.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.1.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.1.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-runtime_0.4.9.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb deleted file mode 100644 index e43931a4ec..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.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.inc b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc index 7c2e553c70..8480ea5b0e 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 @@ -2,8 +2,8 @@ DESCRIPTION="Protocol Buffers with small code size" LICENSE="Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" -SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https" -SRCREV = "98bf4db69897b53434f3d0ba72e0a3ab1a902824" +SRC_URI = "git://github.com/nanopb/nanopb.git;branch=maintenance_0.4;protocol=https" +SRCREV = "cad3c18ef15a663e30e3e43e3a752b66378adec1" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf