aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2023-01-31 13:20:22 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-01-31 17:37:23 +0000
commitcf3686848eb9d4cade93b9952431753bb6904b00 (patch)
treec9739f2eae0a2d6e49225d14ce6bb73867fc8825
parent543604244d50cf4e050abef80fe8dfb5b4ad14d6 (diff)
protobuf: remove upstreamed fix
The protobuf fix is now available in meta-openembedded. Change-Id: I83e911b64cf35767af22b76c19ea27ce818e300a Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 8454efd1ed3d03d4433d2d015ec80ac2329d4a2c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--conf/layer.conf1
-rw-r--r--dynamic-layers/openembedded-layer/recipes-devtools/protobuf/protobuf_%.bbappend1
2 files changed, 0 insertions, 2 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 9542a3b..dfab14b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,7 +16,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
# bbappends for optional layers
BBFILES_DYNAMIC += " \
- openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \
"
BBFILE_COLLECTIONS += "qt6-layer"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/protobuf/protobuf_%.bbappend b/dynamic-layers/openembedded-layer/recipes-devtools/protobuf/protobuf_%.bbappend
deleted file mode 100644
index 50c38a8..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/protobuf/protobuf_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-SYSROOT_DIRS += "${bindir}"