From e78cf913076ba28633d0ec4540f15820a0d944d2 Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Mon, 27 Aug 2018 13:07:30 +0200 Subject: python{3, }-protobuf: consolidate CLEANBROKEN Since python-protobuf and python3-protobuf share the same build instructions, it's sane to clarify for both at the same place, that running setup.py clean is wrong in configure stage. Signed-off-by: Jens Rehsack Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-protobuf.inc | 4 ++++ meta-python/recipes-devtools/python/python-protobuf_3.6.0.bb | 4 ---- meta-python/recipes-devtools/python/python3-protobuf_3.6.0.bb | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python-protobuf.inc b/meta-python/recipes-devtools/python/python-protobuf.inc index 6a0568ae62..a1866b351f 100644 --- a/meta-python/recipes-devtools/python/python-protobuf.inc +++ b/meta-python/recipes-devtools/python/python-protobuf.inc @@ -10,6 +10,10 @@ inherit pypi SRC_URI[md5sum] = "074abcceee0d795ba34ad6430f71d0e8" SRC_URI[sha256sum] = "a37836aa47d1b81c2db1a6b7a5e79926062b5d76bd962115a0e615551be2b48d" +# http://errors.yoctoproject.org/Errors/Details/184715/ +# Can't find required file: ../src/google/protobuf/descriptor.proto +CLEANBROKEN = "1" + UPSTREAM_CHECK_REGEX = "protobuf/(?P\d+(\.\d+)+)/" RDEPENDS_${PN} += " \ diff --git a/meta-python/recipes-devtools/python/python-protobuf_3.6.0.bb b/meta-python/recipes-devtools/python/python-protobuf_3.6.0.bb index dddc9bbb58..f04fc489f0 100644 --- a/meta-python/recipes-devtools/python/python-protobuf_3.6.0.bb +++ b/meta-python/recipes-devtools/python/python-protobuf_3.6.0.bb @@ -1,6 +1,2 @@ inherit setuptools require python-protobuf.inc - -# http://errors.yoctoproject.org/Errors/Details/184715/ -# Can't find required file: ../src/google/protobuf/descriptor.proto -CLEANBROKEN = "1" diff --git a/meta-python/recipes-devtools/python/python3-protobuf_3.6.0.bb b/meta-python/recipes-devtools/python/python3-protobuf_3.6.0.bb index 53d5528c4b..781d1dc4da 100644 --- a/meta-python/recipes-devtools/python/python3-protobuf_3.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-protobuf_3.6.0.bb @@ -1,3 +1,2 @@ inherit setuptools3 require python-protobuf.inc -CLEANBROKEN = "1" -- cgit 1.2.3-korg