diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-04-25 15:59:23 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-01 12:38:41 +0100 |
commit | 1c83fcd38de7f7801391f7604f4d6eb188f72068 (patch) | |
tree | f0fcc343fbe526869045d315c0177e05480604db /meta/recipes-devtools/rpm | |
parent | 03da683a55582a05154104abf986678f3d578a6c (diff) | |
download | openembedded-core-contrib-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/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.16.bb | 2 |
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" |