diff options
author | William A. Kennington III <wak@google.com> | 2024-03-27 00:59:42 +0300 |
---|---|---|
committer | Willy Tu <wltu@google.com> | 2024-06-10 23:10:12 +0300 |
commit | 20ce659f53c1c30c607da7eedd75f4efb3faa334 (patch) | |
tree | 5af2d33e17f48fddd0bb1a52ef3f6a1067c29e7d /meta-google | |
parent | ab31aaff7a459b669d59ddfd7857715ea49dc6fc (diff) | |
download | openbmc-20ce659f53c1c30c607da7eedd75f4efb3faa334.tar.xz |
meta-google: Remove redundant nanopb
meta-openembedded now has this version so we don't need our own copy.
Change-Id: Ief0a6cf5a93d64399a3f6edf2256c59f9dcce87c
Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'meta-google')
-rw-r--r-- | meta-google/recipes-google/nanopb/nanopb-generator_0.4.8.bb | 14 | ||||
-rw-r--r-- | meta-google/recipes-google/nanopb/nanopb-runtime_0.4.8.bb | 17 | ||||
-rw-r--r-- | meta-google/recipes-google/nanopb/nanopb.bb | 17 | ||||
-rw-r--r-- | meta-google/recipes-google/nanopb/nanopb.inc | 13 |
4 files changed, 0 insertions, 61 deletions
diff --git a/meta-google/recipes-google/nanopb/nanopb-generator_0.4.8.bb b/meta-google/recipes-google/nanopb/nanopb-generator_0.4.8.bb deleted file mode 100644 index c86750f8b6..0000000000 --- a/meta-google/recipes-google/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-google/recipes-google/nanopb/nanopb-runtime_0.4.8.bb b/meta-google/recipes-google/nanopb/nanopb-runtime_0.4.8.bb deleted file mode 100644 index e43931a4ec..0000000000 --- a/meta-google/recipes-google/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-google/recipes-google/nanopb/nanopb.bb b/meta-google/recipes-google/nanopb/nanopb.bb deleted file mode 100644 index 7ad6a32782..0000000000 --- a/meta-google/recipes-google/nanopb/nanopb.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Combined nanopb package" -PV = "1.0" -PR = "r1" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -DEPENDS = " \ - nanopb-generator \ - nanopb-runtime \ -" - -RDEPENDS:${PN} = " \ - nanopb-generator \ - nanopb-runtime \ -" diff --git a/meta-google/recipes-google/nanopb/nanopb.inc b/meta-google/recipes-google/nanopb/nanopb.inc deleted file mode 100644 index 87dbc73e63..0000000000 --- a/meta-google/recipes-google/nanopb/nanopb.inc +++ /dev/null @@ -1,13 +0,0 @@ -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 = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e" - -S = "${WORKDIR}/git" - -inherit cmake - -BBCLASSEXTEND = "native nativesdk" - |