Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support scarthgap (the latest yocto LTS) / cut dependency for meta-oe / upgrade nnstreamer version #89

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ This layer provides OFFICIAL support for [NNStreamer](https://github.com/nnstrea
- branch: master
- revision: HEAD

- URI: https://github.com/openembedded/meta-openembedded.git
- layers: meta-oe
- branch: master
- revision: HEAD

## Disclaimer

This meta, "meta-neural-network", is a collection of meta data of set of software packages. Be aware that this meta cannot dictate the licenses of such packages. Packages included in this meta have their own licenses.
2 changes: 1 addition & 1 deletion conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ BBFILE_COLLECTIONS += "neuralnetwork"
BBFILE_PATTERN_neuralnetwork = "^${LAYERDIR}/"
BBFILE_PRIORITY_neuralnetwork = "7"
LAYERVERSION_neuralnetwork = "6"
LAYERSERIES_COMPAT_neuralnetwork = "kirkstone langdale mickledore"
LAYERSERIES_COMPAT_neuralnetwork = "kirkstone langdale mickledore scarthgap"
37 changes: 37 additions & 0 deletions recipes-devtools/googletest/googletest_1.15.2.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
DESCRIPTION = "Google's framework for writing C++ tests"
HOMEPAGE = "https://github.com/google/googletest"
SECTION = "libs"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"

PROVIDES += "gmock gtest"

S = "${WORKDIR}/git"
SRCREV = "b514bdc898e2951020cbdca1304b75f5950d1f59"
SRC_URI = "git://github.com/google/googletest.git;branch=v1.15.x;protocol=https"

inherit cmake pkgconfig

# allow for shared libraries, but do not default to them
#
PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,,"

CXXFLAGS:append = " -fPIC"

ALLOW_EMPTY:${PN} = "1"
ALLOW_EMPTY:${PN}-dbg = "1"

# -staticdev will not be implicitly put into an SDK, so we add an rdepend
# if we are not building shared libraries
#
RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG","shared","","${PN}-staticdev",d)}"

BBCLASSEXTEND = "native nativesdk"

do_configure:prepend() {
# explicitly use python3
# the scripts are already python3 compatible since https://github.com/google/googletest/commit/d404af0d987a9c38cafce82a7e26ec8468c88361 and other fixes like this
# but since this oe-core change http://git.openembedded.org/openembedded-core/commit/?id=5f8f16b17f66966ae91aeabc23e97de5ecd17447
# there isn't python in HOSTTOOLS so "env python" fails
sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/test/*py ${S}/googletest/test/*py
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SRC_URI = "\
git://github.com/nnstreamer/nnstreamer.git;branch=main;protocol=https \
"

PV = "2.1.0+git${SRCPV}"
PV = "2.4.2+git${SRCPV}"
SRCREV = "${AUTOREV}"

S = "${WORKDIR}/git"
Expand Down
124 changes: 0 additions & 124 deletions recipes-tensorflow/tensorflow-lite/tensorflow-lite_1.12.0.bb

This file was deleted.

109 changes: 0 additions & 109 deletions recipes-tensorflow/tensorflow-lite/tensorflow-lite_1.15.2.bb

This file was deleted.