summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMatthieu Crapet <Matthieu.Crapet@ingenico.com>2014-06-12 17:49:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-14 08:43:56 +0100
commita08ef9a3a3c3541a4dac6de6c395ba9e193fa41b (patch)
treec0e9d66419e9827ecf100a8bc12368eaa541a41f /meta
parent6ad8d642d2a2ed3400967e1b504930bacd1961e2 (diff)
downloadpoky-a08ef9a3a3c3541a4dac6de6c395ba9e193fa41b.tar.gz
native.bbclass: Properly define directories
For most users this commit will have no effect. But if you come across the idea of giving different names for paths, you'll get some troubles. When a recipe inherit native, properly define bindir, sbindir, includedir, sysconfdir, datadir (using xxxdir_native definitions from meta/conf/bitbake.conf). For example, edit "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/quilt-native/temp/log.do_configure" and see what are the arguments given by oe_runconf. Notice that ${docdir}, ${mandir}, ${infodir}, ${localstatedir} have no associated _native definition. (From OE-Core rev: 15345ddd4be6a0b041b3d6caaad48d46b22142e9) Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/native.bbclass7
-rw-r--r--meta/conf/bitbake.conf3
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 31f1c41ac6..9dec318aa8 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -77,7 +77,12 @@ base_prefix = "${STAGING_DIR_NATIVE}"
77prefix = "${STAGING_DIR_NATIVE}${prefix_native}" 77prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
78exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" 78exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
79 79
80libdir = "${STAGING_DIR_NATIVE}${libdir_native}" 80bindir = "${STAGING_BINDIR_NATIVE}"
81sbindir = "${STAGING_SBINDIR_NATIVE}"
82libdir = "${STAGING_LIBDIR_NATIVE}"
83includedir = "${STAGING_INCDIR_NATIVE}"
84sysconfdir = "${STAGING_ETCDIR_NATIVE}"
85datadir = "${STAGING_DATADIR_NATIVE}"
81 86
82baselib = "lib" 87baselib = "lib"
83 88
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1856142927..49b37196ff 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -24,11 +24,11 @@ export base_libdir = "${base_prefix}/${baselib}"
24export nonarch_base_libdir = "${base_prefix}/lib" 24export nonarch_base_libdir = "${base_prefix}/lib"
25 25
26# Architecture independent paths 26# Architecture independent paths
27export datadir = "${prefix}/share"
28export sysconfdir = "${base_prefix}/etc" 27export sysconfdir = "${base_prefix}/etc"
29export servicedir = "${base_prefix}/srv" 28export servicedir = "${base_prefix}/srv"
30export sharedstatedir = "${base_prefix}/com" 29export sharedstatedir = "${base_prefix}/com"
31export localstatedir = "${base_prefix}/var" 30export localstatedir = "${base_prefix}/var"
31export datadir = "${prefix}/share"
32export infodir = "${datadir}/info" 32export infodir = "${datadir}/info"
33export mandir = "${datadir}/man" 33export mandir = "${datadir}/man"
34export docdir = "${datadir}/doc" 34export docdir = "${datadir}/doc"
@@ -347,6 +347,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}
347STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" 347STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
348STAGING_LIBEXECDIR_NATIVE = "${STAGING_DIR_NATIVE}${libexecdir_native}" 348STAGING_LIBEXECDIR_NATIVE = "${STAGING_DIR_NATIVE}${libexecdir_native}"
349STAGING_BASE_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${base_libdir_native}" 349STAGING_BASE_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${base_libdir_native}"
350STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}"
350STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" 351STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
351STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" 352STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
352STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}" 353STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"