summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/conf/distro/include/default-versions.inc5
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4+cvs.bb2
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.16.bb2
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_git.bb2
-rw-r--r--meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb1
5 files changed, 4 insertions, 8 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index a04ea718bd..cc8c533d4c 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -2,11 +2,6 @@
2# Default preferred versions 2# Default preferred versions
3# 3#
4 4
5# Force the python versions in one place
6PYTHON_BASEVERSION ?= "2.7"
7PREFERRED_VERSION_python ?= "2.7.11"
8PREFERRED_VERSION_python-native ?= "2.7.11"
9
10# Force the older version of liberation-fonts until we fix the fontforge issue 5# Force the older version of liberation-fonts until we fix the fontforge issue
11PREFERRED_VERSION_liberation-fonts ?= "1.04" 6PREFERRED_VERSION_liberation-fonts ?= "1.04"
12 7
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
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index 3ce4a9ee17..8ef267c833 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -35,7 +35,7 @@ SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
35 35
36S = "${WORKDIR}/git" 36S = "${WORKDIR}/git"
37 37
38inherit autotools-brokensep ptest pkgconfig useradd 38inherit autotools-brokensep ptest pkgconfig useradd python-dir
39 39
40USERADD_PACKAGES = "${PN}" 40USERADD_PACKAGES = "${PN}"
41GROUPADD_PARAM_${PN} = "tracing" 41GROUPADD_PARAM_${PN} = "tracing"
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb b/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
index 962069e3dc..025eb63232 100644
--- a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
+++ b/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
@@ -6,6 +6,7 @@ LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
7 7
8require rt-tests.inc 8require rt-tests.inc
9inherit python-dir
9 10
10EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages" 11EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages"
11 12