summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
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-05-30 22:47:14 +0100
commite0c75841078bf65905c1c9aa2946241b2474a7e2 (patch)
tree615c7fc980a71e0c1f4309300b7859714e078089 /meta/recipes-devtools/rpm
parent3891fcec863602a0ae6d0f3d305ea50a79a205d9 (diff)
downloadopenembedded-core-e0c75841078bf65905c1c9aa2946241b2474a7e2.tar.gz
openembedded-core-e0c75841078bf65905c1c9aa2946241b2474a7e2.tar.bz2
openembedded-core-e0c75841078bf65905c1c9aa2946241b2474a7e2.zip
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. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-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 = "\
# to process certain package feeds.
#SRC_URI += "file://rpm-debug-platform.patch"
-inherit autotools gettext
+inherit autotools gettext python-dir
acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
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 = "\
UPSTREAM_CHECK_REGEX = "rpm-(?P<pver>(\d+[\.\-_]*)+)-.*$"
-inherit autotools gettext
+inherit autotools gettext python-dir
acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"