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/native.bbclass | |
parent | 046ae6a38d829048663fe1afb1f67de1fbe2e3b5 (diff) | |
download | poky-af85ce4b4e675feb5796f87137c86d70c2f15b9a.tar.gz |
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/native.bbclass')
-rw-r--r-- | meta/classes/native.bbclass | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index de6b6fff42..5da766426f 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
@@ -50,32 +50,15 @@ export RANLIB = "${HOST_PREFIX}ranlib" | |||
50 | export STRIP = "${HOST_PREFIX}strip" | 50 | export STRIP = "${HOST_PREFIX}strip" |
51 | 51 | ||
52 | # Path prefixes | 52 | # Path prefixes |
53 | export base_prefix = "${STAGING_DIR_NATIVE}" | 53 | base_prefix = "${STAGING_DIR_NATIVE}" |
54 | export prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" | 54 | prefix = "${STAGING_DIR_NATIVE}/usr" |
55 | export exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" | 55 | exec_prefix = "${STAGING_DIR_NATIVE}/usr" |
56 | 56 | ||
57 | # Base paths | 57 | # Since we actually install these into situ there is no staging prefix |
58 | export base_bindir = "${STAGING_DIR_NATIVE}${layout_base_bindir}" | 58 | STAGING_DIR_HOST = "" |
59 | export base_sbindir = "${STAGING_DIR_NATIVE}${layout_base_sbindir}" | 59 | STAGING_DIR_TARGET = "" |
60 | export base_libdir = "${STAGING_DIR_NATIVE}${layout_base_libdir}" | 60 | SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs" |
61 | 61 | PKG_CONFIG_DIR = "${libdir}/pkgconfig" | |
62 | # Architecture independent paths | ||
63 | export datadir = "${STAGING_DIR_NATIVE}${layout_datadir}" | ||
64 | export sysconfdir = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" | ||
65 | export sharedstatedir = "${STAGING_DIR_NATIVE}${layout_sharedstatedir}" | ||
66 | export localstatedir = "${STAGING_DIR_NATIVE}${layout_localstatedir}" | ||
67 | export infodir = "${STAGING_DIR_NATIVE}${layout_infodir}" | ||
68 | export mandir = "${STAGING_DIR_NATIVE}${layout_mandir}" | ||
69 | export docdir = "${STAGING_DIR_NATIVE}${layout_docdir}" | ||
70 | export servicedir = "${STAGING_DIR_NATIVE}${layout_servicedir}" | ||
71 | |||
72 | # Architecture dependent paths | ||
73 | export bindir = "${STAGING_DIR_NATIVE}${layout_bindir}" | ||
74 | export sbindir = "${STAGING_DIR_NATIVE}${layout_sbindir}" | ||
75 | export libexecdir = "${STAGING_DIR_NATIVE}${layout_libexecdir}" | ||
76 | export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}" | ||
77 | export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}" | ||
78 | export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}" | ||
79 | 62 | ||
80 | # | 63 | # |
81 | # If changing this function, please make sure packaged-staging.bbclass is | 64 | # If changing this function, please make sure packaged-staging.bbclass is |