From 24a8d440c5c2407ec6dc457ecb882c914933372c Mon Sep 17 00:00:00 2001
From: Jasper Orschulko <jasper@fancydomain.eu>
Date: Mon, 2 Nov 2020 14:04:45 +0100
Subject: upgrade and de-blacklist nanopb recipe

The current nanopb recipe is blacklisted due to python2 dependencies.
However, newer releases of nanopb use python3 by default.

This commit updates the used nanopb version to 0.4.3 and removes the
recipe from the blacklist.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb | 30 -------------------------
 meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb | 29 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 30 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb
 create mode 100644 meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb

diff --git a/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb b/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb
deleted file mode 100644
index 2e3da7d4d3..0000000000
--- a/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION="Protocol Buffers with small code size"
-LICENSE="Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
-
-DEPENDS = "protobuf-native"
-
-SRC_URI = "git://github.com/nanopb/nanopb.git"
-SRCREV = "70f0de9877b1ce12abc0229d5df84db6349fcbfc"
-
-S = "${WORKDIR}/git"
-
-inherit cmake python3native
-
-do_install_append() {
-    install -Dm 0755 ${S}/generator/nanopb_generator.py ${D}${bindir}/nanopb_generator.py
-    install -Dm 0755 ${S}/generator/protoc-gen-nanopb ${D}${bindir}/protoc-gen-nanopb
-    install -Dm 0755 ${S}/generator/proto/__init__.py ${D}${PYTHON_SITEPACKAGES_DIR}/proto/__init__.py
-}
-
-FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
-FILES_${PN}-dev += "${libdir}/cmake/${BPN}"
-
-RDEPENDS_${PN} += "\
-   ${PYTHON_PN}-protobuf \
-   protobuf-compiler \
-"
-
-BBCLASSEXTEND = "native nativesdk"
-
-PNBLACKLIST[nanopb] ?= "Needs forward porting to use python3"
diff --git a/meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb b/meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb
new file mode 100644
index 0000000000..ed1a719fee
--- /dev/null
+++ b/meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb
@@ -0,0 +1,29 @@
+DESCRIPTION="Protocol Buffers with small code size"
+LICENSE="Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
+
+DEPENDS = "protobuf-native"
+
+SRC_URI = "git://github.com/nanopb/nanopb.git"
+SRCREV = "1466e6f953835b191a7f5acf0c06c941d4cd33d9"
+
+S = "${WORKDIR}/git"
+
+inherit cmake python3native
+
+do_install_append() {
+    install -Dm 0755 ${S}/generator/nanopb_generator.py ${D}${bindir}/nanopb_generator.py
+    install -Dm 0755 ${S}/generator/protoc-gen-nanopb ${D}${bindir}/protoc-gen-nanopb
+    install -Dm 0755 ${S}/generator/proto/__init__.py ${D}${PYTHON_SITEPACKAGES_DIR}/proto/__init__.py
+}
+
+FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
+FILES_${PN}-dev += "${libdir}/cmake/${BPN}"
+
+RDEPENDS_${PN} += "\
+   ${PYTHON_PN}-protobuf \
+   protobuf-compiler \
+"
+
+BBCLASSEXTEND = "native nativesdk"
+
-- 
cgit v1.2.3-54-g00ecf