From 15345ddd4be6a0b041b3d6caaad48d46b22142e9 Mon Sep 17 00:00:00 2001 From: Matthieu Crapet Date: Thu, 12 Jun 2014 17:49:32 +0200 Subject: 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. Signed-off-by: Matthieu Crapet Signed-off-by: Richard Purdie --- meta/classes/native.bbclass | 7 ++++++- meta/conf/bitbake.conf | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'meta') 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}" prefix = "${STAGING_DIR_NATIVE}${prefix_native}" exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" -libdir = "${STAGING_DIR_NATIVE}${libdir_native}" +bindir = "${STAGING_BINDIR_NATIVE}" +sbindir = "${STAGING_SBINDIR_NATIVE}" +libdir = "${STAGING_LIBDIR_NATIVE}" +includedir = "${STAGING_INCDIR_NATIVE}" +sysconfdir = "${STAGING_ETCDIR_NATIVE}" +datadir = "${STAGING_DATADIR_NATIVE}" baselib = "lib" 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}" export nonarch_base_libdir = "${base_prefix}/lib" # Architecture independent paths -export datadir = "${prefix}/share" export sysconfdir = "${base_prefix}/etc" export servicedir = "${base_prefix}/srv" export sharedstatedir = "${base_prefix}/com" export localstatedir = "${base_prefix}/var" +export datadir = "${prefix}/share" export infodir = "${datadir}/info" export mandir = "${datadir}/man" export docdir = "${datadir}/doc" @@ -347,6 +347,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH} STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" STAGING_LIBEXECDIR_NATIVE = "${STAGING_DIR_NATIVE}${libexecdir_native}" STAGING_BASE_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${base_libdir_native}" +STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}" STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}" -- cgit v1.2.3