diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-16 23:09:44 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-17 22:24:36 +0100 |
| commit | af85ce4b4e675feb5796f87137c86d70c2f15b9a (patch) | |
| tree | f19dbb9bcf1eec671b26685458f7cc47ebb3721e /meta/classes/binconfig.bbclass | |
| parent | 046ae6a38d829048663fe1afb1f67de1fbe2e3b5 (diff) | |
| download | openembedded-core-af85ce4b4e675feb5796f87137c86d70c2f15b9a.tar.gz openembedded-core-af85ce4b4e675feb5796f87137c86d70c2f15b9a.tar.bz2 openembedded-core-af85ce4b4e675feb5796f87137c86d70c2f15b9a.zip | |
Remove layout_* variables
Remove layout_* variables and replace them with variables specific to the
different classes. The layout variables were only useful for the native/cross
classes and caused more confusion than they solved. They didn't scale to the
sdk class. It now clear a small set of native/cross variables fulfil the needs.
This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes
sense since we're installing binaries into the locations we're compiling them for.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/binconfig.bbclass')
| -rw-r--r-- | meta/classes/binconfig.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass index 50c66ae8d3..9ebb54887c 100644 --- a/meta/classes/binconfig.bbclass +++ b/meta/classes/binconfig.bbclass @@ -14,8 +14,8 @@ def get_binconfig_mangle(d): s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" - s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'" - s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'" + s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'" + s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'" s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" return s @@ -31,7 +31,7 @@ do_install_append() { -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -e 's:${STAGING_DATADIR}:${datadir}:' \ - -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' > ${D}${bindir}/`basename $config` + -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' > ${D}${bindir}/`basename $config` done fi @@ -40,7 +40,7 @@ do_install_append() { -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -e 's:${STAGING_DATADIR}:${datadir}:' \ - -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' \ + -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \ $lafile done } |