diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-25 20:16:46 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-26 14:55:35 +0100 |
| commit | 14b70cd222519e5bccaca955334787f123d9fc54 (patch) | |
| tree | d4d969521ac696fa306294b6899588c7e6506946 | |
| parent | d3ae2fc896fd866aac9f064dccbff971c324f43c (diff) | |
| download | openembedded-core-14b70cd222519e5bccaca955334787f123d9fc54.tar.gz openembedded-core-14b70cd222519e5bccaca955334787f123d9fc54.tar.bz2 openembedded-core-14b70cd222519e5bccaca955334787f123d9fc54.zip | |
base/perlnative/pythonnative/gzipnative: Add a new variable to enable easier handling of native path issues
If something is listed in ASSUME_PROVIDED but also manually built (like bzip2-native and
bzip2-replacement-native), we need to ensure that the installed binaries are only accessed
for things which list the provider in DEPENDS.
This patch adds a generic mechanism to handle this instead of everything reinventing the
wheel. EXTRANATIVEPATH += "perl-native" will ensure that ${STAGING_BINDIR_NATIVE}/perl-native
is added to PATH.
This means that:
a) Such providers should install to ${bindir}/xxx-native
b) Should PROVIDE += "xxxx-replacement-native"
c) That users should DEPEND on xxx-replacement-native and have EXTRANATIVEPATH += "xxx-native"
This patch enables this at the core level, the bzip2 recipe still needs adjusting to work
like this along with adjustment of the users of bzip2-replacement-native (python-native?).
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/base.bbclass | 9 | ||||
| -rw-r--r-- | meta/classes/gzipnative.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/perlnative.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/pythonnative.bbclass | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 1f7602394e..a57bd596d6 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -74,6 +74,15 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/$ # in the context of the location its used (:=) THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" +def extra_path_elements(d): + path = "" + elements = (d.getVar('EXTRANATIVEPATH', True) or "").split() + for e in elements: + path = path + "${STAGING_BINDIR_NATIVE}/" + e + ":" + return path + +PATH_prepend = "${@extra_path_elements(d)}" + addtask fetch do_fetch[dirs] = "${DL_DIR}" do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}" diff --git a/meta/classes/gzipnative.bbclass b/meta/classes/gzipnative.bbclass index 4a411434a4..007e32c690 100644 --- a/meta/classes/gzipnative.bbclass +++ b/meta/classes/gzipnative.bbclass @@ -1,3 +1,3 @@ -PATH_prepend = "${STAGING_BINDIR_NATIVE}/pigz-native:${STAGING_BINDIR_NATIVE}/gzip-native:" +EXTRANATIVEPATH += "pigz-native gzip-native" DEPENDS += "gzip-native" diff --git a/meta/classes/perlnative.bbclass b/meta/classes/perlnative.bbclass index 2211b72135..cc8de8b381 100644 --- a/meta/classes/perlnative.bbclass +++ b/meta/classes/perlnative.bbclass @@ -1,3 +1,3 @@ -PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:" +EXTRANATIVEPATH += "perl-native" DEPENDS += "perl-native" OECMAKE_PERLNATIVE_DIR = "${STAGING_BINDIR_NATIVE}/perl-native" diff --git a/meta/classes/pythonnative.bbclass b/meta/classes/pythonnative.bbclass index bc346da58d..7886207d06 100644 --- a/meta/classes/pythonnative.bbclass +++ b/meta/classes/pythonnative.bbclass @@ -1,3 +1,3 @@ PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" -PATH_prepend = "${STAGING_BINDIR_NATIVE}/python-native:" +EXTRANATIVEPATH += "python-native" DEPENDS += " python-native " |