summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-14 15:55:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-19 17:54:58 +0000
commit2c57f28eda433e4f3e639023a6d244554c3ccdad (patch)
tree16da1d42cadd16d6e1ff799e126b01e09c0fac41 /meta
parent9e4186796591fdfc7d84395dd21fe33e18e87ac5 (diff)
downloadpoky-2c57f28eda433e4f3e639023a6d244554c3ccdad.tar.gz
bitbake.conf: add nonarch_base_lib variable
Adapt stagging.bbclass to this change (From OE-Core rev: 0730a8cbb42cd8b6667f2d1daefa0f6fcec06af2) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/staging.bbclass4
-rw-r--r--meta/conf/bitbake.conf1
2 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 82624cba9c..1a078b415b 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -50,6 +50,10 @@ sysroot_stage_dirs() {
50 then 50 then
51 sysroot_stage_libdir $from${base_libdir} $to${base_libdir} 51 sysroot_stage_libdir $from${base_libdir} $to${base_libdir}
52 fi 52 fi
53 if [ -d $from${nonarch_base_libdir} ]
54 then
55 sysroot_stage_libdir $from${nonarch_base_libdir} $to${nonarch_base_libdir}
56 fi
53 sysroot_stage_dir $from${datadir} $to${datadir} 57 sysroot_stage_dir $from${datadir} $to${datadir}
54 # We don't care about docs/info/manpages/locales 58 # We don't care about docs/info/manpages/locales
55 rm -rf $to${mandir}/ $to${docdir}/ $to${infodir}/ ${to}${datadir}/locale/ 59 rm -rf $to${mandir}/ $to${docdir}/ $to${infodir}/ ${to}${datadir}/locale/
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 578c29f46c..2e3856a2d1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -21,6 +21,7 @@ export exec_prefix = "/usr"
21export base_bindir = "${base_prefix}/bin" 21export base_bindir = "${base_prefix}/bin"
22export base_sbindir = "${base_prefix}/sbin" 22export base_sbindir = "${base_prefix}/sbin"
23export base_libdir = "${base_prefix}/${baselib}" 23export base_libdir = "${base_prefix}/${baselib}"
24export nonarch_base_libdir = "${base_prefix}/lib"
24 25
25# Architecture independent paths 26# Architecture independent paths
26export datadir = "${prefix}/share" 27export datadir = "${prefix}/share"