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>
This commit is contained in:
parent
03da683a55
commit
1c83fcd38d
|
@ -2,11 +2,6 @@
|
||||||
# Default preferred versions
|
# Default preferred versions
|
||||||
#
|
#
|
||||||
|
|
||||||
# Force the python versions in one place
|
|
||||||
PYTHON_BASEVERSION ?= "2.7"
|
|
||||||
PREFERRED_VERSION_python ?= "2.7.11"
|
|
||||||
PREFERRED_VERSION_python-native ?= "2.7.11"
|
|
||||||
|
|
||||||
# Force the older version of liberation-fonts until we fix the fontforge issue
|
# Force the older version of liberation-fonts until we fix the fontforge issue
|
||||||
PREFERRED_VERSION_liberation-fonts ?= "1.04"
|
PREFERRED_VERSION_liberation-fonts ?= "1.04"
|
||||||
|
|
||||||
|
|
|
@ -156,7 +156,7 @@ SRC_URI_append_libc-musl = "\
|
||||||
# to process certain package feeds.
|
# to process certain package feeds.
|
||||||
#SRC_URI += "file://rpm-debug-platform.patch"
|
#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"
|
acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
|
||||||
|
|
||||||
|
|
|
@ -165,7 +165,7 @@ SRC_URI_append_libc-musl = "\
|
||||||
|
|
||||||
UPSTREAM_CHECK_REGEX = "rpm-(?P<pver>(\d+[\.\-_]*)+)-.*$"
|
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"
|
acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit autotools-brokensep ptest pkgconfig useradd
|
inherit autotools-brokensep ptest pkgconfig useradd python-dir
|
||||||
|
|
||||||
USERADD_PACKAGES = "${PN}"
|
USERADD_PACKAGES = "${PN}"
|
||||||
GROUPADD_PARAM_${PN} = "tracing"
|
GROUPADD_PARAM_${PN} = "tracing"
|
||||||
|
|
|
@ -6,6 +6,7 @@ LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
|
|
||||||
require rt-tests.inc
|
require rt-tests.inc
|
||||||
|
inherit python-dir
|
||||||
|
|
||||||
EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages"
|
EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue