summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-04-25 15:59:23 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-01 12:38:41 +0100
commit1c83fcd38de7f7801391f7604f4d6eb188f72068 (patch)
treef0fcc343fbe526869045d315c0177e05480604db /meta/recipes-devtools
parent03da683a55582a05154104abf986678f3d578a6c (diff)
downloadpoky-1c83fcd38de7f7801391f7604f4d6eb188f72068.tar.gz
default-versions.inc: drop python-related defaults
There is only one version of python 2.x provided, so no need to set a preferred version. PYTHON_BASEVERSION is now set explicitly in python-dir.bbclass and python3-dir.bbclass, so fix up a few recipes that relied on it being set in default-versions.inc without inheriting python-dir. (From OE-Core rev: e0c75841078bf65905c1c9aa2946241b2474a7e2) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4+cvs.bb2
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.16.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
index 0991f6d52a..625d75e825 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
@@ -156,7 +156,7 @@ SRC_URI_append_libc-musl = "\
156# to process certain package feeds. 156# to process certain package feeds.
157#SRC_URI += "file://rpm-debug-platform.patch" 157#SRC_URI += "file://rpm-debug-platform.patch"
158 158
159inherit autotools gettext 159inherit autotools gettext python-dir
160 160
161acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" 161acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
162 162
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 7ebd5e9359..3adb29c347 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -165,7 +165,7 @@ SRC_URI_append_libc-musl = "\
165 165
166UPSTREAM_CHECK_REGEX = "rpm-(?P<pver>(\d+[\.\-_]*)+)-.*$" 166UPSTREAM_CHECK_REGEX = "rpm-(?P<pver>(\d+[\.\-_]*)+)-.*$"
167 167
168inherit autotools gettext 168inherit autotools gettext python-dir
169 169
170acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" 170acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
171 171