diff options
| -rw-r--r-- | meta/conf/distro/include/default-versions.inc | 5 | ||||
| -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 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_git.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb | 1 |
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 | ||
| 6 | PYTHON_BASEVERSION ?= "2.7" | ||
| 7 | PREFERRED_VERSION_python ?= "2.7.11" | ||
| 8 | PREFERRED_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 |
| 11 | PREFERRED_VERSION_liberation-fonts ?= "1.04" | 6 | PREFERRED_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 | ||
| 159 | inherit autotools gettext | 159 | inherit autotools gettext python-dir |
| 160 | 160 | ||
| 161 | acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" | 161 | acpaths = "-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 | ||
| 166 | UPSTREAM_CHECK_REGEX = "rpm-(?P<pver>(\d+[\.\-_]*)+)-.*$" | 166 | UPSTREAM_CHECK_REGEX = "rpm-(?P<pver>(\d+[\.\-_]*)+)-.*$" |
| 167 | 167 | ||
| 168 | inherit autotools gettext | 168 | inherit autotools gettext python-dir |
| 169 | 169 | ||
| 170 | acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" | 170 | acpaths = "-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 | ||
| 36 | S = "${WORKDIR}/git" | 36 | S = "${WORKDIR}/git" |
| 37 | 37 | ||
| 38 | inherit autotools-brokensep ptest pkgconfig useradd | 38 | inherit autotools-brokensep ptest pkgconfig useradd python-dir |
| 39 | 39 | ||
| 40 | USERADD_PACKAGES = "${PN}" | 40 | USERADD_PACKAGES = "${PN}" |
| 41 | GROUPADD_PARAM_${PN} = "tracing" | 41 | GROUPADD_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" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
| 7 | 7 | ||
| 8 | require rt-tests.inc | 8 | require rt-tests.inc |
| 9 | inherit python-dir | ||
| 9 | 10 | ||
| 10 | EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages" | 11 | EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages" |
| 11 | 12 | ||
