diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-17 10:08:53 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-05 12:36:28 +0000 |
commit | 0fa52f70789afe5a53384ba20249af34c16a8568 (patch) | |
tree | 10922171df8f0e469961b727a9f1ebb2830cd719 /meta/recipes-devtools | |
parent | 5aabdbaff7b8be319a86c5e33cc2eb8c2e4aa2ef (diff) | |
download | poky-0fa52f70789afe5a53384ba20249af34c16a8568.tar.gz |
native.bbclass: Fix variable remapping coverage
When looking for RDEPENDS to process, bitbake iterates through PACKAGES
*and* PN. Since native.bbclass sets PACKAGES to be empty, its pointless
remapping the list of PACKAGES since this does nothing. There is a problem
since *_${PN} are used by bitbake but not remapped by the native.bbclass
class extension code.
This changes the code to remap _${PN} in both expanded and unexpanded
forms. As a result of this, various surprising dependencies are uncovered
and the patch rectifies those. These are real bugs since they're injecting
unneeded (unremapped) dependencies into the dependency chain.
(From OE-Core rev: 0f485bfd6fc82a109b9da629e464fca1e90faec3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
4 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc index 08a1b02219..1d0cf900fc 100644 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ b/meta/recipes-devtools/autoconf/autoconf.inc | |||
@@ -6,6 +6,8 @@ LICENSE = "GPLv3" | |||
6 | HOMEPAGE = "http://www.gnu.org/software/autoconf/" | 6 | HOMEPAGE = "http://www.gnu.org/software/autoconf/" |
7 | SECTION = "devel" | 7 | SECTION = "devel" |
8 | DEPENDS += "m4-native" | 8 | DEPENDS += "m4-native" |
9 | DEPENDS_virtclass-native = "m4-native gnu-config-native" | ||
10 | DEPENDS_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" | ||
9 | RDEPENDS_${PN} = "m4 gnu-config" | 11 | RDEPENDS_${PN} = "m4 gnu-config" |
10 | 12 | ||
11 | SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ | 13 | SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ |
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb index 9028e8336b..84eb1821b4 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb | |||
@@ -4,8 +4,6 @@ PR = "r4" | |||
4 | 4 | ||
5 | PARALLEL_MAKE = "" | 5 | PARALLEL_MAKE = "" |
6 | 6 | ||
7 | DEPENDS += "m4-native" | ||
8 | RDEPENDS_${PN} = "m4 gnu-config" | ||
9 | LICENSE = "GPLv2 & GPLv3" | 7 | LICENSE = "GPLv2 & GPLv3" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ |
11 | file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" | 9 | file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" |
@@ -22,12 +20,6 @@ SRC_URI += "file://autoreconf-include.patch \ | |||
22 | SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07" | 20 | SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07" |
23 | SRC_URI[sha256sum] = "c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8" | 21 | SRC_URI[sha256sum] = "c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8" |
24 | 22 | ||
25 | DEPENDS_virtclass-native = "m4-native gnu-config-native" | ||
26 | RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" | ||
27 | |||
28 | DEPENDS_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" | ||
29 | RDEPENDS_${PN}_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" | ||
30 | |||
31 | SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch" | 23 | SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch" |
32 | 24 | ||
33 | EXTRA_OECONF += "ac_cv_path_M4=m4" | 25 | EXTRA_OECONF += "ac_cv_path_M4=m4" |
diff --git a/meta/recipes-devtools/automake/automake_1.11.2.bb b/meta/recipes-devtools/automake/automake_1.11.2.bb index b455edfe6f..0a65f24fbe 100644 --- a/meta/recipes-devtools/automake/automake_1.11.2.bb +++ b/meta/recipes-devtools/automake/automake_1.11.2.bb | |||
@@ -3,7 +3,7 @@ LICENSE="GPLv2" | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
4 | DEPENDS_virtclass-native = "autoconf-native" | 4 | DEPENDS_virtclass-native = "autoconf-native" |
5 | 5 | ||
6 | RDEPENDS_automake += "\ | 6 | RDEPENDS_${PN} += "\ |
7 | autoconf \ | 7 | autoconf \ |
8 | perl \ | 8 | perl \ |
9 | perl-module-bytes \ | 9 | perl-module-bytes \ |
@@ -27,7 +27,8 @@ RDEPENDS_automake += "\ | |||
27 | perl-module-text-parsewords \ | 27 | perl-module-text-parsewords \ |
28 | perl-module-vars " | 28 | perl-module-vars " |
29 | 29 | ||
30 | RDEPENDS_automake-native = "autoconf-native perl-native-runtime" | 30 | RDEPENDS_${PN}_virtclass-native = "autoconf-native perl-native-runtime" |
31 | RDEPENDS_${PN}_virtclass-nativesdk = "autoconf-nativesdk" | ||
31 | 32 | ||
32 | PATHFIXPATCH = "file://path_prog_fixes.patch" | 33 | PATHFIXPATCH = "file://path_prog_fixes.patch" |
33 | PATHFIXPATCH_virtclass-native = "" | 34 | PATHFIXPATCH_virtclass-native = "" |
diff --git a/meta/recipes-devtools/python/python-native_2.7.2.bb b/meta/recipes-devtools/python/python-native_2.7.2.bb index 8bf736d1ec..67b546d76e 100644 --- a/meta/recipes-devtools/python/python-native_2.7.2.bb +++ b/meta/recipes-devtools/python/python-native_2.7.2.bb | |||
@@ -18,6 +18,8 @@ S = "${WORKDIR}/Python-${PV}" | |||
18 | 18 | ||
19 | inherit native | 19 | inherit native |
20 | 20 | ||
21 | RPROVIDES += "python-distutils-native python-compression-native python-textutils-native" | ||
22 | |||
21 | EXTRA_OEMAKE = '\ | 23 | EXTRA_OEMAKE = '\ |
22 | BUILD_SYS="" \ | 24 | BUILD_SYS="" \ |
23 | HOST_SYS="" \ | 25 | HOST_SYS="" \ |